抄表

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/MeterReadRecordMapper.xml

@@ -343,7 +343,7 @@
     set real_read_times = real_read_times + 1 ,
         un_read_times = un_read_times - 1,
         read_rate = FORMAT(real_read_times / read_times*100, 2)
-    WHERE stat_day = DATE_FORMAT( #{readDate}, '%Y%m%d' ) and tenant_id = #{device.tenantId} and category_id = #{device.tenantId}
+    WHERE stat_day = DATE_FORMAT( #{readDate}, '%Y%m%d' ) and tenant_id = #{device.tenantId} and category_id = #{device.categoryId}
     and company_org_id = #{device.companyOrgId} and dept_org_id = #{device.deptOrgId} and community_id = #{device.communityId}
   </insert>
 </mapper>

zoniot-rmcp/zoniot-rmcp-dap/src/test/java/com/bz/rmcp/dap/DeviceDataServiceTests.java

@@ -45,10 +45,16 @@ public class DeviceDataServiceTests {
 
 
 
+        //{"VOL":3.56,"ALARM":"0","VOL_STATUS":"0","VALVE":"01","WSV":110,"FORCED":"0","DISTURB":"0","OVERDRAFT":"0"}
         Map<String,Object> param = new HashMap<>();
-        param.put("currentQuantity",107.4);
-        param.put("valveState","1");
-        param.put("temp","0");
+        param.put("VOL",3.56);
+        param.put("ALARM","0");
+        param.put("VOL_STATUS","0");
+        param.put("VALVE","01");
+        param.put("WSV",110);
+        param.put("FORCED","0");
+        param.put("DISTURB","0");
+        param.put("OVERDRAFT","0");
 
         Map<Date,String> map = new HashMap<>();
         map.put(new Date(),JSON.toJSONString(param));
@@ -56,7 +62,7 @@ public class DeviceDataServiceTests {
         DeviceOrigDataDTO dto = new DeviceOrigDataDTO();
         dto.setId(1L);
         dto.setAgentIdentifier("");
-        dto.setDeviceNo("11111111111");
+        dto.setDeviceNo("4321554356234");
         dto.setMode("");
         dto.setType("");
         dto.setManufacturer("");