bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/WeatherController.java

@@ -7,13 +7,13 @@ import java.net.URLConnection;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
-import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 
@@ -25,6 +25,10 @@ import io.swagger.annotations.ApiOperation;
 @Api(tags="天气api")
 public class WeatherController extends BaseController {
 	
+	@Value("${param.weather.url}")
+    private String weatherUrl;
+
+	
 	@ApiOperation(httpMethod = "GET",value = "天气查询", notes = "天气查询")
 	@GetMapping("/{address}")
 	public CommonResponse getWeather(@PathVariable("address") String address) {
@@ -32,7 +36,7 @@ public class WeatherController extends BaseController {
 		String result = "";
         BufferedReader in = null;
         try {
-            String urlNameString = "http://t.weather.sojson.com/api/weather/city/" + address;
+            String urlNameString = weatherUrl + address;
             URL realUrl = new URL(urlNameString);
             
             // 打开和URL之间的连接

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IEquipmentFireEquipmentDao.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.fas.business.dao.repository;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
 
 import org.springframework.data.jpa.repository.Modifying;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,6 +22,8 @@ public interface IEquipmentFireEquipmentDao extends BaseDao<EquipmentFireEquipme
     @Query(value = "select count(1) from f_equipment_fire_equipment WHERE equipment_id = ?1 and fire_equipment_id = ?2", nativeQuery = true)
     int findByEqmtIdAndFireEqmtId(Long equipmentId, Long fireEquipmentId);
     
+    List<EquipmentFireEquipment> findAllByEquipmentId(Long equipmentId);
+
     @Query(value = "SELECT count(1) FROM `f_equipment_fire_equipment` WHERE fire_equipment_id in ?1", nativeQuery = true)
 	int countImpEquipByIds(String[] ids);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentServiceImpl.java

@@ -133,6 +133,11 @@ public class EquipmentServiceImpl implements IEquipmentService {
     			equipment=equipment1.get();
     		}
             if (equipment != null) {
+            	List<EquipmentFireEquipment> eqFireEqs = equipmentFireEquipmentDao.findAllByEquipmentId(equipment.getId());
+            	
+            	if(!eqFireEqs.isEmpty()){
+            		equipmentFireEquipmentDao.deleteAll(eqFireEqs);
+            	}
                 this.iEquipmentDao.deleteById(Long.parseLong(id));
             } else {
                 throw new Exception("找不到指定的对象:" + id);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -26,10 +25,9 @@ import com.yeejoin.amos.fas.business.service.intfc.IDataRefreshService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
 import com.yeejoin.amos.fas.business.service.model.*;
-import com.yeejoin.amos.fas.business.util.DateUtils;
-import com.yeejoin.amos.fas.business.util.JexlUtil;
-import com.yeejoin.amos.fas.business.util.RpnUtils;
+import com.yeejoin.amos.fas.business.util.*;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
+import com.yeejoin.amos.fas.business.vo.Toke;
 import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
 import com.yeejoin.amos.fas.common.enums.CheckStatusEnum;
 import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;
@@ -41,8 +39,6 @@ import com.yeejoin.amos.fas.core.util.StringUtil;
 import com.yeejoin.amos.fas.dao.entity.*;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-
 import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,6 +80,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
     private static final String DATETYPE_YYYY = "yyyy";//年
 
+    private static final String TOKE = "TOKE";
+
+    private static CacheMap cacheMap = CacheFactory.newChacheMap();
+
     @Autowired
     private IRiskSourceDao iRiskSourceDao;
 
@@ -212,7 +212,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             int count = iRiskSourceDao.countByParentId(rId);
             Optional<RiskSource> rs = iRiskSourceDao.findById(rId);
             rs.ifPresent(riskSource -> parentIds.add(riskSource.getParentId()));
-            if(parentIds.contains(0l)){
+            if (parentIds.contains(0l)) {
                 throw new YeeException("公司节点不能删除");
             }
             if (count > 0) {
@@ -364,9 +364,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         if (!CollectionUtils.isEmpty(returnList) && equipment != null) {
             fmeaEquipmentPointMapper.saveBatch(returnList);
         }
-        if(equipment != null){
+        if (equipment != null) {
             RsDataQueue rsDataQueue = RsDataQueue.getInstance();
-            rsDataQueue.addEquipmentMessage(fmeaId,equipment.getName());
+            rsDataQueue.addEquipmentMessage(fmeaId, equipment.getName());
         }
         return returnList;
     }
@@ -496,7 +496,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
 
         //Object result = remoteRuleServer.fireRuleFlow(contingencyRo, equipment.getReservePlan(), equipment.getName());
-        ruleTrigger.publish(contingencyRo, equipment.getReservePlan(),ArrayUtils.toArray( equipment.getName()));
+        ruleTrigger.publish(contingencyRo, equipment.getReservePlan(), ArrayUtils.toArray(equipment.getName()));
         ContingencyOriginalData contingencyOriginalData = new ContingencyOriginalData();
         BeanUtils.copyProperties(contingencyRo, contingencyOriginalData);
         iContingencyOriginalDataDao.save(contingencyOriginalData);
@@ -536,7 +536,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
     @Override
-    public Page<Map<String, Object>> listFmeaPointInputitem(String toke,String product,String appKey,Long fmeaId, Integer pageNumber, Integer pageSize) {
+    public Page<Map<String, Object>> listFmeaPointInputitem(String toke, String product, String appKey, Long fmeaId, Integer pageNumber, Integer pageSize) {
         List<Map<String, Object>> content = Lists.newArrayList();
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
         long total = fmeaPointInputitemMapper.countByFmeaId(fmeaId);
@@ -544,26 +544,26 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             return new PageImpl<>(content, pageable, total);
         }
         content = fmeaPointInputitemMapper.listByFmeaId(fmeaId, pageNumber, pageSize);
-        if(!CollectionUtils.isEmpty(content)){
+        if (!CollectionUtils.isEmpty(content)) {
             Set<Object> userIds = content.stream().filter(x -> !StringUtils.isEmpty(x.get("userId"))).map(arg0 -> arg0.get("userId")).collect(Collectors.toSet());
             Set<Object> deptIds = content.stream().filter(x -> !StringUtils.isEmpty(x.get("deptId"))).map(arg0 -> arg0.get("deptId")).collect(Collectors.toSet());
-            Map<String,AgencyUserModel> userMap = new HashMap<>();
-            if(!CollectionUtils.isEmpty(userIds)){
+            Map<String, AgencyUserModel> userMap = new HashMap<>();
+            if (!CollectionUtils.isEmpty(userIds)) {
                 userMap = remoteSecurityService.getUsersMap(toke, product, appKey, userIds);
             }
 
             Map<Long, String> deptMap = new HashMap<>();
-            if(!CollectionUtils.isEmpty(deptIds)){
+            if (!CollectionUtils.isEmpty(deptIds)) {
                 deptMap = remoteSecurityService.getDepName(toke, product, appKey, deptIds);
             }
 
-            for(int i=0;i<content.size();i++){
-            	if(StringUtil.isNotEmpty(content.get(i).get("userId")) && userMap.containsKey(content.get(i).get("userId"))){
+            for (int i = 0; i < content.size(); i++) {
+                if (StringUtil.isNotEmpty(content.get(i).get("userId")) && userMap.containsKey(content.get(i).get("userId"))) {
                     AgencyUserModel user = userMap.get(content.get(i).get("userId"));
                     content.get(i).put("userName", user.getRealName());
                     content.get(i).put("tel", user.getMobile());
                 }
-            	if(StringUtil.isNotEmpty(content.get(i).get("deptId")) && deptMap.containsKey(Long.valueOf(content.get(i).get("deptId").toString()))){
+                if (StringUtil.isNotEmpty(content.get(i).get("deptId")) && deptMap.containsKey(Long.valueOf(content.get(i).get("deptId").toString()))) {
                     content.get(i).put("deptName", deptMap.get(Long.valueOf(content.get(i).get("deptId").toString())));
                 }
             }
@@ -622,17 +622,18 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             }
             RsDataQueue rsDataQueue = RsDataQueue.getInstance();
             fmeaIds.forEach(fmeaId ->
-               rsDataQueue.addPatrolMessage(fmeaId,protalData.getCheckUser(),protalData.getName(),protalData.getNodeState()));
+                    rsDataQueue.addPatrolMessage(fmeaId, protalData.getCheckUser(), protalData.getName(), protalData.getNodeState()));
         }
         iDataRefreshService.refreshViewData(DataRefreshTypeEum.check.getCode());
     }
 
     /**
      * 巡检消息规则推送
+     *
      * @param protalData
      */
     @Async
-    void protalRuleMessagePush(ProtalDataRo protalData, String token, String product, String appKey){
+    void protalRuleMessagePush(ProtalDataRo protalData, String token, String product, String appKey) {
         String bacthNo = UUID.randomUUID().toString();
         protalData.setBatchNo(bacthNo);
         protalData.setOriginalNodeState(protalData.getNodeState());
@@ -707,8 +708,14 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 if (alarmParam == null) {
                     log.warn("alarmParam is empty!");
                 } else {
+                    Toke toke = cacheMap.getValue(TOKE);
+                    if (toke == null) {
+                        toke = remoteSecurityService.come();
+                        Long times = (long) (20 * 24 * 60 * 60);
+                        cacheMap.setex(TOKE, toke, times);
+                    }
                     try {
-                        processFireData(alarmParam);
+                        processFireData(alarmParam,toke);
                     } catch (Exception e) {
                         log.error("parse alarmParam happened error", e);
                         // 失败处理
@@ -720,7 +727,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
 
-    private void processFireData(AlarmParam deviceData) throws Exception {
+    private void processFireData(AlarmParam deviceData,Toke toke) throws Exception {
         //处理设备和巡检数据
         deviceData.setNodeState(deviceData.getState());
         FireEquipmentPoint fireEquipmentPoint = iFireEquipmentPointDao.findOneByCode(deviceData.getPointCode());
@@ -744,20 +751,21 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             equipment = impAndFireEquipMapper.queryImpEqumtByFireEquipmt(fireEquipmentPoint.getFireEquipmentId());
             if (equipment != null && "alarm_type_fire".equals(fireEquipmentPointType)) {
                 //动态预案执行
-            	dynamicPlan(deviceData, equipment, fireEquipment, fireEquipmentPointType);
+                dynamicPlan(deviceData, equipment, fireEquipment, fireEquipmentPointType,toke);
             }
         }
     }
 
     /**
      * 预案执行
+     *
      * @param deviceData
      * @param equipment
      * @param fireEquipment
      * @param fireEquipmentPointType
      */
     @Async
-    void dynamicPlan(AlarmParam deviceData, Equipment equipment, FireEquipment fireEquipment, String fireEquipmentPointType){
+    void dynamicPlan(AlarmParam deviceData, Equipment equipment, FireEquipment fireEquipment, String fireEquipmentPointType,Toke toke) {
         String batchNo = null;
         Object batch = null;
         Dict dict = null;
@@ -789,6 +797,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             Object canBeRunning = redisTemplate.opsForValue().get(cacheKeyForCanBeRunning());
             if (canBeRunning == null) {
                 try {
+                    RequestContext.setToken(toke.getToke());
+                    RequestContext.setProduct(toke.getProduct());
                     alermContingency(batchNo, fireEquipment, equipment);
                 } catch (Exception e) {
                     log.error("调用规则失败", e);
@@ -818,20 +828,20 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
 
     private void saveFireEquipmentData(FireEquipmentPoint fireEquipmentPoint, FireEquipment fireEquipment, AlarmParam deviceData, String fireEquipmentPointType) {
-    	if("alarm_type_fire".equals(fireEquipmentPointType) || "alarm_type_trouble".equals(fireEquipmentPointType)){
+        if ("alarm_type_fire".equals(fireEquipmentPointType) || "alarm_type_trouble".equals(fireEquipmentPointType)) {
             Alarm alarm = iAlarmDao.findByStatusTrueAndFireEquipmentPointCode(deviceData.getPointCode());
-    		if(alarm != null){
+            if (alarm != null) {
                 alarm.setFireEquipmentPointValue(deviceData.getState());
-    			if("false".equals(deviceData.getState())){
+                if ("false".equals(deviceData.getState())) {
                     alarm.setRecoveryDate(new Date());
                     alarm.setStatus(false);
-    			}else{
-    				alarm.setFrequency((alarm.getFrequency()+1));
+                } else {
+                    alarm.setFrequency((alarm.getFrequency() + 1));
                     alarm.setUpdateDate(new Date());
                 }
                 iAlarmDao.save(alarm);
-    		}else{
-    			if("true".equals(deviceData.getState())){
+            } else {
+                if ("true".equals(deviceData.getState())) {
                     alarm = new Alarm();
                     alarm.setFireEquipmentCode(fireEquipment.getCode());
                     alarm.setFireEquipmentId(fireEquipment.getId());
@@ -845,17 +855,17 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     iAlarmDao.save(alarm);
                 }
             }
-    		if(alarm != null){
+            if (alarm != null) {
                 if ("alarm_type_trouble".equals(fireEquipmentPointType)) {
                     //通知刷新3d页面相关故障数据
                     notifyAlarm(fireEquipmentPoint, deviceData);
-                }else{
+                } else {
                     //通知刷新3d页面告警数据
                     iDataRefreshService.refreshViewData(DataRefreshTypeEum.alarm.getCode());
                 }
             }
-    	}else{
-    		if("SWITCH".equals(fireEquipmentPoint.getType())){ //保存遥信信号数据到mysql中
+        } else {
+            if ("SWITCH".equals(fireEquipmentPoint.getType())) { //保存遥信信号数据到mysql中
                 FireEquipmentData fireEquipmentData = new FireEquipmentData();
                 fireEquipmentData.setEqPointCode(deviceData.getPointCode());
                 fireEquipmentData.seteValue(deviceData.getState());
@@ -885,7 +895,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
 
-    
     @Override
     public void saveData(List<AlarmParam> deviceDatas, String type) {
         List<EquipCommunicationData> list = deviceDatas.stream().map(param -> {
@@ -962,10 +971,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             if (ids.size() > 0) {
                 fmeaEquipmentPointMapper.updateStateByIds(state, ids);
             }
-            final Integer st=state;
-            String monitor=fireEquipMapper.findById(fireEquipPointMapper.getByCode(param.getPointCode()).getFireEquipmentId()).getName();
+            final Integer st = state;
+            String monitor = fireEquipMapper.findById(fireEquipPointMapper.getByCode(param.getPointCode()).getFireEquipmentId()).getName();
             RsDataQueue rsDataQueue = RsDataQueue.getInstance();
-            fmeaIds.forEach(fmeaId -> rsDataQueue.addEquipmentMessage(fmeaId,monitor,st));
+            fmeaIds.forEach(fmeaId -> rsDataQueue.addEquipmentMessage(fmeaId, monitor, st));
         }
     }
 
@@ -1065,8 +1074,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             if (!ObjectUtils.isEmpty(map.get("area"))) {
                 area = Double.valueOf(map.get("area").toString());
             }
-            String maxlevel = map.get("max_level") !=null?map.get("max_level").toString():"0.0";
-        	String level = map.get("value") !=null&& StringUtil.isNumeric(map.get("value").toString())?String.format("%.2f", (Double.valueOf(map.get("value").toString()))):maxlevel;
+            String maxlevel = map.get("max_level") != null ? map.get("max_level").toString() : "0.0";
+            String level = map.get("value") != null && StringUtil.isNumeric(map.get("value").toString()) ? String.format("%.2f", (Double.valueOf(map.get("value").toString()))) : maxlevel;
 
             String volume = String.format("%.2f", Double.valueOf(level) * area);
             if (hashOperations.size("Analogue") > 0) {
@@ -1076,8 +1085,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     continue;
                 }
                 EquipCommunicationData data = (EquipCommunicationData) hashOperations.get("Analogue", map.get("CODE"));
-                map.put("level",  StringUtil.isNumeric(data.getState())?data.getState():level);
-                map.put("volume", String.format("%.2f", (Double.valueOf(map.get("level").toString())* area)));
+                map.put("level", StringUtil.isNumeric(data.getState()) ? data.getState() : level);
+                map.put("volume", String.format("%.2f", (Double.valueOf(map.get("level").toString()) * area)));
             } else {
                 map.put("level", level);
                 map.put("volume", volume);
@@ -1110,7 +1119,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
      * 修改、添加导致rpn、rpni改变
      */
     @Override
-    public void notifyFmeaFromUpdate(String toke, String product, String appKey, Long fmeaId, String nofityType,String userName) {
+    public void notifyFmeaFromUpdate(String toke, String product, String appKey, Long fmeaId, String nofityType, String userName) {
         Fmea fmea = fmeaMapper.getById(fmeaId);
         if (fmea == null) {
             return;
@@ -1126,11 +1135,11 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             //1.2未评价过，计算绑定的巡检点项 设备点位故障率
             if (fmea.getNewEvaluationOid() == null) {
                 EvaluationModel evaluationModel = this.getEvaluationModel(fmeaId);
-                if(evaluationModel != null){//已经绑定点位或者巡检点项且匹配到风险模型，则更新为计算后的结果
+                if (evaluationModel != null) {//已经绑定点位或者巡检点项且匹配到风险模型，则更新为计算后的结果
                     BigDecimal newOidValue = new BigDecimal(evaluationModel.getCoefficient());
                     rpn = newOidValue.multiply(sidValue).multiply(didValue).setScale(2, BigDecimal.ROUND_HALF_UP);
                     fmea.setNewEvaluationOid(evaluationModel.getId());
-                }else {//未绑定点位或者巡检点项或者匹配不到风险模型，则更新为rpn与rpni一致
+                } else {//未绑定点位或者巡检点项或者匹配不到风险模型，则更新为rpn与rpni一致
                     fmea.setNewEvaluationOid(fmea.getEvaluationOid());
                     rpn = rpni;
                 }
@@ -1162,11 +1171,11 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
     }
 
-    private JpushMsgBo getJushMessageInfo(MsgParamBo msgParam){
+    private JpushMsgBo getJushMessageInfo(MsgParamBo msgParam) {
         JpushMsgBo msgBo = new JpushMsgBo();
         Optional<RiskFactor> optional = iRiskFactorDao.findById(msgParam.getFmea().getRiskFactorsId());
-        if(optional.isPresent()){
-            JpushMsgContentBo  jpushMsgContentBo = new JpushMsgContentBo(optional.get().getName(),msgParam.getNotifyType());
+        if (optional.isPresent()) {
+            JpushMsgContentBo jpushMsgContentBo = new JpushMsgContentBo(optional.get().getName(), msgParam.getNotifyType());
             jpushMsgContentBo.setExecute(msgParam.getUserName());
             jpushMsgContentBo.setLevelIsChange(msgParam.getLevelIsChange());
             jpushMsgContentBo.setLevel(msgParam.getLevel());
@@ -1219,7 +1228,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     public void notifyFmeaFromAbnormal(
             String toke, String product, String appKey,
-            Long fmeaId, String notifyType,String userName, String relationName, String checkStatus) {
+            Long fmeaId, String notifyType, String userName, String relationName, String checkStatus) {
         Fmea fmea = fmeaMapper.getById(fmeaId);
         if (fmea == null) {
             return;
@@ -1269,7 +1278,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
     }
 
-    private void saveRpnLog(Long riskSourceId, Long fmeaId, BigDecimal rpn, BigDecimal rpni,String notifyType) {
+    private void saveRpnLog(Long riskSourceId, Long fmeaId, BigDecimal rpn, BigDecimal rpni, String notifyType) {
         RpnChangeLog rpnChangeLog = new RpnChangeLog();
         rpnChangeLog.setRiskSourceId(riskSourceId);
         rpnChangeLog.setRpn(rpn);
@@ -1325,14 +1334,14 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             if (rpnValueBo.isEmpty()) {
                 return;
             }
-            Fmea caluFmea=fmeaMapper.getById(fmeaId);
+            Fmea caluFmea = fmeaMapper.getById(fmeaId);
             Integer rpnDiffer = 0;
-            if(caluFmea != null) {
-            	rpnDiffer = caluFmea.getRpn().intValue()-caluFmea.getRpni().intValue();
+            if (caluFmea != null) {
+                rpnDiffer = caluFmea.getRpn().intValue() - caluFmea.getRpni().intValue();
             }
             String checkStatus = "";
-            if(jpushMsgBo != null) {
-            	checkStatus=jpushMsgBo.getMsg().getCheckStatus();
+            if (jpushMsgBo != null) {
+                checkStatus = jpushMsgBo.getMsg().getCheckStatus();
             }
             BigDecimal rpn = rpnValueBo.getRpn();
             BigDecimal rpni = rpnValueBo.getRpni();
@@ -1343,8 +1352,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 riskSource.setRpn(rpn);
                 riskSource.setRpni(rpni);
                 riskSource.setRiskLevelId(newRiskLevel.getId());
-                String changeType = RpnUtils.calChangeTypeByLevel(oldRiskLevel.getLevel(),newRiskLevel.getLevel());
-                riskSource.setFlickerFrequency(RpnUtils.calRiskPointFrequency(rpn,rpni,changeType));
+                String changeType = RpnUtils.calChangeTypeByLevel(oldRiskLevel.getLevel(), newRiskLevel.getLevel());
+                riskSource.setFlickerFrequency(RpnUtils.calRiskPointFrequency(rpn, rpni, changeType));
                 //1.更新fmea对应风险点rpn、rpni、level
                 riskSourceMapper.updateRpn(riskSource);
                 //2.记录风险点rpn变化流水
@@ -1353,12 +1362,12 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 //3.更新父节点rpn、rpni、风险等级
                 this.updateParentRpn(riskSource.getParentId());
                 //4.极光推送给手机客户端
-                if("recovery".equals(notifyType) || "fmeaUpdate".equals(notifyType) || ("alarm".equals(notifyType)&&rpnDiffer>0)||("patrol".equals(notifyType) && rpnDiffer>0 && CheckStatusEnum.UNQUALIFIED.getName().equals(checkStatus))){
+                if ("recovery".equals(notifyType) || "fmeaUpdate".equals(notifyType) || ("alarm".equals(notifyType) && rpnDiffer > 0) || ("patrol".equals(notifyType) && rpnDiffer > 0 && CheckStatusEnum.UNQUALIFIED.getName().equals(checkStatus))) {
                     jpushRiskSourceMessage(jpushMsgBo);
                 }
                 //5.规则告警（消息）
-                if("recovery".equals(notifyType) || "fmeaUpdate".equals(notifyType) || ("alarm".equals(notifyType)&&rpnDiffer>0) ||(notifyType=="patrol" && rpnDiffer>0 && CheckStatusEnum.UNQUALIFIED.getName().equals(checkStatus))){
-                    notifyRule(riskSourceId, rpn, rpni, notifyType,changeType, jpushMsgBo.getMsg());
+                if ("recovery".equals(notifyType) || "fmeaUpdate".equals(notifyType) || ("alarm".equals(notifyType) && rpnDiffer > 0) || (notifyType == "patrol" && rpnDiffer > 0 && CheckStatusEnum.UNQUALIFIED.getName().equals(checkStatus))) {
+                    notifyRule(riskSourceId, rpn, rpni, notifyType, changeType, jpushMsgBo.getMsg());
                 }
                 //6.通知全景监控屏幕数据刷新
                 iDataRefreshService.refreshViewData(DataRefreshTypeEum.rpn.getCode());
@@ -1529,11 +1538,11 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         riskSourceMapper.batchSaveRegionUe4(regionBoList);
     }
 
-    private EvaluationModel getEvaluationModel(Long fmeaId){
+    private EvaluationModel getEvaluationModel(Long fmeaId) {
         List<FmeaEquipmentPoint> equipmentPoints = fmeaEquipmentPointMapper.listFmeaByFmeaId(fmeaId);
         List<FmeaPointInputitem> pointInputitems = fmeaPointInputitemMapper.listFmeaByFmeaId(fmeaId);
         Double maxRate = RpnUtils.getMaxRate(equipmentPoints, pointInputitems);
-        if(maxRate != null){
+        if (maxRate != null) {
             List<EvaluationModel> oModels = iEvaluationModelDao.findAllByType("O");
             EvaluationModel oEvaluationModel = getBetweenModel(maxRate, oModels);
             return oEvaluationModel;

YeeAmosFireAutoSysStart/src/main/resources/application.properties

 
-spring.application.name = Amos-autosys-sqy
+spring.application.name = Amos-autosys
 
 server.port = 8083
 
@@ -52,3 +52,4 @@ windows.img.path = F:\\
 linux.img.path = /
 
 param.safetyIndexChange.cron = 0 0 2 * * ?
+param.weather.url = http://t.weather.sojson.com/api/weather/city/