修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FilePatrolReportServiceImpl.java

@@ -120,6 +120,9 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		int uncomplete_task_count = task_count - complete_task_count;
 		// 未完成任务数
 		map.put("uncomplete_task_count", uncomplete_task_count);
+		if (0 == task_count) {
+			throw new RuntimeException("巡检计划总数是0，请检查同步服务！");
+		}
 		double complete_task_percent = (complete_task_count/task_count)*100;
 		// 任务完成率
 		map.put("complete_task_percent", nf.format(complete_task_percent)+"%");

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -857,7 +857,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
       EquipmentSpecificAlarm equipmentSpecificAlarm = new EquipmentSpecificAlarm();
       equipmentSpecificAlarm.setSystemIds(equipmentSpcIndex.getSystemId());
       equipmentSpecificAlarm.setSystemCodes(this.getSystemCodeBySpeId(equipmentSpcIndex.getSystemId()));
-          List<EquipmentSpecificAlarm> indexAlarms = equipmentSpecificAlarmMapper.findEquipmentSpecificAlarmByEquipmentSpecificIdAndEquipmentIndexIdAndStatusIstrue(equipmentSpcIndex.getEquipmentSpecificId()
+      List<EquipmentSpecificAlarm> indexAlarms = equipmentSpecificAlarmMapper.findEquipmentSpecificAlarmByEquipmentSpecificIdAndEquipmentIndexIdAndStatusIstrue(equipmentSpcIndex.getEquipmentSpecificId()
         		  , equipmentSpcIndex.getEquipmentIndexId());
           // NB设备告警
           if (verifyNB(equipmentSpcIndex.getNameKey())) {
@@ -886,6 +886,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                   action.setEquipmentCode(equipmentSpcIndex.getEquipmentCode());
                   // 冗余字段，alarm_log表更新时使用
                   action.setEquipmentSpecificCode(equipmentSpcIndex.getEquipmentSpecificCode());
+                  action.setBuildId(equipmentSpcIndex.getBuildId());
                   equipmentSpecificAlarms.add(action);
               };
       }