新增 性诱测报2.0业务端对接

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfXycb2DeviceImpl.java

@@ -97,7 +97,7 @@ public class YfXycb2DeviceImpl extends DeviceAbstractImpl implements IYfXycb2Dev
 
         // 更新设备数据到mongodb
         // ct 击虫数量，默认0，由上报击虫信息时候更新 ct 值
-        dataJson.put("ct", "0");
+        dataJson.put("infr_ct", "0");
         iIotYfXycb2dataService.insertXycb2data(newIotDevice, dataJson);
 
         // 保存 设备最新数据 到redis
@@ -125,14 +125,14 @@ public class YfXycb2DeviceImpl extends DeviceAbstractImpl implements IYfXycb2Dev
 
         Integer pestCount = dataJson.getInteger("pest");
 
-        JSONObject jsonObject = iotYfXycb2data.getXycb2dataContent();
-        Long oldPestNum = Long.valueOf((String) jsonObject.getOrDefault("ct", "0"));
+        JSONObject jsonObject = iotYfXycb2data.getXycbdataContent();
+        Long oldPestNum = Long.valueOf((String) jsonObject.getOrDefault("infr_ct", "0"));
         long newPestNum = pestCount + oldPestNum;
-        jsonObject.put("ct", Long.toString(newPestNum));
+        jsonObject.put("infr_ct", Long.toString(newPestNum));
 
         Map<String, Object> updateField = new HashMap<>();
         updateField.put("id", iotYfXycb2data.getId());
-        updateField.put("xycb2dataContent", jsonObject);
+        updateField.put("xycbdataContent", jsonObject);
         iIotYfXycb2dataService.updateIotYfXycb2data(updateField);
         return null;
     }

src/main/java/com/yunfeiyun/agmp/iots/service/impl/IotXycb2dataServiceImpl.java

@@ -17,7 +17,6 @@ public class IotXycb2dataServiceImpl implements IIotYfXycb2dataService {
     private MongoService mongoService;
 
 
-
     /**
      * @param iotDevice
      * @param jsonObject
@@ -26,10 +25,10 @@ public class IotXycb2dataServiceImpl implements IIotYfXycb2dataService {
     public void insertXycb2data(IotDevice iotDevice, JSONObject jsonObject) {
         IotYfXycb2data iotYfXycb2data = new IotYfXycb2data();
         iotYfXycb2data.setCId(iotDevice.getTid());
-        iotYfXycb2data.setXycb2dataBid(iotYfXycb2data.getUUId());
+        iotYfXycb2data.setXycbdataBid(iotYfXycb2data.getUUId());
         iotYfXycb2data.setDevBid(iotDevice.getDevBid());
-        iotYfXycb2data.setXycb2dataCreatedDate(iotDevice.getDevUpdateddate());
-        iotYfXycb2data.setXycb2dataContent(jsonObject);
+        iotYfXycb2data.setXycbdataCreatedDate(iotDevice.getDevUpdateddate());
+        iotYfXycb2data.setXycbdataContent(jsonObject);
 
         mongoService.saveOne(iotYfXycb2data);
     }
@@ -43,7 +42,7 @@ public class IotXycb2dataServiceImpl implements IIotYfXycb2dataService {
         Map<String, Object> map = new HashMap<>();
         map.put("devBid", devBid);
         IotYfXycb2data iotYfXycb2data = (IotYfXycb2data) mongoService.findOne(
-                IotYfXycb2data.class, map, "xycb2dataCreatedDate", "desc"
+                IotYfXycb2data.class, map, "xycbdataCreatedDate", "desc"
         );
         return iotYfXycb2data;
     }

src/main/resources/application-dev.yml

@@ -150,7 +150,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 2
     # 密码
     password: 123456
     # 连接超时时间