解决冲突

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/ManageLevelEum.java

@@ -59,3 +59,4 @@ public enum  ManageLevelEum {
         this.manageLevel = manageLevel;
     }
 }
+

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/RpnChangeLog.java

@@ -32,6 +32,7 @@ public class RpnChangeLog extends BasicEntity {
 
     /**
      * 触发变化类型（巡检、告警、评价、删除）
+     * 变化类型（巡检、评价、告警）
      */
     @Column(name = "trigger_type")
     private String triggerType;

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

 package com.yeejoin.amos.fas.business.controller;
 
+import java.util.HashMap;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskLevelService;
 import com.yeejoin.amos.fas.business.util.CommonPageParamUtil;
@@ -11,18 +25,10 @@ import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/api/riskLevel")
@@ -97,7 +103,7 @@ public class RiskLevelController extends BaseController {
             return CommonResponseUtil.failure(e.getMessage() + ",风险等级删除失败");
         }
     }
-
+    
     @ApiOperation(value = "风险管控级别查询",notes = "风险管控级别查询")
     @GetMapping(value = "/manageLevel/list")
     public CommonResponse getManageLevelEumList(){

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

@@ -8,31 +8,27 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
-import com.yeejoin.amos.fas.business.util.StringUtil;
-import com.yeejoin.amos.fas.common.enums.ManageLevelEum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import com.google.common.base.Joiner;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.dao.mapper.RiskLevelMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskLevelService;
+import com.yeejoin.amos.fas.business.util.StringUtil;
+import com.yeejoin.amos.fas.common.enums.ManageLevelEum;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
 import com.yeejoin.amos.fas.exception.YeeException;
-import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import org.springframework.util.CollectionUtils;
-
 @Service("riskLevelService")
 public class RiskLevelServiceImpl implements IRiskLevelService {
 	@Autowired 
@@ -69,6 +65,7 @@ public class RiskLevelServiceImpl implements IRiskLevelService {
 			});
 		}
 		return new PageImpl<>(content, param, total);
+
 	}
 
 

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

@@ -1123,7 +1123,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             BigDecimal sidValue = new BigDecimal(fmea.getSidValue());
             BigDecimal didValue = new BigDecimal(fmea.getDidValue());
             //1.1计算rpni
+
             BigDecimal rpni = oidValue.multiply(sidValue).multiply(didValue).setScale(2, BigDecimal.ROUND_HALF_UP);
+
             BigDecimal rpn;
             //1.2计算rpn：为空则rpni = rpn;不为空则重新计算s*d*newo
             if (fmea.getNewEvaluationOid() == null) {
@@ -1132,6 +1134,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             } else {
                 BigDecimal newOidValue = new BigDecimal(fmea.getNewOidValue());
                 rpn = newOidValue.multiply(sidValue).multiply(didValue).setScale(2, BigDecimal.ROUND_HALF_UP);
+
             }
             List<RiskLevel> levels = riskLevelDao.findAll();
             RiskLevel newLevel = RpnUtils.getBetweenLevel(rpn, levels);
@@ -1261,7 +1264,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);
@@ -1270,6 +1273,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         rpnChangeLog.setTriggerBy(fmeaId);
         rpnChangeLog.setTriggerType(notifyType);
         rpnChangeLog.setFmeaId(fmeaId);
+        rpnChangeLog.setTriggerType(notifyType);
         iRpnChangeLogDao.save(rpnChangeLog);
     }
 
@@ -1296,7 +1300,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             return;
         }
         List<Fmea> fmeas = fmeaMapper.listByRiskSourceId(riskSourceId);
-        if (CollectionUtils.isEmpty(fmeas)) {//fema删除
+        if (CollectionUtils.isEmpty(fmeas)) {//fema全部删除
             BigDecimal resetValue = new BigDecimal("0");
             riskSource.setRpn(null);
             riskSource.setRpni(null);
@@ -1306,6 +1310,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             riskSourceMapper.updateRpn(riskSource);
             //2.记录风险点rpn变化流水
             this.saveRpnLog(riskSource.getId(), fmeaId, resetValue, resetValue, notifyType);
+
             //3.更新父节点rpn、rpni、风险等级
             this.updateParentRpn(riskSource.getParentId());
             //4.通知全景监控屏幕数据刷新
@@ -1330,6 +1335,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 riskSourceMapper.updateRpn(riskSource);
                 //2.记录风险点rpn变化流水
                 this.saveRpnLog(riskSource.getId(), fmeaId, rpn, rpni, notifyType);
+
                 //3.更新父节点rpn、rpni、风险等级
                 this.updateParentRpn(riskSource.getParentId());
                 //4.极光推送给手机客户端

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-sql-task.xml

@@ -122,4 +122,18 @@
         </sql>
     </changeSet>
 
+	<changeSet author="maoying" id="1589954524000-1" runOnChange="true">
+        <comment>updatePointConfig 触发器创建</comment>
+        <sql endDelimiter="#">
+	        DROP TRIGGER IF EXISTS `updatePointConfig`;
+			CREATE TRIGGER `updatePointConfig` AFTER UPDATE ON `p_point` FOR EACH ROW
+			BEGIN
+            IF (new.name != old.name)
+			THEN
+			 UPDATE p_point_config pc SET pc.`name` = CONCAT(new.name,'合格') WHERE pc.name LIKE '%合格' AND pc.point_id = new.id;
+			 UPDATE p_point_config pc SET pc.`name` = CONCAT(new.name,'漏检')  WHERE pc.name LIKE '%漏检' AND pc.point_id = new.id;
+			END IF;
+			END#
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_level.xml

@@ -23,7 +23,12 @@
 		a.severity,
 		a.name,
 		a.color,
+<<<<<<< HEAD
 		a.create_by as createBy,
+=======
+		a.manage_level manageLevel,
+		b.name as userName ,
+>>>>>>> dev
 		a.create_date as createDate,
 		a.remark,
 		a.manage_level as manageLevel