From 35e48104b9f6084b84ce51a8f3a8d5c70aa1456e Mon Sep 17 00:00:00 2001 From: ls Date: Tue, 15 Oct 2024 11:24:42 +0800 Subject: [PATCH] update --- .../ExperimentRadiationProcessController.java | 178 +++++++++++++++++ ...a => ExperimentTestProcessController.java} | 94 ++++----- ...l.java => ExperimentRadiationProcess.java} | 38 +++- .../entity/ExperimentTestProcess.java | 101 ++++++++++ .../ExperimentRadiationProcessMapper.java | 17 ++ ....java => ExperimentTestProcessMapper.java} | 8 +- .../xml/ExperimentRadiationProcessMapper.xml | 5 + .../xml/ExperimentTestProcessMapper.xml | 5 + ...lMapper.xml => RadiationProcessMapper.xml} | 2 +- .../service/IExperimentDetailService.java | 14 -- .../IExperimentRadiationProcessService.java | 14 ++ .../IExperimentTestProcessService.java | 14 ++ .../impl/ExperimentDetailServiceImpl.java | 19 -- ...ExperimentRadiationProcessServiceImpl.java | 19 ++ .../ExperimentTestProcessServiceImpl.java | 19 ++ .../database/uniapp/CrawlerRecordForm.vue | 107 ---------- .../database/uniapp/CrawlerRecordList.vue | 44 ---- .../database/vue3/CrawlerRecord.api.ts | 64 ------ .../database/vue3/CrawlerRecord.data.ts | 89 --------- .../database/vue3/CrawlerRecordList.vue | 188 ------------------ ...V20240903_1__menu_insert_CrawlerRecord.sql | 26 --- .../vue3/components/CrawlerRecordForm.vue | 70 ------- .../vue3/components/CrawlerRecordModal.vue | 68 ------- 23 files changed, 457 insertions(+), 746 deletions(-) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java rename physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/{ExperimentDetailController.java => ExperimentTestProcessController.java} (53%) rename physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/{ExperimentDetail.java => ExperimentRadiationProcess.java} (60%) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRadiationProcessMapper.java rename physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/{ExperimentDetailMapper.java => ExperimentTestProcessMapper.java} (51%) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentRadiationProcessMapper.xml create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentTestProcessMapper.xml rename physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/{ExperimentDetailMapper.xml => RadiationProcessMapper.xml} (62%) delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDetailService.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDetailServiceImpl.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java delete mode 100755 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/CrawlerRecordForm.vue delete mode 100755 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/CrawlerRecordList.vue delete mode 100755 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/CrawlerRecord.api.ts delete mode 100755 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/CrawlerRecord.data.ts delete mode 100755 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/CrawlerRecordList.vue delete mode 100755 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20240903_1__menu_insert_CrawlerRecord.sql delete mode 100755 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/CrawlerRecordForm.vue delete mode 100755 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/CrawlerRecordModal.vue diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java new file mode 100644 index 0000000..0293043 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.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.ExperimentRadiationProcess; +import org.jeecg.modules.database.service.IExperimentRadiationProcessService; + +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-10-15 + * @Version: V1.0 + */ +@Tag(name="辐照过程") +@RestController +@RequestMapping("/database/experimentRadiationProcess") +@Slf4j +public class ExperimentRadiationProcessController extends JeecgController { + @Autowired + private IExperimentRadiationProcessService experimentRadiationProcessService; + + /** + * 分页列表查询 + * + * @param experimentRadiationProcess + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "辐照过程-分页列表查询") + @Operation(summary="辐照过程-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentRadiationProcess experimentRadiationProcess, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentRadiationProcess, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentRadiationProcessService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experimentRadiationProcess + * @return + */ + @AutoLog(value = "辐照过程-添加") + @Operation(summary="辐照过程-添加") + @RequiresPermissions("database:experiment_radiation_process:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ExperimentRadiationProcess experimentRadiationProcess) { + experimentRadiationProcessService.save(experimentRadiationProcess); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param experimentRadiationProcess + * @return + */ + @AutoLog(value = "辐照过程-编辑") + @Operation(summary="辐照过程-编辑") + @RequiresPermissions("database:experiment_radiation_process:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ExperimentRadiationProcess experimentRadiationProcess) { + experimentRadiationProcessService.updateById(experimentRadiationProcess); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "辐照过程-通过id删除") + @Operation(summary="辐照过程-通过id删除") + @RequiresPermissions("database:experiment_radiation_process:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + experimentRadiationProcessService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "辐照过程-批量删除") + @Operation(summary="辐照过程-批量删除") + @RequiresPermissions("database:experiment_radiation_process:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.experimentRadiationProcessService.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) { + ExperimentRadiationProcess experimentRadiationProcess = experimentRadiationProcessService.getById(id); + if(experimentRadiationProcess==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentRadiationProcess); + } + + /** + * 导出excel + * + * @param request + * @param experimentRadiationProcess + */ + @RequiresPermissions("database:experiment_radiation_process:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ExperimentRadiationProcess experimentRadiationProcess) { + return super.exportXls(request, experimentRadiationProcess, ExperimentRadiationProcess.class, "辐照过程"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("database:experiment_radiation_process:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ExperimentRadiationProcess.class); + } + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDetailController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java similarity index 53% rename from physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDetailController.java rename to physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java index 5cbc026..5994965 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDetailController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java @@ -12,8 +12,8 @@ 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.ExperimentDetail; -import org.jeecg.modules.database.service.IExperimentDetailService; +import org.jeecg.modules.database.entity.ExperimentTestProcess; +import org.jeecg.modules.database.service.IExperimentTestProcessService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -38,68 +38,68 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; /** - * @Description: 试验详情 + * @Description: 测试过程 * @Author: jeecg-boot - * @Date: 2024-08-30 + * @Date: 2024-10-15 * @Version: V1.0 */ -@Tag(name="试验详情") +@Tag(name="测试过程") @RestController -@RequestMapping("/database/experimentDetail") +@RequestMapping("/database/experimentTestProcess") @Slf4j -public class ExperimentDetailController extends JeecgController { +public class ExperimentTestProcessController extends JeecgController { @Autowired - private IExperimentDetailService experimentDetailService; + private IExperimentTestProcessService experimentTestProcessService; /** * 分页列表查询 * - * @param experimentDetail + * @param experimentTestProcess * @param pageNo * @param pageSize * @param req * @return */ - //@AutoLog(value = "试验详情-分页列表查询") - @Operation(summary="试验详情-分页列表查询") + //@AutoLog(value = "测试过程-分页列表查询") + @Operation(summary="测试过程-分页列表查询") @GetMapping(value = "/list") - public Result> queryPageList(ExperimentDetail experimentDetail, + public Result> queryPageList(ExperimentTestProcess experimentTestProcess, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentDetail, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = experimentDetailService.page(page, queryWrapper); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentTestProcess, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentTestProcessService.page(page, queryWrapper); return Result.OK(pageList); } /** * 添加 * - * @param experimentDetail + * @param experimentTestProcess * @return */ - @AutoLog(value = "试验详情-添加") - @Operation(summary="试验详情-添加") - @RequiresPermissions("database:experiment_detail:add") + @AutoLog(value = "测试过程-添加") + @Operation(summary="测试过程-添加") + @RequiresPermissions("database:experiment_test_process:add") @PostMapping(value = "/add") - public Result add(@RequestBody ExperimentDetail experimentDetail) { - experimentDetailService.save(experimentDetail); + public Result add(@RequestBody ExperimentTestProcess experimentTestProcess) { + experimentTestProcessService.save(experimentTestProcess); return Result.OK("添加成功！"); } /** * 编辑 * - * @param experimentDetail + * @param experimentTestProcess * @return */ - @AutoLog(value = "试验详情-编辑") - @Operation(summary="试验详情-编辑") - @RequiresPermissions("database:experiment_detail:edit") + @AutoLog(value = "测试过程-编辑") + @Operation(summary="测试过程-编辑") + @RequiresPermissions("database:experiment_test_process:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ExperimentDetail experimentDetail) { - experimentDetailService.updateById(experimentDetail); + public Result edit(@RequestBody ExperimentTestProcess experimentTestProcess) { + experimentTestProcessService.updateById(experimentTestProcess); return Result.OK("编辑成功!"); } @@ -109,12 +109,12 @@ public class ExperimentDetailController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { - experimentDetailService.removeById(id); + experimentTestProcessService.removeById(id); return Result.OK("删除成功!"); } @@ -124,12 +124,12 @@ public class ExperimentDetailController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.experimentDetailService.removeByIds(Arrays.asList(ids.split(","))); + this.experimentTestProcessService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -139,27 +139,27 @@ public class ExperimentDetailController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - ExperimentDetail experimentDetail = experimentDetailService.getById(id); - if(experimentDetail==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + ExperimentTestProcess experimentTestProcess = experimentTestProcessService.getById(id); + if(experimentTestProcess==null) { return Result.error("未找到对应数据"); } - return Result.OK(experimentDetail); + return Result.OK(experimentTestProcess); } /** * 导出excel * * @param request - * @param experimentDetail + * @param experimentTestProcess */ - @RequiresPermissions("database:experiment_detail:exportXls") + @RequiresPermissions("database:experiment_test_process:exportXls") @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ExperimentDetail experimentDetail) { - return super.exportXls(request, experimentDetail, ExperimentDetail.class, "试验详情"); + public ModelAndView exportXls(HttpServletRequest request, ExperimentTestProcess experimentTestProcess) { + return super.exportXls(request, experimentTestProcess, ExperimentTestProcess.class, "测试过程"); } /** @@ -169,10 +169,10 @@ public class ExperimentDetailController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ExperimentDetail.class); + return super.importExcel(request, response, ExperimentTestProcess.class); } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDetail.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRadiationProcess.java similarity index 60% rename from physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDetail.java rename to physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRadiationProcess.java index 6b8bdfa..fab6514 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDetail.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRadiationProcess.java @@ -18,17 +18,17 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: 试验详情 + * @Description: 辐照过程 * @Author: jeecg-boot - * @Date: 2024-08-30 + * @Date: 2024-10-15 * @Version: V1.0 */ @Data -@TableName("experiment_detail") +@TableName("experiment_radiation_process") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(description="试验详情") -public class ExperimentDetail implements Serializable { +@Schema(description="辐照过程") +public class ExperimentRadiationProcess implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ @@ -54,6 +54,34 @@ public class ExperimentDetail implements Serializable { /**所属部门*/ @Schema(description = "所属部门") private String sysOrgCode; + /** 辐照源*/ + @Excel(name = " 辐照源", width = 15) + @Schema(description = " 辐照源") + private String radiationSource; + /**计量率*/ + @Excel(name = "计量率", width = 15) + @Schema(description = "计量率") + private String measurementRate; + /**辐照标准*/ + @Excel(name = "辐照标准", width = 15) + @Schema(description = "辐照标准") + private String radiationStandard; + /**环境温度*/ + @Excel(name = "环境温度", width = 15) + @Schema(description = "环境温度") + private String environmentalTemperature; + /**备注*/ + @Excel(name = "备注", width = 15) + @Schema(description = "备注") + private String comment; + /**异常记录*/ + @Excel(name = "异常记录", width = 15) + @Schema(description = "异常记录") + private String exceptionRecord; + /**辐照详情（json存储）*/ + @Excel(name = "辐照详情（json存储）", width = 15) + @Schema(description = "辐照详情（json存储）") + private String radiationDetail; /**试验ID*/ @Excel(name = "试验ID", width = 15) @Schema(description = "试验ID") diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java new file mode 100644 index 0000000..3c1f9e3 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java @@ -0,0 +1,101 @@ +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-10-15 + * @Version: V1.0 + */ +@Data +@TableName("experiment_test_process") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="测试过程") +public class ExperimentTestProcess implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private String id; + /**创建人*/ + @Schema(description = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建日期") + private Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新日期") + private Date updateTime; + /**所属部门*/ + @Schema(description = "所属部门") + private String sysOrgCode; + /** 辐照源*/ + @Excel(name = " 辐照源", width = 15) + @Schema(description = " 辐照源") + private String radiationSource; + /**计量率*/ + @Excel(name = "计量率", width = 15) + @Schema(description = "计量率") + private String measurementRate; + /**辐照标准*/ + @Excel(name = "辐照标准", width = 15) + @Schema(description = "辐照标准") + private String radiationStandard; + /**环境温度*/ + @Excel(name = "环境温度", width = 15) + @Schema(description = "环境温度") + private String environmentalTemperature; + /**备注*/ + @Excel(name = "备注", width = 15) + @Schema(description = "备注") + private String comment; + /**异常记录*/ + @Excel(name = "异常记录", width = 15) + @Schema(description = "异常记录") + private String exceptionRecord; + /**辐照详情（json存储）*/ + @Excel(name = "辐照详情（json存储）", width = 15) + @Schema(description = "辐照详情（json存储）") + private String radiationDetail; + /**试验ID*/ + @Excel(name = "试验ID", width = 15) + @Schema(description = "试验ID") + private String experimentId; + /**辐照开始时间*/ + @Excel(name = "辐照开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "辐照开始时间") + private Date radiationStartTime; + /**辐照结束时间*/ + @Excel(name = "辐照结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "辐照结束时间") + private Date radiationEndTime; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRadiationProcessMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRadiationProcessMapper.java new file mode 100644 index 0000000..b5504da --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRadiationProcessMapper.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.ExperimentRadiationProcess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 辐照过程 + * @Author: jeecg-boot + * @Date: 2024-10-15 + * @Version: V1.0 + */ +public interface ExperimentRadiationProcessMapper extends BaseMapper { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDetailMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentTestProcessMapper.java similarity index 51% rename from physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDetailMapper.java rename to physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentTestProcessMapper.java index fba5243..f6bb0ba 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDetailMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentTestProcessMapper.java @@ -3,15 +3,15 @@ package org.jeecg.modules.database.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.database.entity.ExperimentDetail; +import org.jeecg.modules.database.entity.ExperimentTestProcess; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 试验详情 + * @Description: 测试过程 * @Author: jeecg-boot - * @Date: 2024-08-30 + * @Date: 2024-10-15 * @Version: V1.0 */ -public interface ExperimentDetailMapper extends BaseMapper { +public interface ExperimentTestProcessMapper extends BaseMapper { } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentRadiationProcessMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentRadiationProcessMapper.xml new file mode 100644 index 0000000..463a6a3 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentRadiationProcessMapper.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/ExperimentTestProcessMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentTestProcessMapper.xml new file mode 100644 index 0000000..8c24d38 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentTestProcessMapper.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/ExperimentDetailMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/RadiationProcessMapper.xml similarity index 62% rename from physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentDetailMapper.xml rename to physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/RadiationProcessMapper.xml index e5a0c5d..3017ea4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentDetailMapper.xml +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/RadiationProcessMapper.xml @@ -1,5 +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/IExperimentDetailService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDetailService.java deleted file mode 100644 index de0e127..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDetailService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.database.service; - -import org.jeecg.modules.database.entity.ExperimentDetail; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 试验详情 - * @Author: jeecg-boot - * @Date: 2024-08-30 - * @Version: V1.0 - */ -public interface IExperimentDetailService extends IService { - -} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java new file mode 100644 index 0000000..e51e0b4 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.database.service; + +import org.jeecg.modules.database.entity.ExperimentRadiationProcess; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 辐照过程 + * @Author: jeecg-boot + * @Date: 2024-10-15 + * @Version: V1.0 + */ +public interface IExperimentRadiationProcessService extends IService { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java new file mode 100644 index 0000000..8cf1cb8 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.database.service; + +import org.jeecg.modules.database.entity.ExperimentTestProcess; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 测试过程 + * @Author: jeecg-boot + * @Date: 2024-10-15 + * @Version: V1.0 + */ +public interface IExperimentTestProcessService extends IService { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDetailServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDetailServiceImpl.java deleted file mode 100644 index ac1515d..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDetailServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.database.service.impl; - -import org.jeecg.modules.database.entity.ExperimentDetail; -import org.jeecg.modules.database.mapper.ExperimentDetailMapper; -import org.jeecg.modules.database.service.IExperimentDetailService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 试验详情 - * @Author: jeecg-boot - * @Date: 2024-08-30 - * @Version: V1.0 - */ -@Service -public class ExperimentDetailServiceImpl extends ServiceImpl implements IExperimentDetailService { - -} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java new file mode 100644 index 0000000..90bb49c --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.database.service.impl; + +import org.jeecg.modules.database.entity.ExperimentRadiationProcess; +import org.jeecg.modules.database.mapper.ExperimentRadiationProcessMapper; +import org.jeecg.modules.database.service.IExperimentRadiationProcessService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 辐照过程 + * @Author: jeecg-boot + * @Date: 2024-10-15 + * @Version: V1.0 + */ +@Service +public class ExperimentRadiationProcessServiceImpl extends ServiceImpl implements IExperimentRadiationProcessService { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java new file mode 100644 index 0000000..e496a73 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.database.service.impl; + +import org.jeecg.modules.database.entity.ExperimentTestProcess; +import org.jeecg.modules.database.mapper.ExperimentTestProcessMapper; +import org.jeecg.modules.database.service.IExperimentTestProcessService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 测试过程 + * @Author: jeecg-boot + * @Date: 2024-10-15 + * @Version: V1.0 + */ +@Service +public class ExperimentTestProcessServiceImpl extends ServiceImpl implements IExperimentTestProcessService { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/CrawlerRecordForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/CrawlerRecordForm.vue deleted file mode 100755 index 085b415..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/CrawlerRecordForm.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/CrawlerRecordList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/CrawlerRecordList.vue deleted file mode 100755 index ca2f5db..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/CrawlerRecordList.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/CrawlerRecord.api.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/CrawlerRecord.api.ts deleted file mode 100755 index 7e36641..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/CrawlerRecord.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/crawlerRecord/list', - save='/database/crawlerRecord/add', - edit='/database/crawlerRecord/edit', - deleteOne = '/database/crawlerRecord/delete', - deleteBatch = '/database/crawlerRecord/deleteBatch', - importExcel = '/database/crawlerRecord/importExcel', - exportXls = '/database/crawlerRecord/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/CrawlerRecord.data.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/CrawlerRecord.data.ts deleted file mode 100755 index 18b9fda..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/CrawlerRecord.data.ts +++ /dev/null @@ -1,89 +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: 'source' - }, - { - title: '编号', - align:"center", - dataIndex: 'code' - }, - { - title: '名称', - align:"center", - dataIndex: 'name' - }, - { - title: '文件名', - align:"center", - dataIndex: 'fileName' - }, - { - title: '文件ID', - align:"center", - dataIndex: 'fileId' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '来源', - field: 'source', - component: 'Input', - }, - { - label: '编号', - field: 'code', - component: 'Input', - }, - { - label: '名称', - field: 'name', - component: 'Input', - }, - { - label: '文件名', - field: 'fileName', - component: 'Input', - }, - { - label: '文件ID', - field: 'fileId', - component: 'Input', - }, - // TODO 主键隐藏字段，目前写死为ID - { - label: '', - field: 'id', - component: 'Input', - show: false - }, -]; - -// 高级查询数据 -export const superQuerySchema = { - source: {title: '来源',order: 0,view: 'text', type: 'string',}, - code: {title: '编号',order: 1,view: 'text', type: 'string',}, - name: {title: '名称',order: 2,view: 'text', type: 'string',}, - fileName: {title: '文件名',order: 3,view: 'text', type: 'string',}, - fileId: {title: '文件ID',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/CrawlerRecordList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/CrawlerRecordList.vue deleted file mode 100755 index da9d5d8..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/CrawlerRecordList.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/V20240903_1__menu_insert_CrawlerRecord.sql b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20240903_1__menu_insert_CrawlerRecord.sql deleted file mode 100755 index 962ef97..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20240903_1__menu_insert_CrawlerRecord.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 ('2024090305284770040', NULL, '爬虫记录', '/database/crawlerRecordList', 'database/CrawlerRecordList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-09-03 17:28: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 ('2024090305284770041', '2024090305284770040', '添加爬虫记录', NULL, NULL, 0, NULL, NULL, 2, 'database:crawler_record:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-03 17:28: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 ('2024090305284770042', '2024090305284770040', '编辑爬虫记录', NULL, NULL, 0, NULL, NULL, 2, 'database:crawler_record:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-03 17:28: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 ('2024090305284770043', '2024090305284770040', '删除爬虫记录', NULL, NULL, 0, NULL, NULL, 2, 'database:crawler_record:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-03 17:28: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 ('2024090305284770044', '2024090305284770040', '批量删除爬虫记录', NULL, NULL, 0, NULL, NULL, 2, 'database:crawler_record:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-03 17:28: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 ('2024090305284770045', '2024090305284770040', '导出excel_爬虫记录', NULL, NULL, 0, NULL, NULL, 2, 'database:crawler_record:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-03 17:28: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 ('2024090305284770046', '2024090305284770040', '导入excel_爬虫记录', NULL, NULL, 0, NULL, NULL, 2, 'database:crawler_record:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-03 17:28: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/components/CrawlerRecordForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/CrawlerRecordForm.vue deleted file mode 100755 index 0a5c484..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/CrawlerRecordForm.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/CrawlerRecordModal.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/CrawlerRecordModal.vue deleted file mode 100755 index d5294dc..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/CrawlerRecordModal.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - \ No newline at end of file