修改三维风险详情风险描述不显示问题

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

@@ -617,7 +617,7 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success(riskSourceService.processFireEqumtData(deviceData));
     }
 
-    @Permission
+    //@Permission
     @ApiOperation(httpMethod = "POST", value = "上传消防设备数据", notes = "上传消防设备数据")
     @RequestMapping(value = "/data/fireqeuiment/soe", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse postFireEqumentData(@RequestBody AlarmParam alarm) throws Exception {
@@ -626,7 +626,7 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success();
     }
 
-    @Permission
+    //@Permission
     @ApiOperation(httpMethod = "POST", value = "上传消防设备数据", notes = "上传消防设备数据")
     @RequestMapping(value = "/data/fireqeuiment/all", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse postFireEqumentData(@RequestBody List<AlarmParam> deviceDatas) throws Exception {
@@ -634,7 +634,7 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success();
     }
 
-    @Permission
+   // @Permission
 //  @Authorization(ingore = true)
     @ApiOperation(httpMethod = "PUT", value = "上传巡检数据", notes = "上传巡检数据")
     @RequestMapping(value = "/data/patroldata", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)

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

@@ -80,4 +80,6 @@ public interface FireEquipMapper extends BaseMapper {
             @Param("fname") String fname);
 
     FireEquipmentEntity findById(@Param("id") Long id);
+    
+    Long removeIfmeaPointByFireEquipIdAndEquipId(@Param("fireEquipmentId") Long fireEquipmentId,@Param("importantEquipmentId") Long importantEquipmentId);
 }

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

@@ -73,7 +73,7 @@ public interface RiskSourceMapper extends BaseMapper {
 
     List<Map> queryForUnqualified(@Param("riskSourceId") Long riskSourceId);
 
-
+    List<Map> queryForFmeaEquipAlarm(@Param("riskSourceId") Long riskSourceId);
     /**
      * 子节点的rpni
      *

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

@@ -232,7 +232,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
             if (equipmentFireEquipment != null) {
                 result = equipmentFireEquipment.getId();
                 this.equipmentFireEquipmentDao.deleteById(equipmentFireEquipment.getId());
-                iFmeaEquipmentPointDao.removeByFireEquipIdAndEquipId(Long.valueOf(id), equipmentId);
+                fireEquipMapper.removeIfmeaPointByFireEquipIdAndEquipId(Long.valueOf(id), equipmentId);
+                //iFmeaEquipmentPointDao.removeByFireEquipIdAndEquipId(Long.valueOf(id), equipmentId);
             }
             ids.add(result);
         }

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

@@ -811,11 +811,12 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         Map riskSourceInfo = this.riskSourceMapper.queryForRiskSourceLevel(riskSourceId);
         List<Map> fmeaList = this.fmeaMapper.queryForFmeaList(riskSourceId);
         List<Map> inputitemContent = this.riskSourceMapper.queryForUnqualified(riskSourceId);
-        List<Map> fireEquipmentPointMap = fireEquipPointMapper.queryForEqueAndPointName(riskSourceId);
+        //List<Map> fireEquipmentPointMap = fireEquipPointMapper.queryForEqueAndPointName(riskSourceId);
+        List<Map> equipAlarms = riskSourceMapper.queryForFmeaEquipAlarm(riskSourceId);
         returnMap.put("riskSourceInfo", riskSourceInfo);
         returnMap.put("fmeaList", fmeaList);
         returnMap.put("inputitemContent", inputitemContent);
-        returnMap.put("fire_equipment", fireEquipmentPointMap);
+        returnMap.put("fire_equipment", equipAlarms);
         return returnMap;
     }
 

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

@@ -528,4 +528,10 @@
     <select id="findById" resultType="com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentEntity">
         select name from f_fire_equipment where id= #{id}
     </select>
+    
+     <select id="removeIfmeaPointByFireEquipIdAndEquipId" resultType="long">
+        DELETE fmep FROM `f_fmea_equipment_point` fmep
+			LEFT JOIN f_fire_equipment_point fep ON fep.id = fmep.equipment_point_id
+			WHERE fep.fire_equipment_id = #{fireEquipmentId} AND fmep.important_equipment_id = #{importantEquipmentId}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -540,15 +540,47 @@
 	</select>
 
 	<select id="queryForUnqualified" resultType="map">
+	
+		SELECT
+			(
 				SELECT
-			(select i.`name` from p_input_item i where  i.id = pi.point_inputitem_id)inputItemName,
-			(select p.`name` from p_point p where p.id = pi.point_id )pointName,
-			(select ci.input_value from p_check_input ci where ci.id = pi.check_inputitem_id)inputitemContent
+					i.`name`
 				FROM
-			f_risk_source_point_inputitem pi
+					p_input_item i
+				WHERE
+					i.id = ppi.input_item_id
+			) inputItemName,
+			(
+				SELECT
+					p.`name`
+				FROM
+					p_point p
+				WHERE
+					p.id = ppi.point_id
+			) pointName
+		FROM
+			f_fmea_point_inputitem pi
+		LEFT JOIN p_point_inputitem ppi ON ppi.id = pi.point_inputitem_id
+		LEFT JOIN f_fmea fm ON fm.id = pi.fmea_id
+		WHERE
+			pi.`state` = 1
+		AND fm.risk_source_id = #{riskSourceId};	
+	</select>
+	
+	<select id="queryForFmeaEquipAlarm" resultType="map">
+	
+		SELECT
+			fe.`name` as 'fireEquipmentName',
+			fep.`name` as 'name'
+		FROM
+			`f_fmea_equipment_point` AS fmep
+		LEFT JOIN f_fire_equipment_point fep ON fep.id = fmep.equipment_point_id
+		LEFT JOIN f_fire_equipment fe ON fe.id = fep.fire_equipment_id
+		LEFT JOIN f_fmea fm ON fm.id = fmep.fmea_id
 		WHERE
-			pi.`status` = 2
-		and pi.risk_source_id = ${riskSourceId};
+			fmep.state = 1
+		AND fm.risk_source_id = #{riskSourceId}
+		GROUP BY fireEquipmentName,name
 	</select>
 	
 	<select id="queryRiskAreaRpn"  resultType="java.util.HashMap">