diff --git a/Dockerfile b/Dockerfile index 504bb68..61c9a64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -#FROM bellsoft/liberica-openjdk-debian:17 +#FROM bellsoft/liberica-openjdk-debian:17 AS build FROM registry.cn-shanghai.aliyuncs.com/physical/maven:3.9.8-eclipse-temurin-17 AS build WORKDIR /app @@ -11,10 +11,11 @@ COPY settings.xml /root/.m2/settings.xml ADD . /app #RUN mvn dependency:go-offline +# RUN mvn package -DskipTests=true clean install RUN --mount=type=cache,target=/root/.m2 mvn package -DskipTests=true clean install - +#FROM bellsoft/liberica-openjdk-debian:17 FROM registry.cn-shanghai.aliyuncs.com/physical/liberica-openjdk-debian:17 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 4660cb1..14083db 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -65,15 +65,15 @@ services: - "28080:8080" networks: - physical-boot - physical-kkfileview: - restart: on-failure - container_name: physical-kkfileview - image: registry.cn-shanghai.aliyuncs.com/physical/kkfileview - hostname: physical-kkfileview - ports: - - "8099:8012" - networks: - - physical-boot +# physical-kkfileview: +# restart: on-failure +# container_name: physical-kkfileview +# image: registry.cn-shanghai.aliyuncs.com/physical/kkfileview +# hostname: physical-kkfileview +# ports: +# - "81:8012" +# networks: +# - physical-boot physical-web: container_name: physical-web diff --git a/docker-compose.yml b/docker-compose.yml index 0b17511..98657ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,15 +65,15 @@ services: - 28080:8080 networks: - physical-boot - physical-kkfileview: - restart: on-failure - container_name: physical-kkfileview - image: registry.cn-shanghai.aliyuncs.com/physical/kkfileview - hostname: physical-kkfileview - ports: - - 8099:8012 - networks: - - physical-boot +# physical-kkfileview: +# restart: on-failure +# container_name: physical-kkfileview +# image: registry.cn-shanghai.aliyuncs.com/physical/kkfileview +# hostname: physical-kkfileview +# ports: +# - 81:8012 +# networks: +# - physical-boot physical-web: container_name: physical-web diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReportStatus.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReportStatus.java new file mode 100644 index 0000000..7910bfa --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReportStatus.java @@ -0,0 +1,10 @@ +package org.jeecg.modules.database.constant; + +public interface ExperimentReportStatus { + + String INIT = "待校对"; + String PROOFREAD_PASS = "待审核"; + String AUDIT_PASS = "待批准"; + String REJECT = "不通过"; + String PASSED = "通过"; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java index 0d7bac1..0bb41a4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java @@ -84,6 +84,7 @@ public class ExperimentAnnealProcessController extends JeecgController add(@RequestBody ExperimentAnnealProcess experimentAnnealProcess, HttpServletRequest request) { String experimentId = experimentAnnealProcess.getExperimentId(); + experimentAnnealProcess.setId(null); if (StringUtils.isBlank(experimentId)) { return Result.error("试验数据不存在！"); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index 2483a6d..5279939 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -163,6 +163,9 @@ public class ExperimentController extends JeecgController getByExperimentId( + public Result> getByExperimentId( @RequestParam(name = "experimentId", required = true) String experimentId) { - ExperimentReport experimentReport = experimentReportService.getByExperimentId(experimentId); - if (experimentReport == null) { - return Result.error("试验报告不存在!"); + List experimentReport = experimentReportService.getByExperimentId(experimentId); + if (CollUtil.isEmpty(experimentReport)) { + return Result.ok(); } + experimentReport.forEach(v -> { + ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(experimentId, ExperimentDocType.sybg.getType()); + v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null)); + }); - ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(experimentId, ExperimentDocType.sybg.getType()); - experimentReport.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null)); return Result.OK(experimentReport); } @@ -249,33 +250,33 @@ public class ExperimentReportController extends JeecgController { - ExperimentReport getByExperimentId(String experimentId); + List getByExperimentId(String experimentId); + ExperimentReport getLatestReport(String experimentId); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java index b40e06a..a5bdfb8 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java @@ -9,11 +9,9 @@ import com.deepoove.poi.XWPFTemplate; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.util.MinioUtil; -import org.jeecg.modules.database.entity.Experiment; -import org.jeecg.modules.database.entity.ExperimentDoc; +import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.mapper.ExperimentDocMapper; -import org.jeecg.modules.database.service.IExperimentDocService; -import org.jeecg.modules.database.service.IExperimentService; +import org.jeecg.modules.database.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -33,11 +31,12 @@ import java.util.*; public class ExperimentDocServiceImpl extends ServiceImpl implements IExperimentDocService { @Value("${jeecg.template.path}") - private String templatePath; + private String templatePath; @Autowired - private IExperimentService experimentService; - - static Map docTempalteMap = new HashMap<>(); + private IExperimentService experimentService; + @Autowired + private IExperimentReportService experimentReportService; + static Map docTempalteMap = new HashMap<>(); static { //辐照试验计划表 @@ -72,7 +71,7 @@ public class ExperimentDocServiceImpl extends ServiceImpl params = new HashMap(); + Map params = assembleParams(experimentId, fileName); XWPFTemplate.compile(absolutePath).render(params).writeToFile(outputFile); String path = MinioUtil.upload(FileUtil.getInputStream(outputFile), "experiment_doc/" + experimentId + "/" + version + "/" + experiment.getName() + "-" + fileName + ".docx"); @@ -83,6 +82,44 @@ public class ExperimentDocServiceImpl extends ServiceImpl assembleParams(String experimentId, String type) { + switch (type) { + case "辐照试验计划表": + return assembleFzsyjhb(experimentId); + case "试验报告评审表": + return assembleSybgpsb(experimentId); + case "设备使用记录表": + return assembleSbsyjlb(experimentId); + case "试验报告": + return assembleSybg(experimentId); + case "辐照试验总结单": + return assembleFzsyzjd(experimentId); + } + return new HashMap<>(); + } + + private Map assembleFzsyzjd(String experimentId) { + return new HashMap<>(); + } + + private Map assembleSybg(String experimentId) { + Experiment experiment = experimentService.getById(experimentId); + ExperimentReport latestReport = experimentReportService.getLatestReport(experimentId); + return new HashMap<>(); + } + + private Map assembleSbsyjlb(String experimentId) { + return new HashMap<>(); + } + + private Map assembleSybgpsb(String experimentId) { + return new HashMap<>(); + } + + private Map assembleFzsyjhb(String experimentId) { + return new HashMap<>(); + } + @Override public ExperimentDoc generate(String experimentId, String type) { String version = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java index 205d1cd..513ab94 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java @@ -2,12 +2,14 @@ package org.jeecg.modules.database.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.database.entity.ExperimentRadiationProcess; +import org.jeecg.modules.database.constant.ExperimentReportStatus; import org.jeecg.modules.database.entity.ExperimentReport; import org.jeecg.modules.database.mapper.ExperimentReportMapper; import org.jeecg.modules.database.service.IExperimentReportService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: 试验报告 * @Author: jeecg-boot @@ -18,7 +20,16 @@ import org.springframework.stereotype.Service; public class ExperimentReportServiceImpl extends ServiceImpl implements IExperimentReportService { @Override - public ExperimentReport getByExperimentId(String experimentId) { - return getOne(new LambdaQueryWrapper().eq(ExperimentReport::getExperimentId, experimentId),false); + public List getByExperimentId(String experimentId) { + return list(new LambdaQueryWrapper().eq(ExperimentReport::getExperimentId, experimentId)); + } + + @Override + public ExperimentReport getLatestReport(String experimentId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExperimentReport::getExperimentId, experimentId) + .eq(ExperimentReport::getStatus, ExperimentReportStatus.PASSED); + queryWrapper.orderByDesc(ExperimentReport::getCreateTime); + return getOne(queryWrapper, false); } }