From 4f4e6843b9c16ce646de41e5439fed57853b51d7 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 24 八月 2023 14:19:08 +0800
Subject: [PATCH] 图片多传和查看
---
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 74 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
index f41c0fd..82a44f7 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -281,11 +281,11 @@
resultVO.setMsg("安全风险分析单元名称不能为空");
return resultVO;
}
- PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
- if (riskUnit == null){
- resultVO.setMsg("安全风险分析单元名称不存在");
- return resultVO;
- }
+// PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
+// if (riskUnit == null){
+// resultVO.setMsg("安全风险分析单元名称不存在");
+// return resultVO;
+// }
if (StringUtils.isEmpty(riskEventName)){
resultVO.setMsg("安全风险事件名称不能为空");
return resultVO;
@@ -369,7 +369,7 @@
*/
@Override
public ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO) {
- Integer pageIndex = riskEventQueryReqDTO.getPageIndex();
+ Integer pageIndex = riskEventQueryReqDTO.getPageNum();
Integer pageSize = riskEventQueryReqDTO.getPageSize();
if (pageIndex == 0 || pageSize == 0){
return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
@@ -481,7 +481,6 @@
controlMeasure.setCreateByUserName(sysUser.getUserName());
controlMeasure.setRiskEventUuid(riskEvent.getUuid());
- //todo 对所属企业id和uuid没有进行设置
PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
//设置上报时间为空
controlMeasure.setReportTime(null);
@@ -690,7 +689,7 @@
*/
@Override
public ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO) {
- Integer pageIndex = measureQueryReqDTO.getPageIndex();
+ Integer pageIndex = measureQueryReqDTO.getPageNum();
Integer pageSize = measureQueryReqDTO.getPageSize();
if (pageIndex == 0 || pageSize == 0){
return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
@@ -815,7 +814,7 @@
jobAndMeasure.setJobId(jobId);
jobAndMeasure.setJobUuid(jobUuid);
jobAndMeasure.setMeasureId(checkUnit.getControlMeasureId());
- jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//todo 如果删除了措施 此处可能为空，后续处理
+ jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//如果删除了措施 此处可能为空，后续处理
//获取上报主配置信息
PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
//设置上报时间为空
@@ -851,6 +850,7 @@
@Transactional
@Override
public int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob) {
+
// 2、若有变更，需要预先读取jobAndMeasure的uuid，保存下来
PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(hiddenDangerCheckJob.getJobId());
String jobUuid = jobAndMeasureByJobId.getJobUuid();
@@ -876,7 +876,7 @@
//使用保存下来的uuid，再次添加关联关系
jobAndMeasure.setJobUuid(jobUuid);
jobAndMeasure.setMeasureId(checkUnit.getControlMeasureId());
- jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//todo 如果删除了措施 此处可能为空，后续处理
+ jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//如果删除了措施 此处可能为空，后续处理
//获取上报主配置信息
PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
@@ -943,7 +943,7 @@
PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog();
dangerCheck.setUuid(dangerCheckUuid);
- dangerCheck.setCheckStatus(null);//
+ dangerCheck.setCheckStatus((byte) 2);//
dangerCheck.setCheckId(checkId);
dangerCheck.setJobId(hdc.getJobId());
//获取上报主配置信息
@@ -982,12 +982,12 @@
if (checkUnit == null){
throw new RuntimeException("基础检查点不存在");
}
- System.out.println("通过一次检验");
+// System.out.println("通过一次检验");
PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
if (controlMeasure == null){
throw new RuntimeException("管控措施已经被删除");
}
- System.out.println("通过二次检验");
+// System.out.println("通过二次检验");
//封装数据
checkAndMeasure.setCheckId(hdcp.getCheckId());
checkAndMeasure.setDangerCheckPointId(id);
@@ -995,7 +995,7 @@
checkAndMeasure.setControlMeasureId(controlMeasure.getId());
checkAndMeasure.setCheckContent(controlMeasure.getCheckContent());
checkAndMeasure.setCheckResult((byte) 4);
- System.out.println("数据封装完成");
+// System.out.println("数据封装完成");
//写入核查任务检查点与管控措施信息
int result = preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);
if (result <1){
@@ -1037,6 +1037,12 @@
String dangerInfoUuid = UUID.randomUUID().toString();
PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
+ if (ObjectUtils.isEmpty(hdcp.getDangerSrc())){
+ throw new RuntimeException("隐患来源为空");
+ }
+ if (ObjectUtils.isEmpty(hdcp.getHazardDangerType())){
+ throw new RuntimeException("隐患类型为空");
+ }
dangerInfo.setUuid(dangerInfoUuid);
dangerInfo.setDangerCheckPointId(id);
@@ -1046,20 +1052,22 @@
dangerInfo.setDangerReason(hdcp.getDangerReason());
dangerInfo.setDangerResult(hdcp.getDangerResult());
dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
- //隐患状态 0未验收 1验收通过 2验收未通过 ，新建时为空
+// if (ObjectUtils.isNotEmpty(hdcp.getsta))
+ //隐患状态 0未验收 1验收通过 2验收未通过
if (hdcp.getAcceptStatus() == null){
//设置为 空
- dangerInfo.setDangerState(null);
- } else if (hdcp.getAcceptStatus().equals(0)){
+ dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
+ } else if (hdcp.getAcceptStatus().equals("0")){
//设置为整改中
dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
- } else if (hdcp.getAcceptStatus().equals(1)) {
+ } else if (hdcp.getAcceptStatus().equals("1")) {
//设置为已验收
dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
- }else if (hdcp.getAcceptStatus().equals(2)){
+ }else if (hdcp.getAcceptStatus().equals("2")){
//设置为超期未整改
dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
}
+// dangerInfo.setDangerState(null); //设置为 空
dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
//获取上报主配置信息
PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
@@ -1230,11 +1238,11 @@
PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
dangerInfo.setDangerCheckPointId(hdcp.getId());
-
+ int acceptStatus = Integer.parseInt(hdcp.getAcceptStatus());
//如果验收通过，设置为验收成功；验收失败，打回上一级进行整改，设置为整改中
- if (hdcp.getAcceptStatus().equals(0)){
+ if (acceptStatus == 0){
dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
- }else if (hdcp.getAcceptStatus().equals(1)){
+ }else if (acceptStatus == 1){
dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
}
@@ -1276,7 +1284,6 @@
return listQueryRespDTOs;
}
-
/**
* 管控措施-不分页查询
*/
@@ -1296,6 +1303,7 @@
ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
return resultVO;
}
+
/**
* 通过排查点，查找管控措施id
*/
@@ -1303,6 +1311,7 @@
public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) {
return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);
}
+
/**
* 查询管控措施信息
*/
@@ -1324,8 +1333,23 @@
PreventRiskDangerInfo dangerInfobyHiddenDangerId = preventRiskDangerInfoService.getByHiddenDangerId(id);
return dangerInfobyHiddenDangerId;
}
+
+ @Override
+ public int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp) {
+ return preventRiskDangerCheckLogService.updateCheckLog(checkId, hdcp.getMobileCode());
+ }
+
+
+
+
+
+
+
+
+
+
// /**
-// * 全流程隐患上报-附属表信息插入
+// * 全流程 隐患上报-附属表信息插入
// * */
// @Override
// public int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp) {
@@ -1367,4 +1391,6 @@
//
// return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
// }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.2