diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 11affdd..8f2ca35 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -56,4 +56,13 @@ } return ""; } + + public static String getValueByCode(String code){ + for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { + if(applyFromIdEnum.getValue().equals(code)){ + return applyFromIdEnum.getValue(); + } + } + return ""; + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 11affdd..8f2ca35 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -56,4 +56,13 @@ } return ""; } + + public static String getValueByCode(String code){ + for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { + if(applyFromIdEnum.getValue().equals(code)){ + return applyFromIdEnum.getValue(); + } + } + return ""; + } } diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java index ce045cb..da173c2 100644 --- a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java @@ -18,6 +18,7 @@ /** * @Description: 数据库备份任务 + * 注：需在项目启动服务器中安装MySQL使用mysqldump命令，或和数据库部署在同一服务器 * @Author: wangpeng * @Date: 2023/7/4 13:39 */ @@ -46,7 +47,7 @@ * cmd ： 不压缩 (本地或服务器需安装 mysqldump 命令(安装mysql自带患独立安装) * --column-statistics=0 mysql8 添加该参数, 非mysql8 不添加, 否则将出错 */ - String cmdMysql8 = "D:\\software\\mysql-8.0\\mysql-8.0.16-winx64\\bin\\mysqldump --column-statistics=0 -u{USERNAME} -p{PASSWORD} -h{SERVER} -P{PORT} --databases {DBNAME} > {FILEPATH}"; + String cmdMysql8 = "mysqldump --column-statistics=0 -u{USERNAME} -p{PASSWORD} -h{SERVER} -P{PORT} --databases {DBNAME} > {FILEPATH}"; String cmd = "mysqldump -u{USERNAME} -p{PASSWORD} -h{SERVER} -P{PORT} --databases {DBNAME} > {FILEPATH}"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 11affdd..8f2ca35 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -56,4 +56,13 @@ } return ""; } + + public static String getValueByCode(String code){ + for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { + if(applyFromIdEnum.getValue().equals(code)){ + return applyFromIdEnum.getValue(); + } + } + return ""; + } } diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java index ce045cb..da173c2 100644 --- a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java @@ -18,6 +18,7 @@ /** * @Description: 数据库备份任务 + * 注：需在项目启动服务器中安装MySQL使用mysqldump命令，或和数据库部署在同一服务器 * @Author: wangpeng * @Date: 2023/7/4 13:39 */ @@ -46,7 +47,7 @@ * cmd ： 不压缩 (本地或服务器需安装 mysqldump 命令(安装mysql自带患独立安装) * --column-statistics=0 mysql8 添加该参数, 非mysql8 不添加, 否则将出错 */ - String cmdMysql8 = "D:\\software\\mysql-8.0\\mysql-8.0.16-winx64\\bin\\mysqldump --column-statistics=0 -u{USERNAME} -p{PASSWORD} -h{SERVER} -P{PORT} --databases {DBNAME} > {FILEPATH}"; + String cmdMysql8 = "mysqldump --column-statistics=0 -u{USERNAME} -p{PASSWORD} -h{SERVER} -P{PORT} --databases {DBNAME} > {FILEPATH}"; String cmd = "mysqldump -u{USERNAME} -p{PASSWORD} -h{SERVER} -P{PORT} --databases {DBNAME} > {FILEPATH}"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageUpdateRequest.java index ba1fba8..e3f9a96 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageUpdateRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageUpdateRequest.java @@ -14,11 +14,26 @@ @ApiModel @Data public class ApprovalMessageUpdateRequest { - @NotNull(message = "id不能为空") - @ApiModelProperty(value = "主键id", dataType = "Long") +// @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") private Long id; @NotNull(message = "更新状态不能为空") - @ApiModelProperty(value = "状态（1已读0未读）", dataType = "Integer") + @ApiModelProperty(value = "状态（1已读0未读）", dataType = "Integer", required = true) private Integer status; + + @ApiModelProperty(value = "表单id（待审批处理时传该参数）", dataType = "String") + private String formId; + + @ApiModelProperty(value = "业务主键id（待审批处理时传该参数）", dataType = "String") + private String businessId; + + @ApiModelProperty(value = "流程实例id（待审批处理时传该参数）", dataType = "String") + private String processId; + + @ApiModelProperty(value = "任务id（待审批处理时传该参数）", dataType = "String") + private String taskId; + + @ApiModelProperty(value = "可选决策项（待审批处理时传该参数）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 11affdd..8f2ca35 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -56,4 +56,13 @@ } return ""; } + + public static String getValueByCode(String code){ + for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { + if(applyFromIdEnum.getValue().equals(code)){ + return applyFromIdEnum.getValue(); + } + } + return ""; + } } diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java index ce045cb..da173c2 100644 --- a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/MysqlDataBackupHandler.java @@ -18,6 +18,7 @@ /** * @Description: 数据库备份任务 + * 注：需在项目启动服务器中安装MySQL使用mysqldump命令，或和数据库部署在同一服务器 * @Author: wangpeng * @Date: 2023/7/4 13:39 */ @@ -46,7 +47,7 @@ * cmd ： 不压缩 (本地或服务器需安装 mysqldump 命令(安装mysql自带患独立安装) * --column-statistics=0 mysql8 添加该参数, 非mysql8 不添加, 否则将出错 */ - String cmdMysql8 = "D:\\software\\mysql-8.0\\mysql-8.0.16-winx64\\bin\\mysqldump --column-statistics=0 -u{USERNAME} -p{PASSWORD} -h{SERVER} -P{PORT} --databases {DBNAME} > {FILEPATH}"; + String cmdMysql8 = "mysqldump --column-statistics=0 -u{USERNAME} -p{PASSWORD} -h{SERVER} -P{PORT} --databases {DBNAME} > {FILEPATH}"; String cmd = "mysqldump -u{USERNAME} -p{PASSWORD} -h{SERVER} -P{PORT} --databases {DBNAME} > {FILEPATH}"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageUpdateRequest.java index ba1fba8..e3f9a96 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageUpdateRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageUpdateRequest.java @@ -14,11 +14,26 @@ @ApiModel @Data public class ApprovalMessageUpdateRequest { - @NotNull(message = "id不能为空") - @ApiModelProperty(value = "主键id", dataType = "Long") +// @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") private Long id; @NotNull(message = "更新状态不能为空") - @ApiModelProperty(value = "状态（1已读0未读）", dataType = "Integer") + @ApiModelProperty(value = "状态（1已读0未读）", dataType = "Integer", required = true) private Integer status; + + @ApiModelProperty(value = "表单id（待审批处理时传该参数）", dataType = "String") + private String formId; + + @ApiModelProperty(value = "业务主键id（待审批处理时传该参数）", dataType = "String") + private String businessId; + + @ApiModelProperty(value = "流程实例id（待审批处理时传该参数）", dataType = "String") + private String processId; + + @ApiModelProperty(value = "任务id（待审批处理时传该参数）", dataType = "String") + private String taskId; + + @ApiModelProperty(value = "可选决策项（待审批处理时传该参数）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java index d3d3a5d..1edbc1b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java @@ -133,7 +133,7 @@ private void enrichSkipParams(WorkbenchApprovalMessage approvalMessage) { List businessIds = new ArrayList<>(); businessIds.add(approvalMessage.getBusinessId()); - if(ApplyFromIdEnum.FILE_APPROVAL.getCode().equals(approvalMessage.getFormId()) && approvalMessage.getMessageTitle().contains("待审批")) { + if(ApplyFromIdEnum.FILE_APPROVAL.getCode().equals(approvalMessage.getFormId())) { List meterFiles = meterFileMapper.selectBatchForApproval(PageFactory.defaultPage(), new FileApprovalListRequest(), businessIds); if(!CollectionUtils.isEmpty(meterFiles)){ FileApprovalListResponse fileApprovalListResponse = ConvertUtils.sourceToTarget(meterFiles.get(0), FileApprovalListResponse.class); @@ -142,7 +142,7 @@ //查询为空说明待审批在flowable中残留，在业务表中已删除 approvalMessage.setDel(1); } - }else if(ApplyFromIdEnum.TRAIN_APPROVAL.getCode().equals(approvalMessage.getFormId()) && approvalMessage.getMessageTitle().contains("待审批")) { + }else if(ApplyFromIdEnum.TRAIN_APPROVAL.getCode().equals(approvalMessage.getFormId())) { List meterTrainPlans = trainPlanMapper.selectBatchForApproval(PageFactory.defaultPage(), new TrainPlanApprovalListRequest(), businessIds); if(!CollectionUtils.isEmpty(meterTrainPlans)){ TrainPlanApprovalListResponse trainPlanApprovalListResponse = ConvertUtils.sourceToTarget(meterTrainPlans.get(0), TrainPlanApprovalListResponse.class); @@ -150,7 +150,7 @@ }else { approvalMessage.setDel(1); } - }else if(ApplyFromIdEnum.STANDARD_EQUIPMENT.getCode().equals(approvalMessage.getFormId()) && approvalMessage.getMessageTitle().contains("待审批")) { + }else if(ApplyFromIdEnum.STANDARD_EQUIPMENT.getCode().equals(approvalMessage.getFormId())) { List meterTraceSuppliers = traceSupplierMapper.selectBatchForApproval(PageFactory.defaultPage(), new TraceSupplierApprovalListRequest(), businessIds); if(!CollectionUtils.isEmpty(meterTraceSuppliers)){ TraceSupplierApprovalListResponse traceSupplierApprovalListResponse = ConvertUtils.sourceToTarget(meterTraceSuppliers.get(0), TraceSupplierApprovalListResponse.class); @@ -163,11 +163,23 @@ @Override public ReturnDTO updateStatus(ApprovalMessageUpdateRequest updateRequest) { - WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage(); - approvalMessage.setId(updateRequest.getId()); - approvalMessage.setStatus(updateRequest.getStatus()); - if(approvalMessageMapper.updateById(approvalMessage) > 0){ - return ReturnUtil.success(); + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + if(Objects.isNull(updateRequest.getId())){ + String formId = updateRequest.getFormId(); + message.setFormId(formId); + message.setMessageSourceModule(ApplyFromIdEnum.getSourceByCode(formId)); + message.setMessageTitle("待审批通知"); + message.setMessageContent(ApplyFromIdEnum.getValueByCode(formId)); + message.setStatus(1); + message.setBusinessId(updateRequest.getBusinessId()); + message.setProcessId(updateRequest.getProcessId()); + message.setTaskId(updateRequest.getTaskId()); + message.setDecisionItem(updateRequest.getDecisionItem()); + if(approvalMessageMapper.insert(message) > 0) return ReturnUtil.success(); + }else { + message.setId(updateRequest.getId()); + message.setStatus(updateRequest.getStatus()); + if(approvalMessageMapper.updateById(message) > 0) return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); }