Skip to content

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

http://113.142.68.105:5080/zentao/task-view-26884.html

parent 5e756ef4
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 45 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java
View file @ 0b634e39
...@@ -301,8 +301,8 @@ public class CheckController extends AbstractBaseController { ...@@ -301,8 +301,8 @@ public class CheckController extends AbstractBaseController {
} }
List<Map<String, Object>> checkInputItems = checkMapper.queryCheckInputItemsByCheckId(checkDto.getCheckId()); // List<Map<String, Object>> checkInputItems = checkMapper.queryCheckInputItemsByCheckId(checkDto.getCheckId());
publishDataToMessage(checkInputItems); // publishDataToMessage(checkInputItems);
is.pointCheckInfoPushToB(checkDto.getCheckId()); is.pointCheckInfoPushToB(checkDto.getCheckId());
//数字换流站页面刷新 //数字换流站页面刷新
try { try {
...@@ -323,49 +323,49 @@ public class CheckController extends AbstractBaseController { ...@@ -323,49 +323,49 @@ public class CheckController extends AbstractBaseController {
} }
} }
/** // /**
* 巡检组装发送风险消息 // * 巡检组装发送风险消息
* @param // * @param
*/ // */
public void publishDataToMessage(List<Map<String, Object>> checkInputItems) { // public void publishDataToMessage(List<Map<String, Object>> checkInputItems) {
for (Map<String, Object> map : checkInputItems) { // for (Map<String, Object> map : checkInputItems) {
SendToMsgRiskDetailVo detailVo = new SendToMsgRiskDetailVo(); // SendToMsgRiskDetailVo detailVo = new SendToMsgRiskDetailVo();
SendToMsgRiskEquipInfoVo equipInfoVo = new SendToMsgRiskEquipInfoVo(); // SendToMsgRiskEquipInfoVo equipInfoVo = new SendToMsgRiskEquipInfoVo();
SendToMsgRiskAlarmInfoVo alarmInfoVo = new SendToMsgRiskAlarmInfoVo(); // SendToMsgRiskAlarmInfoVo alarmInfoVo = new SendToMsgRiskAlarmInfoVo();
if (map.containsKey("equipId") && !map.get("input_value").equals("合格") ){ // if (map.containsKey("equipId") && !map.get("input_value").equals("合格") ){
equipFeign.updateEquipSpecificStatus("1",map.get("equipId").toString(),map.get("traceId").toString(),"patrol"); // equipFeign.updateEquipSpecificStatus("1",map.get("equipId").toString(),map.get("traceId").toString(),"patrol");
equipInfoVo.setEquipSpeId(String.valueOf(map.get("equipId"))); // equipInfoVo.setEquipSpeId(String.valueOf(map.get("equipId")));
equipInfoVo.setReportIsAlarm(Boolean.TRUE); // equipInfoVo.setReportIsAlarm(Boolean.TRUE);
} // }
equipInfoVo.setId(String.valueOf(map.get("id"))); // equipInfoVo.setId(String.valueOf(map.get("id")));
equipInfoVo.setName(String.valueOf(map.get("inputItem"))); // equipInfoVo.setName(String.valueOf(map.get("inputItem")));
equipInfoVo.setValue(String.valueOf(map.get("input_value"))); // equipInfoVo.setValue(String.valueOf(map.get("input_value")));
equipInfoVo.setCode(String.valueOf(map.get("item_no"))); // equipInfoVo.setCode(String.valueOf(map.get("item_no")));
equipInfoVo.setBizOrgCode(String.valueOf(map.get("biz_org_code"))); // equipInfoVo.setBizOrgCode(String.valueOf(map.get("biz_org_code")));
equipInfoVo.setBizOrgName(String.valueOf(map.get("biz_org_name"))); // equipInfoVo.setBizOrgName(String.valueOf(map.get("biz_org_name")));
if (map.containsKey("traceId")){ // if (map.containsKey("traceId")){
equipInfoVo.setTraceId(map.get("traceId").toString()); // equipInfoVo.setTraceId(map.get("traceId").toString());
} // }
//
Map<String, Object> pointMap = pointMapper.getPointById(Long.valueOf(String.valueOf(map.get("pointId")))); // Map<String, Object> pointMap = pointMapper.getPointById(Long.valueOf(String.valueOf(map.get("pointId"))));
alarmInfoVo.setIndexNo(String.valueOf(pointMap.get("id"))); // alarmInfoVo.setIndexNo(String.valueOf(pointMap.get("id")));
alarmInfoVo.setName(String.valueOf(pointMap.get("pointName"))); // alarmInfoVo.setName(String.valueOf(pointMap.get("pointName")));
alarmInfoVo.setIndexNo(String.valueOf(pointMap.get("pointNo"))); // alarmInfoVo.setIndexNo(String.valueOf(pointMap.get("pointNo")));
alarmInfoVo.setKey(String.valueOf(map.get("inputItem"))); // alarmInfoVo.setKey(String.valueOf(map.get("inputItem")));
alarmInfoVo.setValue(String.valueOf(map.get("input_value"))); // alarmInfoVo.setValue(String.valueOf(map.get("input_value")));
//
TopicEntityVo topicEntityVo = new TopicEntityVo(); // TopicEntityVo topicEntityVo = new TopicEntityVo();
topicEntityVo.setTopic(riskTopic); // topicEntityVo.setTopic(riskTopic);
detailVo.setEquipInfo(equipInfoVo); // detailVo.setEquipInfo(equipInfoVo);
detailVo.setAlarmInfo(alarmInfoVo); // detailVo.setAlarmInfo(alarmInfoVo);
topicEntityVo.setData(JSON.toJSONString(detailVo)); // topicEntityVo.setData(JSON.toJSONString(detailVo));
try { // try {
webMqttComponent.publish(patrolRiskCreateTopic, JSON.toJSONString(topicEntityVo)); // webMqttComponent.publish(patrolRiskCreateTopic, JSON.toJSONString(topicEntityVo));
} catch (Exception e) { // } catch (Exception e) {
log.error("推送失败-----------" + e.getMessage()); // log.error("推送失败-----------" + e.getMessage());
} // }
} // }
} // }
/** /**
* 巡检计划查询 * 巡检计划查询
......
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