Commit cf177afa authored by KeYong's avatar KeYong

修改bug

parent 1a55aefb
...@@ -120,6 +120,9 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService { ...@@ -120,6 +120,9 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
int uncomplete_task_count = task_count - complete_task_count; int uncomplete_task_count = task_count - complete_task_count;
// 未完成任务数 // 未完成任务数
map.put("uncomplete_task_count", uncomplete_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; double complete_task_percent = (complete_task_count/task_count)*100;
// 任务完成率 // 任务完成率
map.put("complete_task_percent", nf.format(complete_task_percent)+"%"); map.put("complete_task_percent", nf.format(complete_task_percent)+"%");
......
...@@ -886,6 +886,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -886,6 +886,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
action.setEquipmentCode(equipmentSpcIndex.getEquipmentCode()); action.setEquipmentCode(equipmentSpcIndex.getEquipmentCode());
// 冗余字段,alarm_log表更新时使用 // 冗余字段,alarm_log表更新时使用
action.setEquipmentSpecificCode(equipmentSpcIndex.getEquipmentSpecificCode()); action.setEquipmentSpecificCode(equipmentSpcIndex.getEquipmentSpecificCode());
action.setBuildId(equipmentSpcIndex.getBuildId());
equipmentSpecificAlarms.add(action); equipmentSpecificAlarms.add(action);
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment