Commit 1d8f7d05 authored by zhangsen's avatar zhangsen

xuqiu

parent 652c0701
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.fas.business.action.model.ProtalDataRo; ...@@ -6,6 +6,7 @@ import com.yeejoin.amos.fas.business.action.model.ProtalDataRo;
import com.yeejoin.amos.fas.business.bo.DangerResultBo; import com.yeejoin.amos.fas.business.bo.DangerResultBo;
import com.yeejoin.amos.fas.business.bo.PlanFlagBo; import com.yeejoin.amos.fas.business.bo.PlanFlagBo;
import com.yeejoin.amos.fas.business.bo.RiskSourceSynBo; import com.yeejoin.amos.fas.business.bo.RiskSourceSynBo;
import com.yeejoin.amos.fas.business.dao.mapper.ContingencyPlanInstanceMapper;
import com.yeejoin.amos.fas.business.param.AlarmParam; import com.yeejoin.amos.fas.business.param.AlarmParam;
import com.yeejoin.amos.fas.business.param.FmeaBindParam; import com.yeejoin.amos.fas.business.param.FmeaBindParam;
import com.yeejoin.amos.fas.business.service.intfc.IRiskFactorService; import com.yeejoin.amos.fas.business.service.intfc.IRiskFactorService;
...@@ -16,10 +17,7 @@ import com.yeejoin.amos.fas.config.Permission; ...@@ -16,10 +17,7 @@ import com.yeejoin.amos.fas.config.Permission;
import com.yeejoin.amos.fas.core.common.request.CommonPageable; import com.yeejoin.amos.fas.core.common.request.CommonPageable;
import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse; import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
import com.yeejoin.amos.fas.core.enums.ReserveEnum; import com.yeejoin.amos.fas.core.enums.ReserveEnum;
import com.yeejoin.amos.fas.core.util.CommonResponse; import com.yeejoin.amos.fas.core.util.*;
import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
import com.yeejoin.amos.fas.core.util.ResponseModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
...@@ -48,6 +46,9 @@ public class RiskSourceController extends BaseController { ...@@ -48,6 +46,9 @@ public class RiskSourceController extends BaseController {
@Autowired @Autowired
IRiskSourceService riskSourceService; IRiskSourceService riskSourceService;
@Autowired
ContingencyPlanInstanceMapper contingencyPlanInstanceMapper;
@Permission @Permission
//@Authorization(ingore = true) //@Authorization(ingore = true)
@ApiOperation(httpMethod = "GET", value = "查询风险点子项", notes = "查询风险点子项") @ApiOperation(httpMethod = "GET", value = "查询风险点子项", notes = "查询风险点子项")
...@@ -719,6 +720,26 @@ public class RiskSourceController extends BaseController { ...@@ -719,6 +720,26 @@ public class RiskSourceController extends BaseController {
return CommonResponseUtil.success(riskSourceService.queryContingencyWater()); return CommonResponseUtil.success(riskSourceService.queryContingencyWater());
} }
@ApiOperation(value = "概览水源信息")
@GetMapping("/getWaterInfo")
public CommonResponse getWaterInfo(CommonPageable commonPageable) {
if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1);
}
ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getOrgCode(reginParams);
String bizOrgCode = null;
if (StringUtil.isNotEmpty(orgCode)) {
bizOrgCode = contingencyPlanInstanceMapper.getBizOrgCode(orgCode);
if (!StringUtil.isNotEmpty(bizOrgCode)) {
return CommonResponseUtil.success(null);
}
} else {
return CommonResponseUtil.success(null);
}
return CommonResponseUtil.success(riskSourceService.getWaterInfo(commonPageable, bizOrgCode));
}
/** /**
* 获取危险因素树二级节点 * 获取危险因素树二级节点
* *
......
package com.yeejoin.amos.fas.business.dao.mapper; package com.yeejoin.amos.fas.business.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance; import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -33,4 +34,11 @@ public interface ContingencyPlanInstanceMapper extends BaseMapper<ContingencyPla ...@@ -33,4 +34,11 @@ public interface ContingencyPlanInstanceMapper extends BaseMapper<ContingencyPla
* @return * @return
*/ */
Boolean updateMessageById(@Param("dto") ContingencyPlanInstance contingencyPlanInstance); Boolean updateMessageById(@Param("dto") ContingencyPlanInstance contingencyPlanInstance);
String getBizOrgCode(@Param("amosOrgCode") String amosOrgCode);
List<Map<String, Object>> getWaterInfo(@Param("current") Integer current, @Param("size") Integer size, @Param("bizOrgCode") String bizOrgCode);
long countWater(@Param("bizOrgCode") String bizOrgCode);
} }
...@@ -193,6 +193,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService { ...@@ -193,6 +193,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
@Autowired @Autowired
private WebMqttComponent webMqttComponent; private WebMqttComponent webMqttComponent;
@Autowired
private EquipmentSpecificMapper equipmentSpecificMapper;
@Override @Override
public RiskSource editRiskSource(HashMap<String, Object> map) throws Exception { public RiskSource editRiskSource(HashMap<String, Object> map) throws Exception {
RiskSource riskSource = (RiskSource) map.get("param"); RiskSource riskSource = (RiskSource) map.get("param");
...@@ -2010,6 +2013,19 @@ public class RiskSourceServiceImpl implements IRiskSourceService { ...@@ -2010,6 +2013,19 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
return riskSource; return riskSource;
} }
@Autowired
private ContingencyPlanInstanceMapper contingencyPlanInstanceMapper;
@Override
public Page<Map<String, Object>> getWaterInfo(CommonPageable commonPageable, String bizOrgCode) {
List<Map<String, Object>> content = Lists.newArrayList();
long total = contingencyPlanInstanceMapper.countWater(bizOrgCode);
if (total <= 0) {
return new PageImpl<>(content, commonPageable, total);
}
Integer start = (commonPageable.getPageNumber() - 1) * commonPageable.getPageSize();
content = contingencyPlanInstanceMapper.getWaterInfo(start, commonPageable.getPageSize(), bizOrgCode);
return new PageImpl<>(content, commonPageable, total);
}
} }
...@@ -220,4 +220,6 @@ public interface IRiskSourceService { ...@@ -220,4 +220,6 @@ public interface IRiskSourceService {
void processProtalDataFromDanger(DangerResultBo dangerResultBo) throws Exception; void processProtalDataFromDanger(DangerResultBo dangerResultBo) throws Exception;
RiskSource updateAreaSyn(String code, String compCode, RiskSourceSynBo synBo); RiskSource updateAreaSyn(String code, String compCode, RiskSourceSynBo synBo);
Page<Map<String, Object>> getWaterInfo(CommonPageable commonPageable, String bizOrgCode);
} }
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