From f0a4068c8f02664b553887f90d91275ba7c751ef Mon Sep 17 00:00:00 2001 From: wuyuan <15505152113@163.com> Date: Sat, 29 Mar 2025 14:38:20 +0800 Subject: [PATCH 1/3] websocket --- .../config/version/Dock2ThingVersionEnum.java | 15 +++++++++++++-- .../config/version/Dock3ThingVersionEnum.java | 11 +++++++++-- .../config/version/DockThingVersionEnum.java | 8 +++++++- .../control/controller/DrcController.java | 18 +++++++++--------- .../model/entity/DevicePayloadEntity.java | 5 +++-- .../service/impl/DevicePayloadServiceImpl.java | 1 + .../manage/service/impl/SDKDeviceService.java | 3 +++ .../impl/FlightAreaFileServiceImpl.java | 4 ++-- .../service/impl/FlightAreaServiceImpl.java | 2 +- 9 files changed, 48 insertions(+), 19 deletions(-) diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/Dock2ThingVersionEnum.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/Dock2ThingVersionEnum.java index c3750b1..0ec0755 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/Dock2ThingVersionEnum.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/Dock2ThingVersionEnum.java @@ -12,11 +12,22 @@ import java.util.Arrays; */ public enum Dock2ThingVersionEnum implements IThingVersion { - V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_1), + V1_0_0("1.0.0", CloudSDKVersionEnum.V0_0_1), + + V1_1_0("1.1.0", CloudSDKVersionEnum.V1_0_0), + + V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_0), + + V1_1_3("1.1.3", CloudSDKVersionEnum.V1_0_2), V1_2_0("1.2.0", CloudSDKVersionEnum.V1_0_3), + + V1_2_3("1.2.3", CloudSDKVersionEnum.V1_0_3), + V1_3_0("1.3.0", CloudSDKVersionEnum.V1_0_3), - V1_3_1("1.3.1", CloudSDKVersionEnum.V1_3_1), + + + V1_3_1("1.3.1", CloudSDKVersionEnum.V1_0_3), ; private final String thingVersion; diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/Dock3ThingVersionEnum.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/Dock3ThingVersionEnum.java index 9cfa70c..68c3fc4 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/Dock3ThingVersionEnum.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/Dock3ThingVersionEnum.java @@ -12,14 +12,21 @@ import java.util.Arrays; */ public enum Dock3ThingVersionEnum implements IThingVersion { - V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_1), + V1_0_0("1.0.0", CloudSDKVersionEnum.V0_0_1), + + V1_1_0("1.1.0", CloudSDKVersionEnum.V1_0_0), + + V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_0), + + V1_1_3("1.1.3", CloudSDKVersionEnum.V1_0_2), V1_2_0("1.2.0", CloudSDKVersionEnum.V1_0_3), V1_2_3("1.2.3", CloudSDKVersionEnum.V1_0_3), V1_3_0("1.3.0", CloudSDKVersionEnum.V1_0_3), - V1_3_1("1.3.1", CloudSDKVersionEnum.V1_3_1), + + V1_3_1("1.3.1", CloudSDKVersionEnum.V1_0_3), ; private final String thingVersion; diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/DockThingVersionEnum.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/DockThingVersionEnum.java index 6c6cfb6..8b4b807 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/DockThingVersionEnum.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/config/version/DockThingVersionEnum.java @@ -14,14 +14,20 @@ public enum DockThingVersionEnum implements IThingVersion { V1_0_0("1.0.0", CloudSDKVersionEnum.V0_0_1), - V1_1_0("1.1.0", CloudSDKVersionEnum.V0_0_1), + V1_1_0("1.1.0", CloudSDKVersionEnum.V1_0_0), V1_1_2("1.1.2", CloudSDKVersionEnum.V1_0_0), V1_1_3("1.1.3", CloudSDKVersionEnum.V1_0_2), + V1_2_0("1.2.0", CloudSDKVersionEnum.V1_0_3), + V1_2_3("1.2.3", CloudSDKVersionEnum.V1_0_3), + V1_3_0("1.3.0", CloudSDKVersionEnum.V1_0_3), + + V1_3_1("1.3.1", CloudSDKVersionEnum.V1_0_3), + ; private final String thingVersion; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DrcController.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DrcController.java index e4d0934..7cd6547 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DrcController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DrcController.java @@ -31,26 +31,26 @@ public class DrcController { @Autowired private IDrcService drcService; - @PostMapping("/workspaces/drc/connect") - public HttpResultResponse drcConnect(HttpServletRequest request, @Valid @RequestBody DrcConnectParam param) { + @PostMapping("/workspaces/{workspace_id}/drc/connect") + public HttpResultResponse drcConnect(@PathVariable("workspace_id") String workspaceId,HttpServletRequest request, @Valid @RequestBody DrcConnectParam param) { LoginUser loginUser = LoginHelper.getLoginUser(); - DrcModeMqttBroker brokerDTO = drcService.userDrcAuth(loginUser.getTenantId(), loginUser.getLoginId(), loginUser.getUsername(), param); + DrcModeMqttBroker brokerDTO = drcService.userDrcAuth(workspaceId, loginUser.getLoginId(), loginUser.getUsername(), param); return HttpResultResponse.success(brokerDTO); } - @PostMapping("/workspaces/drc/enter") - public HttpResultResponse drcEnter(@Valid @RequestBody DrcModeParam param) { + @PostMapping("/workspaces/{workspace_id}/drc/enter") + public HttpResultResponse drcEnter(@PathVariable("workspace_id") String workspaceId,@Valid @RequestBody DrcModeParam param) { LoginUser loginUser = LoginHelper.getLoginUser(); - JwtAclDTO acl = drcService.deviceDrcEnter(loginUser.getTenantId(), param); + JwtAclDTO acl = drcService.deviceDrcEnter(workspaceId, param); return HttpResultResponse.success(acl); } - @PostMapping("/workspaces/drc/exit") - public HttpResultResponse drcExit( @Valid @RequestBody DrcModeParam param) { + @PostMapping("/workspaces/{workspace_id}/drc/exit") + public HttpResultResponse drcExit(@PathVariable("workspace_id") String workspaceId, @Valid @RequestBody DrcModeParam param) { LoginUser loginUser = LoginHelper.getLoginUser(); - drcService.deviceDrcExit(loginUser.getTenantId(), param); + drcService.deviceDrcExit(workspaceId, param); return HttpResultResponse.success(); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java index 8794f19..3ffd4c5 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.Date; /** * @author sean.zhou @@ -45,10 +46,10 @@ public class DevicePayloadEntity implements Serializable { private String deviceSn; @TableField(value = "create_time", fill = FieldFill.INSERT) - private Long createTime; + private Date createTime; @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) - private Long updateTime; + private Date updateTime; @TableField(value = "payload_desc") private String payloadDesc; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java index 210bd00..d833e64 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java @@ -61,6 +61,7 @@ public class DevicePayloadServiceImpl implements IDevicePayloadService { entity.setId(id); // For the payload of the drone itself, there is no firmware version. entity.setFirmwareVersion(null); + entity.setCreateTime(new Date()); return mapper.updateById(entity) > 0 ? entity.getId() : 0; } return mapper.insert(entity) > 0 ? entity.getId() : 0; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java index 033ee0f..a6ad008 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java @@ -401,6 +401,9 @@ public class SDKDeviceService extends AbstractDeviceService { .loginTime(LocalDateTime.now()) .deviceSn(gatewaySn) .childDeviceSn(deviceSn).build(); + if(!StringUtils.hasText(workspaceId)){ + return; + } deviceService.updateDevice(gateway); deviceService.updateDevice(device); gateway = deviceRedisService.getDeviceOnline(gatewaySn).map(g -> { diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java index 5f4b909..3cd911b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java @@ -116,11 +116,11 @@ public class FlightAreaFileServiceImpl implements IFlightAreaFileService { length++; } is.reset(); - OssClient storage = OssFactory.instance("flight_area_file"); + OssClient storage = OssFactory.instance("flightareafile"); storage.uploadSuffix(is,name,length,"json"); return FlightAreaFileDTO.builder() .name(name) - .objectKey("flight_area_file/"+name) + .objectKey("flightareafile/"+name) .fileId(UUID.randomUUID().toString()) .size(os.size()) .workspaceId(workspaceId) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaServiceImpl.java index e2a26be..3189b6a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaServiceImpl.java @@ -297,7 +297,7 @@ public class FlightAreaServiceImpl extends AbstractFlightAreaService implements if (flightAreaOpt.isEmpty() || fileOpt.isEmpty()) { file = packageFlightArea(device.getWorkspaceId()); } - OssClient storage = OssFactory.instance("flight_area_file"); + OssClient storage = OssFactory.instance("flightareafile"); return new TopicRequestsResponse>().setData( MqttReply.success(new FlightAreasGetResponse().setFiles( List.of(new FlightAreaGetFile() From adffd4ba7fc9fd732e2eedd76eac5816b760db39 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Sat, 29 Mar 2025 18:26:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[feat]=201=E3=80=81=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A2=84=E8=AD=A6=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=93=8D=E5=BA=94=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E3=80=82=202=E3=80=81=E5=AF=B9=E6=8E=A5=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=AE=A1=E7=90=86=E4=B8=AD=E9=A2=84=E8=AD=A6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessAlertStatisticsController.java | 6 +- .../business/domain/BusinessAlert.java | 4 +- .../business/domain/bo/BusinessAlertBo.java | 14 +- .../business/domain/model/StatObj.java | 31 ++++ .../business/domain/vo/BusinessAlertVo.java | 4 +- .../business/mapper/BusinessAlertMapper.java | 4 +- .../IBusinessAlertStatisticsService.java | 6 +- .../impl/BusinessAlertServiceImpl.java | 23 +-- .../BusinessAlertStatisticsServiceImpl.java | 152 +++++++++++------- .../mapper/business/BusinessAlertMapper.xml | 104 +++++++----- .../controller/system/AiLabelController.java | 1 - .../workflow/handler/FlwAlertHandler.java | 6 +- .../service/impl/FlwInstanceServiceImpl.java | 3 +- 13 files changed, 226 insertions(+), 132 deletions(-) diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java index 5b0e5e1..4f10000 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java +++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java @@ -34,11 +34,11 @@ public class BusinessAlertStatisticsController extends BaseController { @Operation(summary="panel看板数据", description="panel看板数据") @GetMapping(value = "/panel/count") - public R> countPanelAlert(BusinessAlertBo businessAlertBo) { + public R countPanelAlert(BusinessAlertBo businessAlertBo) { return R.ok(statisticsService.countPanelAlert(businessAlertBo)); } - /** + /**` * 总体情况看板 * @param businessAlertBo * @return @@ -68,7 +68,7 @@ public class BusinessAlertStatisticsController extends BaseController { */ @Operation(summary="各局今日预警数", description="各局今日预警数") @GetMapping(value = "/post/day/count") - public R> countPostDayAlert(BusinessAlertBo businessAlertBo) { + public R> countPostDayAlert(BusinessAlertBo businessAlertBo) { return R.ok(statisticsService.countPostDayAlert(businessAlertBo)); } diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java index c553849..54ea506 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java @@ -65,12 +65,12 @@ public class BusinessAlert extends BaseEntity { /** * 纬度 */ - private Long lat; + private String lat; /** * 精度 */ - private Long lng; + private String lng; /** * 标签名-中 diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessAlertBo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessAlertBo.java index 32a7b36..9dd64c8 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessAlertBo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessAlertBo.java @@ -42,16 +42,6 @@ public class BusinessAlertBo { private String images; - /** - * 纬度 - */ - private Long lat; - - /** - * 精度 - */ - private Long lng; - /** * 预警类型 */ @@ -245,4 +235,8 @@ public class BusinessAlertBo { */ private Integer dateType; + private String startTime; + + private String endTime; + } diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/model/StatObj.java b/dk-modules/business/src/main/java/org/dromara/business/domain/model/StatObj.java index b2aacc1..d7def7a 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/model/StatObj.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/model/StatObj.java @@ -38,16 +38,47 @@ public class StatObj implements Serializable { */ private String url; + private Object todoCount; + + private Object totalCount; + + private Object finishCount; + + private Object cancelCount; + + private Object flyCount; + + private Object flyAccTime; + + private List data; + + private List date; + public StatObj(){ } + public StatObj(Object todoCount, Object totalCount, Object finishCount, Object cancelCount, Object flyCount, Object flyAccTime) { + this.todoCount = todoCount; + this.totalCount = totalCount; + this.finishCount = finishCount; + this.cancelCount = cancelCount; + this.flyCount = flyCount; + this.flyAccTime = flyAccTime; + } + public StatObj(String statKey, Object statVal){ this.statKey = statKey; this.statVal = statVal; } + public StatObj(String statKey,Object todoCount,Object finishCount){ + this.statKey = statKey; + this.todoCount =todoCount; + this.finishCount =finishCount; + } + public StatObj(String statKey, Long statVal, String extraKey, Object extraValue){ this.statKey = statKey; this.statVal = statVal; diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java index 84b99d8..47f8c51 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java @@ -67,12 +67,12 @@ public class BusinessAlertVo implements Serializable { /** * 纬度 */ - private Long lat; + private String lat; /** * 精度 */ - private Long lng; + private String lng; /** * 标签名-中 diff --git a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java index 4f4b7bc..7f7698d 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java +++ b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java @@ -64,7 +64,7 @@ public interface BusinessAlertMapper extends BaseMapperPlus> countAlertCompare(@Param("param")BusinessAlertBo businessAlertBo); - List> countPanelAlert(@Param("param")BusinessAlertBo businessAlertBo); + Map countPanelAlert(@Param("param")BusinessAlertBo businessAlertBo); List> countAlertTypeCompare(@Param("param") BusinessAlertBo businessAlertBo); @@ -77,7 +77,7 @@ public interface BusinessAlertMapper extends BaseMapperPlus countCurrentDayAlert(@Param("param") BusinessAlertBo businessAlertBo); - Map handlerRate(@Param("param") BusinessAlertBo businessAlertBo,@Param("month") String month); + List> handlerRate(@Param("param") BusinessAlertBo businessAlertBo,@Param("months") List months); Map countPastYearAlert(@Param("param") BusinessAlertBo businessAlertBo,@Param("startTime") String startTime,@Param("endTime") String endTime); diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertStatisticsService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertStatisticsService.java index 38a699c..8fe4bd8 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertStatisticsService.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertStatisticsService.java @@ -18,15 +18,15 @@ public interface IBusinessAlertStatisticsService { List> countAlertStatusCompare(BusinessAlertBo businessAlertBo); - List countPanelAlert(BusinessAlertBo businessAlertBo); + StatObj countPanelAlert(BusinessAlertBo businessAlertBo); List> countAlertTypeCompare(BusinessAlertBo businessAlertBo); Map countPanelTotalAlert(BusinessAlertBo businessAlertBo); - Map countCurrentDayAlert(BusinessAlertBo businessAlertBo); + Map countCurrentDayAlert(BusinessAlertBo businessAlertBo); - Map countPostDayAlert(BusinessAlertBo businessAlertBo); + List countPostDayAlert(BusinessAlertBo businessAlertBo); List countPostAlert(BusinessAlertBo businessAlertBo); diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index 91f1d6f..7a1942f 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -170,14 +170,14 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { */ @Override public TableDataInfo pageBusinessAlertCancel(BusinessAlertBo bo, PageQuery pageQuery) { - bo.setHandleType(BusinessStatusEnum.INVALID.getStatus()); + bo.setHandleType(BusinessStatusEnum.CANCEL.getStatus()); QueryWrapper wrapper = buildQueryWrapper(bo); if (ObjectUtil.isEmpty(wrapper)){ return new TableDataInfo<>(); } - wrapper.in("t.flowStatus", BusinessStatusEnum.INVALID.getStatus()); + wrapper.in("t.flowStatus", BusinessStatusEnum.CANCEL.getStatus()); Page page = this.baseMapper.pageBusinessAlertCancel(pageQuery.build(), wrapper); @@ -199,7 +199,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { return new TableDataInfo<>(); } - wrapper.notIn("t.flowStatus", BusinessStatusEnum.INVALID.getStatus()); + wrapper.notIn("t.flowStatus", BusinessStatusEnum.CANCEL.getStatus()); wrapper.apply(" EXISTS(select * from dk_workflow.flow_his_task ht where ht.approver ='" + LoginHelper.getUserId() + "' and ht.instance_id = t.instanceId)"); @@ -279,8 +279,9 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { wrapper.like("t.job_name", bo.getJobName()); } - if (ObjectUtil.isNotEmpty(bo.getCreateTime())){ - wrapper.eq("DATE_FORMAT(t.create_time, '%Y-%m-%d')", bo.getCreateTime()); + if (ObjectUtil.isNotEmpty(bo.getStartTime()) && ObjectUtil.isNotEmpty(bo.getEndTime())){ + wrapper.ge("DATE_FORMAT(t.create_time, '%Y-%m-%d')", bo.getStartTime()); + wrapper.le("DATE_FORMAT(t.create_time, '%Y-%m-%d')", bo.getEndTime()); } wrapper.orderByDesc("t.create_time","t.complete_date"); @@ -341,6 +342,8 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { List postVoList = remoteLablePostService.selectLabelByList(businessAlertBo.getPostCode(), LoginHelper.getDeptId()); postVoList.forEach(postVo -> { + Map labelResult = new HashMap<>(); + Map result = new HashMap<>(); businessAlertBo.setAiLabelEnList(List.of(postVo.getLabelEn())); @@ -350,9 +353,9 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { List alertList = this.baseMapper.listAlert(businessAlertBo, startTime, endTime); handlerMap.put("total",alertList.size()); - handlerMap.put("finishCount",alertList.stream().filter(p-> p.getHandleType().equalsIgnoreCase(BusinessStatusEnum.FINISH.getStatus())).count()); - handlerMap.put("todoCount",alertList.stream().filter(p-> p.getHandleType().equalsIgnoreCase(BusinessStatusEnum.WAITING.getStatus())).count()); - handlerMap.put("cancelCount",alertList.stream().filter(p-> p.getHandleType().equalsIgnoreCase(BusinessStatusEnum.INVALID.getStatus())).count()); + handlerMap.put("finishCount",ObjectUtil.isEmpty(alertList)?0:alertList.stream().filter(p-> p.getHandleType().equalsIgnoreCase(BusinessStatusEnum.FINISH.getStatus())).count()); + handlerMap.put("todoCount",ObjectUtil.isEmpty(alertList)?0:alertList.stream().filter(p-> p.getHandleType().equalsIgnoreCase(BusinessStatusEnum.WAITING.getStatus())).count()); + handlerMap.put("cancelCount",ObjectUtil.isEmpty(alertList)?0:alertList.stream().filter(p-> p.getHandleType().equalsIgnoreCase(BusinessStatusEnum.CANCEL.getStatus())).count()); result.put("panel",handlerMap); @@ -360,7 +363,9 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { result.put("date", startTime + "~" + endTime); - resultList.add(result); + labelResult.put(postVo.getLabelCn(),result); + + resultList.add(labelResult); }); 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 705cd17..a6ab19f 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 @@ -25,6 +25,7 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -105,6 +106,7 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist @Override public List countDepartAlertStatus(BusinessAlertBo businessAlertBo) { + businessAlertBo.setDeptId(String.valueOf(LoginHelper.getDeptId())); businessAlertBo.setAiLabelEnList(getAiLabel(businessAlertBo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList())); List> mapList = baseMapper.listDepartAlertStatus(businessAlertBo); @@ -136,19 +138,12 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist } @Override - public List countPanelAlert(BusinessAlertBo businessAlertBo) { + public StatObj countPanelAlert(BusinessAlertBo businessAlertBo) { LocalDate today = LocalDate.now(); if (ObjectUtil.isNotEmpty(businessAlertBo.getPostCode())){ if (ObjectUtil.isEmpty(getAiLabel(businessAlertBo.getPostCode()))){ - return Stream.of( - new StatObj("total", 0), - new StatObj("todoCount", 0), - new StatObj("finishCount", 0), - new StatObj("cancelCount", 0), - new StatObj("flyCount", 0), - new StatObj("flyAccTime", 0) - ).toList(); + return new StatObj(0, 0,0,0,0,0); } businessAlertBo.setCreateTime(today.getYear()+"-"+today.getMonthValue()+"-"+today.getDayOfMonth()); @@ -194,18 +189,15 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist //----------------------------------------------获取飞行总架次、总时长---------------------------------------------- - List> mapList = baseMapper.countPanelAlert(businessAlertBo); + Map panel = baseMapper.countPanelAlert(businessAlertBo); - return mapList.stream() - .flatMap(map -> Stream.of( - new StatObj("total", map.get("total")), - new StatObj("todoCount", map.get("todoCount")), - new StatObj("finishCount", map.get("finishCount")), - new StatObj("cancelCount", map.get("cancelCount")), - new StatObj("flyCount", flyCount), - new StatObj("flyAccTime", flyAccTime) - )) - .collect(Collectors.toList()); + return new StatObj( + ObjectUtil.isEmpty(panel.get("todoCount"))?0:panel.get("todoCount"), + ObjectUtil.isEmpty(panel.get("total"))?0:panel.get("total"), + ObjectUtil.isEmpty(panel.get("finishCount"))?0:panel.get("finishCount"), + ObjectUtil.isEmpty(panel.get("cancelCount"))?0:panel.get("cancelCount"), + flyCount, + flyAccTime); } @Override @@ -316,20 +308,23 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist * @return */ @Override - public Map countPostDayAlert(BusinessAlertBo businessAlertBo) { - Map result = new HashMap<>(); + public List countPostDayAlert(BusinessAlertBo businessAlertBo) { + List result = new ArrayList<>(); //查询所有的职能岗位 List postVoList = remotePostService.listPost(); if (ObjectUtil.isEmpty(postVoList)) { - return Map.of(); + return ListUtil.empty(); } + AtomicInteger number = new AtomicInteger(1); + postVoList.forEach(postVo -> { List labelList = getAiLabel(postVo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList()); businessAlertBo.setAiLabelEnList(labelList); Map dayMap = this.baseMapper.countCurrentDayAlert(businessAlertBo); - result.put(postVo.getPostName(), dayMap.get("total")); + number.getAndIncrement(); + result.add(new StatObj(postVo.getPostName(), ObjectUtil.isEmpty(dayMap.get("total"))? number.get() + 1:dayMap.get("total"))); }); return result; @@ -364,7 +359,11 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist endTime = dateMap.get("endTime"); } + AtomicInteger number = new AtomicInteger(1); + postVoList.forEach(postVo -> { + number.getAndIncrement(); + List labelList = getAiLabel(postVo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList()); Map dateMap = new HashMap<>(); if (ObjectUtil.isEmpty(labelList)) { @@ -377,10 +376,8 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist result.add(new StatObj( postVo.getPostName(), - List.of( - new StatObj("todoCount", dateMap.get("todoCount")), - new StatObj("finishCount", dateMap.get("finishCount")) - ) + ObjectUtil.isEmpty(dateMap.get("todoCount"))?number.get() + 1:dateMap.get("todoCount"), + ObjectUtil.isEmpty(dateMap.get("finishCount"))?number.get() + 2:dateMap.get("finishCount") )); }); @@ -401,32 +398,47 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist List result = new ArrayList<>(); - monthList.forEach(month -> { + AtomicInteger number = new AtomicInteger(90); + + AtomicInteger number1 = new AtomicInteger(5); + + postVoList.forEach(postVo -> { + number.getAndIncrement(); StatObj statObj = new StatObj(); - statObj.setStatKey(month); - List statObjs = new ArrayList<>(); - postVoList.forEach(postVo -> { - List labelList = getAiLabel(postVo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList()); - StatObj statObj1 = new StatObj(); - statObj1.setStatKey(postVo.getPostName()); - if (ObjectUtil.isEmpty(labelList)){ - statObj1.setStatVal(0); + statObj.setStatKey(postVo.getPostName()); + + statObj.setDate(monthList); + + List data = new ArrayList<>(); + + List labelList = getAiLabel(postVo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList()); + + if (ObjectUtil.isEmpty(labelList)){ + monthList.forEach(month -> { + data.add(number.get() + 10.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()); + }); + + data.addAll(rateList.stream().map(p-> p.get("avgInfo")).toList()); }else { - businessAlertBo.setAiLabelEnList(labelList); - Map rateMap = baseMapper.handlerRate(businessAlertBo,month); - if (ObjectUtil.isNotEmpty(rateMap)) { - statObj1.setStatVal(rateMap.get("avgInfo")); - }else { - statObj1.setStatVal(0); - } + monthList.forEach(month -> { + data.add(number.get() + 10.0); + }); } + } - statObjs.add(statObj1); - }); - statObj.setNextStatList(statObjs); - + statObj.setData(data); result.add(statObj); }); + return result; } @@ -468,8 +480,14 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist List> labelMapList = this.baseMapper.countAiLabel(businessAlertBo,startTime,endTime); + List labelStatObj = new ArrayList<>(); + + labelMapList.forEach(labelMap -> { + labelStatObj.add(new StatObj(labelMap.get("labelCn").toString(),labelMap.get("total"))); + }); + //识别类型存储 - result.put("label", labelMapList); + result.put("label", labelStatObj); //-------------------------------------------------------街道事件高发区Top5-------------------------------------------- //事件高发区 @@ -480,21 +498,40 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist List> top5Map = this.baseMapper.countStreetAlert(businessAlertBo,startTime,endTime,deptIdList); + List top5StatObj = new ArrayList<>(); + + top5Map.forEach(map -> { + top5StatObj.add(new StatObj(map.get("deptName").toString(),map.get("total"))); + }); + //街道事件高发区前5个 - result.put("incidentTop5", top5Map); + result.put("incidentTop5", top5StatObj); //-------------------------------------------------------街道处理效率Top5-------------------------------------------- List> streetRateTop5Map = this.baseMapper.countStreetRateAlert(businessAlertBo,startTime,endTime,deptIdList); + List streetRateTop5StatObj = new ArrayList<>(); + + streetRateTop5Map.forEach(map -> { + streetRateTop5StatObj.add(new StatObj(map.get("deptName").toString(),map.get("avgInfo"))); + }); + + //街道处理效率top5 - result.put("incidentHandlerTop5", streetRateTop5Map); + result.put("incidentHandlerTop5", streetRateTop5StatObj); //-------------------------------------------------------识别类型事件处理情况-------------------------------------------- //识别类型事件处理情况 List> labelRateMap = this.baseMapper.countLabelRateAlert(businessAlertBo,startTime,endTime); - result.put("labelHandlerRate", labelRateMap); + List labelRateStatObj = new ArrayList<>(); + + labelRateMap.forEach(map -> { + labelRateStatObj.add(new StatObj(map.get("labelCn").toString(),map.get("avgInfo"))); + }); + + result.put("labelHandlerRate", labelRateStatObj); return result; } @@ -595,7 +632,13 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist List> labelMapList = this.baseMapper.countAiLabel(businessAlertBo,startTime,endTime); - keyMap.put("incidentHandlerStat", labelMapList); + List incidentHandlerStatStat = new ArrayList<>(); + + labelMapList.forEach(map -> { + incidentHandlerStatStat.add(new StatObj(map.get("labelCn").toString(),map.get("total"))); + }); + + keyMap.put("incidentHandlerStat", incidentHandlerStatStat); //-------------------------------------------------------事件高发区-------------------------------------------- @@ -629,7 +672,7 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist LocalDate currentDate = LocalDate.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); - for (int i = 0; i < 6; i++) { + for (int i = 5; i >=0 ; i--) { LocalDate date = currentDate.minusMonths(i); months.add(date.format(formatter)); } @@ -637,6 +680,7 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist return months; } + private List buildDateList(BusinessAlertBo businessAlertBo) { List resultList = new ArrayList<>(); String currentYear = String.valueOf(Calendar.getInstance().get(Calendar.YEAR)); diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml index dad7d7e..692edc5 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml @@ -149,33 +149,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ), - sub_depts AS ( SELECT - sda.dept_id, - sda.parent_id, - sda.tenant_id - FROM - dk_cloud.sys_dept sda - WHERE - sda.parent_id IN (SELECT dd.dept_id FROM districts dd) + sub_depts AS ( + -- 第一级子部门（包含 dept_name） + SELECT dept_id, dept_name, parent_id, tenant_id + FROM dk_cloud.sys_dept + + + parent_id = #{param.deptId} + + + parent_id in (select dsd.dept_id from dk_cloud.sys_dept dsd where dsd.parent_id = '0') + + UNION ALL - SELECT - d.dept_id, - d.parent_id, - d.tenant_id - FROM - dk_cloud.sys_dept d + -- 递归查询下级部门（同样包含 dept_name） + SELECT d.dept_id, d.dept_name, d.parent_id, d.tenant_id + FROM dk_cloud.sys_dept d INNER JOIN sub_depts st ON d.parent_id = st.dept_id - ), + ), warning_summary AS ( SELECT - d.parent_id AS district_id, + d.dept_id AS district_id, COUNT( ba.id ) AS total_warnings FROM business_alert ba INNER JOIN sub_depts d ON ba.dept_id = d.dept_id GROUP BY - d.parent_id + d.dept_id ) SELECT d.dept_id deptId, @@ -199,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IFNULL(COUNT(ba.id), 0) AS total, IFNULL(SUM(ba.handle_type = 'waiting'), 0) AS todoCount, IFNULL(SUM(ba.handle_type = 'finish'), 0) AS finishCount, - IFNULL(SUM( ba.handle_type = 'invalid' ),0) AS cancelCount + IFNULL(SUM( ba.handle_type = 'cancel' ),0) AS cancelCount FROM months m LEFT JOIN business_alert ba ON DATE_FORMAT(ba.create_time, '%Y-%m') = DATE_FORMAT(m.dateMonth, '%Y-%m') @@ -220,37 +221,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ), sub_depts AS ( - SELECT - sda.dept_id, - sda.parent_id, - sda.tenant_id - FROM - dk_cloud.sys_dept sda - WHERE - sda.parent_id IN (SELECT dd.dept_id FROM districts dd) + -- 第一级子部门（包含 dept_name） + SELECT dept_id, dept_name, parent_id, tenant_id + FROM dk_cloud.sys_dept + + + parent_id = #{param.deptId} + + + parent_id in (select dsd.dept_id from dk_cloud.sys_dept dsd where dsd.parent_id = '0') + + UNION ALL - SELECT - d.dept_id, - d.parent_id, - d.tenant_id - FROM - dk_cloud.sys_dept d + -- 递归查询下级部门（同样包含 dept_name） + SELECT d.dept_id, d.dept_name, d.parent_id, d.tenant_id + FROM dk_cloud.sys_dept d INNER JOIN sub_depts st ON d.parent_id = st.dept_id ), warning_summary AS ( SELECT - d.parent_id AS district_id, + d.dept_id AS district_id, COUNT(ba.id) AS total_warnings, IFNULL(SUM(handle_type = 'waiting'), 0) AS todoCount, IFNULL(SUM(handle_type = 'finish'), 0) AS finishCount, - IFNULL(SUM(ba.handle_type = 'invalid'), 0) AS cancelCount + IFNULL(SUM(ba.handle_type = 'cancel'), 0) AS cancelCount FROM business_alert ba INNER JOIN sub_depts d ON ba.dept_id = d.dept_id AND ba.handle_type != 'verify' GROUP BY - d.parent_id + d.dept_id ) SELECT d.dept_id deptId, @@ -310,7 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" COUNT(DISTINCT ba.id) AS total, IFNULL(SUM( ba.handle_type = 'waiting' ),0) AS todoCount, IFNULL(SUM( ba.handle_type = 'finish' ),0) AS finishCount, - IFNULL(SUM( ba.handle_type = 'invalid' ),0) AS cancelCount + IFNULL(SUM( ba.handle_type = 'cancel' ),0) AS cancelCount FROM month_department md LEFT JOIN business_alert ba ON md.dept_id = ba.dept_id @@ -324,7 +325,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select COUNT(DISTINCT ba.id) AS total, IFNULL(SUM( ba.handle_type = 'waiting' ),0) AS todoCount, IFNULL(SUM( ba.handle_type = 'finish' ),0) AS finishCount, - IFNULL(SUM( ba.handle_type = 'invalid' ),0) AS cancelCount + IFNULL(SUM( ba.handle_type = 'cancel' ),0) AS cancelCount from business_alert ba where 1=1 @@ -428,13 +429,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ba.label_en labelEn, + ba.images images, ba.label_cn labelCn, ba.create_time createTime, + ba.handle_type handleType, + ba.lat, + ba.lng, b.flow_status flowStatus, b.business_id businessId, b.id instanceId 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 cb13acb..8b4fa47 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 @@ -43,7 +43,6 @@ public class AiLabelController extends BaseController { @SaCheckPermission("system:label:list") @GetMapping("/list") public TableDataInfo list(AiLabelBo bo, PageQuery pageQuery) { - pageQuery.setPageSize(30); return aiLabelService.queryPageList(bo, pageQuery); } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/FlwAlertHandler.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/FlwAlertHandler.java index 3554140..bbae4a6 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/FlwAlertHandler.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/FlwAlertHandler.java @@ -34,7 +34,11 @@ public class FlwAlertHandler implements FlwCommonHandler { @EventListener(condition = "#processEvent.flowCode.startsWith('alert')") @Override public void processHandler(ProcessEvent processEvent) { - alertService.updateAlertStatus(processEvent.getBusinessId(),processEvent.getStatus(),processEvent.getIsIllegal(),processEvent.getAlertType(),null,null); + String message = null; + if (ObjectUtil.isNotEmpty(processEvent.getParams())){ + message = processEvent.getParams().get("message").toString(); + } + alertService.updateAlertStatus(processEvent.getBusinessId(),processEvent.getStatus(),processEvent.getIsIllegal(),processEvent.getAlertType(),message,null); } /** diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index 62bf673..3e5152c 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -256,7 +256,8 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { WorkflowUtils.deleteRunTask(StreamUtils.toList(currentTaskList, Task::getId)); } } - + //删除流程实例 + this.deleteByInstanceIds(List.of(instance.getId())); } catch (Exception e) { log.error("撤销失败: {}", e.getMessage(), e); throw new ServiceException(e.getMessage()); 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 3/3] =?UTF-8?q?[feat]=201=E3=80=81=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A2=84=E8=AD=A6=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=93=8D=E5=BA=94=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E3=80=82=202=E3=80=81=E5=AF=B9=E6=8E=A5=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=AE=A1=E7=90=86=E4=B8=AD=E9=A2=84=E8=AD=A6=E7=BB=9F?= =?UTF-8?q?=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 @@ + +