From 9c6911f29866b741fefe65ca404443615f56ec72 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Sat, 29 Mar 2025 20:09:41 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E5=AF=B9=E6=8E=A5=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E9=A2=84=E8=AD=A6=EF=BC=8C=E5=B9=B6=E4=B8=94=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=93=8D=E5=BA=94=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E3=80=82=202=E3=80=81=E5=AF=B9=E6=8E=A5=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E9=A2=84=E8=AD=A6=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/api/RemoteWorkflowService.java | 6 +-- .../{FlowDepartVo.java => FlowLabelVo.java} | 2 +- .../BusinessAlertStatisticsServiceImpl.java | 22 ++++----- dk-modules/sample/pom.xml | 1 - .../controller/system/AiLabelController.java | 1 + ...ontroller.java => FlwLabelController.java} | 18 +++---- .../{FlowDepart.java => FlowLabel.java} | 13 ++--- .../workflow/domain/vo/FlowDefinitionVo.java | 2 +- .../dubbo/RemoteWorkflowServiceImpl.java | 8 ++- .../workflow/mapper/FlwDepartMapper.java | 15 ------ .../workflow/mapper/FlwLabelMapper.java | 13 +++++ .../workflow/service/FlwDepartService.java | 11 ----- .../workflow/service/FlwLabelService.java | 11 +++++ .../workflow/service/IFlwTaskService.java | 11 ++--- .../impl/FlwDefinitionServiceImpl.java | 10 ++-- .../service/impl/FlwDepartServiceImpl.java | 49 ------------------- .../service/impl/FlwLabelServiceImpl.java | 47 ++++++++++++++++++ .../service/impl/FlwTaskServiceImpl.java | 21 +++----- .../mapper/workflow/FlwDepartMapper.xml | 22 --------- .../mapper/workflow/FlwLabelMapper.xml | 22 +++++++++ pom.xml | 10 +++- 21 files changed, 148 insertions(+), 167 deletions(-) rename dk-api/api-workflow/src/main/java/org/dromara/workflow/api/domain/{FlowDepartVo.java => FlowLabelVo.java} (89%) rename dk-modules/workflow/src/main/java/org/dromara/workflow/controller/{FlwDepartController.java => FlwLabelController.java} (66%) rename dk-modules/workflow/src/main/java/org/dromara/workflow/domain/{FlowDepart.java => FlowLabel.java} (72%) delete mode 100644 dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwDepartMapper.java create mode 100644 dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwLabelMapper.java delete mode 100644 dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwDepartService.java create mode 100644 dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwLabelService.java delete mode 100644 dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDepartServiceImpl.java create mode 100644 dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java delete mode 100644 dk-modules/workflow/src/main/resources/mapper/workflow/FlwDepartMapper.xml create mode 100644 dk-modules/workflow/src/main/resources/mapper/workflow/FlwLabelMapper.xml diff --git a/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java b/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java index f83753a..e685f11 100644 --- a/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java +++ b/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java @@ -1,15 +1,13 @@ package org.dromara.workflow.api; import org.dromara.system.api.domain.vo.RemoteUserVo; -import org.dromara.workflow.api.domain.FlowDepartVo; +import org.dromara.workflow.api.domain.FlowLabelVo; import org.dromara.workflow.api.domain.RemoteCompleteTask; import org.dromara.workflow.api.domain.RemoteStartProcess; import org.dromara.workflow.api.domain.RemoteStartProcessReturn; -import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.concurrent.CompletableFuture; /** * 通用 工作流服务 @@ -128,6 +126,6 @@ public interface RemoteWorkflowService { */ List currentTaskAllUser(Long taskId); - FlowDepartVo getFlowDepart(Long deptId); + FlowLabelVo getFlowLabel(String labelId); } diff --git a/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/domain/FlowDepartVo.java b/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/domain/FlowLabelVo.java similarity index 89% rename from dk-api/api-workflow/src/main/java/org/dromara/workflow/api/domain/FlowDepartVo.java rename to dk-api/api-workflow/src/main/java/org/dromara/workflow/api/domain/FlowLabelVo.java index 84dc82b..a67987f 100644 --- a/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/domain/FlowDepartVo.java +++ b/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/domain/FlowLabelVo.java @@ -3,7 +3,7 @@ package org.dromara.workflow.api.domain; import lombok.Data; @Data -public class FlowDepartVo { +public class FlowLabelVo { private Long id; diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java index a6ab19f..0d3ec23 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java @@ -398,12 +398,12 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist List result = new ArrayList<>(); - AtomicInteger number = new AtomicInteger(90); - - AtomicInteger number1 = new AtomicInteger(5); +// AtomicInteger number = new AtomicInteger(90); +// +// AtomicInteger number1 = new AtomicInteger(5); postVoList.forEach(postVo -> { - number.getAndIncrement(); +// number.getAndIncrement(); StatObj statObj = new StatObj(); statObj.setStatKey(postVo.getPostName()); @@ -415,22 +415,22 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist if (ObjectUtil.isEmpty(labelList)){ monthList.forEach(month -> { - data.add(number.get() + 10.0); + data.add(0.0); }); }else { businessAlertBo.setAiLabelEnList(labelList); List> rateList = baseMapper.handlerRate(businessAlertBo,monthList); if (ObjectUtil.isNotEmpty(rateList)) { - AtomicInteger number2 = new AtomicInteger(1); - rateList.forEach(rate -> { - number2.getAndIncrement(); - rate.put("avgInfo",number.get() + number1.get() + number2.get()); - }); +// AtomicInteger number2 = new AtomicInteger(1); +// rateList.forEach(rate -> { +// number2.getAndIncrement(); +// rate.put("avgInfo",number.get() + number1.get() + number2.get()); +// }); data.addAll(rateList.stream().map(p-> p.get("avgInfo")).toList()); }else { monthList.forEach(month -> { - data.add(number.get() + 10.0); + data.add(0.0); }); } } diff --git a/dk-modules/sample/pom.xml b/dk-modules/sample/pom.xml index 4548b5d..002a457 100644 --- a/dk-modules/sample/pom.xml +++ b/dk-modules/sample/pom.xml @@ -132,5 +132,4 @@ 1.12.261 - diff --git a/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java b/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java index 8b4fa47..babe5c3 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java +++ b/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java @@ -46,6 +46,7 @@ public class AiLabelController extends BaseController { return aiLabelService.queryPageList(bo, pageQuery); } + /** * 下拉框集合 */ diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwDepartController.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwLabelController.java similarity index 66% rename from dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwDepartController.java rename to dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwLabelController.java index 848ce37..942ece3 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwDepartController.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwLabelController.java @@ -7,8 +7,8 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.FlowDepart; -import org.dromara.workflow.service.FlwDepartService; +import org.dromara.workflow.domain.FlowLabel; +import org.dromara.workflow.service.FlwLabelService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/depart") -public class FlwDepartController { +@RequestMapping("/flow/label") +public class FlwLabelController { - private final FlwDepartService flwDepartService; + private final FlwLabelService flwDepartService; /** * 查询流程部门关系 @@ -29,7 +29,7 @@ public class FlwDepartController { */ @Operation(summary = "查询流程部门关系",description = "查询流程部门关系") @GetMapping("/{flowCode}/getInfo") - public R getInfo(@PathVariable String flowCode) { + public R getInfo(@PathVariable String flowCode) { return R.ok(flwDepartService.getInfo(flowCode)); } @@ -39,8 +39,8 @@ public class FlwDepartController { * flowCode */ @Operation(summary = "绑定流程部门关系",description = "绑定流程部门关系") - @PostMapping("/bind/depart") - public R bindDepart(@Validated({AddGroup.class}) @RequestBody FlowDepart flowDepart) { - return R.ok(flwDepartService.bindDepart(flowDepart)); + @PostMapping("/bind/label") + public R bindLabel(@Validated({AddGroup.class}) @RequestBody FlowLabel flowLabel) { + return R.ok(flwDepartService.bindLabel(flowLabel)); } } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowDepart.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java similarity index 72% rename from dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowDepart.java rename to dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java index f52887a..6d7531a 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowDepart.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java @@ -15,18 +15,13 @@ import java.util.List; * 部门流程关系表 */ @Data -@TableName(value = "flow_depart",autoResultMap = true) -public class FlowDepart { +@TableName(value = "flow_label",autoResultMap = true) +public class FlowLabel { @TableId(type = IdType.ASSIGN_ID) private Long id; - /** - * 流程类型 - */ -// @NotNull(message = "流程类型不能为空", groups = AddGroup.class) -// private String flowType; /** * 流程编码 @@ -43,6 +38,6 @@ public class FlowDepart { * 部门id集合 */ @NotNull(message = "部门id不能为空", groups = AddGroup.class) - @TableField(value = "dept_ids",typeHandler = ListTypeHandler.class) - List departIds; + @TableField(value = "label_ids",typeHandler = ListTypeHandler.class) + List labelIds; } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java index a235d22..d9fcc2b 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java @@ -103,5 +103,5 @@ public class FlowDefinitionVo implements Serializable { */ private String ext; - private List deptIds; + private List labelIds; } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java index c5e2d02..958a512 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java @@ -1,11 +1,10 @@ package org.dromara.workflow.dubbo; -import cn.dev33.satoken.stp.StpUtil; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.system.api.domain.vo.RemoteUserVo; import org.dromara.workflow.api.RemoteWorkflowService; -import org.dromara.workflow.api.domain.FlowDepartVo; +import org.dromara.workflow.api.domain.FlowLabelVo; import org.dromara.workflow.api.domain.RemoteCompleteTask; import org.dromara.workflow.api.domain.RemoteStartProcess; import org.dromara.workflow.api.domain.RemoteStartProcessReturn; @@ -15,7 +14,6 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -102,8 +100,8 @@ public class RemoteWorkflowServiceImpl implements RemoteWorkflowService { } @Override - public FlowDepartVo getFlowDepart(Long deptId) { - return flwTaskService.getFlowDepart(deptId); + public FlowLabelVo getFlowLabel(String labelId) { + return flwTaskService.getFlowLabel(labelId); } @Override diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwDepartMapper.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwDepartMapper.java deleted file mode 100644 index 56e6de2..0000000 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwDepartMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import jakarta.validation.constraints.NotNull; -import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.FlowDepart; - -import java.util.List; -import java.util.Map; - -public interface FlwDepartMapper extends BaseMapperPlus { - FlowDepart getFlowDepart(@Param("deptId") Long deptId); - - Integer checkFlowDepart(@Param("deptIds") List departIds); -} diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwLabelMapper.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwLabelMapper.java new file mode 100644 index 0000000..34900e1 --- /dev/null +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwLabelMapper.java @@ -0,0 +1,13 @@ +package org.dromara.workflow.mapper; + +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.workflow.domain.FlowLabel; + +import java.util.List; + +public interface FlwLabelMapper extends BaseMapperPlus { + FlowLabel getFlowLabel(@Param("labelId") String labelId); + + Integer checkFlowLabel(@Param("labelIds") List labelIds); +} diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwDepartService.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwDepartService.java deleted file mode 100644 index c8c478a..0000000 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwDepartService.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.dromara.workflow.service; - -import org.dromara.workflow.domain.FlowDepart; - -public interface FlwDepartService { - FlowDepart getInfo(String flowCode); - - FlowDepart bindDepart(FlowDepart flowDepart); - - FlowDepart getFlowDepart(Long deptId); -} diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwLabelService.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwLabelService.java new file mode 100644 index 0000000..619edf8 --- /dev/null +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwLabelService.java @@ -0,0 +1,11 @@ +package org.dromara.workflow.service; + +import org.dromara.workflow.domain.FlowLabel; + +public interface FlwLabelService { + FlowLabel getInfo(String flowCode); + + FlowLabel bindLabel(FlowLabel flowDepart); + + FlowLabel getFlowLabel(String labelId); +} diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java index e21c6c8..9b52dd1 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java @@ -3,20 +3,15 @@ package org.dromara.workflow.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.system.api.domain.vo.RemoteUserVo; -import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.entity.Node; -import org.dromara.warm.flow.core.entity.Task; -import org.dromara.warm.flow.core.service.impl.TaskServiceImpl; import org.dromara.warm.flow.orm.entity.FlowHisTask; -import org.dromara.warm.flow.orm.entity.FlowNode; import org.dromara.warm.flow.orm.entity.FlowTask; -import org.dromara.workflow.api.domain.FlowDepartVo; +import org.dromara.workflow.api.domain.FlowLabelVo; import org.dromara.workflow.api.domain.RemoteStartProcessReturn; import org.dromara.workflow.domain.bo.*; import org.dromara.workflow.domain.vo.FlowHisTaskVo; import org.dromara.workflow.domain.vo.FlowTaskVo; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -214,8 +209,8 @@ public interface IFlwTaskService { /** * 根据部门获取流程 - * @param deptId + * @param labelId * @return */ - FlowDepartVo getFlowDepart(Long deptId); + FlowLabelVo getFlowLabel(String labelId); } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index 08901e9..96ff9a7 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -32,10 +32,10 @@ import org.dromara.warm.flow.orm.mapper.FlowSkipMapper; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.common.constant.FlowConstant; import org.dromara.workflow.domain.FlowCategory; -import org.dromara.workflow.domain.FlowDepart; +import org.dromara.workflow.domain.FlowLabel; import org.dromara.workflow.domain.vo.FlowDefinitionVo; import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.service.FlwDepartService; +import org.dromara.workflow.service.FlwLabelService; import org.dromara.workflow.service.IFlwDefinitionService; import org.dromara.workflow.utils.WorkflowUtils; import org.springframework.stereotype.Service; @@ -67,7 +67,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { private final FlowNodeMapper flowNodeMapper; private final FlowSkipMapper flowSkipMapper; private final FlwCategoryMapper flwCategoryMapper; - private final FlwDepartService flwDepartService; + private final FlwLabelService flwDepartService; /** * 查询流程定义列表 @@ -85,9 +85,9 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class)); build.setTotal(page.getTotal()); build.getRows().forEach(p ->{ - FlowDepart info = flwDepartService.getInfo(p.getFlowCode()); + FlowLabel info = flwDepartService.getInfo(p.getFlowCode()); if(ObjectUtil.isNotEmpty(info)){ - p.setDeptIds(info.getDepartIds()); + p.setLabelIds(info.getLabelIds()); } }); return build; diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDepartServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDepartServiceImpl.java deleted file mode 100644 index 5cfb40c..0000000 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDepartServiceImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.dromara.workflow.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.workflow.domain.FlowDepart; -import org.dromara.workflow.mapper.FlwDepartMapper; -import org.dromara.workflow.service.FlwDepartService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Map; - -@Service -@RequiredArgsConstructor -public class FlwDepartServiceImpl extends ServiceImpl implements FlwDepartService { - - - @Override - public FlowDepart getInfo(String flowCode) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(FlowDepart::getFlowCode, flowCode); - - return this.baseMapper.selectOne(wrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public FlowDepart bindDepart(FlowDepart flowDepart) { - LambdaQueryWrapper updateWrapper = new LambdaQueryWrapper<>(); - updateWrapper.eq(FlowDepart::getFlowCode, flowDepart.getFlowCode()); - this.baseMapper.delete(updateWrapper); - - //查询部门是否还存在别的流程 - if (this.baseMapper.checkFlowDepart(flowDepart.getDepartIds()) > 0){ - throw new ServiceException("所选的部门中,已存在在其他流程中,请检查后在提交!"); - } - - this.baseMapper.insert(flowDepart); - - return flowDepart; - } - - @Override - public FlowDepart getFlowDepart(Long deptId) { - return this.baseMapper.getFlowDepart(deptId); - } -} diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java new file mode 100644 index 0000000..2cabe80 --- /dev/null +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java @@ -0,0 +1,47 @@ +package org.dromara.workflow.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.workflow.domain.FlowLabel; +import org.dromara.workflow.mapper.FlwLabelMapper; +import org.dromara.workflow.service.FlwLabelService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class FlwLabelServiceImpl extends ServiceImpl implements FlwLabelService { + + + @Override + public FlowLabel getInfo(String flowCode) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(FlowLabel::getFlowCode, flowCode); + + return this.baseMapper.selectOne(wrapper); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public FlowLabel bindLabel(FlowLabel flowDepart) { + LambdaQueryWrapper updateWrapper = new LambdaQueryWrapper<>(); + updateWrapper.eq(FlowLabel::getFlowCode, flowDepart.getFlowCode()); + this.baseMapper.delete(updateWrapper); + + //查询部门是否还存在别的流程 + if (this.baseMapper.checkFlowLabel(flowDepart.getLabelIds()) > 0){ + throw new ServiceException("所选的标签中,已存在在其他流程中,请检查后在提交!"); + } + + this.baseMapper.insert(flowDepart); + + return flowDepart; + } + + @Override + public FlowLabel getFlowLabel(String labelId) { + return this.baseMapper.getFlowLabel(labelId); + } +} diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index e149a0d..569a561 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; -import org.dromara.business.api.RemoteBusinessAlertService; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; @@ -22,13 +21,9 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mail.utils.MailUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.sse.dto.SseMessageDto; -import org.dromara.common.sse.utils.SseMessageUtils; -import org.dromara.resource.api.RemoteMessageService; import org.dromara.system.api.RemoteUserService; import org.dromara.system.api.domain.vo.RemoteUserVo; import org.dromara.warm.flow.core.dto.FlowParams; @@ -40,13 +35,13 @@ import org.dromara.warm.flow.orm.entity.*; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; import org.dromara.warm.flow.orm.mapper.FlowTaskMapper; -import org.dromara.workflow.api.domain.FlowDepartVo; +import org.dromara.workflow.api.domain.FlowLabelVo; import org.dromara.workflow.api.domain.RemoteStartProcessReturn; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.common.enums.MessageTypeEnum; import org.dromara.workflow.common.enums.TaskAssigneeType; import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.FlowDepart; +import org.dromara.workflow.domain.FlowLabel; import org.dromara.workflow.domain.bo.*; import org.dromara.workflow.domain.vo.FlowHisTaskVo; import org.dromara.workflow.domain.vo.FlowTaskVo; @@ -54,7 +49,7 @@ import org.dromara.workflow.handler.FlowProcessEventHandler; import org.dromara.workflow.handler.WorkflowPermissionHandler; import org.dromara.workflow.mapper.FlwCategoryMapper; import org.dromara.workflow.mapper.FlwTaskMapper; -import org.dromara.workflow.service.FlwDepartService; +import org.dromara.workflow.service.FlwLabelService; import org.dromara.workflow.service.IFlwTaskService; import org.dromara.workflow.utils.WorkflowUtils; import org.springframework.beans.BeanUtils; @@ -65,8 +60,6 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.*; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import static org.dromara.workflow.common.constant.FlowConstant.*; @@ -94,7 +87,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { private final FlowProcessEventHandler flowProcessEventHandler; private final FlwTaskMapper flwTaskMapper; private final FlwCategoryMapper flwCategoryMapper; - private final FlwDepartService flwDepartService; + private final FlwLabelService flwDepartService; @DubboReference private RemoteUserService remoteUserService; @@ -329,9 +322,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { } @Override - public FlowDepartVo getFlowDepart(Long deptId) { - FlowDepart flowDepart = flwDepartService.getFlowDepart(deptId); - FlowDepartVo flowDepartVo = new FlowDepartVo(); + public FlowLabelVo getFlowLabel(String labelId) { + FlowLabel flowDepart = flwDepartService.getFlowLabel(labelId); + FlowLabelVo flowDepartVo = new FlowLabelVo(); BeanUtils.copyProperties(flowDepart, flowDepartVo); return flowDepartVo; } diff --git a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwDepartMapper.xml b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwDepartMapper.xml deleted file mode 100644 index e8d2908..0000000 --- a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwDepartMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - diff --git a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwLabelMapper.xml b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwLabelMapper.xml new file mode 100644 index 0000000..86615f1 --- /dev/null +++ b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwLabelMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 699db26..02bf097 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 2.2.2 UTF-8 UTF-8 - 21 + 17 3.2.11 2023.0.3 3.2.3 @@ -85,7 +85,7 @@ dev - wuyuan + dev 127.0.0.1:8848 DEFAULT_GROUP DEFAULT_GROUP @@ -511,6 +511,10 @@ + + org.springframework.boot + spring-boot-maven-plugin + @@ -600,5 +604,7 @@ + +