diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/controller/DataBaseController.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/controller/DataBaseController.java index 8667a41..642838c 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/controller/DataBaseController.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/controller/DataBaseController.java @@ -152,8 +152,8 @@ public class DataBaseController extends BladeController { excel.setDataTableAlias("任务种类"); excels.add(excel); // ExcelUtil.export(response, "数据库数据" + DateUtil.time(), "数据库数据", excels, DatabaseExcel.class); - - String fileName = "D:\\test\\" + System.currentTimeMillis() + ".xlsx"; + String path = sysClient.getParamValue("data_base_excel_path").getData(); + String fileName = path + UUID.randomUUID().toString() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 EasyExcel.write(fileName, DatabaseExcel.class).registerWriteHandler(new CustomSheetWriteHandler()) .registerWriteHandler(new CustomCellWriteHandler()).sheet("模板").doWrite(excels); @@ -177,7 +177,8 @@ public class DataBaseController extends BladeController { // 3、创建一个目录对象 SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); - String basePath = "D://用户签名//" + format.format(new Date()); + String path = sysClient.getParamValue("workorder_file_upload_path").getData(); + String basePath = path + format.format(new Date()); File dir = new File(basePath); //判断当前目录是否存在 if (!dir.exists()) { @@ -187,13 +188,13 @@ public class DataBaseController extends BladeController { try { // 4、将临时文件转存到指定位置 - file.transferTo(new File(basePath + "//" + fileName)); + file.transferTo(new File(basePath + "/" + fileName)); } catch (IOException e) { e.printStackTrace(); } UploadReturn uploadReturn = new UploadReturn(); uploadReturn.setName(originalFilename); - uploadReturn.setPath(basePath + "//" + fileName); + uploadReturn.setPath(basePath + "/" + fileName); uploadReturn.setCreateUser(AuthUtil.getNickName()); uploadReturn.setCreateTime(new Date()); return R.data(uploadReturn); @@ -219,7 +220,7 @@ public class DataBaseController extends BladeController { // } File file2 = new File(path); //获取文件名 - String[] split = path.split("//"); + String[] split = path.split("/"); String fileName = split[split.length - 1]; // String[] split1 = fileName.split("."); // String s = split1[0]; diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/impl/DataBaseServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/impl/DataBaseServiceImpl.java index 2bdee77..cee0d5c 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/impl/DataBaseServiceImpl.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/service/impl/DataBaseServiceImpl.java @@ -68,7 +68,8 @@ public class DataBaseServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DataTable::getDataBaseId, base.getId()); @@ -78,11 +79,13 @@ public class DataBaseServiceImpl extends BaseServiceImpl 0) { - throw new Exception("数据重复！"); + throw new Exception("操作失败"); } else { taskInfo.setCreateUserName(AuthUtil.getNickName()); return R.status(taskInfoService.save(taskInfo)); @@ -111,7 +111,7 @@ public class TaskInfoController extends BladeController { wrapper.eq(TaskInfo::getTaskParentId, taskInfo.getTaskParentId()); TaskInfo info = taskInfoService.getOne(wrapper); if (info != null && !taskInfo.getId().equals(info.getId())) { - throw new Exception("数据重复！"); + throw new Exception("操作失败"); } else { return R.status(taskInfoService.updateById(taskInfo)); } diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/entity/WorkOrder.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/entity/WorkOrder.java index c5413ca..5d62c8d 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/entity/WorkOrder.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/entity/WorkOrder.java @@ -1,11 +1,21 @@ package org.springblade.plugin.operation.workorder.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; import java.util.Date; @Data -public class WorkOrder { +@TableName("t_work_order") +@EqualsAndHashCode(callSuper = true) +public class WorkOrder extends TenantEntity { + private static final long serialVersionUID = 1L; + + // 流程id + private String processInstanceId; // 任务种类 private String taskType; @@ -13,44 +23,62 @@ public class WorkOrder { // 任务父类 private String taskParent; - // 操作模块 - private String operationModule; - // 当前责任人 + @TableField(exist = false) private String currentResponsiblePerson; // 分管部门 - private String dept; + private String management; // 任务等级 - private String level; + private String taskLevel; + + //重复模式id 字典 + private String repeatMode; // 运维公司 - private String company; + private String maintenanceCompany; // 发起人 - private String sponsor; + private String applyUser; // 审批状态 + @TableField(exist = false) private String approvalStatus; - // 创建时间 - private Date createTime; + //系统名称、数据库 1 系统 2数据库 + private Integer type; + + //系统名称或数据库id + private String operateSys; + + //模块或数据库表id + private String operateModule; + + //是否完成 0 否 1 是 + private Integer isFinish; + + //完成时间 + private Date finishTime; // 结束时间 + @TableField(exist = false) private Date endTime; // 期望完成时间 + @TableField(exist = false) private String expectedCompletionTime; + @TableField(exist = false) private String taskId; - private String processInstanceId; - + @TableField(exist = false) private Date startTime; + @TableField(exist = false) private Date startTime2; + @TableField(exist = false) private Date endTime2; } diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java index 35aac1d..79d321a 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java @@ -120,18 +120,18 @@ public class WorkOrderServiceImpl implements IWorkOrderService { // 操作模块 ProjectInfo projectInfo = projectInfoService.getById(variables.get("xitongmingchengshujuku").toString()); if (projectInfo != null) { - order.setOperationModule(projectInfo.getProjectName()); + order.setOperateSys(projectInfo.getProjectName()); } else { - order.setOperationModule(dataBaseService.getById(variables.get("xitongmingchengshujuku").toString()).getDataBaseName()); + order.setOperateSys(dataBaseService.getById(variables.get("xitongmingchengshujuku").toString()).getDataBaseName()); } // 当前责任人 order.setCurrentResponsiblePerson(userClient.userInfoById(Long.parseLong(task.getAssignee())).getData().getRealName()); - order.setDept(variables.get("$guanlibumen").toString()); + order.setManagement(variables.get("$guanlibumen").toString()); // 运维公司 - order.setCompany(userClient.userInfoById(Long.parseLong(variables.get("yunweigongsi").toString())).getData().getRealName()); - order.setSponsor(userClient.userInfoById(Long.parseLong(historicProcessInstance.getStartUserId())).getData().getRealName()); + order.setMaintenanceCompany(userClient.userInfoById(Long.parseLong(variables.get("yunweigongsi").toString())).getData().getRealName()); + order.setApplyUser(userClient.userInfoById(Long.parseLong(historicProcessInstance.getStartUserId())).getData().getRealName()); if (task.getName().contains("审批")) { order.setApprovalStatus("审批中"); @@ -165,8 +165,8 @@ public class WorkOrderServiceImpl implements IWorkOrderService { } // 管理部门 - if (StringUtils.isNotBlank(workOrder.getDept())) { - workOrders = workOrders.stream().filter(s -> s.getDept().equals(workOrder.getDept())).collect(Collectors.toList()); + if (StringUtils.isNotBlank(workOrder.getManagement())) { + workOrders = workOrders.stream().filter(s -> s.getManagement().equals(workOrder.getManagement())).collect(Collectors.toList()); } // 任务级别 @@ -180,8 +180,8 @@ public class WorkOrderServiceImpl implements IWorkOrderService { } // 发起人 - if (StringUtils.isNotBlank(workOrder.getSponsor())) { - workOrders = workOrders.stream().filter(s -> s.getSponsor().equals(workOrder.getSponsor())).collect(Collectors.toList()); + if (StringUtils.isNotBlank(workOrder.getApplyUser())) { + workOrders = workOrders.stream().filter(s -> s.getApplyUser().equals(workOrder.getApplyUser())).collect(Collectors.toList()); } // 创建时间范围 @@ -224,10 +224,10 @@ public class WorkOrderServiceImpl implements IWorkOrderService { if (StringUtils.isNotBlank(workOrder.getTaskType()) || StringUtils.isNotBlank(workOrder.getTaskParent()) || StringUtils.isNotBlank(workOrder.getCurrentResponsiblePerson()) || - StringUtils.isNotBlank(workOrder.getDept()) || - StringUtils.isNotBlank(workOrder.getLevel()) || + StringUtils.isNotBlank(workOrder.getManagement()) || + StringUtils.isNotBlank(workOrder.getTaskLevel()) || StringUtils.isNotBlank(workOrder.getApprovalStatus()) || - StringUtils.isNotBlank(workOrder.getSponsor()) || + StringUtils.isNotBlank(workOrder.getApplyUser()) || (workOrder.getStartTime() != null && workOrder.getEndTime() != null) || (workOrder.getStartTime2() != null && workOrder.getEndTime2() != null)) { workOrders = getList(workOrder); @@ -351,13 +351,19 @@ public class WorkOrderServiceImpl implements IWorkOrderService { varMap.put("renwufulei", DictBizCache.getById(Long.parseLong(varMap.get("renwufulei").toString())).getDictValue()); // 操作模块 - ProjectInfo projectInfo = projectInfoService.getById(varMap.get("xitongmingchengshujuku").toString()); - if (projectInfo != null) { - varMap.put("xitongmingchengshujuku", projectInfo.getProjectName()); + if ("1".equals(varMap.get("type").toString())) { + varMap.put("xitongmingchengshujuku", projectInfoService.getById(varMap.get("xitongmingchengshujuku").toString()).getProjectName()); } else { varMap.put("xitongmingchengshujuku", dataBaseService.getById(varMap.get("xitongmingchengshujuku").toString()).getDataBaseName()); } +// ProjectInfo projectInfo = projectInfoService.getById(varMap.get("xitongmingchengshujuku").toString()); +// if (projectInfo != null) { +// varMap.put("xitongmingchengshujuku", projectInfo.getProjectName()); +// } else { +// varMap.put("xitongmingchengshujuku", dataBaseService.getById(varMap.get("xitongmingchengshujuku").toString()).getDataBaseName()); +// } + // 运维公司 varMap.put("yunweigongsi", userClient.userInfoById(Long.parseLong(varMap.get("yunweigongsi").toString())).getData().getRealName()); @@ -412,8 +418,8 @@ public class WorkOrderServiceImpl implements IWorkOrderService { } // 任务等级 - if (StringUtils.isNotBlank(workOrder.getLevel())) { - workOrders = workOrders.stream().filter(s -> s.get("$renwudengji").equals(workOrder.getLevel())).collect(Collectors.toList()); + if (StringUtils.isNotBlank(workOrder.getTaskLevel())) { + workOrders = workOrders.stream().filter(s -> s.get("$renwudengji").equals(workOrder.getTaskLevel())).collect(Collectors.toList()); } // 任务种类 @@ -427,8 +433,8 @@ public class WorkOrderServiceImpl implements IWorkOrderService { } // 管理部门 - if (StringUtils.isNotBlank(workOrder.getDept())) { - workOrders = workOrders.stream().filter(s -> s.get("$guanlibumen").equals(workOrder.getDept())).collect(Collectors.toList()); + if (StringUtils.isNotBlank(workOrder.getManagement())) { + workOrders = workOrders.stream().filter(s -> s.get("$guanlibumen").equals(workOrder.getManagement())).collect(Collectors.toList()); } // 审批状态 @@ -437,8 +443,8 @@ public class WorkOrderServiceImpl implements IWorkOrderService { } // 发起人 - if (StringUtils.isNotBlank(workOrder.getSponsor())) { - workOrders = workOrders.stream().filter(s -> s.get("startUserId").equals(workOrder.getSponsor())).collect(Collectors.toList()); + if (StringUtils.isNotBlank(workOrder.getApplyUser())) { + workOrders = workOrders.stream().filter(s -> s.get("startUserId").equals(workOrder.getApplyUser())).collect(Collectors.toList()); } // 创建时间范围