Skip to content

Y
YeeAmosFireAutoSysRoot
Commit a0c5e717 authored by maoying's avatar maoying
Browse files
Options

合并v2.1.0.0修复的bug

parents 42546691 b82e5c78
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 15 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/RiskSourceController.java
View file @ a0c5e717
......@@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -22,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.fas.business.action.model.FireEquimentDataRo;
import com.yeejoin.amos.fas.business.action.model.ProtalDataRo;
import com.yeejoin.amos.fas.business.param.AlarmParam;
......@@ -87,7 +87,7 @@ public class RiskSourceController extends BaseController {
* @return
*/
@Permission
@ApiOperation(httpMethod = "GET", value = "风险上升率", notes = "风险上升率")
@ApiOperation(httpMethod = "GET", value = "风险上升率", notes = "风险上升率")
@RequestMapping(value = "/riseuprate", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryForRiseUp() throws Exception {
return CommonResponseUtil.success(riskSourceService.queryForRiseUp());
......@@ -617,7 +617,6 @@ public class RiskSourceController extends BaseController {
return CommonResponseUtil.success(riskSourceService.processFireEqumtData(deviceData));
}
// @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 +625,6 @@ public class RiskSourceController extends BaseController {
return CommonResponseUtil.success();
}
// @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 +632,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
View file @ a0c5e717
......@@ -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
View file @ a0c5e717
......@@ -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
View file @ a0c5e717
......@@ -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
View file @ a0c5e717
......@@ -809,11 +809,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
View file @ a0c5e717
......@@ -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
View file @ a0c5e717
......@@ -540,15 +540,47 @@
</select>
<select id="queryForUnqualified" resultType="map">
SELECT
(
SELECT
i.`name`
FROM
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
(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
fe.`name` as 'fireEquipmentName',
fep.`name` as 'name'
FROM
f_risk_source_point_inputitem pi
`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">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment