Skip to content

A
amos-boot-biz
Commit 9140a2de authored by litengwei's avatar litengwei
Browse files
Options

中心BUG修改

parent 35fb6e88
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 48 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 @ 9140a2de
......@@ -308,8 +308,8 @@ public class CheckController extends AbstractBaseController {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
List<Map<String, Object>> checkInputItems = checkMapper.queryCheckInputItemsByCheckId(checkDto.getCheckId());
publishDataToMessage(checkInputItems);
// List<Map<String, Object>> checkInputItems = checkMapper.queryCheckInputItemsByCheckId(checkDto.getCheckId());
// publishDataToMessage(checkInputItems);
is.pointCheckInfoPushToB(checkDto.getCheckId());
//数字换流站页面刷新
try {
......@@ -330,57 +330,56 @@ public class CheckController extends AbstractBaseController {
}
}
/**
* 巡检组装发送风险消息
* @param
*/
public void publishDataToMessage(List<Map<String, Object>> checkInputItems) {
for (Map<String, Object> map : checkInputItems) {
SendToMsgRiskDetailVo detailVo = new SendToMsgRiskDetailVo();
SendToMsgRiskEquipInfoVo equipInfoVo = new SendToMsgRiskEquipInfoVo();
SendToMsgRiskAlarmInfoVo alarmInfoVo = new SendToMsgRiskAlarmInfoVo();
if (map.containsKey("equipId") && !map.get("input_value").equals("合格") ){
equipFeign.updateEquipSpecificStatus("1",map.get("equipId").toString(),map.get("traceId").toString(),"patrol");
equipInfoVo.setEquipSpeId(String.valueOf(map.get("equipId")));
equipInfoVo.setReportIsAlarm(Boolean.TRUE);
}
equipInfoVo.setId(String.valueOf(map.get("id")));
equipInfoVo.setName(String.valueOf(map.get("inputItem")));
equipInfoVo.setValue(String.valueOf(map.get("input_value")));
equipInfoVo.setCode(String.valueOf(map.get("item_no")));
equipInfoVo.setBizOrgCode(String.valueOf(map.get("biz_org_code")));
equipInfoVo.setBizOrgName(String.valueOf(map.get("biz_org_name")));
if (map.containsKey("traceId")){
equipInfoVo.setTraceId(map.get("traceId").toString());
}
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
Map<String, Object> pointMap = pointMapper.getPointById(Long.valueOf(String.valueOf(map.get("pointId"))));
alarmInfoVo.setIndexNo(String.valueOf(pointMap.get("id")));
alarmInfoVo.setName(String.valueOf(pointMap.get("pointName")));
alarmInfoVo.setIndexNo(String.valueOf(pointMap.get("pointNo")));
alarmInfoVo.setKey(String.valueOf(map.get("inputItem")));
alarmInfoVo.setValue(String.valueOf(map.get("input_value")));
TopicEntityVo topicEntityVo = new TopicEntityVo();
topicEntityVo.setTopic(riskTopic);
detailVo.setEquipInfo(equipInfoVo);
detailVo.setAlarmInfo(alarmInfoVo);
topicEntityVo.setData(JSON.toJSONString(detailVo));
try {
webMqttComponent.publish(patrolRiskCreateTopic, JSON.toJSONString(topicEntityVo));
} catch (Exception e) {
log.error("推送失败-----------" + e.getMessage());
}
}
}
// /**
// * 巡检组装发送风险消息
// * @param
// */
// public void publishDataToMessage(List<Map<String, Object>> checkInputItems) {
// for (Map<String, Object> map : checkInputItems) {
// SendToMsgRiskDetailVo detailVo = new SendToMsgRiskDetailVo();
// SendToMsgRiskEquipInfoVo equipInfoVo = new SendToMsgRiskEquipInfoVo();
// SendToMsgRiskAlarmInfoVo alarmInfoVo = new SendToMsgRiskAlarmInfoVo();
// if (map.containsKey("equipId") && !map.get("input_value").equals("合格") ){
// equipFeign.updateEquipSpecificStatus("1",map.get("equipId").toString(),map.get("traceId").toString(),"patrol");
// equipInfoVo.setEquipSpeId(String.valueOf(map.get("equipId")));
// equipInfoVo.setReportIsAlarm(Boolean.TRUE);
// }
// equipInfoVo.setId(String.valueOf(map.get("id")));
// equipInfoVo.setName(String.valueOf(map.get("inputItem")));
// equipInfoVo.setValue(String.valueOf(map.get("input_value")));
// equipInfoVo.setCode(String.valueOf(map.get("item_no")));
// equipInfoVo.setBizOrgCode(String.valueOf(map.get("biz_org_code")));
// equipInfoVo.setBizOrgName(String.valueOf(map.get("biz_org_name")));
// if (map.containsKey("traceId")){
// equipInfoVo.setTraceId(map.get("traceId").toString());
// }
//
// // 权限处理
// PermissionInterceptorContext.setDataAuthRule(authKey);
// Map<String, Object> pointMap = pointMapper.getPointById(Long.valueOf(String.valueOf(map.get("pointId"))));
// alarmInfoVo.setIndexNo(String.valueOf(pointMap.get("id")));
// alarmInfoVo.setName(String.valueOf(pointMap.get("pointName")));
// alarmInfoVo.setIndexNo(String.valueOf(pointMap.get("pointNo")));
// alarmInfoVo.setKey(String.valueOf(map.get("inputItem")));
// alarmInfoVo.setValue(String.valueOf(map.get("input_value")));
//
// TopicEntityVo topicEntityVo = new TopicEntityVo();
// topicEntityVo.setTopic(riskTopic);
// detailVo.setEquipInfo(equipInfoVo);
// detailVo.setAlarmInfo(alarmInfoVo);
// topicEntityVo.setData(JSON.toJSONString(detailVo));
// try {
// webMqttComponent.publish(patrolRiskCreateTopic, JSON.toJSONString(topicEntityVo));
// } catch (Exception e) {
// log.error("推送失败-----------" + e.getMessage());
// }
// }
// }
/**
* 巡检计划查询
*
* @param
* @param param
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
......
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