中心BUG修改

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

@@ -2015,37 +2015,37 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Transactional(rollbackFor = Exception.class)
     public void patrolTaskStatic() throws Exception {
         List<Map<String, Object>> mapPatrol = equipmentSpecificIndexMapper.patrolTaskStatic();
+        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, String> map = new HashMap<>();
-                    map.put("planName", m.getOrDefault("planName", "").toString());
-                    map.put("bizOrgCode", m.get("bizOrgCode").toString());
-                    map.put("bizOrgName", m.get("bizOrgName").toString());
-                    try {
-                        emqKeeper.getMqttClient().publish("equip/patrol/put", JSONObject.toJSONString(map).getBytes(), 2, false);
-                    } catch (MqttException exp) {
-                        log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
-                    }
+                    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, String> map = new HashMap<>();
+                        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());
-                        try {
-                            emqKeeper.getMqttClient().publish("equip/patrol/put", JSONObject.toJSONString(map).getBytes(), 2, false);
-                        } catch (MqttException exp) {
-                            log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
-                        }
+                        mapList.add(map);
                     }
                 }
             }
         }
+        if(mapList.size() > 0) {
+            try {
+                emqKeeper.getMqttClient().publish("equip/patrol/put", JSONObject.toJSONString(mapList).getBytes(), 1, false);
+            } catch (MqttException exp) {
+                log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
+            }
+        }
         if(mapPatrol.size() == 0) {
             Map<String, String> map = new HashMap<>();
             map.put("bizOrgCode", "");

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -514,7 +514,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' )
+        where ppt.check_date  =  DATE_FORMAT( now(), '%Y-%m-%d' )  and pp.biz_org_code is not null
         GROUP BY biz_org_code
     </select>
     <select id="getEquipIndexInIndex" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">