update
This commit is contained in:
@@ -103,50 +103,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
|||||||
return Result.error("实验编号格式不正确！");
|
return Result.error("实验编号格式不正确！");
|
||||||
}
|
}
|
||||||
experiment.setStatus(ExperimentStatus.PRE_TEST);
|
experiment.setStatus(ExperimentStatus.PRE_TEST);
|
||||||
experimentService.save(experiment);
|
experimentService.saveWithDetail(experiment);
|
||||||
|
|
||||||
String experimentUser = experiment.getExperimentUser();
|
|
||||||
if (StringUtils.isNotBlank(experimentUser)) {
|
|
||||||
for (String userId : experimentUser.split(",")) {
|
|
||||||
ExperimentUser userDomain = new ExperimentUser();
|
|
||||||
userDomain.setExperimentId(experiment.getId());
|
|
||||||
userDomain.setUserId(userId);
|
|
||||||
userDomain.setType("OPERATOR");
|
|
||||||
experimentUserService.save(userDomain);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList();
|
|
||||||
if (CollUtil.isNotEmpty(sampleInfoList)) {
|
|
||||||
for (ExperimentSampleInfo sampleInfo : sampleInfoList) {
|
|
||||||
sampleInfo.setId(null);
|
|
||||||
sampleInfo.setExperimentId(experiment.getId());
|
|
||||||
experimentSampleInfoService.save(sampleInfo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList();
|
|
||||||
if (CollUtil.isNotEmpty(deviationConditionList)) {
|
|
||||||
for (ExperimentDeviationCondition deviationCondition : deviationConditionList) {
|
|
||||||
deviationCondition.setId(null);
|
|
||||||
deviationCondition.setExperimentId(experiment.getId());
|
|
||||||
experimentDeviationConditionService.save(deviationCondition);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList();
|
|
||||||
if (CollUtil.isNotEmpty(deviationEquipmentList)) {
|
|
||||||
for (ExperimentDeviationEquipment deviationEquipment : deviationEquipmentList) {
|
|
||||||
deviationEquipment.setId(null);
|
|
||||||
deviationEquipment.setExperimentId(experiment.getId());
|
|
||||||
experimentDeviationEquipmentService.save(deviationEquipment);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList();
|
|
||||||
if (CollUtil.isNotEmpty(irradiationBoardList)) {
|
|
||||||
for (ExperimentIrradiationBoard irradiationBoard : irradiationBoardList) {
|
|
||||||
irradiationBoard.setId(null);
|
|
||||||
irradiationBoard.setExperimentId(experiment.getId());
|
|
||||||
experimentIrradiationBoardService.save(irradiationBoard);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ExperimentLog experimentLog = new ExperimentLog();
|
ExperimentLog experimentLog = new ExperimentLog();
|
||||||
experimentLog.setExperimentId(experiment.getId());
|
experimentLog.setExperimentId(experiment.getId());
|
||||||
@@ -164,6 +121,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
|||||||
return Result.OK("添加成功！");
|
return Result.OK("添加成功！");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 编辑
|
* 编辑
|
||||||
*
|
*
|
||||||
@@ -178,50 +136,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
|||||||
if (StringUtils.containsAny(experiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
|
if (StringUtils.containsAny(experiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
|
||||||
return Result.error("试验状态:[" + experiment.getStatus() + "]不能进行修改！");
|
return Result.error("试验状态:[" + experiment.getStatus() + "]不能进行修改！");
|
||||||
}
|
}
|
||||||
String experimentUser = experiment.getExperimentUser();
|
experimentService.saveWithDetail(experiment);
|
||||||
if (StringUtils.isNotBlank(experimentUser)) {
|
|
||||||
experimentUserService.removeByExperimentId(experiment.getId());
|
|
||||||
String[] split = experimentUser.split(",");
|
|
||||||
List<ExperimentUser> userList = new ArrayList<>();
|
|
||||||
for (String userId : split) {
|
|
||||||
ExperimentUser userDomain = new ExperimentUser();
|
|
||||||
userDomain.setExperimentId(experiment.getId());
|
|
||||||
userDomain.setUserId(userId);
|
|
||||||
userDomain.setType("OPERATOR");
|
|
||||||
userList.add(userDomain);
|
|
||||||
}
|
|
||||||
experimentUserService.saveBatch(userList);
|
|
||||||
}
|
|
||||||
|
|
||||||
List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList();
|
|
||||||
if (CollUtil.isNotEmpty(sampleInfoList)) {
|
|
||||||
for (ExperimentSampleInfo sampleInfo : sampleInfoList) {
|
|
||||||
sampleInfo.setExperimentId(experiment.getId());
|
|
||||||
experimentSampleInfoService.saveOrUpdate(sampleInfo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList();
|
|
||||||
if (CollUtil.isNotEmpty(deviationConditionList)) {
|
|
||||||
for (ExperimentDeviationCondition deviationCondition : deviationConditionList) {
|
|
||||||
deviationCondition.setExperimentId(experiment.getId());
|
|
||||||
experimentDeviationConditionService.saveOrUpdate(deviationCondition);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList();
|
|
||||||
if (CollUtil.isNotEmpty(deviationEquipmentList)) {
|
|
||||||
for (ExperimentDeviationEquipment deviationEquipment : deviationEquipmentList) {
|
|
||||||
deviationEquipment.setExperimentId(experiment.getId());
|
|
||||||
experimentDeviationEquipmentService.saveOrUpdate(deviationEquipment);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList();
|
|
||||||
if (CollUtil.isNotEmpty(irradiationBoardList)) {
|
|
||||||
for (ExperimentIrradiationBoard irradiationBoard : irradiationBoardList) {
|
|
||||||
irradiationBoard.setExperimentId(experiment.getId());
|
|
||||||
experimentIrradiationBoardService.saveOrUpdate(irradiationBoard);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
experimentService.updateById(experiment);
|
|
||||||
ExperimentLog experimentLog = new ExperimentLog();
|
ExperimentLog experimentLog = new ExperimentLog();
|
||||||
experimentLog.setExperimentId(experiment.getId());
|
experimentLog.setExperimentId(experiment.getId());
|
||||||
experimentLog.setLogContent("修改实验信息");
|
experimentLog.setLogContent("修改实验信息");
|
||||||
|
|||||||
@@ -0,0 +1,162 @@
|
|||||||
|
package org.jeecg.modules.database.controller;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
|
import org.jeecg.common.api.vo.Result;
|
||||||
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||||
|
import org.jeecg.common.system.base.controller.JeecgController;
|
||||||
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
|
import org.jeecg.modules.database.entity.ExperimentFile;
|
||||||
|
import org.jeecg.modules.database.service.IExperimentFileService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 试验文件
|
||||||
|
* @Author: jeecg-boot
|
||||||
|
* @Date: 2024-12-09
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
@Tag(name = "试验文件")
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/database/experimentFile")
|
||||||
|
@Slf4j
|
||||||
|
public class ExperimentFileController extends JeecgController<ExperimentFile, IExperimentFileService> {
|
||||||
|
@Autowired
|
||||||
|
private IExperimentFileService experimentFileService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页列表查询
|
||||||
|
*
|
||||||
|
* @param experimentFile
|
||||||
|
* @param pageNo
|
||||||
|
* @param pageSize
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
//@AutoLog(value = "试验文件-分页列表查询")
|
||||||
|
@Operation(summary = "试验文件-分页列表查询")
|
||||||
|
@GetMapping(value = "/list")
|
||||||
|
public Result<IPage<ExperimentFile>> queryPageList(ExperimentFile experimentFile,
|
||||||
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||||
|
HttpServletRequest req) {
|
||||||
|
QueryWrapper<ExperimentFile> queryWrapper = QueryGenerator.initQueryWrapper(experimentFile, req.getParameterMap());
|
||||||
|
Page<ExperimentFile> page = new Page<ExperimentFile>(pageNo, pageSize);
|
||||||
|
IPage<ExperimentFile> pageList = experimentFileService.page(page, queryWrapper);
|
||||||
|
return Result.OK(pageList);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 添加
|
||||||
|
*
|
||||||
|
* @param experimentFile
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "试验文件-添加")
|
||||||
|
@Operation(summary = "试验文件-添加")
|
||||||
|
@RequiresPermissions("database:experiment_file:add")
|
||||||
|
@PostMapping(value = "/add")
|
||||||
|
public Result<String> add(@RequestBody ExperimentFile experimentFile) {
|
||||||
|
experimentFileService.save(experimentFile);
|
||||||
|
return Result.OK("添加成功！");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 编辑
|
||||||
|
*
|
||||||
|
* @param experimentFile
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "试验文件-编辑")
|
||||||
|
@Operation(summary = "试验文件-编辑")
|
||||||
|
@RequiresPermissions("database:experiment_file:edit")
|
||||||
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||||
|
public Result<String> edit(@RequestBody ExperimentFile experimentFile) {
|
||||||
|
experimentFileService.updateById(experimentFile);
|
||||||
|
return Result.OK("编辑成功!");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id删除
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "试验文件-通过id删除")
|
||||||
|
@Operation(summary = "试验文件-通过id删除")
|
||||||
|
@RequiresPermissions("database:experiment_file:delete")
|
||||||
|
@DeleteMapping(value = "/delete")
|
||||||
|
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
|
experimentFileService.removeById(id);
|
||||||
|
return Result.OK("删除成功!");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量删除
|
||||||
|
*
|
||||||
|
* @param ids
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "试验文件-批量删除")
|
||||||
|
@Operation(summary = "试验文件-批量删除")
|
||||||
|
@RequiresPermissions("database:experiment_file:deleteBatch")
|
||||||
|
@DeleteMapping(value = "/deleteBatch")
|
||||||
|
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
|
this.experimentFileService.removeByIds(Arrays.asList(ids.split(",")));
|
||||||
|
return Result.OK("批量删除成功!");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id查询
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
//@AutoLog(value = "试验文件-通过id查询")
|
||||||
|
@Operation(summary = "试验文件-通过id查询")
|
||||||
|
@GetMapping(value = "/queryById")
|
||||||
|
public Result<ExperimentFile> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||||
|
ExperimentFile experimentFile = experimentFileService.getById(id);
|
||||||
|
if (experimentFile == null) {
|
||||||
|
return Result.error("未找到对应数据");
|
||||||
|
}
|
||||||
|
return Result.OK(experimentFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 导出excel
|
||||||
|
*
|
||||||
|
* @param request
|
||||||
|
* @param experimentFile
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("database:experiment_file:exportXls")
|
||||||
|
@RequestMapping(value = "/exportXls")
|
||||||
|
public ModelAndView exportXls(HttpServletRequest request, ExperimentFile experimentFile) {
|
||||||
|
return super.exportXls(request, experimentFile, ExperimentFile.class, "试验文件");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过excel导入数据
|
||||||
|
*
|
||||||
|
* @param request
|
||||||
|
* @param response
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("database:experiment_file:importExcel")
|
||||||
|
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||||
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||||
|
return super.importExcel(request, response, ExperimentFile.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -173,21 +173,24 @@ public class Experiment implements Serializable {
|
|||||||
@Excel(name = "试验文件", width = 15)
|
@Excel(name = "试验文件", width = 15)
|
||||||
@Schema(description = "试验文件")
|
@Schema(description = "试验文件")
|
||||||
private String files;
|
private String files;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private List<ExperimentFile> fileList;
|
||||||
/**
|
/**
|
||||||
* 试验人员ID, 逗号分割多个
|
* 试验人员ID, 逗号分割多个
|
||||||
*/
|
*/
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String experimentUser;
|
private String experimentUser;
|
||||||
/**
|
/**
|
||||||
* 试验负责人
|
* 试验负责人
|
||||||
*/
|
*/
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String supervisorName;
|
private String supervisorName;
|
||||||
/**
|
/**
|
||||||
* 试验人员
|
* 试验人员
|
||||||
*/
|
*/
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private List<ExperimentUser> experimentUserList;
|
private List<ExperimentUser> experimentUserList;
|
||||||
//
|
//
|
||||||
//public void addCopyCount() {
|
//public void addCopyCount() {
|
||||||
// if (Objects.isNull(copyCount)) {
|
// if (Objects.isNull(copyCount)) {
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
package org.jeecg.modules.database.entity;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||||
|
import lombok.Data;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||||
|
import org.jeecg.common.aspect.annotation.Dict;
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 试验文件
|
||||||
|
* @Author: jeecg-boot
|
||||||
|
* @Date: 2024-12-09
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@TableName("experiment_file")
|
||||||
|
@Accessors(chain = true)
|
||||||
|
@EqualsAndHashCode(callSuper = false)
|
||||||
|
@Schema(description="试验文件")
|
||||||
|
public class ExperimentFile 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;
|
||||||
|
/**试验ID*/
|
||||||
|
@Excel(name = "试验ID", width = 15)
|
||||||
|
@Schema(description = "试验ID")
|
||||||
|
private String experimentId;
|
||||||
|
/**文件名称*/
|
||||||
|
@Excel(name = "文件名称", width = 15)
|
||||||
|
@Schema(description = "文件名称")
|
||||||
|
private String fileName;
|
||||||
|
/**类型*/
|
||||||
|
@Excel(name = "类型", width = 15)
|
||||||
|
@Schema(description = "类型")
|
||||||
|
private String fileType;
|
||||||
|
/**文件链接*/
|
||||||
|
@Excel(name = "文件链接", width = 15)
|
||||||
|
@Schema(description = "文件链接")
|
||||||
|
private String fileUrl;
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package org.jeecg.modules.database.mapper;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
import org.jeecg.modules.database.entity.ExperimentFile;
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 试验文件
|
||||||
|
* @Author: jeecg-boot
|
||||||
|
* @Date: 2024-12-09
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
public interface ExperimentFileMapper extends BaseMapper<ExperimentFile> {
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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.ExperimentFileMapper">
|
||||||
|
|
||||||
|
</mapper>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package org.jeecg.modules.database.service;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
import org.jeecg.modules.database.entity.ExperimentFile;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 试验文件
|
||||||
|
* @Author: jeecg-boot
|
||||||
|
* @Date: 2024-12-09
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
public interface IExperimentFileService extends IService<ExperimentFile> {
|
||||||
|
|
||||||
|
List<ExperimentFile> getByExperimentId(String experimentId);
|
||||||
|
}
|
||||||
@@ -17,4 +17,6 @@ public interface IExperimentService extends IService<Experiment> {
|
|||||||
|
|
||||||
void changeStatus(String experimentId, String status);
|
void changeStatus(String experimentId, String status);
|
||||||
|
|
||||||
|
void saveWithDetail(Experiment experiment);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package org.jeecg.modules.database.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import org.jeecg.modules.database.entity.ExperimentFile;
|
||||||
|
import org.jeecg.modules.database.mapper.ExperimentFileMapper;
|
||||||
|
import org.jeecg.modules.database.service.IExperimentFileService;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 试验文件
|
||||||
|
* @Author: jeecg-boot
|
||||||
|
* @Date: 2024-12-09
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
public class ExperimentFileServiceImpl extends ServiceImpl<ExperimentFileMapper, ExperimentFile> implements IExperimentFileService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ExperimentFile> getByExperimentId(String experimentId) {
|
||||||
|
return list(new LambdaQueryWrapper<ExperimentFile>().eq(ExperimentFile::getExperimentId, experimentId));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -41,6 +41,9 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IExperimentSequenceService experimentSequenceService;
|
private IExperimentSequenceService experimentSequenceService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IExperimentFileService experimentFileService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void fetchExperimentDetail(Experiment experiment) {
|
public void fetchExperimentDetail(Experiment experiment) {
|
||||||
if (StringUtils.isNotBlank(experiment.getSupervisor())) {
|
if (StringUtils.isNotBlank(experiment.getSupervisor())) {
|
||||||
@@ -83,6 +86,11 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
|
|||||||
experiment.setIrradiationBoardList(irradiationBoardList);
|
experiment.setIrradiationBoardList(irradiationBoardList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<ExperimentFile> experimentFileList = experimentFileService.getByExperimentId(experiment.getId());
|
||||||
|
if (CollUtil.isNotEmpty(experimentFileList)) {
|
||||||
|
experiment.setFileList(experimentFileList);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -155,4 +163,49 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
|
|||||||
experiment.setStatus(status);
|
experiment.setStatus(status);
|
||||||
updateById(experiment);
|
updateById(experiment);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void saveWithDetail(Experiment experiment) {
|
||||||
|
String experimentUser = experiment.getExperimentUser();
|
||||||
|
if (StringUtils.isNotBlank(experimentUser)) {
|
||||||
|
experimentUserService.removeByExperimentId(experiment.getId());
|
||||||
|
for (String userId : experimentUser.split(",")) {
|
||||||
|
ExperimentUser userDomain = new ExperimentUser();
|
||||||
|
userDomain.setExperimentId(experiment.getId());
|
||||||
|
userDomain.setUserId(userId);
|
||||||
|
userDomain.setType("OPERATOR");
|
||||||
|
experimentUserService.save(userDomain);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList();
|
||||||
|
if (CollUtil.isNotEmpty(sampleInfoList)) {
|
||||||
|
for (ExperimentSampleInfo sampleInfo : sampleInfoList) {
|
||||||
|
sampleInfo.setExperimentId(experiment.getId());
|
||||||
|
experimentSampleInfoService.saveOrUpdate(sampleInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList();
|
||||||
|
if (CollUtil.isNotEmpty(deviationConditionList)) {
|
||||||
|
for (ExperimentDeviationCondition deviationCondition : deviationConditionList) {
|
||||||
|
deviationCondition.setExperimentId(experiment.getId());
|
||||||
|
experimentDeviationConditionService.saveOrUpdate(deviationCondition);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList();
|
||||||
|
if (CollUtil.isNotEmpty(deviationEquipmentList)) {
|
||||||
|
for (ExperimentDeviationEquipment deviationEquipment : deviationEquipmentList) {
|
||||||
|
deviationEquipment.setExperimentId(experiment.getId());
|
||||||
|
experimentDeviationEquipmentService.saveOrUpdate(deviationEquipment);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList();
|
||||||
|
if (CollUtil.isNotEmpty(irradiationBoardList)) {
|
||||||
|
for (ExperimentIrradiationBoard irradiationBoard : irradiationBoardList) {
|
||||||
|
irradiationBoard.setExperimentId(experiment.getId());
|
||||||
|
experimentIrradiationBoardService.saveOrUpdate(irradiationBoard);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
saveOrUpdate(experiment);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
<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">试验ID：</text></view>
|
||||||
|
<input placeholder="请输入试验ID" v-model="model.experimentId"/>
|
||||||
|
</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.fileName"/>
|
||||||
|
</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.fileType"/>
|
||||||
|
</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.fileUrl"/>
|
||||||
|
</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: "ExperimentFileForm",
|
||||||
|
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/experimentFile/queryById",
|
||||||
|
add: "/database/experimentFile/add",
|
||||||
|
edit: "/database/experimentFile/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/experimentFile/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/experimentFile/list',
|
||||||
|
save='/database/experimentFile/add',
|
||||||
|
edit='/database/experimentFile/edit',
|
||||||
|
deleteOne = '/database/experimentFile/delete',
|
||||||
|
deleteBatch = '/database/experimentFile/deleteBatch',
|
||||||
|
importExcel = '/database/experimentFile/importExcel',
|
||||||
|
exportXls = '/database/experimentFile/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,78 @@
|
|||||||
|
import {BasicColumn} from '/@/components/Table';
|
||||||
|
import {FormSchema} from '/@/components/Table';
|
||||||
|
import { rules} from '/@/utils/helper/validator';
|
||||||
|
import { render } from '/@/utils/common/renderUtils';
|
||||||
|
import { getWeekMonthQuarterYear } from '/@/utils';
|
||||||
|
//列表数据
|
||||||
|
export const columns: BasicColumn[] = [
|
||||||
|
{
|
||||||
|
title: '试验ID',
|
||||||
|
align:"center",
|
||||||
|
dataIndex: 'experimentId'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '文件名称',
|
||||||
|
align:"center",
|
||||||
|
dataIndex: 'fileName'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '类型',
|
||||||
|
align:"center",
|
||||||
|
dataIndex: 'fileType'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '文件链接',
|
||||||
|
align:"center",
|
||||||
|
dataIndex: 'fileUrl'
|
||||||
|
},
|
||||||
|
];
|
||||||
|
//查询数据
|
||||||
|
export const searchFormSchema: FormSchema[] = [
|
||||||
|
];
|
||||||
|
//表单数据
|
||||||
|
export const formSchema: FormSchema[] = [
|
||||||
|
{
|
||||||
|
label: '试验ID',
|
||||||
|
field: 'experimentId',
|
||||||
|
component: 'Input',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '文件名称',
|
||||||
|
field: 'fileName',
|
||||||
|
component: 'Input',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '类型',
|
||||||
|
field: 'fileType',
|
||||||
|
component: 'Input',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '文件链接',
|
||||||
|
field: 'fileUrl',
|
||||||
|
component: 'Input',
|
||||||
|
},
|
||||||
|
// TODO 主键隐藏字段，目前写死为ID
|
||||||
|
{
|
||||||
|
label: '',
|
||||||
|
field: 'id',
|
||||||
|
component: 'Input',
|
||||||
|
show: false
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
// 高级查询数据
|
||||||
|
export const superQuerySchema = {
|
||||||
|
experimentId: {title: '试验ID',order: 0,view: 'text', type: 'string',},
|
||||||
|
fileName: {title: '文件名称',order: 1,view: 'text', type: 'string',},
|
||||||
|
fileType: {title: '类型',order: 2,view: 'text', type: 'string',},
|
||||||
|
fileUrl: {title: '文件链接',order: 3,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>
|
||||||
|
<!-- 表单区域 -->
|
||||||
|
<ExperimentFileModal @register="registerModal" @success="handleSuccess"></ExperimentFileModal>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" name="database-experimentFile" 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 ExperimentFileModal from './components/ExperimentFileModal.vue'
|
||||||
|
import {columns, searchFormSchema, superQuerySchema} from './ExperimentFile.data';
|
||||||
|
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ExperimentFile.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 ('2024120903338100040', NULL, '试验文件', '/database/experimentFileList', 'database/ExperimentFileList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0);
|
||||||
|
|
||||||
|
-- 权限控制sql
|
||||||
|
-- 新增
|
||||||
|
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
|
||||||
|
VALUES ('2024120903338100041', '2024120903338100040', '添加试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);
|
||||||
|
-- 编辑
|
||||||
|
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
|
||||||
|
VALUES ('2024120903338100042', '2024120903338100040', '编辑试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);
|
||||||
|
-- 删除
|
||||||
|
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
|
||||||
|
VALUES ('2024120903338100043', '2024120903338100040', '删除试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);
|
||||||
|
-- 批量删除
|
||||||
|
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
|
||||||
|
VALUES ('2024120903338100044', '2024120903338100040', '批量删除试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);
|
||||||
|
-- 导出excel
|
||||||
|
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
|
||||||
|
VALUES ('2024120903338100045', '2024120903338100040', '导出excel_试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);
|
||||||
|
-- 导入excel
|
||||||
|
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
|
||||||
|
VALUES ('2024120903338100046', '2024120903338100040', '导入excel_试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', 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 '../ExperimentFile.data';
|
||||||
|
import {saveOrUpdate} from '../ExperimentFile.api';
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
name: "ExperimentFileForm",
|
||||||
|
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/experimentFile/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 '../ExperimentFile.data';
|
||||||
|
import {saveOrUpdate} from '../ExperimentFile.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>
|
||||||
@@ -70,7 +70,7 @@ public class LoginController {
|
|||||||
String password = sysLoginModel.getPassword();
|
String password = sysLoginModel.getPassword();
|
||||||
if (isLoginFailOvertimes(username)) {
|
if (isLoginFailOvertimes(username)) {
|
||||||
long expire = redisUtil.getExpire(CommonConstant.LOGIN_FAIL + username);
|
long expire = redisUtil.getExpire(CommonConstant.LOGIN_FAIL + username);
|
||||||
return result.error500("该用户登录失败次数过多，请于" + (expire / 60) + 1 + "分钟后再次登录！");
|
return result.error500("该用户登录失败次数过多，请于" + ((expire / 60) + 1) + "分钟后再次登录！");
|
||||||
}
|
}
|
||||||
|
|
||||||
// step.1 验证码check
|
// step.1 验证码check
|
||||||
@@ -185,7 +185,8 @@ public class LoginController {
|
|||||||
LoginUser sysUser = sysBaseApi.getUserByName(username);
|
LoginUser sysUser = sysBaseApi.getUserByName(username);
|
||||||
if (sysUser != null) {
|
if (sysUser != null) {
|
||||||
//update-begin--Author:wangshuai Date:20200714 for：登出日志没有记录人员
|
//update-begin--Author:wangshuai Date:20200714 for：登出日志没有记录人员
|
||||||
baseCommonService.addLog("用户名: " + sysUser.getRealname() + ",退出成功！", CommonConstant.LOG_TYPE_1, null, sysUser,new Date());
|
baseCommonService.addLog("用户名: " + sysUser.getRealname() + ",退出成功！", CommonConstant.LOG_TYPE_1, null, sysUser,
|
||||||
|
new Date());
|
||||||
//update-end--Author:wangshuai Date:20200714 for：登出日志没有记录人员
|
//update-end--Author:wangshuai Date:20200714 for：登出日志没有记录人员
|
||||||
log.info(" 用户名: " + sysUser.getRealname() + ",退出成功！ ");
|
log.info(" 用户名: " + sysUser.getRealname() + ",退出成功！ ");
|
||||||
//清空用户登录Token缓存
|
//清空用户登录Token缓存
|
||||||
|
|||||||
Reference in New Issue
Block a user