update

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"))

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" +

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.*;
-import org.jeecg.modules.database.entity.ExperimentLog;
-import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
 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<Experi
         }
         return Result.OK(experimentRadiationProcess);
     }
+    /**
+     * 通过实验id查询
+     *
+     * @param experimentalId
+     * @return
+     */
+    //@AutoLog(value = "试验评定-通过id查询")
+    @Operation(summary = "辐照过程-通过实验ID查询")
+    @GetMapping(value = "/queryByExperimentId")
+    public Result<ExperimentRadiationProcess> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) {
+        LambdaQueryWrapper<ExperimentRadiationProcess> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ExperimentRadiationProcess::getExperimentId, experimentalId);
+        ExperimentRadiationProcess experimentReview = experimentRadiationProcessService.getOne(queryWrapper);
+        if (experimentReview == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(experimentReview);
+    }
 
     /**
      * 导出excel

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.*;
-import org.jeecg.modules.database.entity.ExperimentReport;
 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<ExperimentReport
         }
         return Result.OK(experimentReport);
     }
-
+    /**
+     * 通过实验id查询
+     *
+     * @param experimentalId
+     * @return
+     */
+    //@AutoLog(value = "试验评定-通过id查询")
+    @Operation(summary = "试验报告-通过实验ID查询")
+    @GetMapping(value = "/queryByExperimentId")
+    public Result<ExperimentReport> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) {
+        LambdaQueryWrapper<ExperimentReport> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ExperimentReport::getExperimentId, experimentalId);
+        ExperimentReport experimentReview = experimentReportService.getOne(queryWrapper);
+        if (experimentReview == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(experimentReview);
+    }
     /**
      * 导出excel
      *

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<ExperimentReview
         return Result.OK(experimentReview);
     }
 
+    /**
+     * 通过实验id查询
+     *
+     * @param experimentalId
+     * @return
+     */
+    //@AutoLog(value = "试验评定-通过id查询")
+    @Operation(summary = "试验评定-通过实验查询")
+    @GetMapping(value = "/queryByExperimentId")
+    public Result<ExperimentReview> queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentalId) {
+        LambdaQueryWrapper<ExperimentReview> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ExperimentReview::getExperimentId, experimentalId);
+        ExperimentReview experimentReview = experimentReviewService.getOne(queryWrapper);
+        if (experimentReview == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(experimentReview);
+    }
+
     /**
      * 导出excel
      *

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.*;
-import org.jeecg.modules.database.entity.ExperimentLog;
-import org.jeecg.modules.database.entity.ExperimentTestProcess;
 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<ExperimentT
         }
         return Result.OK(experimentTestProcess);
     }
+    /**
+     * 通过实验id查询
+     *
+     * @param experimentalId
+     * @return
+     */
+    //@AutoLog(value = "试验评定-通过id查询")
+    @Operation(summary = "测试过程-通过实验ID查询")
+    @GetMapping(value = "/queryByExperimentId")
+    public Result<ExperimentTestProcess> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) {
+        LambdaQueryWrapper<ExperimentTestProcess> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ExperimentTestProcess::getExperimentId, experimentalId);
+        ExperimentTestProcess experimentReview = experimentTestProcessService.getOne(queryWrapper);
+        if (experimentReview == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(experimentReview);
+    }
 
     /**
      * 导出excel

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.*;
-import org.jeecg.modules.database.entity.ExperimentUser;
 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<ExperimentUser, IE
         }
         return Result.OK(experimentUser);
     }
-
+    /**
+     * 通过实验id查询
+     *
+     * @param experimentalId
+     * @return
+     */
+    //@AutoLog(value = "试验评定-通过id查询")
+    @Operation(summary = "试验人员-通过实验ID查询")
+    @GetMapping(value = "/queryByExperimentId")
+    public Result<ExperimentUser> queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentalId) {
+        LambdaQueryWrapper<ExperimentUser> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ExperimentUser::getExperimentId, experimentalId);
+        ExperimentUser experimentReview = experimentUserService.getOne(queryWrapper);
+        if (experimentReview == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(experimentReview);
+    }
     /**
      * 导出excel
      *

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;
     /**
      * 评审流程
      */