wulianwei há 1 ano atrás
pai
commit
a0ecd436ec
1 ficheiros alterados com 1 adições e 43 exclusões
  1. 1 43
      src/main/java/regist/MyServer.java

+ 1 - 43
src/main/java/regist/MyServer.java

@@ -107,42 +107,8 @@ class MyServerHandler extends ChannelInboundHandlerAdapter{
         }
    
         String[] prodata = msgStr.split("&");
-        boolean deviceExist = false;
-        if(prodata.length <= 2){
-        	return json.toString();
-        }
         String deviceName = prodata[0];
-        String simIccid = prodata[1];
-        String version = "";
-        if(prodata.length > 2) {
-        	version = prodata[2];
-        }
-        
-        Connection conn = ds.getConnection();
-        ResultSet resultSet =  SqlExecutor.callQuery(conn, "select mqtt_conn_info,is_delete from bus_device where device_id = ? limit 1", deviceName);
-        if(resultSet.next()){
-        	SqlExecutor.execute(conn, "update bus_device set sim_iccid = ?,version = ?,create_time = ? where  device_id = ? ", simIccid,version,new Date(),deviceName);
-        	String jsonString = resultSet.getString(1);
-        	int isDelete = resultSet.getInt(2);
-        	if(isDelete == 0){
-        		deviceExist = true;
-        	}
-        	if(deviceExist && StrUtil.isNotBlank(jsonString)){
-        		if(!conn.getAutoCommit()){              	
-              		conn.commit();
-              	}
-        		conn.close();
-        		return jsonString;
-        	}
-        }else{
-        	SqlExecutor.execute(conn, "insert into bus_device(id,device_id,tenant_id,sim_iccid,version,create_time,create_by)values(?,?,?,?,?,?,?) "
-        			,IdUtil.getSnowflakeNextIdStr(),deviceName,"1",simIccid,version,new Date(),"1" );
-        	 if(!conn.getAutoCommit()){
-         		conn.commit();
-         	 }
-        }
-        
-        
+       
         JSONObject registData = AliDeviceHttp.deviceRegist(deviceName);
         if(registData.isEmpty()) {
         	registData = AliDeviceHttp.deviceQuery(deviceName); 
@@ -155,16 +121,8 @@ class MyServerHandler extends ChannelInboundHandlerAdapter{
         	json.put("deviceName", deviceName);
         	json.put("deviceSecret", registData.getString("DeviceSecret"));
         	json.put("productKey", registData.getString("ProductKey"));
-			SqlExecutor.execute(conn, "update bus_device set mqtt_conn_info = ? where  device_id = ? ", json.toString(),deviceName);
         }
         
-        
-        if(!conn.getAutoCommit())
-    	{
-    		conn.commit();
-    	}
-        conn.close();
-        
         return json.toString();
 	}
 }