整理代码

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java

@@ -520,6 +520,7 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         queryWrapper.eq(StringUtils.isNotBlank(dto.getParentId()), PlatOrg::getParentId, dto.getParentId())
         queryWrapper.eq(StringUtils.isNotBlank(dto.getParentId()), PlatOrg::getParentId, dto.getParentId())
                 .like(StringUtils.isNotBlank(dto.getName()),PlatOrg::getName,dto.getName())
                 .like(StringUtils.isNotBlank(dto.getName()),PlatOrg::getName,dto.getName())
                 .eq(StringUtils.isNotBlank(dto.getType()),PlatOrg::getType,dto.getType())
                 .eq(StringUtils.isNotBlank(dto.getType()),PlatOrg::getType,dto.getType())
+                .eq(StringUtils.isNotBlank(dto.getStatus()),PlatOrg::getStatus,dto.getStatus())
                 .orderByDesc(BaseEntity::getUpdateDate);
                 .orderByDesc(BaseEntity::getUpdateDate);
         return queryWrapper;
         return queryWrapper;
     }
     }

server-web/src/main/java/com/makeit/mqtt/PushCallback.java

@@ -87,9 +87,13 @@ public class PushCallback implements MqttCallback {
         }
         }
         for (PlatAlarmConfig config : deviceAlarmConfigList) {
         for (PlatAlarmConfig config : deviceAlarmConfigList) {
             String alarmType = config.getAlarmType();
             String alarmType = config.getAlarmType();
+
             PlatAlarmCheckDTO platAlarmCheckDTO = new PlatAlarmCheckDTO();
             PlatAlarmCheckDTO platAlarmCheckDTO = new PlatAlarmCheckDTO();
+            //告警配置
             platAlarmCheckDTO.setPlatAlarmConfig(config);
             platAlarmCheckDTO.setPlatAlarmConfig(config);
+            //设备信息
             platAlarmCheckDTO.setPlatDevice(platDevice);
             platAlarmCheckDTO.setPlatDevice(platDevice);
+            //iot上报数据
             platAlarmCheckDTO.setProperties(properties);
             platAlarmCheckDTO.setProperties(properties);
 
 
             for (IAlarm alarm : alarmList) {
             for (IAlarm alarm : alarmList) {