From 90054a0cf04a4836f6d8ac48e65e94acfc078e1e Mon Sep 17 00:00:00 2001 From: ls Date: Mon, 21 Oct 2024 11:21:15 +0800 Subject: [PATCH] update --- docker-compose.yml | 9 + .../ExperimentAnnealProcessController.java | 178 +++++++++++++++++ ...oller.java => ImportRecordController.java} | 80 ++++---- .../database/entity/CrawlerRecord.java | 145 -------------- .../entity/ExperimentAnnealProcess.java | 89 +++++++++ .../modules/database/entity/ImportRecord.java | 103 ++++++++++ ...ava => ExperimentAnnealProcessMapper.java} | 8 +- .../database/mapper/ImportRecordMapper.java | 14 ++ .../mapper/xml/CrawlerRecordMapper.xml | 2 +- .../xml/ExperimentAnnealProcessMapper.xml | 5 + .../IExperimentAnnealProcessService.java | 14 ++ ...Service.java => IImportRecordService.java} | 4 +- .../ExperimentAnnealProcessServiceImpl.java | 19 ++ ...Impl.java => ImportRecordServiceImpl.java} | 57 +++--- .../uniapp/ExperimentAnnealProcessForm.vue | 125 ++++++++++++ .../uniapp/ExperimentAnnealProcessList.vue | 44 ++++ .../vue3/ExperimentAnnealProcess.api.ts | 64 ++++++ .../vue3/ExperimentAnnealProcess.data.ts | 122 ++++++++++++ .../vue3/ExperimentAnnealProcessList.vue | 188 ++++++++++++++++++ ...1__menu_insert_ExperimentAnnealProcess.sql | 26 +++ .../ExperimentAnnealProcessForm.vue | 70 +++++++ .../ExperimentAnnealProcessModal.vue | 68 +++++++ scripts/Dockerfile | 5 + scripts/build.sh | 1 + scripts/requirements.txt | 1 + 25 files changed, 1218 insertions(+), 223 deletions(-) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java rename physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/{CrawlerRecordController.java => ImportRecordController.java} (60%) delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/CrawlerRecord.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ImportRecord.java rename physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/{CrawlerRecordMapper.java => ExperimentAnnealProcessMapper.java} (51%) mode change 100755 => 100644 create mode 100755 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ImportRecordMapper.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentAnnealProcessMapper.xml create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java rename physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/{ICrawlerRecordService.java => IImportRecordService.java} (67%) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java rename physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/{CrawlerRecordServiceImpl.java => ImportRecordServiceImpl.java} (85%) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentAnnealProcessForm.vue create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentAnnealProcessList.vue create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentAnnealProcess.api.ts create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentAnnealProcess.data.ts create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentAnnealProcessList.vue create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241021_1__menu_insert_ExperimentAnnealProcess.sql create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentAnnealProcessForm.vue create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentAnnealProcessModal.vue create mode 100644 scripts/build.sh diff --git a/docker-compose.yml b/docker-compose.yml index 41e0092..c51e3e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -78,6 +78,15 @@ services: - physical-boot ports: - 8005:80 + physical-crawler: + container_name: physical-crawler + image: registry.cn-shanghai.aliyuncs.com/physical/physical-crawler + ports: + - "25000:5000" + environment: + - FLASK_ENV=production + volumes: + - ./crawler_files:/app/downloaded_files networks: physical-boot: diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java new file mode 100644 index 0000000..f415f09 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.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.ExperimentAnnealProcess; +import org.jeecg.modules.database.service.IExperimentAnnealProcessService; + +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-21 + * @Version: V1.0 + */ +@Tag(name="退火过程") +@RestController +@RequestMapping("/database/experimentAnnealProcess") +@Slf4j +public class ExperimentAnnealProcessController extends JeecgController { + @Autowired + private IExperimentAnnealProcessService experimentAnnealProcessService; + + /** + * 分页列表查询 + * + * @param experimentAnnealProcess + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "退火过程-分页列表查询") + @Operation(summary="退火过程-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentAnnealProcess experimentAnnealProcess, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentAnnealProcess, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentAnnealProcessService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experimentAnnealProcess + * @return + */ + @AutoLog(value = "退火过程-添加") + @Operation(summary="退火过程-添加") + @RequiresPermissions("database:experiment_anneal_process:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ExperimentAnnealProcess experimentAnnealProcess) { + experimentAnnealProcessService.save(experimentAnnealProcess); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param experimentAnnealProcess + * @return + */ + @AutoLog(value = "退火过程-编辑") + @Operation(summary="退火过程-编辑") + @RequiresPermissions("database:experiment_anneal_process:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ExperimentAnnealProcess experimentAnnealProcess) { + experimentAnnealProcessService.updateById(experimentAnnealProcess); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "退火过程-通过id删除") + @Operation(summary="退火过程-通过id删除") + @RequiresPermissions("database:experiment_anneal_process:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + experimentAnnealProcessService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "退火过程-批量删除") + @Operation(summary="退火过程-批量删除") + @RequiresPermissions("database:experiment_anneal_process:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.experimentAnnealProcessService.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) { + ExperimentAnnealProcess experimentAnnealProcess = experimentAnnealProcessService.getById(id); + if(experimentAnnealProcess==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentAnnealProcess); + } + + /** + * 导出excel + * + * @param request + * @param experimentAnnealProcess + */ + @RequiresPermissions("database:experiment_anneal_process:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ExperimentAnnealProcess experimentAnnealProcess) { + return super.exportXls(request, experimentAnnealProcess, ExperimentAnnealProcess.class, "退火过程"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("database:experiment_anneal_process:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ExperimentAnnealProcess.class); + } + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/CrawlerRecordController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ImportRecordController.java similarity index 60% rename from physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/CrawlerRecordController.java rename to physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ImportRecordController.java index de0fa4c..874aa5d 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/CrawlerRecordController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ImportRecordController.java @@ -14,8 +14,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.config.shiro.IgnoreAuth; -import org.jeecg.modules.database.entity.CrawlerRecord; -import org.jeecg.modules.database.service.ICrawlerRecordService; +import org.jeecg.modules.database.entity.ImportRecord; +import org.jeecg.modules.database.service.IImportRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -23,68 +23,68 @@ import org.springframework.web.servlet.ModelAndView; import java.util.Arrays; /** - * @Description: 爬虫记录 + * @Description: 三方导入记录 * @Author: jeecg-boot * @Date: 2024-09-03 * @Version: V1.0 */ -@Tag(name = "爬虫记录") +@Tag(name = "三方导入记录") @RestController @RequestMapping("/database/crawlerRecord") @Slf4j -public class CrawlerRecordController extends JeecgController { +public class ImportRecordController extends JeecgController { @Autowired - private ICrawlerRecordService crawlerRecordService; + private IImportRecordService crawlerRecordService; /** * 分页列表查询 * - * @param crawlerRecord + * @param importRecord * @param pageNo * @param pageSize * @param req * @return */ - //@AutoLog(value = "爬虫记录-分页列表查询") - @Operation(summary = "爬虫记录-分页列表查询") + //@AutoLog(value = "三方导入记录-分页列表查询") + @Operation(summary = "三方导入记录-分页列表查询") @GetMapping(value = "/list") - public Result> queryPageList(CrawlerRecord crawlerRecord, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(crawlerRecord, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = crawlerRecordService.page(page, queryWrapper); + public Result> queryPageList(ImportRecord importRecord, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(importRecord, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = crawlerRecordService.page(page, queryWrapper); return Result.OK(pageList); } /** * 添加 * - * @param crawlerRecord + * @param importRecord * @return */ - @AutoLog(value = "爬虫记录-添加") - @Operation(summary = "爬虫记录-添加") + @AutoLog(value = "三方导入记录-添加") + @Operation(summary = "三方导入记录-添加") @RequiresPermissions("database:crawler_record:add") @PostMapping(value = "/add") - public Result add(@RequestBody CrawlerRecord crawlerRecord) { - crawlerRecordService.save(crawlerRecord); + public Result add(@RequestBody ImportRecord importRecord) { + crawlerRecordService.save(importRecord); return Result.OK("添加成功！"); } /** * 编辑 * - * @param crawlerRecord + * @param importRecord * @return */ - @AutoLog(value = "爬虫记录-编辑") - @Operation(summary = "爬虫记录-编辑") + @AutoLog(value = "三方导入记录-编辑") + @Operation(summary = "三方导入记录-编辑") @RequiresPermissions("database:crawler_record:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) - public Result edit(@RequestBody CrawlerRecord crawlerRecord) { - crawlerRecordService.updateById(crawlerRecord); + public Result edit(@RequestBody ImportRecord importRecord) { + crawlerRecordService.updateById(importRecord); return Result.OK("编辑成功!"); } @@ -94,8 +94,8 @@ public class CrawlerRecordController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { @@ -109,8 +109,8 @@ public class CrawlerRecordController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -124,27 +124,27 @@ public class CrawlerRecordController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { - CrawlerRecord crawlerRecord = crawlerRecordService.getById(id); - if (crawlerRecord == null) { + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ImportRecord importRecord = crawlerRecordService.getById(id); + if (importRecord == null) { return Result.error("未找到对应数据"); } - return Result.OK(crawlerRecord); + return Result.OK(importRecord); } /** * 导出excel * * @param request - * @param crawlerRecord + * @param importRecord */ @RequiresPermissions("database:crawler_record:exportXls") @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, CrawlerRecord crawlerRecord) { - return super.exportXls(request, crawlerRecord, CrawlerRecord.class, "爬虫记录"); + public ModelAndView exportXls(HttpServletRequest request, ImportRecord importRecord) { + return super.exportXls(request, importRecord, ImportRecord.class, "三方导入记录"); } /** @@ -157,7 +157,7 @@ public class CrawlerRecordController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, CrawlerRecord.class); + return super.importExcel(request, response, ImportRecord.class); } @IgnoreAuth diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/CrawlerRecord.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/CrawlerRecord.java deleted file mode 100644 index 27fff92..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/CrawlerRecord.java +++ /dev/null @@ -1,145 +0,0 @@ -package org.jeecg.modules.database.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 爬虫记录 - * @Author: jeecg-boot - * @Date: 2024-10-14 - * @Version: V1.0 - */ -@Data -@TableName("crawler_record") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@Schema(description = "爬虫记录") -public class CrawlerRecord 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 type; - /** - * 编号 - */ - @Excel(name = "编号", width = 15) - @Schema(description = "编号") - private String code; - /** - * 制造商 - */ - @Excel(name = "制造商", width = 15) - @Schema(description = "制造商") - private String manufacturer; - /** - * 文件 - */ - @Excel(name = "文件", width = 15) - @Schema(description = "文件") - private String fileUrl; - /** - * 测试类型 - */ - @Excel(name = "测试类型", width = 15) - @Schema(description = "测试类型") - private String functionType; - /** - * 测试方式 - */ - @Excel(name = "测试方式", width = 15) - @Schema(description = "测试方式") - private String testMethod; - /** - * 分组 - */ - @Excel(name = "分组", width = 15) - @Schema(description = "分组") - private String category; - /** - * 二级分组 - */ - @Excel(name = "二级分组", width = 15) - @Schema(description = "二级分组") - private String subCategory; - /** - * 文档日期 - */ - @Excel(name = "文档日期", width = 15) - @Schema(description = "文档日期") - private String reportDate; - /** - * 测试技术 - */ - @Excel(name = "测试技术", width = 15) - @Schema(description = "测试技术") - private String technology; - /** - * 报告来源 - */ - @Excel(name = "报告来源", width = 15) - @Schema(description = "报告来源") - private String reportSource; - - /** - * 辐射测试类型 - */ - @Excel(name = "辐射测试类型", width = 15) - @Schema(description = "辐射测试类型") - private String radiationTestType; - /** - * 报告ID - */ - @Excel(name = "报告ID", width = 15) - @Schema(description = "报告ID") - private String reportId; -} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java new file mode 100644 index 0000000..7f8f374 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.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-10-21 + * @Version: V1.0 + */ +@Data +@TableName("experiment_anneal_process") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="退火过程") +public class ExperimentAnnealProcess 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 annealTemperature; + /**备注*/ + @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; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ImportRecord.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ImportRecord.java new file mode 100644 index 0000000..39aae02 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ImportRecord.java @@ -0,0 +1,103 @@ +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-21 + * @Version: V1.0 + */ +@Data +@TableName("import_record") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="三方导入记录") +public class ImportRecord 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 deviceType; + /**器件名称*/ + @Excel(name = "器件名称", width = 15) + @Schema(description = "器件名称") + private String deviceName; + /**器件型号*/ + @Excel(name = "器件型号", width = 15) + @Schema(description = "器件型号") + private String deviceMode; + /**器件功能*/ + @Excel(name = "器件功能", width = 15) + @Schema(description = "器件功能") + private String deviceFunction; + /**器件批次*/ + @Excel(name = "器件批次", width = 15) + @Schema(description = "器件批次") + private String deviceBatch; + /**生产厂家*/ + @Excel(name = "生产厂家", width = 15) + @Schema(description = "生产厂家") + private String manufacturer; + /**试验时间*/ + @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 experimentDate; + /**数据来源*/ + @Excel(name = "数据来源", width = 15) + @Schema(description = "数据来源") + private String dataSource; + /**试验人员*/ + @Excel(name = "试验人员", width = 15) + @Schema(description = "试验人员") + private String experimentUser; + /**条目数统计*/ + @Excel(name = "条目数统计", width = 15) + @Schema(description = "条目数统计") + private String totalCount; + /**附件ID*/ + @Excel(name = "附件ID", width = 15) + @Schema(description = "附件ID") + private String fileList; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/CrawlerRecordMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentAnnealProcessMapper.java old mode 100755 new mode 100644 similarity index 51% rename from physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/CrawlerRecordMapper.java rename to physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentAnnealProcessMapper.java index 488f440..e64a3ed --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/CrawlerRecordMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentAnnealProcessMapper.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.CrawlerRecord; +import org.jeecg.modules.database.entity.ExperimentAnnealProcess; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 爬虫记录 + * @Description: 退火过程 * @Author: jeecg-boot - * @Date: 2024-09-03 + * @Date: 2024-10-21 * @Version: V1.0 */ -public interface CrawlerRecordMapper extends BaseMapper { +public interface ExperimentAnnealProcessMapper extends BaseMapper { } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ImportRecordMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ImportRecordMapper.java new file mode 100755 index 0000000..75c37ed --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ImportRecordMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.database.mapper; + +import org.jeecg.modules.database.entity.ImportRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 三方导入记录 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +public interface ImportRecordMapper extends BaseMapper { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/CrawlerRecordMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/CrawlerRecordMapper.xml index 44e5ff2..2b0159b 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/CrawlerRecordMapper.xml +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/CrawlerRecordMapper.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/mapper/xml/ExperimentAnnealProcessMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentAnnealProcessMapper.xml new file mode 100644 index 0000000..60f4784 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentAnnealProcessMapper.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/IExperimentAnnealProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java new file mode 100644 index 0000000..a5e5d83 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.database.service; + +import org.jeecg.modules.database.entity.ExperimentAnnealProcess; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 退火过程 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +public interface IExperimentAnnealProcessService extends IService { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ICrawlerRecordService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IImportRecordService.java similarity index 67% rename from physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ICrawlerRecordService.java rename to physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IImportRecordService.java index 6eaa5e9..9ced2dc 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ICrawlerRecordService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IImportRecordService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.database.service; -import org.jeecg.modules.database.entity.CrawlerRecord; +import org.jeecg.modules.database.entity.ImportRecord; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Date: 2024-09-03 * @Version: V1.0 */ -public interface ICrawlerRecordService extends IService { +public interface IImportRecordService extends IService { void esaradCrawler(); void radhomeCrawler(); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java new file mode 100644 index 0000000..36024ac --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.database.service.impl; + +import org.jeecg.modules.database.entity.ExperimentAnnealProcess; +import org.jeecg.modules.database.mapper.ExperimentAnnealProcessMapper; +import org.jeecg.modules.database.service.IExperimentAnnealProcessService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 退火过程 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Service +public class ExperimentAnnealProcessServiceImpl extends ServiceImpl implements IExperimentAnnealProcessService { + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/CrawlerRecordServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ImportRecordServiceImpl.java similarity index 85% rename from physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/CrawlerRecordServiceImpl.java rename to physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ImportRecordServiceImpl.java index 2bc4f9e..0bb46b3 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/CrawlerRecordServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ImportRecordServiceImpl.java @@ -4,9 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ReUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; @@ -22,9 +20,9 @@ import okhttp3.*; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.util.MinioUtil; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.database.entity.CrawlerRecord; -import org.jeecg.modules.database.mapper.CrawlerRecordMapper; -import org.jeecg.modules.database.service.ICrawlerRecordService; +import org.jeecg.modules.database.entity.ImportRecord; +import org.jeecg.modules.database.mapper.ImportRecordMapper; +import org.jeecg.modules.database.service.IImportRecordService; import org.jeecg.modules.oss.service.impl.OssFileServiceImpl; import org.jetbrains.annotations.NotNull; import org.jsoup.Jsoup; @@ -43,12 +41,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import static org.jeecg.modules.online.auth.b.a.f; -import static org.jeecg.modules.online.auth.b.a.i; - @Slf4j @Service -public class CrawlerRecordServiceImpl extends ServiceImpl implements ICrawlerRecordService { +public class ImportRecordServiceImpl extends ServiceImpl implements IImportRecordService { @Autowired private RedisUtil redisUtil; @@ -86,7 +81,7 @@ public class CrawlerRecordServiceImpl extends ServiceImpl tableData = new ArrayList<>(); + List tableData = new ArrayList<>(); Document doc = Jsoup.connect("https://esarad.esa.int").get(); Element table = doc.getElementById("dtReports"); @@ -120,7 +115,7 @@ public class CrawlerRecordServiceImpl extends ServiceImpl tableData = new ArrayList<>(); + List tableData = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { @@ -221,7 +216,7 @@ public class CrawlerRecordServiceImpl extends ServiceImpl fileList, String type) { + private void saveRadhomeFiles(List fileList, String type) { ThreadUtil.execute(() -> { try { - for (CrawlerRecord record : fileList) { + for (ImportRecord record : fileList) { String fileUploadResult = ""; String fileUrl = record.getFileUrl(); if (fileUrl.contains(";")) { @@ -295,11 +290,11 @@ public class CrawlerRecordServiceImpl extends ServiceImpl fileList, String type) { + private void saveEsaradFiles(List fileList, String type) { ThreadUtil.execute(() -> { try { - for (CrawlerRecord record : fileList) { - CrawlerRecord dbData = getOne(Wrappers.lambdaQuery().eq(CrawlerRecord::getReportSource, record.getReportId())); + for (ImportRecord record : fileList) { + ImportRecord dbData = getOne(Wrappers.lambdaQuery().eq(ImportRecord::getReportSource, record.getReportId())); if (Objects.nonNull(dbData)) { continue; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentAnnealProcessForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentAnnealProcessForm.vue new file mode 100644 index 0000000..c942493 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentAnnealProcessForm.vue @@ -0,0 +1,125 @@ + + + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentAnnealProcessList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentAnnealProcessList.vue new file mode 100644 index 0000000..1add660 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentAnnealProcessList.vue @@ -0,0 +1,44 @@ + + + + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentAnnealProcess.api.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentAnnealProcess.api.ts new file mode 100644 index 0000000..57cfcca --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentAnnealProcess.api.ts @@ -0,0 +1,64 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/database/experimentAnnealProcess/list', + save='/database/experimentAnnealProcess/add', + edit='/database/experimentAnnealProcess/edit', + deleteOne = '/database/experimentAnnealProcess/delete', + deleteBatch = '/database/experimentAnnealProcess/deleteBatch', + importExcel = '/database/experimentAnnealProcess/importExcel', + exportXls = '/database/experimentAnnealProcess/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/ExperimentAnnealProcess.data.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentAnnealProcess.data.ts new file mode 100644 index 0000000..f3b69e3 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentAnnealProcess.data.ts @@ -0,0 +1,122 @@ +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: 'radiationSource' + }, + { + title: '计量率', + align:"center", + dataIndex: 'measurementRate' + }, + { + title: '辐照标准', + align:"center", + dataIndex: 'radiationStandard' + }, + { + title: '退火温度', + align:"center", + dataIndex: 'annealTemperature' + }, + { + title: '备注', + align:"center", + dataIndex: 'comment' + }, + { + title: '异常记录', + align:"center", + dataIndex: 'exceptionRecord' + }, + { + title: '辐照详情（json存储）', + align:"center", + dataIndex: 'radiationDetail' + }, + { + title: '试验ID', + align:"center", + dataIndex: 'experimentId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: ' 辐照源', + field: 'radiationSource', + component: 'Input', + }, + { + label: '计量率', + field: 'measurementRate', + component: 'Input', + }, + { + label: '辐照标准', + field: 'radiationStandard', + component: 'Input', + }, + { + label: '退火温度', + field: 'annealTemperature', + component: 'Input', + }, + { + label: '备注', + field: 'comment', + component: 'Input', + }, + { + label: '异常记录', + field: 'exceptionRecord', + component: 'Input', + }, + { + label: '辐照详情（json存储）', + field: 'radiationDetail', + component: 'Input', + }, + { + label: '试验ID', + field: 'experimentId', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + radiationSource: {title: ' 辐照源',order: 0,view: 'text', type: 'string',}, + measurementRate: {title: '计量率',order: 1,view: 'text', type: 'string',}, + radiationStandard: {title: '辐照标准',order: 2,view: 'text', type: 'string',}, + annealTemperature: {title: '退火温度',order: 3,view: 'text', type: 'string',}, + comment: {title: '备注',order: 4,view: 'text', type: 'string',}, + exceptionRecord: {title: '异常记录',order: 5,view: 'text', type: 'string',}, + radiationDetail: {title: '辐照详情（json存储）',order: 6,view: 'text', type: 'string',}, + experimentId: {title: '试验ID',order: 7,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/ExperimentAnnealProcessList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentAnnealProcessList.vue new file mode 100644 index 0000000..c4a41b2 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentAnnealProcessList.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241021_1__menu_insert_ExperimentAnnealProcess.sql b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241021_1__menu_insert_ExperimentAnnealProcess.sql new file mode 100644 index 0000000..c546e14 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241021_1__menu_insert_ExperimentAnnealProcess.sql @@ -0,0 +1,26 @@ +-- 注意：该页面对应的前台目录为views/database文件夹下 +-- 如果你想更改到其他目录，请修改sql中component字段对应的值 + + +INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) +VALUES ('2024102103111150340', NULL, '退火过程', '/database/experimentAnnealProcessList', 'database/ExperimentAnnealProcessList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-10-21 03:11:34', 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 ('2024102103111150341', '2024102103111150340', '添加退火过程', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_anneal_process:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-21 03:11:34', 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 ('2024102103111150342', '2024102103111150340', '编辑退火过程', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_anneal_process:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-21 03:11:34', 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 ('2024102103111150343', '2024102103111150340', '删除退火过程', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_anneal_process:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-21 03:11:34', 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 ('2024102103111150344', '2024102103111150340', '批量删除退火过程', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_anneal_process:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-21 03:11:34', 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 ('2024102103111150345', '2024102103111150340', '导出excel_退火过程', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_anneal_process:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-21 03:11:34', 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 ('2024102103111150346', '2024102103111150340', '导入excel_退火过程', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_anneal_process:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-21 03:11:34', 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/ExperimentAnnealProcessForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentAnnealProcessForm.vue new file mode 100644 index 0000000..bbe84f2 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentAnnealProcessForm.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentAnnealProcessModal.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentAnnealProcessModal.vue new file mode 100644 index 0000000..5a39cdb --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentAnnealProcessModal.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/scripts/Dockerfile b/scripts/Dockerfile index ef359a4..a9879d9 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -12,5 +12,10 @@ RUN pip install --no-cache-dir -r requirements.txt # 设置环境变量 ENV FLASK_APP=main.py +ENV PYTHONUNBUFFERED=1 + +EXPOSE 5000 + # 启动 Flask 应用 CMD ["flask", "run", "--host=0.0.0.0"] +#CMD ["gunicorn", "--bind", "0.0.0.0:5000", "main:app"] diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100644 index 0000000..b72bce4 --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1 @@ +docker build --platform linux/amd64 -t registry.cn-shanghai.aliyuncs.com/physical/physical-crawler --push . \ No newline at end of file diff --git a/scripts/requirements.txt b/scripts/requirements.txt index c2ac9fe..2804718 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -4,3 +4,4 @@ urllib3 flask lxml mysql-connector-python +gunicorn