diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewProcessType.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewProcessType.java index 34e3424..8137718 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewProcessType.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewProcessType.java @@ -2,10 +2,8 @@ package org.jeecg.modules.database.constant; public interface ExperimentReviewProcessType { - String GJB548C = "GJB-548C"; - String MIL883 = "MIL-883"; + String GJB548C = "GJB548C"; String ESCC229000 = "ESCC229000"; - String ESCC22500 = "ESCC 22500"; - String QJ10004 = "MOS器件QJ10004"; - String BIQJ10004 = "双极器件QJ10004"; + String ESCC22500 = "ESCC22500"; + String QJ10004 = "QJ10004"; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewResultEnum.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewResultEnum.java new file mode 100644 index 0000000..f4b7620 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewResultEnum.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.database.constant; + +public interface ExperimentReviewResultEnum { + + String ITEM_PASS = ""; + String FINAL_PASS = "评定通过"; + String NOT_PASS = "评定未通过"; + String UNKNOWN = "无法评定"; + String HIGH = "高估"; + String LOW = "低估"; + String HIGH_OR_LOW = "高估/低估"; +} 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 3023018..d81e0ac 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,104 +1,97 @@ 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; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.jeecg.common.api.vo.Result; -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.modules.database.constant.ExperimentReviewStatusEnum; -import org.jeecg.modules.database.entity.ExperimentReview; -import org.jeecg.modules.database.service.IExperimentReviewService; -import org.jeecg.modules.system.service.ISysUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - import java.util.Arrays; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.*; +import org.jeecg.modules.database.service.*; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + /** - * @Description: 试验评定 + * @Description: 试验评定结果 * @Author: jeecg-boot - * @Date: 2024-11-05 + * @Date: 2025-06-16 * @Version: V1.0 */ -@Tag(name = "试验评定") +@Tag(name = "试验评定结果") @RestController @RequestMapping("/database/experimentReview") @Slf4j public class ExperimentReviewController extends JeecgController { @Autowired - private IExperimentReviewService experimentReviewService; - + private IExperimentReviewService experimentReviewResultService; @Autowired - private ISysUserService userService; + private IExperimentService experimentService; + @Autowired + private IExperimentSampleInfoService experimentSampleInfoService; /** * 分页列表查询 * - * @param experimentReview + * @param experimentReviewResult * @param pageNo * @param pageSize * @param req * @return */ - //@AutoLog(value = "试验评定-分页列表查询") - @Operation(summary = "试验评定-分页列表查询") + //@AutoLog(value = "试验评定结果-分页列表查询") + @Operation(summary = "试验评定结果-分页列表查询") @GetMapping(value = "/list") - public Result> queryPageList(ExperimentReview experimentReview, + public Result> queryPageList(ExperimentReview experimentReviewResult, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentReview, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentReviewResult, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = experimentReviewService.page(page, queryWrapper); + IPage pageList = experimentReviewResultService.page(page, queryWrapper); return Result.OK(pageList); } /** * 添加 * - * @param experimentReview + * @param experimentReviewResult * @return */ - @AutoLog(value = "试验评定-添加") - @Operation(summary = "试验评定-添加") - @RequiresPermissions("database:experiment_review:add") + @AutoLog(value = "试验评定结果-添加") + @Operation(summary = "试验评定结果-添加") @PostMapping(value = "/add") - public Result add(@RequestBody ExperimentReview experimentReview, HttpServletRequest request) { - experimentReview.setReviewStatus(ExperimentReviewStatusEnum.REVIEW_FINISHED.getStatus()); - experimentReviewService.saveOrUpdate(experimentReview); - return Result.OK("添加成功！"); - } - - @Operation(summary = "试验评定-暂存") - @PostMapping(value = "/temporarySave") - public Result temporarySave(@RequestBody ExperimentReview experimentReview, HttpServletRequest request) { - experimentReview.setReviewStatus(ExperimentReviewStatusEnum.TEMP_SAVE.getStatus()); - experimentReviewService.saveOrUpdate(experimentReview); - return Result.OK("暂存成功！"); + public Result add(@RequestBody ExperimentReview experimentReviewResult) { + Experiment experiment = experimentService.getById(experimentReviewResult.getExperimentId()); + ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(experimentReviewResult.getSampleId()); + ExperimentReview review = experimentReviewResultService.review(experiment, sampleInfo, ExperimentReviewProcessType.GJB548C); + return Result.OK(review); } /** * 编辑 * - * @param experimentReview + * @param experimentReviewResult * @return */ - @AutoLog(value = "试验评定-编辑") - @Operation(summary = "试验评定-编辑") - @RequiresPermissions("database:experiment_review:edit") + @AutoLog(value = "试验评定结果-编辑") + @Operation(summary = "试验评定结果-编辑") + @RequiresPermissions("database:experiment_review_result:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) - public Result edit(@RequestBody ExperimentReview experimentReview) { - experimentReviewService.updateById(experimentReview); + public Result edit(@RequestBody ExperimentReview experimentReviewResult) { + experimentReviewResultService.updateById(experimentReviewResult); return Result.OK("编辑成功!"); } @@ -108,12 +101,12 @@ public class ExperimentReviewController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { - experimentReviewService.removeById(id); + experimentReviewResultService.removeById(id); return Result.OK("删除成功!"); } @@ -123,12 +116,12 @@ public class ExperimentReviewController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - this.experimentReviewService.removeByIds(Arrays.asList(ids.split(","))); + this.experimentReviewResultService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -138,46 +131,27 @@ public class ExperimentReviewController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { - ExperimentReview experimentReview = experimentReviewService.getById(id); - if (experimentReview == null) { + ExperimentReview experimentReviewResult = experimentReviewResultService.getById(id); + if (experimentReviewResult == null) { return Result.error("未找到对应数据"); } - return Result.OK(experimentReview); - } - - /** - * 通过实验id查询 - * - * @param experimentalId - * @return - */ - //@AutoLog(value = "试验评定-通过id查询") - @Operation(summary = "试验评定-通过实验查询") - @GetMapping(value = "/queryByExperimentId") - public Result 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.OK(); - } - return Result.OK(experimentReview); + return Result.OK(experimentReviewResult); } /** * 导出excel * * @param request - * @param experimentReview + * @param experimentReviewResult */ - + @RequiresPermissions("database:experiment_review_result:exportXls") @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ExperimentReview experimentReview) { - return super.exportXls(request, experimentReview, ExperimentReview.class, "试验评定"); + public ModelAndView exportXls(HttpServletRequest request, ExperimentReview experimentReviewResult) { + return super.exportXls(request, experimentReviewResult, ExperimentReview.class, "试验评定结果"); } /** @@ -187,7 +161,7 @@ public class ExperimentReviewController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, ExperimentReview.class); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewDetailController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewDetailController.java new file mode 100644 index 0000000..7e65122 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewDetailController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.database.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.database.entity.ExperimentReviewDetail; +import org.jeecg.modules.database.service.IExperimentReviewDetailService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 试验评定真值表 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +@Tag(name="试验评定真值表") +@RestController +@RequestMapping("/database/experimentReviewDetail") +@Slf4j +public class ExperimentReviewDetailController extends JeecgController { + @Autowired + private IExperimentReviewDetailService experimentReviewDetailService; + + /** + * 分页列表查询 + * + * @param experimentReviewDetail + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试验评定真值表-分页列表查询") + @Operation(summary="试验评定真值表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentReviewDetail experimentReviewDetail, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentReviewDetail, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentReviewDetailService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experimentReviewDetail + * @return + */ + @AutoLog(value = "试验评定真值表-添加") + @Operation(summary="试验评定真值表-添加") + @RequiresPermissions("database:experiment_review_detail:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ExperimentReviewDetail experimentReviewDetail) { + experimentReviewDetailService.save(experimentReviewDetail); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param experimentReviewDetail + * @return + */ + @AutoLog(value = "试验评定真值表-编辑") + @Operation(summary="试验评定真值表-编辑") + @RequiresPermissions("database:experiment_review_detail:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ExperimentReviewDetail experimentReviewDetail) { + experimentReviewDetailService.updateById(experimentReviewDetail); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "试验评定真值表-通过id删除") + @Operation(summary="试验评定真值表-通过id删除") + @RequiresPermissions("database:experiment_review_detail:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + experimentReviewDetailService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "试验评定真值表-批量删除") + @Operation(summary="试验评定真值表-批量删除") + @RequiresPermissions("database:experiment_review_detail:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.experimentReviewDetailService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "试验评定真值表-通过id查询") + @Operation(summary="试验评定真值表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ExperimentReviewDetail experimentReviewDetail = experimentReviewDetailService.getById(id); + if(experimentReviewDetail==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentReviewDetail); + } + + /** + * 导出excel + * + * @param request + * @param experimentReviewDetail + */ + @RequiresPermissions("database:experiment_review_detail:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ExperimentReviewDetail experimentReviewDetail) { + return super.exportXls(request, experimentReviewDetail, ExperimentReviewDetail.class, "试验评定真值表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("database:experiment_review_detail:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ExperimentReviewDetail.class); + } + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewRuleController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewRuleController.java new file mode 100644 index 0000000..c813be7 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewRuleController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.database.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.database.entity.ExperimentReviewRule; +import org.jeecg.modules.database.service.IExperimentReviewRuleService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 试验评定规则 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +@Tag(name="试验评定规则") +@RestController +@RequestMapping("/database/experimentReviewRule") +@Slf4j +public class ExperimentReviewRuleController extends JeecgController { + @Autowired + private IExperimentReviewRuleService experimentReviewRuleService; + + /** + * 分页列表查询 + * + * @param experimentReviewRule + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试验评定规则-分页列表查询") + @Operation(summary="试验评定规则-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentReviewRule experimentReviewRule, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentReviewRule, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentReviewRuleService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experimentReviewRule + * @return + */ + @AutoLog(value = "试验评定规则-添加") + @Operation(summary="试验评定规则-添加") + @RequiresPermissions("database:experiment_review_rule:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ExperimentReviewRule experimentReviewRule) { + experimentReviewRuleService.save(experimentReviewRule); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param experimentReviewRule + * @return + */ + @AutoLog(value = "试验评定规则-编辑") + @Operation(summary="试验评定规则-编辑") + @RequiresPermissions("database:experiment_review_rule:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ExperimentReviewRule experimentReviewRule) { + experimentReviewRuleService.updateById(experimentReviewRule); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "试验评定规则-通过id删除") + @Operation(summary="试验评定规则-通过id删除") + @RequiresPermissions("database:experiment_review_rule:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + experimentReviewRuleService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "试验评定规则-批量删除") + @Operation(summary="试验评定规则-批量删除") + @RequiresPermissions("database:experiment_review_rule:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.experimentReviewRuleService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "试验评定规则-通过id查询") + @Operation(summary="试验评定规则-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ExperimentReviewRule experimentReviewRule = experimentReviewRuleService.getById(id); + if(experimentReviewRule==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentReviewRule); + } + + /** + * 导出excel + * + * @param request + * @param experimentReviewRule + */ + @RequiresPermissions("database:experiment_review_rule:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ExperimentReviewRule experimentReviewRule) { + return super.exportXls(request, experimentReviewRule, ExperimentReviewRule.class, "试验评定规则"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("database:experiment_review_rule:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ExperimentReviewRule.class); + } + +} 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 e7d884b..aa8c7ee 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 @@ -1,36 +1,37 @@ package org.jeecg.modules.database.entity; -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - import java.io.Serializable; import java.util.Date; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; /** - * @Description: 试验评定 + * @Description: 试验评定结果 * @Author: jeecg-boot - * @Date: 2024-11-05 + * @Date: 2025-06-16 * @Version: V1.0 */ @Data @TableName("experiment_review") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(description = "试验评定") +@Schema(description = "试验评定结果") public class ExperimentReview implements Serializable { private static final long serialVersionUID = 1L; /** - * 主键 + * id */ @TableId(type = IdType.ASSIGN_ID) - @Schema(description = "主键") + @Schema(description = "id") private String id; /** * 创建人 @@ -62,34 +63,59 @@ public class ExperimentReview implements Serializable { @Schema(description = "所属部门") private String sysOrgCode; /** - * 实验ID + * 试验ID */ - @Excel(name = "实验ID", width = 15) - @Schema(description = "实验ID") + @Excel(name = "试验ID", width = 15) + @Schema(description = "试验ID") private String experimentId; /** - * 评审流程 + * 样品ID */ - @Excel(name = "评审流程", width = 15) - @Schema(description = "评审流程") - private String reviewProcess; + @Excel(name = "样品ID", width = 15) + @Schema(description = "样品ID") + private String sampleId; /** - * 评审详情(json大字段) + * 试验流程标准 */ - @Excel(name = "评审详情(json大字段)", width = 15) - @Schema(description = "评审详情(json大字段)") - private String reviewDetail; - /** - * 评审结果 - */ - @Excel(name = "评审结果", width = 15) - @Schema(description = "评审结果(合格/不合格)") - private String reviewResult; + @Excel(name = "试验流程标准", width = 15) + @Schema(description = "试验流程标准") + private String processType; /** - * 评审状态 + * 是否需要退火 */ - @Excel(name = "评审状态", width = 15) - @Schema(description = "评审状态") - private int reviewStatus; + @Excel(name = "是否需要退火", width = 15) + @Schema(description = "是否需要退火(Y/N)") + private String need_anneal; + + /** + * 是否需要辐照 + */ + @Excel(name = "是否需要辐照", width = 15) + @Schema(description = "是否需要辐照(Y/N)") + private String need_radiation; + + /** + * 是否需要老练 + */ + @Excel(name = "是否需要老练", width = 15) + @Schema(description = "是否需要老练(Y/N)") + private String need_burnin; + + /** + * 评定结果 + */ + @Excel(name = "评定结果", width = 15) + @Schema(description = "评定结果") + private String result; + /** + * 评定状态 + */ + @Excel(name = "评定状态", width = 15) + @Schema(description = "评定状态") + private String reviewStatus; + + @TableField(exist = false) + private List matchedRuleList; + } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReviewDetail.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReviewDetail.java new file mode 100644 index 0000000..c7ebebb --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReviewDetail.java @@ -0,0 +1,85 @@ +package org.jeecg.modules.database.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 试验评定真值表 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +@Data +@TableName("experiment_review_detail") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="试验评定真值表") +public class ExperimentReviewDetail implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "id") + private String id; + /**创建人*/ + @Schema(description = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + @Schema(description = "创建日期") + private Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + @Schema(description = "更新日期") + private Date updateTime; + /**所属部门*/ + @Schema(description = "所属部门") + private String sysOrgCode; + /**试验ID*/ + @Excel(name = "试验ID", width = 15) + @Schema(description = "试验ID") + private String experimentId; + /**样品ID*/ + @Excel(name = "样品ID", width = 15) + @Schema(description = "样品ID") + private String sampleId; + /**试验流程标准*/ + @Excel(name = "试验流程标准", width = 15) + @Schema(description = "试验流程标准") + private String processType; + /**规则ID*/ + @Excel(name = "规则ID", width = 15) + @Schema(description = "规则ID") + private String ruleId; + /**规则优先级*/ + @Excel(name = "规则优先级", width = 15) + @Schema(description = "规则优先级") + private int priority; + /**评定结果*/ + @Excel(name = "评定结果", width = 15) + @Schema(description = "评定结果") + private String result; + /**评定状态*/ + @Excel(name = "评定状态", width = 15) + @Schema(description = "评定状态") + private String reviewStatus; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReviewRule.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReviewRule.java new file mode 100644 index 0000000..ddd9e27 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReviewRule.java @@ -0,0 +1,85 @@ +package org.jeecg.modules.database.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 试验评定规则 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +@Data +@TableName("experiment_review_rule") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="试验评定规则") +public class ExperimentReviewRule implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "id") + private String id; + /**创建人*/ + @Schema(description = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + @Schema(description = "创建日期") + private Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + @Schema(description = "更新日期") + private Date updateTime; + /**所属部门*/ + @Schema(description = "所属部门") + private String sysOrgCode; + /**试验流程标准*/ + @Excel(name = "试验流程标准", width = 15) + @Schema(description = "试验流程标准") + private String processType; + /**建议标题*/ + @Excel(name = "建议标题", width = 15) + @Schema(description = "建议标题") + private String title; + /**评定结果*/ + @Excel(name = "评定结果", width = 15) + @Schema(description = "评定结果") + private String result; + /**损伤机理*/ + @Excel(name = "损伤机理", width = 15) + @Schema(description = "损伤机理") + private String impactDesc; + /**适用范围*/ + @Excel(name = "适用范围", width = 15) + @Schema(description = "适用范围") + private String impactScope; + /**规则表达式*/ + @Excel(name = "规则表达式", width = 15) + @Schema(description = "规则表达式") + private String expression; + /**规则优先级*/ + @Excel(name = "规则优先级", width = 15) + @Schema(description = "规则优先级") + private int priority; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentReviewDetailMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentReviewDetailMapper.java new file mode 100644 index 0000000..0441a07 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentReviewDetailMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.database.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.database.entity.ExperimentReviewDetail; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 试验评定真值表 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +public interface ExperimentReviewDetailMapper extends BaseMapper { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentReviewResultMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentReviewResultMapper.java new file mode 100644 index 0000000..6b04b27 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentReviewResultMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.database.mapper; + +import org.jeecg.modules.database.entity.ExperimentReview; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 试验评定结果 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +public interface ExperimentReviewResultMapper extends BaseMapper { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentReviewRuleMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentReviewRuleMapper.java new file mode 100644 index 0000000..8b82dd8 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentReviewRuleMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.database.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.database.entity.ExperimentReviewRule; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 试验评定规则 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +public interface ExperimentReviewRuleMapper extends BaseMapper { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentReviewDetailMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentReviewDetailMapper.xml new file mode 100644 index 0000000..be9d8d1 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentReviewDetailMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentReviewResultMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentReviewResultMapper.xml new file mode 100644 index 0000000..e9bbd86 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentReviewResultMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentReviewRuleMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentReviewRuleMapper.xml new file mode 100644 index 0000000..ca5faad --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentReviewRuleMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewDetailService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewDetailService.java new file mode 100644 index 0000000..4e829ef --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewDetailService.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.database.service; + +import org.jeecg.modules.database.entity.ExperimentReviewDetail; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * @Description: 试验评定真值表 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +public interface IExperimentReviewDetailService extends IService { + + List getBySample(String experimentId, String sampleId); + + ExperimentReviewDetail getByRule(String experimentId, String sampleId, String ruleId); + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewRuleExecutor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewRuleExecutor.java new file mode 100644 index 0000000..0afb137 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewRuleExecutor.java @@ -0,0 +1,23 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service; + +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.system.cache.AuthStateRedisCache; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author lise + * @version IExperimentReviewRuleExecutor.java, v 0.1 2025年06月16日 17:30 lise + */ +public interface IExperimentReviewRuleExecutor { + + String getProcessType(); + int getPriority(); + String execute(Experiment experiment, ExperimentSampleInfo sampleInfo); +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewRuleService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewRuleService.java new file mode 100644 index 0000000..cf4fc8a --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewRuleService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.database.service; + +import org.jeecg.modules.database.entity.*; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * @Description: 试验评定规则 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +public interface IExperimentReviewRuleService extends IService { + + List getByType(String processType); + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java index 766f7e5..f3b9b6e 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java @@ -1,15 +1,15 @@ package org.jeecg.modules.database.service; +import org.jeecg.modules.database.entity.*; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.database.entity.ExperimentReview; /** - * @Description: 试验评定 + * @Description: 试验评定结果 * @Author: jeecg-boot - * @Date: 2024-11-05 + * @Date: 2025-06-16 * @Version: V1.0 */ public interface IExperimentReviewService extends IService { - ExperimentReview getByExperimentId(String experimentId); + ExperimentReview review(Experiment experiment, ExperimentSampleInfo sampleInfo, String processType); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225001Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225001Executor.java new file mode 100644 index 0000000..59c7435 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225001Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC225001Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC22500; + } + + @Override + public int getPriority() { + return 1; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225002Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225002Executor.java new file mode 100644 index 0000000..7221f81 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225002Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC225002Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC22500; + } + + @Override + public int getPriority() { + return 2; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225003Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225003Executor.java new file mode 100644 index 0000000..6b0ffa6 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225003Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC225003Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC22500; + } + + @Override + public int getPriority() { + return 3; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225004Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225004Executor.java new file mode 100644 index 0000000..04de11a --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225004Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC225004Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC22500; + } + + @Override + public int getPriority() { + return 4; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290001Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290001Executor.java new file mode 100644 index 0000000..7242150 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290001Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC2290001Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC229000; + } + + @Override + public int getPriority() { + return 1; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290002Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290002Executor.java new file mode 100644 index 0000000..b3efef2 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290002Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC2290002Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC229000; + } + + @Override + public int getPriority() { + return 2; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290003Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290003Executor.java new file mode 100644 index 0000000..aa7a420 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290003Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC2290003Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC229000; + } + + @Override + public int getPriority() { + return 3; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290004Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290004Executor.java new file mode 100644 index 0000000..092a685 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290004Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC2290004Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC229000; + } + + @Override + public int getPriority() { + return 4; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290005Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290005Executor.java new file mode 100644 index 0000000..3f5e6ac --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290005Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC2290005Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC229000; + } + + @Override + public int getPriority() { + return 5; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290006Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290006Executor.java new file mode 100644 index 0000000..14a6786 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290006Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC2290006Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC229000; + } + + @Override + public int getPriority() { + return 6; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290007Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290007Executor.java new file mode 100644 index 0000000..e755bc6 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290007Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC2290007Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC229000; + } + + @Override + public int getPriority() { + return 7; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290008Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290008Executor.java new file mode 100644 index 0000000..74fb233 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290008Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC2290008Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC229000; + } + + @Override + public int getPriority() { + return 8; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290009Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290009Executor.java new file mode 100644 index 0000000..aa7068b --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290009Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class ESCC2290009Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.ESCC229000; + } + + @Override + public int getPriority() { + return 9; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ExecutorHolder.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ExecutorHolder.java new file mode 100644 index 0000000..0dc3691 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ExecutorHolder.java @@ -0,0 +1,74 @@ +package org.jeecg.modules.database.service.executor; + +import jakarta.annotation.PostConstruct; +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +@Service +public class ExecutorHolder { + private Map executors = new HashMap<>(); + + @PostConstruct + public void init() { + executors.put(ExperimentReviewProcessType.ESCC22500 + "1", new ESCC225001Executor()); + executors.put(ExperimentReviewProcessType.ESCC22500 + "2", new ESCC225002Executor()); + executors.put(ExperimentReviewProcessType.ESCC22500 + "3", new ESCC225003Executor()); + executors.put(ExperimentReviewProcessType.ESCC22500 + "4", new ESCC225004Executor()); + executors.put(ExperimentReviewProcessType.ESCC229000 + "1", new ESCC2290001Executor()); + executors.put(ExperimentReviewProcessType.ESCC229000 + "2", new ESCC2290002Executor()); + executors.put(ExperimentReviewProcessType.ESCC229000 + "3", new ESCC2290003Executor()); + executors.put(ExperimentReviewProcessType.ESCC229000 + "4", new ESCC2290004Executor()); + executors.put(ExperimentReviewProcessType.ESCC229000 + "5", new ESCC2290005Executor()); + executors.put(ExperimentReviewProcessType.ESCC229000 + "6", new ESCC2290006Executor()); + executors.put(ExperimentReviewProcessType.ESCC229000 + "7", new ESCC2290007Executor()); + executors.put(ExperimentReviewProcessType.ESCC229000 + "8", new ESCC2290008Executor()); + executors.put(ExperimentReviewProcessType.ESCC229000 + "9", new ESCC2290009Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "1", new GJB548C1Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "2", new GJB548C2Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "3", new GJB548C3Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "4", new GJB548C4Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "5", new GJB548C5Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "6", new GJB548C6Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "7", new GJB548C7Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "8", new GJB548C8Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "9", new GJB548C9Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "10", new GJB548C10Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "11", new GJB548C11Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "12", new GJB548C12Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "13", new GJB548C13Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "14", new GJB548C14Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "15", new GJB548C15Executor()); + executors.put(ExperimentReviewProcessType.GJB548C + "16", new GJB548C16Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "1", new QJ100041Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "2", new QJ100042Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "3", new QJ100043Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "4", new QJ100044Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "5", new QJ100045Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "6", new QJ100046Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "7", new QJ100047Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "8", new QJ100048Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "9", new QJ100049Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "10", new QJ1000410Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "11", new QJ1000411Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "12", new QJ1000412Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "13", new QJ1000413Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "14", new QJ1000414Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "15", new QJ1000415Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "16", new QJ1000416Executor()); + executors.put(ExperimentReviewProcessType.QJ10004 + "17", new QJ1000417Executor()); + } + + public String execute(String processType, Experiment experiment, ExperimentSampleInfo sampleInfo) { + IExperimentReviewRuleExecutor executor = executors.get(processType); + if (executor == null) { + return null; + } + return executor.execute(experiment, sampleInfo); + } +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C10Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C10Executor.java new file mode 100644 index 0000000..b272b60 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C10Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C10Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 10; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C11Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C11Executor.java new file mode 100644 index 0000000..fb551ae --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C11Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C11Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 11; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C12Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C12Executor.java new file mode 100644 index 0000000..cbd3f78 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C12Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C12Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 12; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C13Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C13Executor.java new file mode 100644 index 0000000..2917c2f --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C13Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C13Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 13; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C14Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C14Executor.java new file mode 100644 index 0000000..0bd2e79 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C14Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C14Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 14; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C15Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C15Executor.java new file mode 100644 index 0000000..f03c3c3 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C15Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C15Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 15; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C16Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C16Executor.java new file mode 100644 index 0000000..a960113 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C16Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C16Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 16; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C1Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C1Executor.java new file mode 100644 index 0000000..cc21120 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C1Executor.java @@ -0,0 +1,34 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.constant.ExperimentReviewResultEnum; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + * @version GJB548C1Executor.java, v 0.1 2025年06月16日 20:57 lise + */ + +public class GJB548C1Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 1; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ExperimentReviewResultEnum.HIGH; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C2Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C2Executor.java new file mode 100644 index 0000000..02d379f --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C2Executor.java @@ -0,0 +1,34 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.constant.ExperimentReviewResultEnum; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + * @version GJB548C1Executor.java, v 0.1 2025年06月16日 20:57 lise + */ + +public class GJB548C2Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 2; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ExperimentReviewResultEnum.ITEM_PASS; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C3Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C3Executor.java new file mode 100644 index 0000000..9f2e38e --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C3Executor.java @@ -0,0 +1,34 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.constant.ExperimentReviewResultEnum; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + * @version GJB548C1Executor.java, v 0.1 2025年06月16日 20:57 lise + */ + +public class GJB548C3Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 3; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ExperimentReviewResultEnum.HIGH; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C4Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C4Executor.java new file mode 100644 index 0000000..942570a --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C4Executor.java @@ -0,0 +1,33 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + * @version GJB548C1Executor.java, v 0.1 2025年06月16日 20:57 lise + */ + +public class GJB548C4Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 4; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C5Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C5Executor.java new file mode 100644 index 0000000..2102b6c --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C5Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C5Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 4; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C6Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C6Executor.java new file mode 100644 index 0000000..0b40f90 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C6Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C6Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 6; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C7Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C7Executor.java new file mode 100644 index 0000000..f651151 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C7Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C7Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 7; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C8Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C8Executor.java new file mode 100644 index 0000000..b58c5f2 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C8Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C8Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 8; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C9Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C9Executor.java new file mode 100644 index 0000000..8a6a333 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C9Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class GJB548C9Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.GJB548C; + } + + @Override + public int getPriority() { + return 9; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000410Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000410Executor.java new file mode 100644 index 0000000..84afb63 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000410Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ1000410Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 10; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000411Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000411Executor.java new file mode 100644 index 0000000..f927090 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000411Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ1000411Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 11; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000412Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000412Executor.java new file mode 100644 index 0000000..4f3c192 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000412Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ1000412Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 12; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000413Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000413Executor.java new file mode 100644 index 0000000..144afc7 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000413Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ1000413Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 13; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000414Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000414Executor.java new file mode 100644 index 0000000..7e52657 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000414Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ1000414Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 14; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000415Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000415Executor.java new file mode 100644 index 0000000..ef74166 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000415Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ1000415Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 15; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000416Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000416Executor.java new file mode 100644 index 0000000..fe52dac --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000416Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ1000416Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 16; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000417Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000417Executor.java new file mode 100644 index 0000000..d32d96f --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000417Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ1000417Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 17; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100041Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100041Executor.java new file mode 100644 index 0000000..0056808 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100041Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ100041Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 1; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100042Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100042Executor.java new file mode 100644 index 0000000..c0b8813 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100042Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ100042Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 2; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100043Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100043Executor.java new file mode 100644 index 0000000..2954b0b --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100043Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ100043Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 3; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100044Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100044Executor.java new file mode 100644 index 0000000..65d87aa --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100044Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ100044Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 4; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100045Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100045Executor.java new file mode 100644 index 0000000..d9c311d --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100045Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ100045Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 5; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100046Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100046Executor.java new file mode 100644 index 0000000..94e46d2 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100046Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ100046Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 6; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100047Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100047Executor.java new file mode 100644 index 0000000..37b46aa --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100047Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ100047Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 7; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100048Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100048Executor.java new file mode 100644 index 0000000..f735081 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100048Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ100048Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 8; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100049Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100049Executor.java new file mode 100644 index 0000000..61c214d --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100049Executor.java @@ -0,0 +1,32 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.service.executor; + +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.service.IExperimentReviewRuleExecutor; +import org.springframework.stereotype.Service; + +/** + * @author lise + */ + +public class QJ100049Executor implements IExperimentReviewRuleExecutor { + @Override + public String getProcessType() { + return ExperimentReviewProcessType.QJ10004; + } + + @Override + public int getPriority() { + return 9; + } + + @Override + public String execute(Experiment experiment, ExperimentSampleInfo sampleInfo) { + return ""; + } +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewDetailServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewDetailServiceImpl.java new file mode 100644 index 0000000..8be9529 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewDetailServiceImpl.java @@ -0,0 +1,43 @@ +package org.jeecg.modules.database.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.modules.database.entity.ExperimentReviewDetail; +import org.jeecg.modules.database.mapper.ExperimentReviewDetailMapper; +import org.jeecg.modules.database.service.IExperimentReviewDetailService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.List; + +/** + * @Description: 试验评定真值表 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +@Service +public class ExperimentReviewDetailServiceImpl extends ServiceImpl + implements IExperimentReviewDetailService { + @Override + public List getBySample(String experimentId, String sampleId) { + return list(new LambdaQueryWrapper().eq(ExperimentReviewDetail::getExperimentId, experimentId) + .eq(ExperimentReviewDetail::getSampleId, sampleId).orderByAsc(ExperimentReviewDetail::getPriority)); + } + + @Override + public ExperimentReviewDetail getByRule(String experimentId, String sampleId, String ruleId) { + return baseMapper.selectOne(new LambdaQueryWrapper().eq(ExperimentReviewDetail::getExperimentId, + experimentId).eq(ExperimentReviewDetail::getSampleId, sampleId).eq(ExperimentReviewDetail::getRuleId, ruleId), false); + + } + + @Override + public boolean saveOrUpdate(ExperimentReviewDetail entity) { + ExperimentReviewDetail experimentReviewDetail = getByRule(entity.getExperimentId(), entity.getSampleId(), entity.getRuleId()); + if (experimentReviewDetail != null) { + entity.setId(experimentReviewDetail.getId()); + } + return super.saveOrUpdate(entity); + } +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewRuleServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewRuleServiceImpl.java new file mode 100644 index 0000000..56952af --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewRuleServiceImpl.java @@ -0,0 +1,30 @@ +package org.jeecg.modules.database.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.modules.database.entity.*; +import org.jeecg.modules.database.mapper.ExperimentReviewRuleMapper; +import org.jeecg.modules.database.service.IExperimentReviewRuleService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.List; + +/** + * @Description: 试验评定规则 + * @Author: jeecg-boot + * @Date: 2025-06-16 + * @Version: V1.0 + */ +@Service +public class ExperimentReviewRuleServiceImpl extends ServiceImpl + implements IExperimentReviewRuleService { + + @Override + public List getByType(String processType) { + return list(new LambdaQueryWrapper().eq(ExperimentReviewRule::getProcessType, processType) + .orderByAsc(ExperimentReviewRule::getPriority)); + } + + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java index 06f130c..07d675b 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java @@ -1,23 +1,91 @@ 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.ExperimentReview; -import org.jeecg.modules.database.mapper.ExperimentReviewMapper; -import org.jeecg.modules.database.service.IExperimentReviewService; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import org.apache.commons.lang3.StringUtils; +import org.jeecg.modules.database.constant.ExperimentReviewResultEnum; +import org.jeecg.modules.database.entity.*; +import org.jeecg.modules.database.mapper.ExperimentReviewResultMapper; +import org.jeecg.modules.database.service.*; +import org.jeecg.modules.database.service.executor.ExecutorHolder; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.*; + /** - * @Description: 试验评定 + * @Description: 试验评定结果 * @Author: jeecg-boot - * @Date: 2024-11-05 + * @Date: 2025-06-16 * @Version: V1.0 */ @Service -public class ExperimentReviewServiceImpl extends ServiceImpl implements IExperimentReviewService { +public class ExperimentReviewServiceImpl extends ServiceImpl + implements IExperimentReviewService { + @Autowired + private IExperimentReviewRuleService experimentReviewRuleService; + @Autowired + private IExperimentReviewDetailService experimentReviewDetailService; + @Autowired + private ExecutorHolder executorHolder; + //高估代表 0，低估代表 1,无法评定代表2，评定结果通过代表3，未通过代表 4 @Override - public ExperimentReview getByExperimentId(String experimentId) { - return getOne(new LambdaQueryWrapper().eq(ExperimentReview::getExperimentId, experimentId), false); + public ExperimentReview review(Experiment experiment, ExperimentSampleInfo sampleInfo, String processType) { + List ruleList = experimentReviewRuleService.getByType(processType); + ExperimentReview result = new ExperimentReview(); + result.setExperimentId(experiment.getId()); + result.setProcessType(processType); + result.setSampleId(sampleInfo.getId()); + for (int i = 0; i < ruleList.size(); i++) { + ExperimentReviewRule rule = ruleList.get(i); + String executeResult = executorHolder.execute(rule.getProcessType() + rule.getPriority(), experiment, sampleInfo); + if (StrUtil.isNotBlank(executeResult)) { + ExperimentReviewDetail detail = new ExperimentReviewDetail(); + detail.setExperimentId(experiment.getId()); + detail.setSampleId(sampleInfo.getId()); + detail.setProcessType(processType); + detail.setRuleId(rule.getId()); + detail.setPriority(rule.getPriority()); + detail.setResult(executeResult); + experimentReviewDetailService.saveOrUpdate(detail); + } + if (i == 0) { + continue; + } + String reviewResult = adjustResult(experiment.getId(), sampleInfo.getId()); + if (StringUtils.isNotBlank(reviewResult)) { + result.setResult(reviewResult); + return result; + } + } + return result; + } + + private String adjustResult(String experimentId, String sampleId) { + List detailList = experimentReviewDetailService.getBySample(experimentId, sampleId); + ExperimentReviewDetail first = CollUtil.getFirst(detailList); + ExperimentReviewDetail last = CollUtil.getLast(detailList); + if (detailList.size() > 1 && !StrUtil.equals(first.getResult(), last.getResult())) { + return ExperimentReviewResultEnum.UNKNOWN; + } + if (detailList.size() == 1 && first.getResult().equals(ExperimentReviewResultEnum.FINAL_PASS)) { + return ExperimentReviewResultEnum.FINAL_PASS; + } + if (detailList.size() == 1 && first.getResult().equals(ExperimentReviewResultEnum.NOT_PASS)) { + return ExperimentReviewResultEnum.NOT_PASS; + } + if (detailList.size() == 2 && StrUtil.equals(first.getResult(), last.getResult())) { + return first.getResult(); + } + if (detailList.size() == 2 && !StrUtil.equals(first.getResult(), last.getResult())) { + return ExperimentReviewResultEnum.UNKNOWN; + } + if (detailList.size() > 2) { + return ExperimentReviewResultEnum.UNKNOWN; + } + return null; } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewDetailForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewDetailForm.vue new file mode 100644 index 0000000..3534a15 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewDetailForm.vue @@ -0,0 +1,113 @@ + + + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewDetailList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewDetailList.vue new file mode 100644 index 0000000..e500989 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewDetailList.vue @@ -0,0 +1,44 @@ + + + + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewResultForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewResultForm.vue new file mode 100644 index 0000000..a121f32 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewResultForm.vue @@ -0,0 +1,107 @@ + + + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewResultList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewResultList.vue new file mode 100644 index 0000000..37f7860 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewResultList.vue @@ -0,0 +1,44 @@ + + + + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewRuleForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewRuleForm.vue new file mode 100644 index 0000000..d839e91 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewRuleForm.vue @@ -0,0 +1,119 @@ + + + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewRuleList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewRuleList.vue new file mode 100644 index 0000000..9ef8256 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentReviewRuleList.vue @@ -0,0 +1,44 @@ + + + + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewDetail.api.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewDetail.api.ts new file mode 100644 index 0000000..8ad37cf --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewDetail.api.ts @@ -0,0 +1,64 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/database/experimentReviewDetail/list', + save='/database/experimentReviewDetail/add', + edit='/database/experimentReviewDetail/edit', + deleteOne = '/database/experimentReviewDetail/delete', + deleteBatch = '/database/experimentReviewDetail/deleteBatch', + importExcel = '/database/experimentReviewDetail/importExcel', + exportXls = '/database/experimentReviewDetail/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewDetail.data.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewDetail.data.ts new file mode 100644 index 0000000..1a59a35 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewDetail.data.ts @@ -0,0 +1,100 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '试验ID', + align:"center", + dataIndex: 'experimentId' + }, + { + title: '样品ID', + align:"center", + dataIndex: 'sampleId' + }, + { + title: '试验流程标准', + align:"center", + dataIndex: 'processType' + }, + { + title: '规则ID', + align:"center", + dataIndex: 'ruleId' + }, + { + title: '评定结果', + align:"center", + dataIndex: 'result' + }, + { + title: '评定状态', + align:"center", + dataIndex: 'reviewStatus' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '试验ID', + field: 'experimentId', + component: 'Input', + }, + { + label: '样品ID', + field: 'sampleId', + component: 'Input', + }, + { + label: '试验流程标准', + field: 'processType', + component: 'Input', + }, + { + label: '规则ID', + field: 'ruleId', + component: 'Input', + }, + { + label: '评定结果', + field: 'result', + component: 'Input', + }, + { + label: '评定状态', + field: 'reviewStatus', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + experimentId: {title: '试验ID',order: 0,view: 'text', type: 'string',}, + sampleId: {title: '样品ID',order: 1,view: 'text', type: 'string',}, + processType: {title: '试验流程标准',order: 2,view: 'text', type: 'string',}, + ruleId: {title: '规则ID',order: 3,view: 'text', type: 'string',}, + result: {title: '评定结果',order: 4,view: 'text', type: 'string',}, + reviewStatus: {title: '评定状态',order: 5,view: 'text', type: 'string',}, +}; + +/** +* 流程表单调用这个方法获取formSchema +* @param param +*/ +export function getBpmFormSchema(_formData): FormSchema[]{ + // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema + return formSchema; +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewDetailList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewDetailList.vue new file mode 100644 index 0000000..fa3c7f1 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewDetailList.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewResult.api.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewResult.api.ts new file mode 100644 index 0000000..53d4b1b --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewResult.api.ts @@ -0,0 +1,64 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/database/experimentReviewResult/list', + save='/database/experimentReviewResult/add', + edit='/database/experimentReviewResult/edit', + deleteOne = '/database/experimentReviewResult/delete', + deleteBatch = '/database/experimentReviewResult/deleteBatch', + importExcel = '/database/experimentReviewResult/importExcel', + exportXls = '/database/experimentReviewResult/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewResult.data.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewResult.data.ts new file mode 100644 index 0000000..760e6a6 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewResult.data.ts @@ -0,0 +1,89 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '试验ID', + align:"center", + dataIndex: 'experimentId' + }, + { + title: '样品ID', + align:"center", + dataIndex: 'sampleId' + }, + { + title: '试验流程标准', + align:"center", + dataIndex: 'processType' + }, + { + title: '评定结果', + align:"center", + dataIndex: 'result' + }, + { + title: '评定状态', + align:"center", + dataIndex: 'reviewStatus' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '试验ID', + field: 'experimentId', + component: 'Input', + }, + { + label: '样品ID', + field: 'sampleId', + component: 'Input', + }, + { + label: '试验流程标准', + field: 'processType', + component: 'Input', + }, + { + label: '评定结果', + field: 'result', + component: 'Input', + }, + { + label: '评定状态', + field: 'reviewStatus', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + experimentId: {title: '试验ID',order: 0,view: 'text', type: 'string',}, + sampleId: {title: '样品ID',order: 1,view: 'text', type: 'string',}, + processType: {title: '试验流程标准',order: 2,view: 'text', type: 'string',}, + result: {title: '评定结果',order: 3,view: 'text', type: 'string',}, + reviewStatus: {title: '评定状态',order: 4,view: 'text', type: 'string',}, +}; + +/** +* 流程表单调用这个方法获取formSchema +* @param param +*/ +export function getBpmFormSchema(_formData): FormSchema[]{ + // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema + return formSchema; +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewResultList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewResultList.vue new file mode 100644 index 0000000..baff700 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewResultList.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewRule.api.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewRule.api.ts new file mode 100644 index 0000000..f3b7d7d --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewRule.api.ts @@ -0,0 +1,64 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/database/experimentReviewRule/list', + save='/database/experimentReviewRule/add', + edit='/database/experimentReviewRule/edit', + deleteOne = '/database/experimentReviewRule/delete', + deleteBatch = '/database/experimentReviewRule/deleteBatch', + importExcel = '/database/experimentReviewRule/importExcel', + exportXls = '/database/experimentReviewRule/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewRule.data.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewRule.data.ts new file mode 100644 index 0000000..1cf1019 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewRule.data.ts @@ -0,0 +1,111 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '试验流程标准', + align:"center", + dataIndex: 'processType' + }, + { + title: '建议标题', + align:"center", + dataIndex: 'title' + }, + { + title: '评定结果', + align:"center", + dataIndex: 'result' + }, + { + title: '损伤机理', + align:"center", + dataIndex: 'impactDesc' + }, + { + title: '适用范围', + align:"center", + dataIndex: 'impactScope' + }, + { + title: '规则表达式', + align:"center", + dataIndex: 'expression' + }, + { + title: '规则优先级', + align:"center", + dataIndex: 'priority' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '试验流程标准', + field: 'processType', + component: 'Input', + }, + { + label: '建议标题', + field: 'title', + component: 'Input', + }, + { + label: '评定结果', + field: 'result', + component: 'Input', + }, + { + label: '损伤机理', + field: 'impactDesc', + component: 'Input', + }, + { + label: '适用范围', + field: 'impactScope', + component: 'Input', + }, + { + label: '规则表达式', + field: 'expression', + component: 'Input', + }, + { + label: '规则优先级', + field: 'priority', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + processType: {title: '试验流程标准',order: 0,view: 'text', type: 'string',}, + title: {title: '建议标题',order: 1,view: 'text', type: 'string',}, + result: {title: '评定结果',order: 2,view: 'text', type: 'string',}, + impactDesc: {title: '损伤机理',order: 3,view: 'text', type: 'string',}, + impactScope: {title: '适用范围',order: 4,view: 'text', type: 'string',}, + expression: {title: '规则表达式',order: 5,view: 'text', type: 'string',}, + priority: {title: '规则优先级',order: 6,view: 'text', type: 'string',}, +}; + +/** +* 流程表单调用这个方法获取formSchema +* @param param +*/ +export function getBpmFormSchema(_formData): FormSchema[]{ + // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema + return formSchema; +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewRuleList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewRuleList.vue new file mode 100644 index 0000000..4691214 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentReviewRuleList.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20250616_1__menu_insert_ExperimentReviewDetail.sql b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20250616_1__menu_insert_ExperimentReviewDetail.sql new file mode 100644 index 0000000..10d753e --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20250616_1__menu_insert_ExperimentReviewDetail.sql @@ -0,0 +1,26 @@ +-- 注意：该页面对应的前台目录为views/database文件夹下 +-- 如果你想更改到其他目录，请修改sql中component字段对应的值 + + +INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) +VALUES ('202506160440880560', NULL, '试验评定真值表', '/database/experimentReviewDetailList', 'database/ExperimentReviewDetailList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-06-16 16:40:56', NULL, NULL, 0); + +-- 权限控制sql +-- 新增 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202506160440880561', '202506160440880560', '添加试验评定真值表', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_detail:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:56', NULL, NULL, 0, 0, '1', 0); +-- 编辑 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202506160440880562', '202506160440880560', '编辑试验评定真值表', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_detail:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:56', NULL, NULL, 0, 0, '1', 0); +-- 删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202506160440880563', '202506160440880560', '删除试验评定真值表', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_detail:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:56', NULL, NULL, 0, 0, '1', 0); +-- 批量删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202506160440880564', '202506160440880560', '批量删除试验评定真值表', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_detail:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:56', NULL, NULL, 0, 0, '1', 0); +-- 导出excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202506160440880565', '202506160440880560', '导出excel_试验评定真值表', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_detail:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:56', NULL, NULL, 0, 0, '1', 0); +-- 导入excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202506160440880566', '202506160440880560', '导入excel_试验评定真值表', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_detail:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:56', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20250616_1__menu_insert_ExperimentReviewResult.sql b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20250616_1__menu_insert_ExperimentReviewResult.sql new file mode 100644 index 0000000..b7faae5 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20250616_1__menu_insert_ExperimentReviewResult.sql @@ -0,0 +1,26 @@ +-- 注意：该页面对应的前台目录为views/database文件夹下 +-- 如果你想更改到其他目录，请修改sql中component字段对应的值 + + +INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) +VALUES ('2025061604416880040', NULL, '试验评定结果', '/database/experimentReviewResultList', 'database/ExperimentReviewResultList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-06-16 16:41:04', NULL, NULL, 0); + +-- 权限控制sql +-- 新增 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604416880041', '2025061604416880040', '添加试验评定结果', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_result:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:41:04', NULL, NULL, 0, 0, '1', 0); +-- 编辑 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604416880042', '2025061604416880040', '编辑试验评定结果', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_result:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:41:04', NULL, NULL, 0, 0, '1', 0); +-- 删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604416880043', '2025061604416880040', '删除试验评定结果', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_result:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:41:04', NULL, NULL, 0, 0, '1', 0); +-- 批量删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604416880044', '2025061604416880040', '批量删除试验评定结果', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_result:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:41:04', NULL, NULL, 0, 0, '1', 0); +-- 导出excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604416880045', '2025061604416880040', '导出excel_试验评定结果', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_result:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:41:04', NULL, NULL, 0, 0, '1', 0); +-- 导入excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604416890046', '2025061604416880040', '导入excel_试验评定结果', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_result:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:41:04', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20250616_1__menu_insert_ExperimentReviewRule.sql b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20250616_1__menu_insert_ExperimentReviewRule.sql new file mode 100644 index 0000000..6bb849c --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20250616_1__menu_insert_ExperimentReviewRule.sql @@ -0,0 +1,26 @@ +-- 注意：该页面对应的前台目录为views/database文件夹下 +-- 如果你想更改到其他目录，请修改sql中component字段对应的值 + + +INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) +VALUES ('2025061604401660460', NULL, '试验评定规则', '/database/experimentReviewRuleList', 'database/ExperimentReviewRuleList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-06-16 16:40:46', NULL, NULL, 0); + +-- 权限控制sql +-- 新增 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604401660461', '2025061604401660460', '添加试验评定规则', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_rule:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:46', NULL, NULL, 0, 0, '1', 0); +-- 编辑 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604401660462', '2025061604401660460', '编辑试验评定规则', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_rule:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:46', NULL, NULL, 0, 0, '1', 0); +-- 删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604401660463', '2025061604401660460', '删除试验评定规则', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_rule:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:46', NULL, NULL, 0, 0, '1', 0); +-- 批量删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604401660464', '2025061604401660460', '批量删除试验评定规则', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_rule:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:46', NULL, NULL, 0, 0, '1', 0); +-- 导出excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604401660465', '2025061604401660460', '导出excel_试验评定规则', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_rule:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:46', NULL, NULL, 0, 0, '1', 0); +-- 导入excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025061604401660466', '2025061604401660460', '导入excel_试验评定规则', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_review_rule:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-16 16:40:46', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewDetailForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewDetailForm.vue new file mode 100644 index 0000000..3f179ce --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewDetailForm.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewDetailModal.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewDetailModal.vue new file mode 100644 index 0000000..d78859b --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewDetailModal.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewResultForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewResultForm.vue new file mode 100644 index 0000000..6bd9421 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewResultForm.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewResultModal.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewResultModal.vue new file mode 100644 index 0000000..42aae8c --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewResultModal.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewRuleForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewRuleForm.vue new file mode 100644 index 0000000..99f128c --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewRuleForm.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewRuleModal.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewRuleModal.vue new file mode 100644 index 0000000..69a5733 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentReviewRuleModal.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file