中心BUG修改

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

@@ -1980,7 +1980,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                         map.put("bizOrgName", e.get("bizOrgName").toString());
 //
                         try {
-                            emqKeeper.getMqttClient().publish("equip/scrap/put", JSONObject.toJSONString(map).getBytes(), 1, false);
+                            emqKeeper.getMqttClient().publish("equip/scrap/put", JSONObject.toJSONString(map).getBytes(), 2, false);
                         } catch (MqttException exp) {
                             log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
                         }
@@ -1991,7 +1991,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                         mapZxj.put("topic", "equip/scrap/put");
                         mapZxj.put("data", map);
                         try {
-                            emqKeeper.getMqttClient().publish("equip/scrap/put/zxj", JSON.toJSONString(mapZxj).getBytes(), 1, false);
+                            emqKeeper.getMqttClient().publish("equip/scrap/put/zxj", JSON.toJSONString(mapZxj).getBytes(), 2, false);
                         } catch (MqttException exp) {
                             log.info(String.format("发送eqm消息，message根据该消息转发为kafka消息,失败信息：%s", exp.getMessage()));
                         }
@@ -2025,7 +2025,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                     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(), 1, false);
+                        emqKeeper.getMqttClient().publish("equip/patrol/put", JSONObject.toJSONString(map).getBytes(), 2, false);
                     } catch (MqttException exp) {
                         log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
                     }
@@ -2038,7 +2038,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                         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(), 1, false);
+                            emqKeeper.getMqttClient().publish("equip/patrol/put", JSONObject.toJSONString(map).getBytes(), 2, false);
                         } catch (MqttException exp) {
                             log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
                         }
@@ -2050,7 +2050,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             Map<String, String> map = new HashMap<>();
             map.put("bizOrgCode", "");
             try {
-                emqKeeper.getMqttClient().publish("equip/patrol/put", JSONObject.toJSONString(map).getBytes(), 1, false);
+                emqKeeper.getMqttClient().publish("equip/patrol/put", JSONObject.toJSONString(map).getBytes(), 2, false);
             } catch (MqttException exp) {
                 log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/CheckMapper.java

@@ -394,7 +394,8 @@ public interface CheckMapper extends BaseMapper {
 
 	List<CheckInfoVo> getPeopleCheckPage(CheckInfoPageParam param);
 
-	@Select("SELECT\n" +
+	@Select("<script>"
+			+ "SELECT\n" +
 			"        a.id,\n" +
 			"        a.user_id,\n" +
 			"        date_format(\n" +
@@ -424,6 +425,6 @@ public interface CheckMapper extends BaseMapper {
 			"        <choose>\n" +
 			"            <when test=\"pageSize==-1\"></when>\n" +
 			"            <when test=\"pageSize!=-1\">limit #{offset},#{pageSize}</when>\n" +
-			"        </choose>")
+			"        </choose>" + "</script>")
 	List<CheckInfoVo> getPeopleCheckPageNew(CheckInfoPageParam param);
 }