From ff0591fcf8d96264dd82acc249fcf73ca72989cc Mon Sep 17 00:00:00 2001 From: Lee <1976536221@qq.com> Date: Fri, 31 Mar 2023 16:28:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prepare/harmonic/pojo/vo/SuperviceRunLogVo.java | 11 +++++++---- .../controller/line/ThsSuperviseController.java | 9 ++++----- .../mysql/Impl/line/ThsOverRunLogServiceImpl.java | 5 ++++- .../process/controller/ThsSuperviseController.java | 6 +++++- .../com/njcn/process/mapper/ThsSuperviseMapper.java | 2 -- .../njcn/process/mapper/ThsWarnStrategyMapper.java | 2 -- .../service/impl/ThsOverRunLogServiceImpl.java | 5 ++++- .../process/service/impl/ThsSuperviseServiceImpl.java | 6 +++++- .../com/njcn/process/utils/ReadPatientExcelUtil.java | 8 +++++++- 9 files changed, 36 insertions(+), 18 deletions(-) diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviceRunLogVo.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviceRunLogVo.java index 18fbad0a5..d5f4b1dd4 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviceRunLogVo.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviceRunLogVo.java @@ -3,16 +3,19 @@ package com.njcn.prepare.harmonic.pojo.vo; import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog; import com.njcn.prepare.harmonic.pojo.po.ThsSupervise; import io.swagger.annotations.ApiModelProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; import java.util.List; @Data -@Builder -@AllArgsConstructor -@NoArgsConstructor @ToString +@NoArgsConstructor +@AllArgsConstructor public class SuperviceRunLogVo { + private static final long serialVersionUID = 1L; @ApiModelProperty(name = "thsSupervise", value = "技术监督参数", required = true) private ThsSupervise thsSupervise; @ApiModelProperty(name = "overRunLog", value = "监测点集合", required = true) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java index 4638c45c6..d52c3aefe 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java @@ -11,10 +11,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** *

@@ -34,8 +31,10 @@ public class ThsSuperviseController extends BaseController { @ApiOperation("预警/告警事务生成") @ApiImplicitParam(name = "superviseParam", value = "创建技术监督参数", required = true) @PostMapping("/initSupervise") + @ResponseBody public HttpResult initSupervise(@RequestBody @Validated SuperviseParam superviseParam) { - return thsSuperviseService.initSupervise(superviseParam); + HttpResult superviceRunLogVoHttpResult = thsSuperviseService.initSupervise(superviseParam); + return superviceRunLogVoHttpResult; } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsOverRunLogServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsOverRunLogServiceImpl.java index 8f11d125f..6d2ab151e 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsOverRunLogServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsOverRunLogServiceImpl.java @@ -49,7 +49,10 @@ public class ThsOverRunLogServiceImpl extends ServiceImpl().eq(ThsSupervise::getSupIndex, supIndex)); List thsOverRunLogs = thsOverRunLogMapper.selectList(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, supIndex)); - return SuperviceRunLogVo.builder().overRunLog(thsOverRunLogs).thsSupervise(thsSupervise).build(); + SuperviceRunLogVo superviceRunLogVo = new SuperviceRunLogVo(); + superviceRunLogVo.setThsSupervise(thsSupervise); + superviceRunLogVo.setOverRunLog(thsOverRunLogs); + return superviceRunLogVo; } @Override diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsSuperviseController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsSuperviseController.java index 3ea8684cc..7f9a49385 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsSuperviseController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsSuperviseController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.prepare.harmonic.api.line.ThsSuperviseClient; import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto; import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo; @@ -42,12 +43,15 @@ public class ThsSuperviseController extends BaseController { private ThsSuperviseService thsSuperviseService; @Autowired private ThsOverRunLogService thsOverRunLogService; + @Autowired + private ThsSuperviseClient thsSuperviseClient; @ApiOperation("预警/告警事务生成") @ApiImplicitParam(name = "superviseParam", value = "创建技术监督参数", required = true) @PostMapping("/initSupervise") public HttpResult initSupervise(@RequestBody @Validated SuperviseParam superviseParam) { - return thsSuperviseService.initSupervise(superviseParam); + HttpResult superviceRunLogVoHttpResult = thsSuperviseService.initSupervise(superviseParam); + return superviceRunLogVoHttpResult; } @ApiOperation("保存技术监督监测点") diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsSuperviseMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsSuperviseMapper.java index 7481c50b7..931bcd570 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsSuperviseMapper.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsSuperviseMapper.java @@ -1,6 +1,5 @@ package com.njcn.process.mapper; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto; @@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Param; * @author lxp * @since 2023-03-16 */ -@DS("process") @Mapper public interface ThsSuperviseMapper extends BaseMapper { /** diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java index 9686e2b7c..a19bbd878 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java @@ -1,6 +1,5 @@ package com.njcn.process.mapper; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.harmonic.pojo.vo.ThsStrategyVo; import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; @@ -18,7 +17,6 @@ import java.util.List; * @author wr * @since 2023-03-10 */ -@DS("process") public interface ThsWarnStrategyMapper extends BaseMapper { /*** diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsOverRunLogServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsOverRunLogServiceImpl.java index 866e9e25c..45e980817 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsOverRunLogServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsOverRunLogServiceImpl.java @@ -76,7 +76,10 @@ public class ThsOverRunLogServiceImpl extends ServiceImpl().eq(ThsAlarmFormwork::getFormworkType, formworkType) .eq(ThsAlarmFormwork::getType, type).last("limit 1")); + if (thsAlarmFormwork == null) { + throw new BusinessException("请先上传下发单模板单据！"); + } String fileUrl = fileStorageUtil.getFileUrl(thsAlarmFormwork.getPath()); ThsSupervise thsSupervise = new ThsSupervise(); thsSupervise.setModifyTime(new Date()); @@ -502,6 +505,8 @@ public class ThsSuperviseServiceImpl extends ServiceImpl= 5) { superviseVo.setAlertType(AlertTypeEnum.YELLOW.getCode()); + } else { + superviseVo.setAlertType(AlertTypeEnum.BLACK.getCode()); } break; } @@ -560,7 +565,6 @@ public class ThsSuperviseServiceImpl extends ServiceImpl selectStrategyList(SuperviseParam superviseParam) { return thsWarnStrategyMapper.selectStrategyList(superviseParam); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/utils/ReadPatientExcelUtil.java b/pqs-process/process-boot/src/main/java/com/njcn/process/utils/ReadPatientExcelUtil.java index 99630eb61..e6823cf35 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/utils/ReadPatientExcelUtil.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/utils/ReadPatientExcelUtil.java @@ -121,8 +121,14 @@ public class ReadPatientExcelUtil { cell.setCellType(CellType.STRING); } String stringCellValue = cell.getStringCellValue(); - ThsOverRunLog.setDescription(stringCellValue); + ThsOverRunLog.setOverTime(Integer.valueOf(stringCellValue)); } else if (c == 4) { + if (cell.getCellTypeEnum() == CellType.NUMERIC) { + cell.setCellType(CellType.STRING); + } + String stringCellValue = cell.getStringCellValue(); + ThsOverRunLog.setDescription(stringCellValue); + } else if (c == 5) { if (cell.getCellTypeEnum() == CellType.NUMERIC) { cell.setCellType(CellType.STRING); }