upd

com.sharemao.core.task/src/main/java/com/sharemao/core/task/iot2/ct/RealNameV2.java

@@ -2,6 +2,7 @@ package com.sharemao.core.task.iot2.ct;
 
 import com.nianzai.base.dao.util.DAOHelper;
 import com.nianzai.util.DateTimeUtil;
+import com.nianzai.util.Tools;
 import com.sharemao.core.task.iot.bw.BW;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,13 +31,21 @@ public class RealNameV2 {
 		{
 			for(Map<String,Object> m:simlist)
 			{
+                if (m.get("iccid")==null||Tools.isEmpty(m.get("iccid").toString())){
+                    continue;
+                }
 				String iccid=m.get("iccid").toString();
 				int kasid=Integer.parseInt(m.get("kasid").toString());
                 String token=CTAPI.getToken(kasid);
 				if (kasid==27) {
 					iccid = iccid.toUpperCase();
 				}
-				String resettm=m.get("resettm")==null?"":m.get("resettm").toString();
+                String resettm="";
+                String sqli="SELECT resettm FROM `iccidtemp` where iccid='"+iccid+"'";
+                List<Map<String,Object>> resettmList=DAOHelper.find("ufiiccid", sqli);
+                if (resettmList!=null && !resettmList.isEmpty() && resettmList.get(0)!=null && resettmList.get(0).get("resettm")!=null){
+                    resettm = resettmList.get(0).get("resettm").toString();
+                }
 				String status;
                 if (kasid==59){
                     status = CTAPI.zysm(iccid,resettm);

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

@@ -37,25 +37,11 @@ public class SMD
 {
 	public static void main(String[] args) throws Exception 
 	{
-//		sim2();
+		sim2();
 //        updrv();
 //        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.shuhaiwifi.web.auth2/src/main/java/com/shuhaiwifi/web/auth2/iot/Iot.java

@@ -9,7 +9,7 @@ public class Iot
 	public static int wx=5;//五兴4G移动卡
 	public static int yljs=6;//亿联4G移动（江苏移动）
 	public static int zy=7;//中亿4G移动卡
-	public static int bmbjyd=8;//铂明
+	public static int bmyd=8;//铂明
 	public static int bmlcyd=9;//铂明C4870聊城移动
 	public static int wx2=10;//五兴4G移动卡
 	public static int lxxj=11;//龙鑫新疆移动
@@ -17,7 +17,6 @@ public class Iot
 	public static int lxqh=13;//龙鑫青海移动
 	public static int lxgz=14;//龙鑫贵州移动
 	public static int whhnyd=15;//文航河南移动
-    public static int bmgdyd=16;//铂明广东移动
 
 	public static String getOprtStr(String iccid)
 	{

com.shuhaiwifi.web.auth2/src/main/java/com/shuhaiwifi/web/auth2/iot/ThirdToken.java

@@ -190,53 +190,54 @@ public class ThirdToken {
 				}
 			}
 		}
-		if(kasid==Iot.bmbjyd || kasid==Iot.bmlcyd || kasid==Iot.bmgdyd) {
-			String appId="",openId="",channelId="";
-			if (kasid==Iot.bmbjyd) {
-				appId="C5010100A23100111720247";
-				openId="GFLaxxfVMG4DGkgcdZEEg4zexmje3dq4";
-				channelId="236";
-			} else if (kasid==Iot.bmlcyd){
-				appId="C5010531Aq5201817914";
-				openId="GFLaxxfVMG4DGkgcdZEEg4zexmje3dq4";
-				channelId="216";
-			} else {
-                appId="C5010200A9992002368004";
-                openId="GFLaxxfVMG4DGkgcdZEEg4zexmje3dq4";
-                channelId="239";
+        if (kasid==Iot.bmlcyd){
+            String appId="C5010531Aq5201817914";
+            String openId="GFLaxxfVMG4DGkgcdZEEg4zexmje3dq4";
+            String channelId="216";
+            Map<String, String> receivedData = new HashMap<String, String>();
+            String times=String.valueOf(System.currentTimeMillis()/1000);
+            receivedData.put("times", times);
+            receivedData.put("appId", appId);
+            receivedData.put("channelId", channelId);
+            TreeMap<String, String> sortedData = new TreeMap<>(receivedData);
+            // 构建待签名字符串
+            StringBuilder stringA = new StringBuilder();
+            stringA.append(openId);
+            for (Map.Entry<String, String> entry : sortedData.entrySet()) {
+                String key = entry.getKey();
+                String value = entry.getValue();
+                if (value != null && !value.isEmpty() && !"sign".equals(key) ) {
+                    stringA.append(key).append(value);
+                }
+            }
+            // 拼接key，并进行MD5运算
+            stringA.append(openId);
+            String signValue = SecureUtil.sha1((stringA.toString())).toUpperCase();
+            String url="http://db.jinmaiiot.com:7021/api/external/getDeviceToken?appId="+appId+"&openId="+openId+"&times="+times+"&sign="+signValue+"&channelId="+channelId;
+            logger.info("bmlcyd>>>"+url);
+            String content= HttpUtil.get(url);
+            logger.info(content);
+            JSONObject resJson = JSONObject.parseObject(content);
+            JSONArray result=resJson.getJSONArray("result");
+            int status=resJson.getIntValue("status");
+            if(status==0) {
+                resJson=JSONObject.parseObject(String.valueOf(result.get(0)));
+                token=resJson.getString("token");
+                logger.info(token);
+            }
+        }
+		if(kasid==Iot.bmyd) {
+            String url="http://db.jinmaiiot.com:7021/query/queryYd?method=deviceToken&openId=GFLaxxfVMG4DGkgcdZEEg4zexmje3dq4&msisdn=1442352353017";
+            logger.info("bmyd>>>"+url);
+            String content= HttpUtil.get(url);
+            logger.info(content);
+            JSONObject resJson = JSONObject.parseObject(content);
+            JSONObject result=resJson.getJSONObject("result");
+            int status=resJson.getIntValue("code");
+            if(status==0) {
+                token=result.getString("token");
+                logger.info(token);
             }
-			Map<String, String> receivedData = new HashMap<String, String>();
-			String times=String.valueOf(System.currentTimeMillis()/1000);
-			receivedData.put("times", times);
-			receivedData.put("appId", appId);
-			receivedData.put("channelId", channelId);
-			TreeMap<String, String> sortedData = new TreeMap<>(receivedData);
-			// 构建待签名字符串
-			StringBuilder stringA = new StringBuilder();
-			stringA.append(openId);
-			for (Map.Entry<String, String> entry : sortedData.entrySet()) {
-			    String key = entry.getKey();
-			    String value = entry.getValue();
-			    if (value != null && !value.isEmpty() && !"sign".equals(key) ) {
-			        stringA.append(key).append(value);
-			    }
-			}
-			// 拼接key，并进行MD5运算
-			stringA.append(openId);
-			System.out.println(stringA.toString());
-			String signValue = SecureUtil.sha1((stringA.toString())).toUpperCase();
-			String url="http://db.jinmaiiot.com:7021/api/external/getDeviceToken?appId="+appId+"&openId="+openId+"&times="+times+"&sign="+signValue+"&channelId="+channelId;
-			logger.info("bmyd>>>"+url);
-			String content= HttpUtil.get(url);
-			logger.info(content);
-			JSONObject resJson = JSONObject.parseObject(content);
-			JSONArray result=resJson.getJSONArray("result");
-			int status=resJson.getIntValue("status");
-			if(status==0) {
-				resJson=JSONObject.parseObject(String.valueOf(result.get(0)));
-				token=resJson.getString("token");
-	        	logger.info(token);
-			}
 		}
 		if(kasid==Iot.lxxj || kasid==Iot.lxyn || kasid==Iot.lxqh || kasid==Iot.lxgz) {
 			String appId="";