Merge branch 'develop_20200601' of http://172.16.10.76/bank/AmosBankRoot into develop_20200601

AmosBankService/src/main/java/com/yeejoin/amos/bank/config/SelfSupportListener.java

@@ -25,6 +25,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.bank.TopographyNode;
 import com.yeejoin.amos.bank.common.enums.AlarmPointTypeEnum;
+import com.yeejoin.amos.bank.common.enums.DevicePointEnum;
 import com.yeejoin.amos.bank.common.enums.DeviceStatusEnum;
 import com.yeejoin.amos.bank.dao.IDeviceRecord;
 import com.yeejoin.amos.bank.dao.entity.Alarm;
@@ -32,11 +33,13 @@ import com.yeejoin.amos.bank.dao.entity.AlarmPoint;
 import com.yeejoin.amos.bank.dao.repository.IAlarmRepository;
 import com.yeejoin.amos.bank.dao.repository.ITopographyLineRepository;
 import com.yeejoin.amos.bank.entity.DeviceRecord;
+import com.yeejoin.amos.bank.entity.EquipmentQualityVo;
 import com.yeejoin.amos.bank.remote.client.RiskModelRemoteClient;
 import com.yeejoin.amos.bank.service.IAlarmPointService;
 import com.yeejoin.amos.bank.service.IAlarmService;
 import com.yeejoin.amos.bank.utils.HttpUtil;
 import com.yeejoin.amos.bank.webSocket.WebsocketParam;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.spc.business.dao.mapper.EquipmentMapper;
 import com.yeejoin.amos.spc.business.remote.RemoteWebSocketServer;
 import com.yeejoin.amos.spc.core.util.StringUtil;
@@ -158,6 +161,28 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
 					    record.setName(eqpName + " " + ipAddress);
 						iDeviceRecord.save(record);
 						TopographyNode node = equipmentMapper.queryNodeBySourceId(String.valueOf(eqpId));
+						
+						//触发风险合格不合格
+						EquipmentQualityVo queryEquipmentPoint = equipmentMapper.queryEquipmentPoint(eqpId, remark);
+						Long equipmentsPointId = queryEquipmentPoint.getId();
+						List<Long> riskFactorId = equipmentMapper.judgeEquipmentExists(equipmentsPointId);
+						if ("不通".equals(statusName)) {
+							Integer value = DevicePointEnum.getValue("异常");
+							equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
+						} else {
+							Integer value = DevicePointEnum.getValue("正常");
+							equipmentMapper.updateEquipmentPointStatus(value, queryEquipmentPoint.getId());
+						}
+						//修改rpn值
+						for (int j = 0; j < riskFactorId.size(); j++) {
+							try {
+								riskModelRemoteClient.updateEquipmentAlarmData(riskFactorId.get(j));
+								System.out.println("----udpate riskFactor sucess");
+							} catch (InnerInvokException e1) {
+								logger.error("update rpn fail " + e1.getMessage());
+							}
+						}
+						
 						if(null!=node) {
 							node.setNumber(statusByName);
 							node.setState(statusByName);