From eb492386bae0ea629ec4e12d031e2a7b4f3e67cb Mon Sep 17 00:00:00 2001 From: ls Date: Thu, 7 Nov 2024 10:50:51 +0800 Subject: [PATCH] update --- .../java/org/jeecg/config/Swagger3Config.java | 4 ++-- .../java/org/jeecg/PhysicalApplication.java | 2 +- .../ExperimentRadiationProcessController.java | 23 ++++++++++++++++--- .../ExperimentReportController.java | 23 ++++++++++++++++--- .../ExperimentReviewController.java | 20 ++++++++++++++++ .../ExperimentTestProcessController.java | 23 ++++++++++++++++--- .../controller/ExperimentUserController.java | 23 ++++++++++++++++--- .../database/entity/ExperimentReview.java | 2 +- 8 files changed, 104 insertions(+), 16 deletions(-) diff --git a/physical-base-core/src/main/java/org/jeecg/config/Swagger3Config.java b/physical-base-core/src/main/java/org/jeecg/config/Swagger3Config.java index 18b8c11..9e3e928 100644 --- a/physical-base-core/src/main/java/org/jeecg/config/Swagger3Config.java +++ b/physical-base-core/src/main/java/org/jeecg/config/Swagger3Config.java @@ -41,9 +41,9 @@ public class Swagger3Config implements WebMvcConfigurer { public OpenAPI customOpenAPI() { return new OpenAPI() .info(new Info() - .title("JeecgBoot 后台服务API接口文档") + .title("Physical boot 后台服务API接口文档") .version("1.0") - .contact(new Contact().name("北京国炬信息技术有限公司").url("www.jeccg.com").email("jeecgos@163.com")) + .contact(new Contact().name("YGG").url("www.ygg.com").email("ygg@163.com")) .description("后台API接口") .termsOfService("NO terms of service") .license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0.html")) diff --git a/physical-launcher/src/main/java/org/jeecg/PhysicalApplication.java b/physical-launcher/src/main/java/org/jeecg/PhysicalApplication.java index 0e52079..59518fa 100644 --- a/physical-launcher/src/main/java/org/jeecg/PhysicalApplication.java +++ b/physical-launcher/src/main/java/org/jeecg/PhysicalApplication.java @@ -36,7 +36,7 @@ public class PhysicalApplication extends SpringBootServletInitializer { String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application Physical-Boot is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/\n\t" + "External: \thttp://" + ip + ":" + port + path + "/\n\t" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java index ced8208..f67ae5b 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.database.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,9 +16,7 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.modules.database.constant.ExperimentStatus; -import org.jeecg.modules.database.entity.Experiment; -import org.jeecg.modules.database.entity.ExperimentLog; -import org.jeecg.modules.database.entity.ExperimentRadiationProcess; +import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.service.IExperimentLogService; import org.jeecg.modules.database.service.IExperimentRadiationProcessService; import org.jeecg.modules.database.service.IExperimentService; @@ -181,6 +180,24 @@ public class ExperimentRadiationProcessController extends JeecgController queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExperimentRadiationProcess::getExperimentId, experimentalId); + ExperimentRadiationProcess experimentReview = experimentRadiationProcessService.getOne(queryWrapper); + if (experimentReview == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentReview); + } /** * 导出excel diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java index 8dd3487..9aa2fa4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.database.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -17,8 +18,7 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.database.constant.ExperimentStatus; -import org.jeecg.modules.database.entity.Experiment; -import org.jeecg.modules.database.entity.ExperimentReport; +import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.service.IExperimentReportService; import org.jeecg.modules.database.service.IExperimentService; import org.jeecg.modules.system.entity.SysUser; @@ -152,7 +152,24 @@ public class ExperimentReportController extends JeecgController queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExperimentReport::getExperimentId, experimentalId); + ExperimentReport experimentReview = experimentReportService.getOne(queryWrapper); + if (experimentReview == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentReview); + } /** * 导出excel * diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java index daa6718..b944692 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.database.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -134,6 +135,25 @@ public class ExperimentReviewController extends JeecgController queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentalId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExperimentReview::getExperimentId, experimentalId); + ExperimentReview experimentReview = experimentReviewService.getOne(queryWrapper); + if (experimentReview == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentReview); + } + /** * 导出excel * diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java index 24cc49a..293e77c 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.database.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,9 +16,7 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.modules.database.constant.ExperimentStatus; -import org.jeecg.modules.database.entity.Experiment; -import org.jeecg.modules.database.entity.ExperimentLog; -import org.jeecg.modules.database.entity.ExperimentTestProcess; +import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.service.IExperimentLogService; import org.jeecg.modules.database.service.IExperimentService; import org.jeecg.modules.database.service.IExperimentTestProcessService; @@ -179,6 +178,24 @@ public class ExperimentTestProcessController extends JeecgController queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExperimentTestProcess::getExperimentId, experimentalId); + ExperimentTestProcess experimentReview = experimentTestProcessService.getOne(queryWrapper); + if (experimentReview == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentReview); + } /** * 导出excel diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java index 5769592..88467c5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.database.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,8 +15,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.modules.database.entity.ExperimentLog; -import org.jeecg.modules.database.entity.ExperimentUser; +import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.service.IExperimentLogService; import org.jeecg.modules.database.service.IExperimentUserService; import org.jeecg.modules.system.entity.SysUser; @@ -167,7 +167,24 @@ public class ExperimentUserController extends JeecgController queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentalId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExperimentUser::getExperimentId, experimentalId); + ExperimentUser experimentReview = experimentUserService.getOne(queryWrapper); + if (experimentReview == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentReview); + } /** * 导出excel * diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java index e87b8fb..194f533 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java @@ -68,7 +68,7 @@ public class ExperimentReview implements Serializable { */ @Excel(name = "实验ID", width = 15) @Schema(description = "实验ID") - private String experimentalId; + private String experimentId; /** * 评审流程 */