upd

com.sharemao.web.manager/src/main/java/com/sharemao/manager/service/impl/KasServiceImpl.java

@@ -32,7 +32,8 @@ public class KasServiceImpl extends DevBaseService implements KasService {
 		
 		String orgTm = para.get("orgid");
 		String title = para.get("kasname");
-		
+		String simtype = para.get("simtype");
+
 		if(!ProjectTools.isEmpty(orgTm) && !orgTm.equals("-1"))
 			cdtSql += " AND orgid = "+orgTm;
 		else if(orgid >1)
@@ -40,6 +41,9 @@ public class KasServiceImpl extends DevBaseService implements KasService {
 		
 		if(!ProjectTools.isEmpty(title))
 			cdtSql += " AND kasname like '%"+title+"%'";
+
+		if(!ProjectTools.isEmpty(simtype) && !simtype.equals("-1"))
+			cdtSql += " AND simtype = "+simtype;
 		
 		System.out.println("sql+cdtSql>>>>>"+sql+cdtSql);
 		return getPageData(para.get("page"), para.get("rows"), sql+cdtSql, countSql+cdtSql);

com.sharemao.web.manager/src/main/java/test/SMD.java

@@ -39,8 +39,23 @@ public class SMD
 	{
 //		sim2();
 //        updrv();
-        show();
+//        show();
 
+        int t=0;
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 32; i++) {
+            String sql="select devid from device"+i+" where mode = 6 or mode =7 or mode=8";
+            List<Map<String, Object>> devices =RCPService.getMifiService().getMapList(sql);
+            t += devices.size();
+            if (devices != null) {
+                devices.stream().forEach(item -> {
+                    String devid = String.valueOf(item.get("devid"));
+                    sb.append(",'").append(devid).append("'");
+                });
+            }
+        }
+        System.out.println("("+sb.substring(1)+")");
+        System.out.println(t);
     }
 
 	//内置卡1入库

com.sharemao.web.manager/src/main/webapp/view/module/kas.jsp

@@ -23,7 +23,17 @@
 				<li>
 					<label>卡商</label>
 					<input class="easyui-textbox" id="kasname">
-				</li>				
+				</li>
+				<li>
+					<label>使用类型</label>
+					<select class="easyui-combobox" name="simtype" id="simtype">
+                        data-options="prompt:'请选择',required:true,editable:false">
+                        <option value="-1">全部</option>
+                        <option value="1">纯物联网卡</option>
+                        <option value="2">设备卡</option>
+                        <option value="3">esim卡</option>
+                    </select>
+				</li>
 			</ul>
 			<span style="float:right;padding-right:20px;">
 				<a href="#" class="easyui-linkbutton" iconCls="icon-search-green" plain="true" onclick="getSearchList()">搜索</a>
@@ -199,7 +209,7 @@
 	});
 		
 	function getSearchList(){
-		var params = {"orgid":$('#orgcc').combobox('getValue'),"kasname":$('#kasname').textbox('getValue'),
+		var params = {"orgid":$('#orgcc').combobox('getValue'),"kasname":$('#kasname').textbox('getValue'),"simtype":$('#simtype').combobox('getValue')
 			};
 		$('#common-table').datagrid('load',params);
 	}
@@ -278,6 +288,8 @@
 		$('#orgcc').combobox('setText', "");
 		$('#isenable').combobox('setValue', "-1");
 		$('#isenable').combobox('setText', "全部");
+		$('#simtype').combobox('setValue', "-1");
+		$('#simtype').combobox('setText', "全部");
 		$('#proname').textbox('setValue', "");
 		getSearchList();
 	}

com.shuhaiwifi.task/src/main/java/com/shuhaiwifi/task/DistributeSMD.java

@@ -20,7 +20,7 @@ public class DistributeSMD {
 		List<Map<String,Object>> devlists = new ArrayList<Map<String,Object>>();
         long sevenDaysAgo = System.currentTimeMillis() - (7 * 24 * 60 * 60 * 1000);
         for (int i = 0; i < 32; i++) {
-			String devsql = "SELECT * from device"+i+" where devgrpid=1 and lastcntm > "+sevenDaysAgo;
+			String devsql = "SELECT * from device"+i+" where (devgrpid=1 or devgrpid=9) and lastcntm > "+sevenDaysAgo;
 			List<Map<String,Object>> devlist=RCPService.getMifiService().getMapList(devsql);
 			if (devlist!=null&&devlist.size()>0) {
 				devlists.addAll(devlist);