diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java new file mode 100644 index 0000000..9578980 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.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.ExperimentDeviationCondition; +import org.jeecg.modules.database.service.IExperimentDeviationConditionService; + +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: 2024-12-05 + * @Version: V1.0 + */ +@Tag(name="试验偏置条件信息") +@RestController +@RequestMapping("/database/experimentDeviationCondition") +@Slf4j +public class ExperimentDeviationConditionController extends JeecgController { + @Autowired + private IExperimentDeviationConditionService experimentDeviationConditionService; + + /** + * 分页列表查询 + * + * @param experimentDeviationCondition + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试验偏置条件信息-分页列表查询") + @Operation(summary="试验偏置条件信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentDeviationCondition experimentDeviationCondition, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentDeviationCondition, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentDeviationConditionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experimentDeviationCondition + * @return + */ + @AutoLog(value = "试验偏置条件信息-添加") + @Operation(summary="试验偏置条件信息-添加") + @RequiresPermissions("database:experiment_deviation_condition:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) { + experimentDeviationConditionService.save(experimentDeviationCondition); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param experimentDeviationCondition + * @return + */ + @AutoLog(value = "试验偏置条件信息-编辑") + @Operation(summary="试验偏置条件信息-编辑") + @RequiresPermissions("database:experiment_deviation_condition:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) { + experimentDeviationConditionService.updateById(experimentDeviationCondition); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "试验偏置条件信息-通过id删除") + @Operation(summary="试验偏置条件信息-通过id删除") + @RequiresPermissions("database:experiment_deviation_condition:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + experimentDeviationConditionService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "试验偏置条件信息-批量删除") + @Operation(summary="试验偏置条件信息-批量删除") + @RequiresPermissions("database:experiment_deviation_condition:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.experimentDeviationConditionService.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) { + ExperimentDeviationCondition experimentDeviationCondition = experimentDeviationConditionService.getById(id); + if(experimentDeviationCondition==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentDeviationCondition); + } + + /** + * 导出excel + * + * @param request + * @param experimentDeviationCondition + */ + @RequiresPermissions("database:experiment_deviation_condition:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ExperimentDeviationCondition experimentDeviationCondition) { + return super.exportXls(request, experimentDeviationCondition, ExperimentDeviationCondition.class, "试验偏置条件信息"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("database:experiment_deviation_condition:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ExperimentDeviationCondition.class); + } + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java new file mode 100644 index 0000000..c30fcb7 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.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.ExperimentDeviationEquipment; +import org.jeecg.modules.database.service.IExperimentDeviationEquipmentService; + +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: 2024-12-05 + * @Version: V1.0 + */ +@Tag(name="试验加偏设备信息") +@RestController +@RequestMapping("/database/experimentDeviationEquipment") +@Slf4j +public class ExperimentDeviationEquipmentController extends JeecgController { + @Autowired + private IExperimentDeviationEquipmentService experimentDeviationEquipmentService; + + /** + * 分页列表查询 + * + * @param experimentDeviationEquipment + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试验加偏设备信息-分页列表查询") + @Operation(summary="试验加偏设备信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentDeviationEquipment experimentDeviationEquipment, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentDeviationEquipment, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentDeviationEquipmentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experimentDeviationEquipment + * @return + */ + @AutoLog(value = "试验加偏设备信息-添加") + @Operation(summary="试验加偏设备信息-添加") + @RequiresPermissions("database:experiment_deviation_equipment:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) { + experimentDeviationEquipmentService.save(experimentDeviationEquipment); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param experimentDeviationEquipment + * @return + */ + @AutoLog(value = "试验加偏设备信息-编辑") + @Operation(summary="试验加偏设备信息-编辑") + @RequiresPermissions("database:experiment_deviation_equipment:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) { + experimentDeviationEquipmentService.updateById(experimentDeviationEquipment); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "试验加偏设备信息-通过id删除") + @Operation(summary="试验加偏设备信息-通过id删除") + @RequiresPermissions("database:experiment_deviation_equipment:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + experimentDeviationEquipmentService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "试验加偏设备信息-批量删除") + @Operation(summary="试验加偏设备信息-批量删除") + @RequiresPermissions("database:experiment_deviation_equipment:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.experimentDeviationEquipmentService.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) { + ExperimentDeviationEquipment experimentDeviationEquipment = experimentDeviationEquipmentService.getById(id); + if(experimentDeviationEquipment==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentDeviationEquipment); + } + + /** + * 导出excel + * + * @param request + * @param experimentDeviationEquipment + */ + @RequiresPermissions("database:experiment_deviation_equipment:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ExperimentDeviationEquipment experimentDeviationEquipment) { + return super.exportXls(request, experimentDeviationEquipment, ExperimentDeviationEquipment.class, "试验加偏设备信息"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("database:experiment_deviation_equipment:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ExperimentDeviationEquipment.class); + } + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java new file mode 100644 index 0000000..9872e3c --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.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.ExperimentIrradiationBoard; +import org.jeecg.modules.database.service.IExperimentIrradiationBoardService; + +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: 2024-12-05 + * @Version: V1.0 + */ +@Tag(name="试验辐照板信息") +@RestController +@RequestMapping("/database/experimentIrradiationBoard") +@Slf4j +public class ExperimentIrradiationBoardController extends JeecgController { + @Autowired + private IExperimentIrradiationBoardService experimentIrradiationBoardService; + + /** + * 分页列表查询 + * + * @param experimentIrradiationBoard + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试验辐照板信息-分页列表查询") + @Operation(summary="试验辐照板信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentIrradiationBoard experimentIrradiationBoard, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentIrradiationBoard, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentIrradiationBoardService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experimentIrradiationBoard + * @return + */ + @AutoLog(value = "试验辐照板信息-添加") + @Operation(summary="试验辐照板信息-添加") + @RequiresPermissions("database:experiment_irradiation_board:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) { + experimentIrradiationBoardService.save(experimentIrradiationBoard); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param experimentIrradiationBoard + * @return + */ + @AutoLog(value = "试验辐照板信息-编辑") + @Operation(summary="试验辐照板信息-编辑") + @RequiresPermissions("database:experiment_irradiation_board:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) { + experimentIrradiationBoardService.updateById(experimentIrradiationBoard); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "试验辐照板信息-通过id删除") + @Operation(summary="试验辐照板信息-通过id删除") + @RequiresPermissions("database:experiment_irradiation_board:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + experimentIrradiationBoardService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "试验辐照板信息-批量删除") + @Operation(summary="试验辐照板信息-批量删除") + @RequiresPermissions("database:experiment_irradiation_board:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.experimentIrradiationBoardService.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) { + ExperimentIrradiationBoard experimentIrradiationBoard = experimentIrradiationBoardService.getById(id); + if(experimentIrradiationBoard==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentIrradiationBoard); + } + + /** + * 导出excel + * + * @param request + * @param experimentIrradiationBoard + */ + @RequiresPermissions("database:experiment_irradiation_board:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ExperimentIrradiationBoard experimentIrradiationBoard) { + return super.exportXls(request, experimentIrradiationBoard, ExperimentIrradiationBoard.class, "试验辐照板信息"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("database:experiment_irradiation_board:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ExperimentIrradiationBoard.class); + } + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java index 56d40d3..ed361b6 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java @@ -136,31 +136,45 @@ public class Experiment implements Serializable { */ @Excel(name = "样品信息", width = 15) @Schema(description = "样品信息") - private String sampleInfo; + private String sampleInfo; + + @TableField(exist = false) + private List sampleInfoList; + /** * 辐照板 */ @Excel(name = "辐照板", width = 15) @Schema(description = "辐照板") - private String irradiationBoard; + private String irradiationBoard; + + @TableField(exist = false) + private List irradiationBoardList; + /** * 偏置条件 */ @Excel(name = "偏置条件", width = 15) @Schema(description = "偏置条件") - private String deviationCondition; + private String deviationCondition; + + @TableField(exist = false) + private List deviationConditionList; /** * 加偏设备 */ @Excel(name = "加偏设备", width = 15) @Schema(description = "加偏设备") - private String deviationEquipment; + private String deviationEquipment; + + @TableField(exist = false) + private List deviationEquipmentList; /** * 复制次数 */ @Excel(name = "复制次数", width = 15) @Schema(description = "复制次数") - private Integer copyCount; + private Integer copyCount; /** * 试验人员ID, 逗号分割多个 diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationCondition.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationCondition.java new file mode 100644 index 0000000..a3912a2 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationCondition.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: 2024-12-05 + * @Version: V1.0 + */ +@Data +@TableName("experiment_deviation_condition") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="试验偏置条件信息") +public class ExperimentDeviationCondition implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private java.lang.String id; + /**创建人*/ + @Schema(description = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @Schema(description = "所属部门") + private java.lang.String sysOrgCode; + /**试验ID*/ + @Excel(name = "试验ID", width = 15) + @Schema(description = "试验ID") + private java.lang.String experimentId; + /**样品类型*/ + @Excel(name = "样品类型", width = 15) + @Schema(description = "样品类型") + private java.lang.String sampleType; + /**样品型号*/ + @Excel(name = "样品型号", width = 15) + @Schema(description = "样品型号") + private java.lang.String sampleModel; + /**样品编号*/ + @Excel(name = "样品编号", width = 15) + @Schema(description = "样品编号") + private java.lang.String sampleNumber; + /**偏执条件*/ + @Excel(name = "偏执条件", width = 15) + @Schema(description = "偏执条件") + private java.lang.String offsetCondition; + /**负载*/ + @Excel(name = "负载", width = 15) + @Schema(description = "负载") + private java.lang.String loadCapacity; + /**图片*/ + @Excel(name = "图片", width = 15) + @Schema(description = "图片") + private java.lang.String sampleImage; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationEquipment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationEquipment.java new file mode 100644 index 0000000..84fa408 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationEquipment.java @@ -0,0 +1,89 @@ +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: 2024-12-05 + * @Version: V1.0 + */ +@Data +@TableName("experiment_deviation_equipment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="试验加偏设备信息") +public class ExperimentDeviationEquipment implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private java.lang.String id; + /**创建人*/ + @Schema(description = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @Schema(description = "所属部门") + private java.lang.String sysOrgCode; + /**试验ID*/ + @Excel(name = "试验ID", width = 15) + @Schema(description = "试验ID") + private java.lang.String experimentId; + /**样品类型*/ + @Excel(name = "样品类型", width = 15) + @Schema(description = "样品类型") + private java.lang.String sampleType; + /**样品型号*/ + @Excel(name = "样品型号", width = 15) + @Schema(description = "样品型号") + private java.lang.String sampleModel; + /**设备型号*/ + @Excel(name = "设备型号", width = 15) + @Schema(description = "设备型号") + private java.lang.String equipmentModel; + /**设备名称*/ + @Excel(name = "设备名称", width = 15) + @Schema(description = "设备名称") + private java.lang.String equipmentName; + /**设备类型*/ + @Excel(name = "设备类型", width = 15) + @Schema(description = "设备类型") + private java.lang.String equipmentType; + /**图片*/ + @Excel(name = "图片", width = 15) + @Schema(description = "图片") + private java.lang.String sampleImage; + /**计量有效期*/ + @Excel(name = "计量有效期", width = 15) + @Schema(description = "计量有效期") + private java.lang.String measurementValidity; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentIrradiationBoard.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentIrradiationBoard.java new file mode 100644 index 0000000..fc9495d --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentIrradiationBoard.java @@ -0,0 +1,89 @@ +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: 2024-12-05 + * @Version: V1.0 + */ +@Data +@TableName("experiment_irradiation_board") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="试验辐照板信息") +public class ExperimentIrradiationBoard implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private java.lang.String id; + /**创建人*/ + @Schema(description = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @Schema(description = "所属部门") + private java.lang.String sysOrgCode; + /**试验ID*/ + @Excel(name = "试验ID", width = 15) + @Schema(description = "试验ID") + private java.lang.String experimentId; + /**样品类型*/ + @Excel(name = "样品类型", width = 15) + @Schema(description = "样品类型") + private java.lang.String sampleType; + /**样品型号*/ + @Excel(name = "样品型号", width = 15) + @Schema(description = "样品型号") + private java.lang.String sampleModel; + /**辐照板数量*/ + @Excel(name = "辐照板数量", width = 15) + @Schema(description = "辐照板数量") + private java.lang.String irradiationBoardNumber; + /**辐照板编号*/ + @Excel(name = "辐照板编号", width = 15) + @Schema(description = "辐照板编号") + private java.lang.String irradiationBoardCode; + /**计量有效期*/ + @Excel(name = "计量有效期", width = 15) + @Schema(description = "计量有效期") + private java.lang.String measurementValidity; + /**占源面积*/ + @Excel(name = "占源面积", width = 15) + @Schema(description = "占源面积") + private java.lang.String sourceArea; + /**图片*/ + @Excel(name = "图片", width = 15) + @Schema(description = "图片") + private java.lang.String sampleImage; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.java new file mode 100644 index 0000000..951ebbe --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.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.ExperimentDeviationCondition; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 试验偏置条件信息 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +public interface ExperimentDeviationConditionMapper extends BaseMapper { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.java new file mode 100644 index 0000000..dde2386 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.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.ExperimentDeviationEquipment; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 试验加偏设备信息 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +public interface ExperimentDeviationEquipmentMapper extends BaseMapper { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentIrradiationBoardMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentIrradiationBoardMapper.java new file mode 100644 index 0000000..e5cae72 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentIrradiationBoardMapper.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.ExperimentIrradiationBoard; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 试验辐照板信息 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +public interface ExperimentIrradiationBoardMapper extends BaseMapper { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentDeviationConditionMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentDeviationConditionMapper.xml new file mode 100644 index 0000000..6aaa866 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentDeviationConditionMapper.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/ExperimentDeviationEquipmentMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentDeviationEquipmentMapper.xml new file mode 100644 index 0000000..3545d76 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentDeviationEquipmentMapper.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/ExperimentIrradiationBoardMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentIrradiationBoardMapper.xml new file mode 100644 index 0000000..8a4d425 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentIrradiationBoardMapper.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/IExperimentDeviationConditionService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationConditionService.java new file mode 100644 index 0000000..706d8e1 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationConditionService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.database.service; + +import org.jeecg.modules.database.entity.ExperimentDeviationCondition; +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; + +import java.util.List; + +/** + * @Description: 试验偏置条件信息 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +public interface IExperimentDeviationConditionService extends IService { + List getByExperimentId(String experimentId); + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationEquipmentService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationEquipmentService.java new file mode 100644 index 0000000..2420b05 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationEquipmentService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.database.service; + +import org.jeecg.modules.database.entity.ExperimentDeviationCondition; +import org.jeecg.modules.database.entity.ExperimentDeviationEquipment; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * @Description: 试验加偏设备信息 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +public interface IExperimentDeviationEquipmentService extends IService { + List getByExperimentId(String experimentId); + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentIrradiationBoardService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentIrradiationBoardService.java new file mode 100644 index 0000000..4843e70 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentIrradiationBoardService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.database.service; + +import org.jeecg.modules.database.entity.ExperimentDeviationEquipment; +import org.jeecg.modules.database.entity.ExperimentIrradiationBoard; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * @Description: 试验辐照板信息 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +public interface IExperimentIrradiationBoardService extends IService { + List getByExperimentId(String experimentId); + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java index ba9ae2d..2fb4b32 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java @@ -3,6 +3,8 @@ package org.jeecg.modules.database.service; import org.jeecg.modules.database.entity.ExperimentSampleInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @Description: 试验样品信息 * @Author: jeecg-boot @@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IExperimentSampleInfoService extends IService { + List getByExperimentId(String experimentId); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationConditionServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationConditionServiceImpl.java new file mode 100644 index 0000000..e3cc5af --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationConditionServiceImpl.java @@ -0,0 +1,25 @@ +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.ExperimentDeviationCondition; +import org.jeecg.modules.database.mapper.ExperimentDeviationConditionMapper; +import org.jeecg.modules.database.service.IExperimentDeviationConditionService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description: 试验偏置条件信息 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +@Service +public class ExperimentDeviationConditionServiceImpl extends ServiceImpl + implements IExperimentDeviationConditionService { + @Override + public List getByExperimentId(String experimentId) { + return list(new LambdaQueryWrapper().eq(ExperimentDeviationCondition::getExperimentId, experimentId)); + } +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java new file mode 100644 index 0000000..2f1b8f9 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java @@ -0,0 +1,25 @@ +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.ExperimentDeviationEquipment; +import org.jeecg.modules.database.mapper.ExperimentDeviationEquipmentMapper; +import org.jeecg.modules.database.service.IExperimentDeviationEquipmentService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description: 试验加偏设备信息 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +@Service +public class ExperimentDeviationEquipmentServiceImpl extends ServiceImpl + implements IExperimentDeviationEquipmentService { + @Override + public List getByExperimentId(String experimentId) { + return list(new LambdaQueryWrapper().eq(ExperimentDeviationEquipment::getExperimentId, experimentId)); + } +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java new file mode 100644 index 0000000..7657834 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java @@ -0,0 +1,27 @@ +package org.jeecg.modules.database.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.modules.database.entity.ExperimentIrradiationBoard; +import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import org.jeecg.modules.database.mapper.ExperimentIrradiationBoardMapper; +import org.jeecg.modules.database.service.IExperimentIrradiationBoardService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.List; + +/** + * @Description: 试验辐照板信息 + * @Author: jeecg-boot + * @Date: 2024-12-05 + * @Version: V1.0 + */ +@Service +public class ExperimentIrradiationBoardServiceImpl extends ServiceImpl implements IExperimentIrradiationBoardService { + + @Override + public List getByExperimentId(String experimentId) { + return list(new LambdaQueryWrapper().eq(ExperimentIrradiationBoard::getExperimentId, experimentId)); + } +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java index 8aad914..829ddf3 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java @@ -1,19 +1,26 @@ 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.ExperimentSampleInfo; import org.jeecg.modules.database.mapper.ExperimentSampleInfoMapper; import org.jeecg.modules.database.service.IExperimentSampleInfoService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 试验样品信息 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-04 * @Version: V1.0 */ @Service -public class ExperimentSampleInfoServiceImpl extends ServiceImpl implements IExperimentSampleInfoService { +public class ExperimentSampleInfoServiceImpl extends ServiceImpl + implements IExperimentSampleInfoService { + @Override + public List getByExperimentId(String experimentId) { + return list(new LambdaQueryWrapper().eq(ExperimentSampleInfo::getExperimentId, experimentId)); + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java index a076ff4..ee2aa58 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java @@ -3,11 +3,9 @@ package org.jeecg.modules.database.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; -import org.jeecg.modules.database.entity.Experiment; -import org.jeecg.modules.database.entity.ExperimentUser; +import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.mapper.ExperimentMapper; -import org.jeecg.modules.database.service.IExperimentService; -import org.jeecg.modules.database.service.IExperimentUserService; +import org.jeecg.modules.database.service.*; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -26,9 +24,17 @@ import java.util.stream.Collectors; @Service public class ExperimentServiceImpl extends ServiceImpl implements IExperimentService { @Autowired - private ISysUserService userService; + private ISysUserService userService; @Autowired - private IExperimentUserService experimentUserService; + private IExperimentUserService experimentUserService; + @Autowired + private IExperimentSampleInfoService experimentSampleInfoService; + @Autowired + private IExperimentDeviationConditionService experimentDeviationConditionService; + @Autowired + private IExperimentDeviationEquipmentService experimentDeviationEquipmentService; + @Autowired + private IExperimentIrradiationBoardService experimentIrradiationBoardService; @Override public void fetchExperimentDetail(Experiment experiment) { @@ -49,5 +55,29 @@ public class ExperimentServiceImpl extends ServiceImpl sampleInfoList = experimentSampleInfoService.getByExperimentId( + experiment.getId()); + if (CollUtil.isNotEmpty(sampleInfoList)) { + experiment.setSampleInfoList(sampleInfoList); + } + + List deviationConditionList = experimentDeviationConditionService.getByExperimentId( + experiment.getId()); + if (CollUtil.isNotEmpty(deviationConditionList)) { + experiment.setDeviationConditionList(deviationConditionList); + } + + List deviationEquipmentList = experimentDeviationEquipmentService.getByExperimentId( + experiment.getId()); + if (CollUtil.isNotEmpty(deviationEquipmentList)) { + experiment.setDeviationEquipmentList(deviationEquipmentList); + } + + List irradiationBoardList = experimentIrradiationBoardService.getByExperimentId(experiment.getId()); + if (CollUtil.isNotEmpty(irradiationBoardList)) { + experiment.setIrradiationBoardList(irradiationBoardList); + } + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSampleInfoForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSampleInfoForm.vue deleted file mode 100644 index 69200fb..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSampleInfoForm.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSampleInfoList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSampleInfoList.vue deleted file mode 100644 index cbe6de6..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSampleInfoList.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSequenceForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSequenceForm.vue deleted file mode 100644 index 715b5d0..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSequenceForm.vue +++ /dev/null @@ -1,83 +0,0 @@ - - - diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSequenceList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSequenceList.vue deleted file mode 100644 index a0afff7..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentSequenceList.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSampleInfo.api.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSampleInfo.api.ts deleted file mode 100644 index b30c50c..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSampleInfo.api.ts +++ /dev/null @@ -1,64 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import { useMessage } from "/@/hooks/web/useMessage"; - -const { createConfirm } = useMessage(); - -enum Api { - list = '/database/experimentSampleInfo/list', - save='/database/experimentSampleInfo/add', - edit='/database/experimentSampleInfo/edit', - deleteOne = '/database/experimentSampleInfo/delete', - deleteBatch = '/database/experimentSampleInfo/deleteBatch', - importExcel = '/database/experimentSampleInfo/importExcel', - exportXls = '/database/experimentSampleInfo/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/ExperimentSampleInfo.data.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSampleInfo.data.ts deleted file mode 100644 index a4ab1a7..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSampleInfo.data.ts +++ /dev/null @@ -1,105 +0,0 @@ -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: '样品类型', - align:"center", - dataIndex: 'sampleType' - }, - { - title: '样品型号', - align:"center", - dataIndex: 'sampleModel' - }, - { - title: '样品批次', - align:"center", - dataIndex: 'sampleBatch' - }, - { - title: '生产厂家', - align:"center", - dataIndex: 'sampleManufacturer' - }, - { - title: '图片', - align:"center", - dataIndex: 'sampleImage' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '试验ID', - field: 'experimentId', - component: 'Input', - dynamicRules: ({model,schema}) => { - return [ - { required: true, message: '请输入试验ID!'}, - ]; - }, - }, - { - label: '样品类型', - field: 'sampleType', - component: 'Input', - }, - { - label: '样品型号', - field: 'sampleModel', - component: 'Input', - }, - { - label: '样品批次', - field: 'sampleBatch', - component: 'Input', - }, - { - label: '生产厂家', - field: 'sampleManufacturer', - component: 'Input', - }, - { - label: '图片', - field: 'sampleImage', - component: 'Input', - }, - // TODO 主键隐藏字段,目前写死为ID - { - label: '', - field: 'id', - component: 'Input', - show: false - }, -]; - -// 高级查询数据 -export const superQuerySchema = { - experimentId: {title: '试验ID',order: 0,view: 'text', type: 'string',}, - sampleType: {title: '样品类型',order: 1,view: 'text', type: 'string',}, - sampleModel: {title: '样品型号',order: 2,view: 'text', type: 'string',}, - sampleBatch: {title: '样品批次',order: 3,view: 'text', type: 'string',}, - sampleManufacturer: {title: '生产厂家',order: 4,view: 'text', type: 'string',}, - sampleImage: {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/ExperimentSampleInfoList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSampleInfoList.vue deleted file mode 100644 index f76df41..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSampleInfoList.vue +++ /dev/null @@ -1,188 +0,0 @@ - - - - - \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSequence.api.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSequence.api.ts deleted file mode 100644 index 7e8692b..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSequence.api.ts +++ /dev/null @@ -1,64 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import { useMessage } from "/@/hooks/web/useMessage"; - -const { createConfirm } = useMessage(); - -enum Api { - list = '/database/experimentSequence/list', - save='/database/experimentSequence/add', - edit='/database/experimentSequence/edit', - deleteOne = '/database/experimentSequence/delete', - deleteBatch = '/database/experimentSequence/deleteBatch', - importExcel = '/database/experimentSequence/importExcel', - exportXls = '/database/experimentSequence/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/ExperimentSequence.data.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSequence.data.ts deleted file mode 100644 index 58aaa3f..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSequence.data.ts +++ /dev/null @@ -1,50 +0,0 @@ -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: 'sequenceValue' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '序列值', - field: 'sequenceValue', - component: 'Input', - dynamicRules: ({model,schema}) => { - return [ - { required: true, message: '请输入序列值!'}, - ]; - }, - }, - // TODO 主键隐藏字段,目前写死为ID - { - label: '', - field: 'id', - component: 'Input', - show: false - }, -]; - -// 高级查询数据 -export const superQuerySchema = { - sequenceValue: {title: '序列值',order: 0,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/ExperimentSequenceList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSequenceList.vue deleted file mode 100644 index 219ef7a..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentSequenceList.vue +++ /dev/null @@ -1,188 +0,0 @@ - - - - - \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241204_1__menu_insert_ExperimentSampleInfo.sql b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241204_1__menu_insert_ExperimentSampleInfo.sql deleted file mode 100644 index 9fc1082..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241204_1__menu_insert_ExperimentSampleInfo.sql +++ /dev/null @@ -1,26 +0,0 @@ --- 注意:该页面对应的前台目录为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 ('202412040408790140', NULL, '试验样品信息', '/database/experimentSampleInfoList', 'database/ExperimentSampleInfoList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-12-04 16:08:14', 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 ('202412040408790141', '202412040408790140', '添加试验样品信息', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sample_info:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:08:14', 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 ('202412040408790142', '202412040408790140', '编辑试验样品信息', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sample_info:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:08:14', 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 ('202412040408790143', '202412040408790140', '删除试验样品信息', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sample_info:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:08:14', 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 ('202412040408790144', '202412040408790140', '批量删除试验样品信息', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sample_info:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:08:14', 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 ('202412040408790145', '202412040408790140', '导出excel_试验样品信息', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sample_info:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:08:14', 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 ('202412040408790146', '202412040408790140', '导入excel_试验样品信息', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sample_info:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:08:14', 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/V20241204_1__menu_insert_ExperimentSequence.sql b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241204_1__menu_insert_ExperimentSequence.sql deleted file mode 100644 index 503df7c..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241204_1__menu_insert_ExperimentSequence.sql +++ /dev/null @@ -1,26 +0,0 @@ --- 注意:该页面对应的前台目录为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 ('2024120404071620580', NULL, '试验序列', '/database/experimentSequenceList', 'database/ExperimentSequenceList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-12-04 16:07:58', 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 ('2024120404071630581', '2024120404071620580', '添加试验序列', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sequence:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:07:58', 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 ('2024120404071630582', '2024120404071620580', '编辑试验序列', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sequence:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:07:58', 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 ('2024120404071630583', '2024120404071620580', '删除试验序列', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sequence:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:07:58', 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 ('2024120404071630584', '2024120404071620580', '批量删除试验序列', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sequence:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:07:58', 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 ('2024120404071630585', '2024120404071620580', '导出excel_试验序列', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sequence:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:07:58', 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 ('2024120404071630586', '2024120404071620580', '导入excel_试验序列', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_sequence:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-04 16:07:58', 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/ExperimentSampleInfoForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentSampleInfoForm.vue deleted file mode 100644 index 126f825..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentSampleInfoForm.vue +++ /dev/null @@ -1,70 +0,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/ExperimentSampleInfoModal.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentSampleInfoModal.vue deleted file mode 100644 index d6b25b6..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentSampleInfoModal.vue +++ /dev/null @@ -1,68 +0,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/ExperimentSequenceForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentSequenceForm.vue deleted file mode 100644 index fbd2cf1..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentSequenceForm.vue +++ /dev/null @@ -1,70 +0,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/ExperimentSequenceModal.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentSequenceModal.vue deleted file mode 100644 index 26bd432..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentSequenceModal.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - \ No newline at end of file