Skip to content

A
amos-boot-biz
Commit 0d5ce5f5 authored by litengwei's avatar litengwei
Browse files
Options

中心BUG修改

parent 2434d1fa
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 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 @ 0d5ce5f5
...@@ -1980,7 +1980,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1980,7 +1980,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
map.put("bizOrgName", e.get("bizOrgName").toString()); map.put("bizOrgName", e.get("bizOrgName").toString());
// //
try { 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) { } catch (MqttException exp) {
log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage())); log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
} }
...@@ -1991,7 +1991,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1991,7 +1991,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
mapZxj.put("topic", "equip/scrap/put"); mapZxj.put("topic", "equip/scrap/put");
mapZxj.put("data", map); mapZxj.put("data", map);
try { 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) { } catch (MqttException exp) {
log.info(String.format("发送eqm消息，message根据该消息转发为kafka消息,失败信息：%s", exp.getMessage())); log.info(String.format("发送eqm消息，message根据该消息转发为kafka消息,失败信息：%s", exp.getMessage()));
} }
...@@ -2025,7 +2025,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -2025,7 +2025,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
map.put("bizOrgCode", m.get("bizOrgCode").toString()); map.put("bizOrgCode", m.get("bizOrgCode").toString());
map.put("bizOrgName", m.get("bizOrgName").toString()); map.put("bizOrgName", m.get("bizOrgName").toString());
try { 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) { } catch (MqttException exp) {
log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage())); log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
} }
...@@ -2038,7 +2038,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -2038,7 +2038,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
map.put("bizOrgCode", m1.get("bizOrgCode").toString()); map.put("bizOrgCode", m1.get("bizOrgCode").toString());
map.put("bizOrgName", m1.get("bizOrgName").toString()); map.put("bizOrgName", m1.get("bizOrgName").toString());
try { 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) { } catch (MqttException exp) {
log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage())); log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
} }
...@@ -2050,7 +2050,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -2050,7 +2050,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("bizOrgCode", ""); map.put("bizOrgCode", "");
try { 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) { } catch (MqttException exp) {
log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage())); 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
View file @ 0d5ce5f5
...@@ -394,7 +394,8 @@ public interface CheckMapper extends BaseMapper { ...@@ -394,7 +394,8 @@ public interface CheckMapper extends BaseMapper {
List<CheckInfoVo> getPeopleCheckPage(CheckInfoPageParam param); List<CheckInfoVo> getPeopleCheckPage(CheckInfoPageParam param);
@Select("SELECT\n" + @Select("<script>"
+ "SELECT\n" +
" a.id,\n" + " a.id,\n" +
" a.user_id,\n" + " a.user_id,\n" +
" date_format(\n" + " date_format(\n" +
...@@ -424,6 +425,6 @@ public interface CheckMapper extends BaseMapper { ...@@ -424,6 +425,6 @@ public interface CheckMapper extends BaseMapper {
" <choose>\n" + " <choose>\n" +
" <when test=\"pageSize==-1\"></when>\n" + " <when test=\"pageSize==-1\"></when>\n" +
" <when test=\"pageSize!=-1\">limit #{offset},#{pageSize}</when>\n" + " <when test=\"pageSize!=-1\">limit #{offset},#{pageSize}</when>\n" +
" </choose>") " </choose>" + "</script>")
List<CheckInfoVo> getPeopleCheckPageNew(CheckInfoPageParam param); List<CheckInfoVo> getPeopleCheckPageNew(CheckInfoPageParam param);
} }
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