报警BUG

zoniot-rmcp/zoniot-rmcp-alarm/src/main/java/com/bz/rmcp/alarm/service/impl/DeviceAlarmServiceImpl.java

@@ -108,18 +108,20 @@ public class DeviceAlarmServiceImpl implements DeviceAlarmService {
             rulePageDto.setAlarmTypeId(alarmType.getId());
             List<AlarmRuleDto> ruleList = deviceAlarmRuleMapper.selectList(rulePageDto);
             if(ruleList.isEmpty()){
-                break;
+                continue;
             }
             for (AlarmRuleDto rule : ruleList) {
                 String measuringCode = rule.getMeasuringCode();
 
                 Object measuringValue = measureDataDto.getMeasureMap().get(measuringCode);
+                log.info("measuringValue = {},{}",measuringCode,JSON.toJSONString(measuringValue));
                 if(measuringValue == null) {
                     isOk = false;
-                    break;
+                    continue;
                 }
                 Boolean isAlarm = checkIsAlarm(rule,measuringValue);
                 isOk = isOk && isAlarm;
+                log.info("isAlarm = {},{}",isAlarm,JSON.toJSONString(rule));
                 if(isOk){
                     List<MeasuringPointVo> pointVoList = deviceMeasuringPointService.getMeasuringPoint(device.getProductId());
                     measuringData.append(getMeasuringData(String.valueOf(measuringValue), measuringCode, pointVoList));

zoniot-rmcp/zoniot-rmcp-alarm/src/test/java/com/bz/rmcp/alarm/AlarmTests.java

@@ -35,11 +35,11 @@ public class AlarmTests {
 
     @Test
     public void alarm(){
-        String json = "{\"VOL\":3.56,\"ALARM\":\"0\",\"VOL_STATUS\":\"0\",\"VALVE\":\"01\",\"WSV\":110,\"FORCED\":\"1\",\"DISTURB\":\"1\",\"OVERDRAFT\":\"1\"}";
+        String json = "{\"VOL\":3.56,\"ALARM\":\"0\",\"VOL_STATUS\":\"1\",\"VALVE\":\"01\",\"WSV\":113,\"FORCED\":\"0\",\"DISTURB\":\"0\",\"OVERDRAFT\":\"1\"}";
         Map<String,Object> map  = JSON.parseObject(json, HashMap.class);
 
         MeasureDataDto measureDataDto = new MeasureDataDto();
-        measureDataDto.setDeviceId(880829562492162048L);
+        measureDataDto.setDeviceId(880882562661224448L);
         measureDataDto.setReceiveDate(new Date());
         measureDataDto.setMeasureMap(map);
 

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

@@ -549,7 +549,7 @@
       <if test="dto.endDate != null"> and rd.install_date <![CDATA[ <= ]]> #{dto.endDate}</if>
       <include refid="permissionCondition"/>
     </where>
-    order by rd.create_date desc
+    order by rd.create_date,rd.id desc
   </select>
 
   <select id="findList_COUNT" resultType="Long">

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceController.java

@@ -105,7 +105,7 @@ public class DeviceController {
     public AjaxMessage<Void> batchDelete(
             @ApiParam(value = "设备id", required = true) @RequestBody(required = true) List<Long> ids
     ) {
-        deviceService.batchDelele(ids);
+        deviceService.batchDelete(ids);
         return AjaxMessage.success();
     }
 
@@ -116,7 +116,7 @@ public class DeviceController {
     public AjaxMessage<Void> allDelete(
             @RequestBody(required = true) DeviceQueryDto dto
     ) {
-        deviceService.allDelele(dto);
+        deviceService.allDelete(dto);
         return AjaxMessage.success();
     }
 

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/DeviceService.java

@@ -50,7 +50,7 @@ public interface DeviceService{
      * @return void
      * @author linqingwei
      **/
-    void batchDelele(List<Long> ids);
+    void batchDelete(List<Long> ids);
 
     /*
      * @description 全部删除
@@ -58,7 +58,7 @@ public interface DeviceService{
      * @return void
      * @author linqingwei
      **/
-    void allDelele(DeviceQueryDto dto);
+    void allDelete(DeviceQueryDto dto);
 
     /*
      * @description 下载模板

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/DeviceServiceImpl.java

@@ -194,7 +194,7 @@ public class DeviceServiceImpl implements DeviceService{
 
     @Override
     @Transactional
-    public void batchDelele(List<Long> ids) {
+    public void batchDelete(List<Long> ids) {
         log.info("begin DeviceServiceImpl batchDel ids = {}", JSON.toJSONString(ids));
         deviceMapper.delByIds(ids);
         // 删除计划清单
@@ -211,7 +211,7 @@ public class DeviceServiceImpl implements DeviceService{
 
     @Override
     @Transactional
-    public void allDelele(DeviceQueryDto dto) {
+    public void allDelete(DeviceQueryDto dto) {
         log.info("begin DeviceServiceImpl allDel dto = {}", JSON.toJSONString(dto));
         List<DeviceVo> list = deviceMapper.findList(dto,UserUtil.getCurrentUser().getUserCondition());
         List<Long> ids = new ArrayList<>();
@@ -219,7 +219,7 @@ public class DeviceServiceImpl implements DeviceService{
             for (DeviceVo vo : list) {
                 ids.add(vo.getId());
             }
-            this.batchDelele(ids);
+            this.batchDelete(ids);
         }
         log.info("end DeviceServiceImpl allDel ");
     }