Skip to content

A
AmosBankRoot
Commit 9094f8b4 authored by zhengjiangtao's avatar zhengjiangtao
Browse files
Options

修改三维消息弹出框Bug

parent 6068daf4
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 12 deletions
AmosBankService/src/main/java/com/yeejoin/amos/bank/config/BlueprintListener.java
View file @ 9094f8b4
......@@ -104,7 +104,7 @@ public class BlueprintListener extends EmqxListener implements InitializingBean
equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
try {
for (int j = 0; j < riskFactorId.size(); j++) {
riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j),eqpName);
riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j),eqpName,value);
}
} catch (InnerInvokException e1) {
logger.error("update rpn fail " + e1.getMessage());
......
AmosBankService/src/main/java/com/yeejoin/amos/bank/config/DeviceListener.java
View file @ 9094f8b4
......@@ -103,17 +103,18 @@ public class DeviceListener extends EmqxListener implements InitializingBean {
Long equipmentsPointId = queryEquipmentPoint.getId();
System.out.println("----shudu equipmentsPointId : "+ equipmentsPointId);
List<Long> riskFactorId = equipmentMapper.judgeEquipmentExists(equipmentsPointId);
Integer value = 0;
if ("35".equals(statusName)) {
Integer value = DevicePointEnum.getValue("异常");
value = DevicePointEnum.getValue("异常");
equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
} else {
Integer value = DevicePointEnum.getValue("正常");
value = DevicePointEnum.getValue("正常");
equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
}
System.out.println("----shudu riskFactorId : "+ riskFactorId);
for (int j = 0; j < riskFactorId.size(); j++) {
try {
riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j),eqpName);
riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j),eqpName,value);
System.out.println("----udpate riskFactor sucess");
} catch (InnerInvokException e1) {
logger.error("update rpn fail " + e1.getMessage());
......@@ -136,7 +137,7 @@ public class DeviceListener extends EmqxListener implements InitializingBean {
try {
for (int j = 0; j < riskFactorId.size(); j++) {
System.out.println("----shudu riskFactorId : "+ riskFactorId);
riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j),eqpName);
riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j),eqpName,value);
System.out.println("----udpate riskFactor sucess");
}
} catch (InnerInvokException e1) {
......
AmosBankService/src/main/java/com/yeejoin/amos/bank/config/EquipmentListener.java
View file @ 9094f8b4
......@@ -219,19 +219,20 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
if (!ObjectUtils.isEmpty(queryEquipmentPoint)) {
Long equipmentsPointId = queryEquipmentPoint.getId();
List<Long> riskFactorId = equipmentMapper.judgeEquipmentExists(equipmentsPointId);
Integer value = 0;
if ("异常".equals(statusName)) {
Integer value = DevicePointEnum.getValue("异常");
value = DevicePointEnum.getValue("异常");
equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
statusByName = value;
} else {
Integer value = DevicePointEnum.getValue("正常");
value = DevicePointEnum.getValue("正常");
equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
statusByName = value;
}
// 修改rpn值
for (int j = 0; j < riskFactorId.size(); j++) {
try {
riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j),eqpName);
riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j),eqpName,value);
System.out.println("----udpate riskFactor sucess");
} catch (InnerInvokException e1) {
logger.error("update rpn fail " + e1.getMessage());
......
AmosBankService/src/main/java/com/yeejoin/amos/bank/config/SelfSupportListener.java
View file @ 9094f8b4
......@@ -178,17 +178,18 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
EquipmentQualityVo queryEquipmentPoint = equipmentMapper.queryEquipmentPoint(eqpId, remark);
Long equipmentsPointId = queryEquipmentPoint.getId();
List<Long> riskFactorId = equipmentMapper.judgeEquipmentExists(equipmentsPointId);
Integer value = 0;
if ("不通".equals(statusName)) {
Integer value = DevicePointEnum.getValue("异常");
value = DevicePointEnum.getValue("异常");
equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
} else {
Integer value = DevicePointEnum.getValue("正常");
value = DevicePointEnum.getValue("正常");
equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
}
//修改rpn值
for (int j = 0; j < riskFactorId.size(); j++) {
try {
riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j),eqpName);
riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j),eqpName,value);
System.out.println("----udpate riskFactor sucess");
} catch (InnerInvokException e1) {
logger.error("update rpn fail " + e1.getMessage());
......
AmosBankService/src/main/java/com/yeejoin/amos/bank/remote/client/RiskModelRemoteClient.java
View file @ 9094f8b4
......@@ -20,7 +20,8 @@ public interface RiskModelRemoteClient {
*/
@RequestMapping(value = "api/risksource/update/fireqeuiment/sod", method = RequestMethod.GET, consumes = "application/json")
CommonResponse updateEquipmentAlarmData(@RequestParam(value = "riskFactorID") Long riskFactorID,
@RequestParam("equipmentName") String equipmentName) throws InnerInvokException;
@RequestParam("equipmentName") String equipmentName,@RequestParam("state") Integer state)
throws InnerInvokException;
/**
* 根据风险因素id查询巡检点和指标项目列表
......
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