chudk 7 years ago
parent
commit
9a7a50d68e

+ 1 - 2
src/main/java/com/tidecloud/dataacceptance/entity/Device.java

@@ -89,8 +89,7 @@ public class Device implements Serializable{
         builder.append(device.getLng()).append(",");
         builder.append(device.getLat()).append(",");
         builder.append(device.getSpeed()).append(",");
-        builder.append(device.getStep()).append(",");
-        builder.append(device.getTerminalState());
+        builder.append(device.getStep());
         
         return builder.toString();
     }

+ 2 - 0
src/main/java/com/tidecloud/datacceptance/service/impl/DiscardServerHandler.java

@@ -72,11 +72,13 @@ public class DiscardServerHandler extends ChannelInboundHandlerAdapter {
         
         case "UD":
             Device deviceUD = getDevice(msg);
+            deviceUD.setDeviceId(deviceId);
             dataStorage(deviceUD);
             logger.info("正常存储设备信息:" + deviceUD.toString());
             break;
         case "UD2":
             Device deviceUD2 = getDevice(msg);
+            deviceUD2.setDeviceId(deviceId);
             dataStorage(deviceUD2);
             logger.info("正常存储设备信息:" + getDevice(msg).toString());
             break;