update
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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<ExperimentAnnealProcess, IExperimentAnnealProcessService> {
|
||||
@Autowired
|
||||
private IExperimentAnnealProcessService experimentAnnealProcessService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param experimentAnnealProcess
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "退火过程-分页列表查询")
|
||||
@Operation(summary="退火过程-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<ExperimentAnnealProcess>> queryPageList(ExperimentAnnealProcess experimentAnnealProcess,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<ExperimentAnnealProcess> queryWrapper = QueryGenerator.initQueryWrapper(experimentAnnealProcess, req.getParameterMap());
|
||||
Page<ExperimentAnnealProcess> page = new Page<ExperimentAnnealProcess>(pageNo, pageSize);
|
||||
IPage<ExperimentAnnealProcess> 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<String> 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<String> 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<String> 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<String> 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<ExperimentAnnealProcess> 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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<CrawlerRecord, ICrawlerRecordService> {
|
||||
public class ImportRecordController extends JeecgController<ImportRecord, IImportRecordService> {
|
||||
@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<IPage<CrawlerRecord>> queryPageList(CrawlerRecord crawlerRecord,
|
||||
public Result<IPage<ImportRecord>> queryPageList(ImportRecord importRecord,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<CrawlerRecord> queryWrapper = QueryGenerator.initQueryWrapper(crawlerRecord, req.getParameterMap());
|
||||
Page<CrawlerRecord> page = new Page<CrawlerRecord>(pageNo, pageSize);
|
||||
IPage<CrawlerRecord> pageList = crawlerRecordService.page(page, queryWrapper);
|
||||
QueryWrapper<ImportRecord> queryWrapper = QueryGenerator.initQueryWrapper(importRecord, req.getParameterMap());
|
||||
Page<ImportRecord> page = new Page<ImportRecord>(pageNo, pageSize);
|
||||
IPage<ImportRecord> 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<String> add(@RequestBody CrawlerRecord crawlerRecord) {
|
||||
crawlerRecordService.save(crawlerRecord);
|
||||
public Result<String> 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<String> edit(@RequestBody CrawlerRecord crawlerRecord) {
|
||||
crawlerRecordService.updateById(crawlerRecord);
|
||||
public Result<String> edit(@RequestBody ImportRecord importRecord) {
|
||||
crawlerRecordService.updateById(importRecord);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
@@ -94,8 +94,8 @@ public class CrawlerRecordController extends JeecgController<CrawlerRecord, ICra
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "爬虫记录-通过id删除")
|
||||
@Operation(summary = "爬虫记录-通过id删除")
|
||||
@AutoLog(value = "三方导入记录-通过id删除")
|
||||
@Operation(summary = "三方导入记录-通过id删除")
|
||||
@RequiresPermissions("database:crawler_record:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
@@ -109,8 +109,8 @@ public class CrawlerRecordController extends JeecgController<CrawlerRecord, ICra
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "爬虫记录-批量删除")
|
||||
@Operation(summary = "爬虫记录-批量删除")
|
||||
@AutoLog(value = "三方导入记录-批量删除")
|
||||
@Operation(summary = "三方导入记录-批量删除")
|
||||
@RequiresPermissions("database:crawler_record:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
@@ -124,27 +124,27 @@ public class CrawlerRecordController extends JeecgController<CrawlerRecord, ICra
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "爬虫记录-通过id查询")
|
||||
@Operation(summary = "爬虫记录-通过id查询")
|
||||
//@AutoLog(value = "三方导入记录-通过id查询")
|
||||
@Operation(summary = "三方导入记录-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<CrawlerRecord> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
CrawlerRecord crawlerRecord = crawlerRecordService.getById(id);
|
||||
if (crawlerRecord == null) {
|
||||
public Result<ImportRecord> 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<CrawlerRecord, ICra
|
||||
@RequiresPermissions("database:crawler_record:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, CrawlerRecord.class);
|
||||
return super.importExcel(request, response, ImportRecord.class);
|
||||
}
|
||||
|
||||
@IgnoreAuth
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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<CrawlerRecord> {
|
||||
public interface ExperimentAnnealProcessMapper extends BaseMapper<ExperimentAnnealProcess> {
|
||||
|
||||
}
|
||||
@@ -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<ImportRecord> {
|
||||
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.database.mapper.CrawlerRecordMapper">
|
||||
<mapper namespace="org.jeecg.modules.database.mapper.ImportRecordMapper">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.database.mapper.ExperimentAnnealProcessMapper">
|
||||
|
||||
</mapper>
|
||||
@@ -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<ExperimentAnnealProcess> {
|
||||
|
||||
}
|
||||
@@ -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<CrawlerRecord> {
|
||||
public interface IImportRecordService extends IService<ImportRecord> {
|
||||
void esaradCrawler();
|
||||
|
||||
void radhomeCrawler();
|
||||
@@ -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<ExperimentAnnealProcessMapper, ExperimentAnnealProcess> implements IExperimentAnnealProcessService {
|
||||
|
||||
}
|
||||
@@ -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<CrawlerRecordMapper, CrawlerRecord> implements ICrawlerRecordService {
|
||||
public class ImportRecordServiceImpl extends ServiceImpl<ImportRecordMapper, ImportRecord> implements IImportRecordService {
|
||||
@Autowired
|
||||
private RedisUtil redisUtil;
|
||||
|
||||
@@ -86,7 +81,7 @@ public class CrawlerRecordServiceImpl extends ServiceImpl<CrawlerRecordMapper, C
|
||||
}
|
||||
redisUtil.set(esaradKey, "T", 24 * 60 * 60);
|
||||
|
||||
List<CrawlerRecord> tableData = new ArrayList<>();
|
||||
List<ImportRecord> 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<CrawlerRecordMapper, C
|
||||
Element row = rows.get(j);
|
||||
|
||||
// Select all cells in the row
|
||||
CrawlerRecord crawlerRecord = new CrawlerRecord();
|
||||
ImportRecord importRecord = new ImportRecord();
|
||||
|
||||
Elements cells = row.select("td");
|
||||
|
||||
@@ -132,49 +127,49 @@ public class CrawlerRecordServiceImpl extends ServiceImpl<CrawlerRecordMapper, C
|
||||
String value = cells.get(i).text();
|
||||
switch (header) {
|
||||
case "Radiation Test Method":
|
||||
crawlerRecord.setTestMethod(value);
|
||||
importRecord.setTestMethod(value);
|
||||
break;
|
||||
case "EPPL Familiy":
|
||||
crawlerRecord.setCategory(value);
|
||||
importRecord.setCategory(value);
|
||||
break;
|
||||
case "EPPL Group":
|
||||
crawlerRecord.setSubCategory(value);
|
||||
importRecord.setSubCategory(value);
|
||||
break;
|
||||
case "DUT Manufacturer":
|
||||
crawlerRecord.setManufacturer(value);
|
||||
importRecord.setManufacturer(value);
|
||||
break;
|
||||
case "Function":
|
||||
crawlerRecord.setFunctionType(value);
|
||||
importRecord.setFunctionType(value);
|
||||
break;
|
||||
case "Report Date":
|
||||
crawlerRecord.setReportDate(value);
|
||||
importRecord.setReportDate(value);
|
||||
break;
|
||||
case "Report Source":
|
||||
crawlerRecord.setReportSource(value);
|
||||
importRecord.setReportSource(value);
|
||||
break;
|
||||
case "Technology":
|
||||
crawlerRecord.setTechnology(value);
|
||||
importRecord.setTechnology(value);
|
||||
break;
|
||||
case "Id":
|
||||
crawlerRecord.setReportId(value);
|
||||
importRecord.setReportId(value);
|
||||
break;
|
||||
case "DUT part type":
|
||||
crawlerRecord.setCode(value);
|
||||
importRecord.setCode(value);
|
||||
break;
|
||||
case "Radiation Test Type":
|
||||
crawlerRecord.setRadiationTestType(value);
|
||||
importRecord.setRadiationTestType(value);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Add the map to the list
|
||||
tableData.add(crawlerRecord);
|
||||
tableData.add(importRecord);
|
||||
}
|
||||
}
|
||||
|
||||
// Print the list of maps
|
||||
for (CrawlerRecord rowMap : tableData) {
|
||||
for (ImportRecord rowMap : tableData) {
|
||||
rowMap.setFileUrl("https://esarad.esa.int/?id=" + rowMap.getReportId() + "&handler=DownloadDb");
|
||||
}
|
||||
saveEsaradFiles(tableData, esaradKey);
|
||||
@@ -212,7 +207,7 @@ public class CrawlerRecordServiceImpl extends ServiceImpl<CrawlerRecordMapper, C
|
||||
JSONArray list = jsonObject.getJSONArray("ROWS");
|
||||
System.out.println("total count " + total);
|
||||
System.out.println("total list " + list.get(0));
|
||||
List<CrawlerRecord> tableData = new ArrayList<>();
|
||||
List<ImportRecord> tableData = new ArrayList<>();
|
||||
|
||||
for (int i = 0; i < list.size(); i++) {
|
||||
|
||||
@@ -221,7 +216,7 @@ public class CrawlerRecordServiceImpl extends ServiceImpl<CrawlerRecordMapper, C
|
||||
}
|
||||
JSONArray row = (JSONArray) list.get(i);
|
||||
String fileNames = String.valueOf(row.get(4));
|
||||
CrawlerRecord map = new CrawlerRecord();
|
||||
ImportRecord map = new ImportRecord();
|
||||
String fileUrls = fixFileNames(fileNames);
|
||||
map.setFileUrl(fileUrls);
|
||||
|
||||
@@ -262,10 +257,10 @@ public class CrawlerRecordServiceImpl extends ServiceImpl<CrawlerRecordMapper, C
|
||||
return StringUtils.join(result, ";");
|
||||
}
|
||||
|
||||
private void saveRadhomeFiles(List<CrawlerRecord> fileList, String type) {
|
||||
private void saveRadhomeFiles(List<ImportRecord> 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<CrawlerRecordMapper, C
|
||||
});
|
||||
}
|
||||
|
||||
private void saveEsaradFiles(List<CrawlerRecord> fileList, String type) {
|
||||
private void saveEsaradFiles(List<ImportRecord> fileList, String type) {
|
||||
ThreadUtil.execute(() -> {
|
||||
try {
|
||||
for (CrawlerRecord record : fileList) {
|
||||
CrawlerRecord dbData = getOne(Wrappers.<CrawlerRecord>lambdaQuery().eq(CrawlerRecord::getReportSource, record.getReportId()));
|
||||
for (ImportRecord record : fileList) {
|
||||
ImportRecord dbData = getOne(Wrappers.<ImportRecord>lambdaQuery().eq(ImportRecord::getReportSource, record.getReportId()));
|
||||
if (Objects.nonNull(dbData)) {
|
||||
continue;
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
<template>
|
||||
<view>
|
||||
<!--标题和返回-->
|
||||
<cu-custom :bgColor="NavBarColor" isBack :backRouterName="backRouteName">
|
||||
<block slot="backText">返回</block>
|
||||
<block slot="content">退火过程</block>
|
||||
</cu-custom>
|
||||
<!--表单区域-->
|
||||
<view>
|
||||
<form>
|
||||
<view class="cu-form-group">
|
||||
<view class="flex align-center">
|
||||
<view class="title"><text space="ensp"> 辐照源:</text></view>
|
||||
<input placeholder="请输入 辐照源" v-model="model.radiationSource"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="flex align-center">
|
||||
<view class="title"><text space="ensp">计量率:</text></view>
|
||||
<input placeholder="请输入计量率" v-model="model.measurementRate"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="flex align-center">
|
||||
<view class="title"><text space="ensp">辐照标准:</text></view>
|
||||
<input placeholder="请输入辐照标准" v-model="model.radiationStandard"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="flex align-center">
|
||||
<view class="title"><text space="ensp">退火温度:</text></view>
|
||||
<input placeholder="请输入退火温度" v-model="model.annealTemperature"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="flex align-center">
|
||||
<view class="title"><text space="ensp">备注:</text></view>
|
||||
<input placeholder="请输入备注" v-model="model.comment"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="flex align-center">
|
||||
<view class="title"><text space="ensp">异常记录:</text></view>
|
||||
<input placeholder="请输入异常记录" v-model="model.exceptionRecord"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="flex align-center">
|
||||
<view class="title"><text space="ensp">辐照详情(json存储):</text></view>
|
||||
<input placeholder="请输入辐照详情(json存储)" v-model="model.radiationDetail"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="flex align-center">
|
||||
<view class="title"><text space="ensp">试验ID:</text></view>
|
||||
<input placeholder="请输入试验ID" v-model="model.experimentId"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="padding">
|
||||
<button class="cu-btn block bg-blue margin-tb-sm lg" @click="onSubmit">
|
||||
<text v-if="loading" class="cuIcon-loading2 cuIconfont-spin"></text>提交
|
||||
</button>
|
||||
</view>
|
||||
</form>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import myDate from '@/components/my-componets/my-date.vue'
|
||||
|
||||
export default {
|
||||
name: "ExperimentAnnealProcessForm",
|
||||
components:{ myDate },
|
||||
props:{
|
||||
formData:{
|
||||
type:Object,
|
||||
default:()=>{},
|
||||
required:false
|
||||
}
|
||||
},
|
||||
data(){
|
||||
return {
|
||||
CustomBar: this.CustomBar,
|
||||
NavBarColor: this.NavBarColor,
|
||||
loading:false,
|
||||
model: {},
|
||||
backRouteName:'index',
|
||||
url: {
|
||||
queryById: "/database/experimentAnnealProcess/queryById",
|
||||
add: "/database/experimentAnnealProcess/add",
|
||||
edit: "/database/experimentAnnealProcess/edit",
|
||||
},
|
||||
}
|
||||
},
|
||||
created(){
|
||||
this.initFormData();
|
||||
},
|
||||
methods:{
|
||||
initFormData(){
|
||||
if(this.formData){
|
||||
let dataId = this.formData.dataId;
|
||||
this.$http.get(this.url.queryById,{params:{id:dataId}}).then((res)=>{
|
||||
if(res.data.success){
|
||||
console.log("表单数据",res);
|
||||
this.model = res.data.result;
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
onSubmit() {
|
||||
let myForm = {...this.model};
|
||||
this.loading = true;
|
||||
let url = myForm.id?this.url.edit:this.url.add;
|
||||
this.$http.post(url,myForm).then(res=>{
|
||||
console.log("res",res)
|
||||
this.loading = false
|
||||
this.$Router.push({name:this.backRouteName})
|
||||
}).catch(()=>{
|
||||
this.loading = false
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,44 @@
|
||||
<template>
|
||||
<view>
|
||||
<!--标题和返回-->
|
||||
<cu-custom :bgColor="NavBarColor" isBack>
|
||||
<block slot="backText">返回</block>
|
||||
<block slot="content">退火过程</block>
|
||||
</cu-custom>
|
||||
<!--滚动加载列表-->
|
||||
<mescroll-body ref="mescrollRef" bottom="88" @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback" @up="upCallback">
|
||||
<view class="cu-list menu">
|
||||
<view class="cu-item" v-for="(item,index) in list" :key="index" @click="goHome">
|
||||
<view class="flex" style="width:100%">
|
||||
<text class="text-lg" style="color: #000;">
|
||||
{{ item.createBy}}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</mescroll-body>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
|
||||
import Mixin from "@/common/mixin/Mixin.js";
|
||||
|
||||
export default {
|
||||
name: '退火过程',
|
||||
mixins: [MescrollMixin,Mixin],
|
||||
data() {
|
||||
return {
|
||||
CustomBar:this.CustomBar,
|
||||
NavBarColor:this.NavBarColor,
|
||||
url: "/database/experimentAnnealProcess/list",
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
goHome(){
|
||||
this.$Router.push({name: "index"})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -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});
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -0,0 +1,188 @@
|
||||
<template>
|
||||
<div>
|
||||
<!--引用表格-->
|
||||
<BasicTable @register="registerTable" :rowSelection="rowSelection">
|
||||
<!--插槽:table标题-->
|
||||
<template #tableTitle>
|
||||
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
|
||||
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
|
||||
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
|
||||
<a-dropdown v-if="selectedRowKeys.length > 0">
|
||||
<template #overlay>
|
||||
<a-menu>
|
||||
<a-menu-item key="1" @click="batchHandleDelete">
|
||||
<Icon icon="ant-design:delete-outlined"></Icon>
|
||||
删除
|
||||
</a-menu-item>
|
||||
</a-menu>
|
||||
</template>
|
||||
<a-button>批量操作
|
||||
<Icon icon="mdi:chevron-down"></Icon>
|
||||
</a-button>
|
||||
</a-dropdown>
|
||||
<!-- 高级查询 -->
|
||||
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
|
||||
</template>
|
||||
<!--操作栏-->
|
||||
<template #action="{ record }">
|
||||
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
|
||||
</template>
|
||||
<!--字段回显插槽-->
|
||||
<template v-slot:bodyCell="{ column, record, index, text }">
|
||||
</template>
|
||||
</BasicTable>
|
||||
<!-- 表单区域 -->
|
||||
<ExperimentAnnealProcessModal @register="registerModal" @success="handleSuccess"></ExperimentAnnealProcessModal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" name="database-experimentAnnealProcess" setup>
|
||||
import {ref, reactive, computed, unref} from 'vue';
|
||||
import {BasicTable, useTable, TableAction} from '/@/components/Table';
|
||||
import {useModal} from '/@/components/Modal';
|
||||
import { useListPage } from '/@/hooks/system/useListPage'
|
||||
import ExperimentAnnealProcessModal from './components/ExperimentAnnealProcessModal.vue'
|
||||
import {columns, searchFormSchema, superQuerySchema} from './ExperimentAnnealProcess.data';
|
||||
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ExperimentAnnealProcess.api';
|
||||
import { downloadFile } from '/@/utils/common/renderUtils';
|
||||
import { useUserStore } from '/@/store/modules/user';
|
||||
const queryParam = reactive<any>({});
|
||||
const checkedKeys = ref<Array<string | number>>([]);
|
||||
const userStore = useUserStore();
|
||||
//注册model
|
||||
const [registerModal, {openModal}] = useModal();
|
||||
//注册table数据
|
||||
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
|
||||
tableProps:{
|
||||
title: '退火过程',
|
||||
api: list,
|
||||
columns,
|
||||
canResize:false,
|
||||
formConfig: {
|
||||
//labelWidth: 120,
|
||||
schemas: searchFormSchema,
|
||||
autoSubmitOnEnter:true,
|
||||
showAdvancedButton:true,
|
||||
fieldMapToNumber: [
|
||||
],
|
||||
fieldMapToTime: [
|
||||
],
|
||||
},
|
||||
actionColumn: {
|
||||
width: 120,
|
||||
fixed:'right'
|
||||
},
|
||||
beforeFetch: (params) => {
|
||||
return Object.assign(params, queryParam);
|
||||
},
|
||||
},
|
||||
exportConfig: {
|
||||
name:"退火过程",
|
||||
url: getExportUrl,
|
||||
params: queryParam,
|
||||
},
|
||||
importConfig: {
|
||||
url: getImportUrl,
|
||||
success: handleSuccess
|
||||
},
|
||||
})
|
||||
|
||||
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
|
||||
|
||||
// 高级查询配置
|
||||
const superQueryConfig = reactive(superQuerySchema);
|
||||
|
||||
/**
|
||||
* 高级查询事件
|
||||
*/
|
||||
function handleSuperQuery(params) {
|
||||
Object.keys(params).map((k) => {
|
||||
queryParam[k] = params[k];
|
||||
});
|
||||
reload();
|
||||
}
|
||||
/**
|
||||
* 新增事件
|
||||
*/
|
||||
function handleAdd() {
|
||||
openModal(true, {
|
||||
isUpdate: false,
|
||||
showFooter: true,
|
||||
});
|
||||
}
|
||||
/**
|
||||
* 编辑事件
|
||||
*/
|
||||
function handleEdit(record: Recordable) {
|
||||
openModal(true, {
|
||||
record,
|
||||
isUpdate: true,
|
||||
showFooter: true,
|
||||
});
|
||||
}
|
||||
/**
|
||||
* 详情
|
||||
*/
|
||||
function handleDetail(record: Recordable) {
|
||||
openModal(true, {
|
||||
record,
|
||||
isUpdate: true,
|
||||
showFooter: false,
|
||||
});
|
||||
}
|
||||
/**
|
||||
* 删除事件
|
||||
*/
|
||||
async function handleDelete(record) {
|
||||
await deleteOne({id: record.id}, handleSuccess);
|
||||
}
|
||||
/**
|
||||
* 批量删除事件
|
||||
*/
|
||||
async function batchHandleDelete() {
|
||||
await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
|
||||
}
|
||||
/**
|
||||
* 成功回调
|
||||
*/
|
||||
function handleSuccess() {
|
||||
(selectedRowKeys.value = []) && reload();
|
||||
}
|
||||
/**
|
||||
* 操作栏
|
||||
*/
|
||||
function getTableAction(record){
|
||||
return [
|
||||
{
|
||||
label: '编辑',
|
||||
onClick: handleEdit.bind(null, record),
|
||||
}
|
||||
]
|
||||
}
|
||||
/**
|
||||
* 下拉操作栏
|
||||
*/
|
||||
function getDropDownAction(record){
|
||||
return [
|
||||
{
|
||||
label: '详情',
|
||||
onClick: handleDetail.bind(null, record),
|
||||
}, {
|
||||
label: '删除',
|
||||
popConfirm: {
|
||||
title: '是否确认删除',
|
||||
confirm: handleDelete.bind(null, record),
|
||||
placement: 'topLeft',
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
:deep(.ant-picker),:deep(.ant-input-number){
|
||||
width: 100%;
|
||||
}
|
||||
</style>
|
||||
@@ -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);
|
||||
@@ -0,0 +1,70 @@
|
||||
<template>
|
||||
<div style="min-height: 400px">
|
||||
<BasicForm @register="registerForm"></BasicForm>
|
||||
<div style="width: 100%;text-align: center" v-if="!formDisabled">
|
||||
<a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import {BasicForm, useForm} from '/@/components/Form/index';
|
||||
import {computed, defineComponent} from 'vue';
|
||||
import {defHttp} from '/@/utils/http/axios';
|
||||
import { propTypes } from '/@/utils/propTypes';
|
||||
import {getBpmFormSchema} from '../ExperimentAnnealProcess.data';
|
||||
import {saveOrUpdate} from '../ExperimentAnnealProcess.api';
|
||||
|
||||
export default defineComponent({
|
||||
name: "ExperimentAnnealProcessForm",
|
||||
components:{
|
||||
BasicForm
|
||||
},
|
||||
props:{
|
||||
formData: propTypes.object.def({}),
|
||||
formBpm: propTypes.bool.def(true),
|
||||
},
|
||||
setup(props){
|
||||
const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
|
||||
labelWidth: 150,
|
||||
schemas: getBpmFormSchema(props.formData),
|
||||
showActionButtonGroup: false,
|
||||
baseColProps: {span: 24}
|
||||
});
|
||||
|
||||
const formDisabled = computed(()=>{
|
||||
if(props.formData.disabled === false){
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
|
||||
let formData = {};
|
||||
const queryByIdUrl = '/database/experimentAnnealProcess/queryById';
|
||||
async function initFormData(){
|
||||
let params = {id: props.formData.dataId};
|
||||
const data = await defHttp.get({url: queryByIdUrl, params});
|
||||
formData = {...data}
|
||||
//设置表单的值
|
||||
await setFieldsValue(formData);
|
||||
//默认是禁用
|
||||
await setProps({disabled: formDisabled.value})
|
||||
}
|
||||
|
||||
async function submitForm() {
|
||||
let data = getFieldsValue();
|
||||
let params = Object.assign({}, formData, data);
|
||||
console.log('表单数据', params)
|
||||
await saveOrUpdate(params, true)
|
||||
}
|
||||
|
||||
initFormData();
|
||||
|
||||
return {
|
||||
registerForm,
|
||||
formDisabled,
|
||||
submitForm,
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@@ -0,0 +1,68 @@
|
||||
<template>
|
||||
<BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
|
||||
<BasicForm @register="registerForm"/>
|
||||
</BasicModal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {ref, computed, unref} from 'vue';
|
||||
import {BasicModal, useModalInner} from '/@/components/Modal';
|
||||
import {BasicForm, useForm} from '/@/components/Form/index';
|
||||
import {formSchema} from '../ExperimentAnnealProcess.data';
|
||||
import {saveOrUpdate} from '../ExperimentAnnealProcess.api';
|
||||
// Emits声明
|
||||
const emit = defineEmits(['register','success']);
|
||||
const isUpdate = ref(true);
|
||||
const isDetail = ref(false);
|
||||
//表单配置
|
||||
const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
|
||||
//labelWidth: 150,
|
||||
schemas: formSchema,
|
||||
showActionButtonGroup: false,
|
||||
baseColProps: {span: 24}
|
||||
});
|
||||
//表单赋值
|
||||
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
|
||||
//重置表单
|
||||
await resetFields();
|
||||
setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
|
||||
isUpdate.value = !!data?.isUpdate;
|
||||
isDetail.value = !!data?.showFooter;
|
||||
if (unref(isUpdate)) {
|
||||
//表单赋值
|
||||
await setFieldsValue({
|
||||
...data.record,
|
||||
});
|
||||
}
|
||||
// 隐藏底部时禁用整个表单
|
||||
setProps({ disabled: !data?.showFooter })
|
||||
});
|
||||
//设置标题
|
||||
const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
|
||||
//表单提交事件
|
||||
async function handleSubmit(v) {
|
||||
try {
|
||||
let values = await validate();
|
||||
setModalProps({confirmLoading: true});
|
||||
//提交表单
|
||||
await saveOrUpdate(values, isUpdate.value);
|
||||
//关闭弹窗
|
||||
closeModal();
|
||||
//刷新列表
|
||||
emit('success');
|
||||
} finally {
|
||||
setModalProps({confirmLoading: false});
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
/** 时间和数字输入框样式 */
|
||||
:deep(.ant-input-number) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
:deep(.ant-calendar-picker) {
|
||||
width: 100%;
|
||||
}
|
||||
</style>
|
||||
@@ -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"]
|
||||
|
||||
1
scripts/build.sh
Normal file
1
scripts/build.sh
Normal file
@@ -0,0 +1 @@
|
||||
docker build --platform linux/amd64 -t registry.cn-shanghai.aliyuncs.com/physical/physical-crawler --push .
|
||||
@@ -4,3 +4,4 @@ urllib3
|
||||
flask
|
||||
lxml
|
||||
mysql-connector-python
|
||||
gunicorn
|
||||
|
||||
Reference in New Issue
Block a user