Skip to content

A
amos-boot-biz
Commit 9d152e69 authored by 张森's avatar 张森
Browse files
Options

xunjian 触发预警问题处理

parent 50c482c9
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 21 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @ 9d152e69
......@@ -2023,26 +2023,33 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
List<Map<String, Object>> mapList = new ArrayList<>();
for (Map<String, Object> m : mapPatrol
) {
// 判断是否一次巡查都没有
if(m.get("isFinishOnce").toString().equals("0")) {
if(m.get("planNum").toString().equals("1")) {
Map<String, Object> map = new HashMap<>();
map.put("planName", m.getOrDefault("planName", ""));
map.put("bizOrgCode", m.get("bizOrgCode"));
map.put("bizOrgName", m.get("bizOrgName"));
mapList.add(map);
} else if(Integer.parseInt(m.get("planNum").toString()) > 1){
List<Map<String, Object>> mapPatrolTask = equipmentSpecificIndexMapper.patrolTaskQuery(m.get("bizOrgCode").toString());
for (Map<String, Object> m1:mapPatrolTask
) {
Map<String, Object> map = new HashMap<>();
map.put("planName", m1.get("planName").toString());
map.put("bizOrgCode", m1.get("bizOrgCode").toString());
map.put("bizOrgName", m1.get("bizOrgName").toString());
mapList.add(map);
}
}
if(m.get("isFinishOnce").toString().equals("1")) {
Map<String, Object> map = new HashMap<>();
map.put("planName", m.getOrDefault("planName", ""));
map.put("bizOrgCode", m.get("bizOrgCode"));
map.put("bizOrgName", m.get("bizOrgName"));
mapList.add(map);
}
// 判断是否一次巡查都没有
// if(m.get("isFinishOnce").toString().equals("0")) {
// if(m.get("planNum").toString().equals("1")) {
// Map<String, Object> map = new HashMap<>();
// map.put("planName", m.getOrDefault("planName", ""));
// map.put("bizOrgCode", m.get("bizOrgCode"));
// map.put("bizOrgName", m.get("bizOrgName"));
// mapList.add(map);
// } else if(Integer.parseInt(m.get("planNum").toString()) > 1){
// List<Map<String, Object>> mapPatrolTask = equipmentSpecificIndexMapper.patrolTaskQuery(m.get("bizOrgCode").toString());
// for (Map<String, Object> m1:mapPatrolTask
// ) {
// Map<String, Object> map = new HashMap<>();
// map.put("planName", m1.get("planName").toString());
// map.put("bizOrgCode", m1.get("bizOrgCode").toString());
// map.put("bizOrgName", m1.get("bizOrgName").toString());
// mapList.add(map);
// }
// }
// }
}
if(mapList.size() > 0) {
try {
......@@ -2051,7 +2058,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
}
}
if(mapPatrol.size() == 0) {
if(mapList.size() == 0) {
Map<String, Object> map = new HashMap<>();
map.put("bizOrgCode", "");
mapList.add(map);
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml
View file @ 9d152e69
......@@ -515,7 +515,7 @@
FROM
`p_plan_task` ppt
LEFT JOIN `p_plan` pp ON pp.id = ppt.plan_id
where ppt.check_date = DATE_FORMAT( now(), '%Y-%m-%d' ) and pp.biz_org_code is not null and ppt.plan_name is not null
where ppt.check_date = DATE_FORMAT( now(), '%Y-%m-%d' ) and pp.biz_org_code is not null and ppt.plan_id is not null
GROUP BY biz_org_code
</select>
<select id="getEquipIndexInIndex" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
......
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