bug

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

@@ -148,9 +148,7 @@ public class RiskModelController extends BaseController {
     public CommonResponse deleteFmea(@ApiParam(value = "Fmea模型id", required = true) @RequestBody RiskFmeaParam param) {
         try {
             Long[] fmeaIds = param.getFmeaIds();
-            Long riskSourceId = param.getRiskSourceId();
             fmeaService.deleteFmea(fmeaIds);
-            fmeaService.updateRpniInfo(riskSourceId);
             if (fmeaIds.length > 0) {
                 RsDataQueue rsDataQueue = RsDataQueue.getInstance();
                 for (Long fmeaId : fmeaIds) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FmeaMapper.java

@@ -35,4 +35,6 @@ public interface FmeaMapper extends BaseMapper {
     Fmea getById(Long id);
 
     List<Fmea> listByRiskSourceId(Long riskSourceId);
+
+    void updateRpn(Fmea fmea);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/RiskSourceMapper.java

@@ -49,7 +49,7 @@ public interface RiskSourceMapper extends BaseMapper {
 
 
     //厂区rpn，重点设备个数，风险点个数，巡检点个数
-    Map<String,List> statistics3dCount();
+    Map<String, List> statistics3dCount();
 
     //消防设备按分类统计个数
     List<Map> statisticsEquipClassify();
@@ -93,4 +93,6 @@ public interface RiskSourceMapper extends BaseMapper {
     List<Map> queryContingencyWater();
 
     List<Map> queryFmeaByPointId(@Param("pointId") Long pointId);
+
+    void updateRpn(RiskSource riskSource);
 }

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

@@ -66,8 +66,8 @@ public class FmeaServiceImpl implements IFmeaService {
         fmeas.forEach(fmea -> {
             String userId = paramMap.get("user_id") == null ? "0" : paramMap.get("user_id").toString();
             fmea.setCreateBy(Integer.parseInt(userId));
-            RiskSource riskSource = iRiskSourceDao.findById(fmea.getRiskSourceId());
-            fmea.setRiskSource(riskSource);
+//            RiskSource riskSource = iRiskSourceDao.findById(fmea.getRiskSourceId());
+//            fmea.setRiskSource(riskSource);
             iFmeaDao.save(fmea);
             //updateRpniInfo(fmea.getRiskSourceId());
         });

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

@@ -1399,7 +1399,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             BigDecimal sidValue = new BigDecimal(fmea.getSidValue());
             BigDecimal didValue = new BigDecimal(fmea.getDidValue());
             BigDecimal rpni = oidValue.multiply(sidValue).multiply(didValue);
-            BigDecimal rpn = null;
+            BigDecimal rpn;
             if (fmea.getNewEvaluationOid() == null) {
                 fmea.setNewEvaluationOid(fmea.getEvaluationOid());
                 rpn = rpni;
@@ -1410,7 +1410,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             }
             fmea.setRpni(rpni);
             fmea.setRpn(rpn);
-            iFmeaDao.save(fmea);
+            fmeaMapper.updateRpn(fmea);
             saveRpnLog(fmea.getRiskSourceId(), fmeaId, rpn, rpni);
             this.notifyRiskSource(fmea.getRiskSourceId());
         }
@@ -1438,7 +1438,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 BigDecimal rpn = newOidValue.multiply(sidValue).multiply(didValue);
                 fmea.setRpn(rpn);
                 fmea.setNewEvaluationOid(oEvaluationModel.getId());
-                iFmeaDao.save(fmea);
+                fmeaMapper.updateRpn(fmea);
                 saveRpnLog(fmea.getRiskSourceId(), fmeaId, rpn, fmea.getRpni());
                 this.notifyRiskSource(fmea.getRiskSourceId());
             }
@@ -1550,7 +1550,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             riskSource.setRpn(rpn);
             riskSource.setRpni(rpni);
             riskSource.setRiskLevelId(newLevel.getId());
-            iRiskSourceDao.save(riskSource);
+            riskSourceMapper.updateRpn(riskSource);
         }
     }
 

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

@@ -43,6 +43,10 @@
 			fm.department_leader as departmentLeader,
 			fm.group_leader as groupLeader,
 			fm.person_leader as personLeader,
+			(select name from s_user where id = fm.company_leader) as companyLeaderName,
+			(select name from s_user where id = fm.department_leader) as departmentLeaderName,
+			(select name from s_user where id = fm.group_leader) as groupLeaderName,
+			(select name from s_user where id = fm.person_leader) as personLeaderName,
 		    rf.`name` AS riskFactorName,
 		    fat.`name` AS accidentTypeName,
 		    fat.id AS accidentTypeId,
@@ -123,5 +127,19 @@
 			a.risk_source_id = #{riskSourceId}
 	</select>
 
-
+	<update id="updateRpn">
+		update f_fmea
+		<set>
+			<if test="rpn != null">
+				rpn = #{rpn},
+			</if>
+			<if test="rpni != null">
+				rpni = #{rpni},
+			</if>
+			<if test="newEvaluationOid != null">
+				new_evaluation_oid = #{newEvaluationOid},
+			</if>
+		</set>
+		where id = #{id}
+	</update>
 </mapper>
\ No newline at end of file

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

@@ -656,4 +656,20 @@
 			parent_id = #{riskSourceId}
 	</select>
 
+	<update id="updateRpn">
+		update f_risk_source
+		<set>
+			<if test="rpn != null">
+				rpn = #{rpn},
+			</if>
+			<if test="rpni != null">
+				rpni = #{rpni},
+			</if>
+			<if test="riskLevelId != null">
+				risk_level_id = #{riskLevelId},
+			</if>
+		</set>
+		where id = #{id}
+	</update>
+
 </mapper>
\ No newline at end of file