From 0bab96fa64a6d5655abf87e9aa71c3085b0f4a32 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 29 Apr 2025 19:16:31 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=B7=B2=E5=AE=8C=E7=BB=93=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=A4=84=E7=BD=AE=E4=BA=BA=E5=91=98=E6=8E=A5=E5=8F=A3=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/business/service/impl/BusinessAlertServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 0e316c6..cf80f93 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 @@ -375,6 +375,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { try { page.getRecords().forEach(businessAlertVo->{ + businessAlertVo.setHandleType(null); if (businessAlertVo.getBusinessType() == 2){ businessAlertVo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, businessAlertVo.getImages(), 3600).toString()); }else { From a3e6b0b2fa80be43e18d0c56f89be2c43b25263c Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Tue, 6 May 2025 15:45:30 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/business/BusinessTaskMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml index aa031b0..66499c7 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml @@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - order by t.status,t.create_time desc + order by t.create_time desc + + + diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index dcd758f..86c0ee1 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -1,5 +1,6 @@ package org.dromara.workflow.controller; +import cn.hutool.core.util.ObjectUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -50,6 +51,10 @@ public class FlwTaskController extends BaseController { @PostMapping("/startWorkFlow") public R startWorkFlow(@Validated(AddGroup.class) @RequestBody StartProcessBo startProcessBo) { RemoteStartProcessReturn startProcessReturn = flwTaskService.startWorkFlow(startProcessBo); + + //加签 + flwTaskService.addSign(startProcessReturn.getProcessInstanceId()); + return R.ok("提交成功", startProcessReturn); } @@ -62,7 +67,13 @@ public class FlwTaskController extends BaseController { @RepeatSubmit() @PostMapping("/completeTask") public R completeTask(@Validated(AddGroup.class) @RequestBody CompleteTaskBo completeTaskBo) { - return toAjax(flwTaskService.completeTask(completeTaskBo)); + String instanceId = flwTaskService.completeTask(completeTaskBo); + + if (ObjectUtil.isNotEmpty(instanceId)){ + return toAjax(flwTaskService.addSign(Long.valueOf(instanceId))); + } + + return toAjax(true); } /** diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java index fa31d6c..c349234 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java @@ -57,4 +57,6 @@ public interface FlwTaskMapper { */ Page getTaskCopyByPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List getPermissionFlag(@Param("definitionId") Long definitionId, + @Param("nodeCode") String nodeCode, @Param("nodeType") Integer nodeType); } 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 52b4a0b..fa12064 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 @@ -37,7 +37,7 @@ public interface IFlwTaskService { * @param completeTaskBo 办理任务参数 * @return 结果 */ - boolean completeTask(CompleteTaskBo completeTaskBo); + String completeTask(CompleteTaskBo completeTaskBo); /** * 查询当前用户的待办任务 @@ -223,4 +223,7 @@ public interface IFlwTaskService { * @return 节点 */ FlowNode getByNodeCode(String nodeCode, Long definitionId); + + Boolean addSign(Long instanceId); + } 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 189a594..f7b1d35 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 @@ -159,7 +159,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { */ @Override @Transactional(rollbackFor = Exception.class) - public boolean completeTask(CompleteTaskBo completeTaskBo) { + public String completeTask(CompleteTaskBo completeTaskBo) { try { // 获取任务ID并查询对应的流程任务和实例信息 Long taskId = completeTaskBo.getTaskId(); @@ -217,7 +217,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { } //设置下一环节处理人 setNextHandler(ins.getId()); - return true; + return String.valueOf(ins.getId()); } catch (Exception e) { log.error(e.getMessage(), e); throw new ServiceException(e.getMessage()); @@ -713,9 +713,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { Task task = taskService.getById(taskId); FlowNode flowNode = getByNodeCode(task.getNodeCode(), task.getDefinitionId()); if ("addSignature".equals(taskOperation) || "reductionSignature".equals(taskOperation)) { - if (flowNode.getNodeRatio().compareTo(BigDecimal.ZERO) == 0) { - throw new ServiceException(task.getNodeName() + "不是会签节点！"); - } +// if (flowNode.getNodeRatio().compareTo(BigDecimal.ZERO) == 0) { +// throw new ServiceException(task.getNodeName() + "不是会签节点！"); +// } } // 设置任务状态并执行对应的任务操作 switch (taskOperation) { @@ -864,7 +864,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService { completeTaskBo.setTaskId(taskId); completeTaskBo.setMessageType(List.of(MessageTypeEnum.SYSTEM_MESSAGE.getCode())); IFlwTaskService service = applicationContext.getBean(IFlwTaskService.class); - return service.completeTask(completeTaskBo); + service.completeTask(completeTaskBo); + return true; } /** @@ -880,4 +881,70 @@ public class FlwTaskServiceImpl implements IFlwTaskService { .eq(FlowNode::getDefinitionId, definitionId)); } + @Override + public Boolean addSign(Long instanceId) { + try { + + List flowTasks = selectByInstId(instanceId); + FlowTask flowTask1 = flowTasks.getFirst(); + + //判断是否有人员，进行加签 + //获取当前任务的办理人 + List currentTaskUser = currentTaskAllUser(flowTask1.getId()); + + FlowTask flowTask = flowTaskMapper.selectById(flowTask1.getId()); + if (ObjectUtil.isNull(flowTask)) { + throw new ServiceException("流程任务不存在或任务已审批！"); + } + + Instance ins = insService.getById(flowTask.getInstanceId()); + + //根据配置的人员查询系统中的用户 + Long definitionId = ins.getDefinitionId(); + String nodeCode = ins.getNodeCode(); + Integer nodeType = ins.getNodeType(); + List permissionUser = this.flwTaskMapper.getPermissionFlag(definitionId,nodeCode,nodeType); + String first = permissionUser.getFirst(); + + List totalUser = new ArrayList<>(); + + if (!first.contains("${handler}")){ + String[] split = first.split("@@"); + for (String handleFlag : split) { + List remoteUserVos = flwTaskAssigneeService.fetchUsersByStorageId(handleFlag); + totalUser.addAll(remoteUserVos); + } + } + + //比较差值 + List different = totalUser.stream() + .filter(user -> currentTaskUser.stream().noneMatch(u -> u.getUserId().equals(user.getUserId()))) + .toList(); + + List userIds = different.stream() + .map(RemoteUserVo::getUserId) + .distinct() + .map(String::valueOf) + .toList(); + + //加签 + if (ObjectUtil.isNotEmpty(userIds)){ + TaskOperationBo taskOperationBo = new TaskOperationBo(); + taskOperationBo.setUserIds(userIds); + taskOperationBo.setTaskId(flowTask1.getId()); + + IFlwTaskService flwTaskService = applicationContext.getBean(IFlwTaskService.class); + + flwTaskService.taskOperation(taskOperationBo,"addSignature"); + } + + return true; + + } catch (Exception e) { + e.printStackTrace(); + log.error(e.getMessage(), e); + return false; + } + } + } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java index d113438..85a0841 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java @@ -136,7 +136,7 @@ public class WorkflowServiceImpl implements WorkflowService { */ @Override public boolean completeTask(RemoteCompleteTask completeTask) { - return flwTaskService.completeTask(BeanUtil.toBean(completeTask, CompleteTaskBo.class)); + return ObjectUtil.isNotEmpty(flwTaskService.completeTask(BeanUtil.toBean(completeTask, CompleteTaskBo.class))); } /** diff --git a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml index f539030..141e784 100644 --- a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml +++ b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml @@ -112,4 +112,9 @@ ) t ${ew.getCustomSqlSegment} + + + From f29808dfaf883c45c641bd766288a147c1abc275 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 6 May 2025 16:24:12 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=AE=A1=E7=90=86=E6=A0=B9=E6=8D=AE=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=9F=A5=E8=AF=A2=202=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=8A=A8=E6=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BA=BA=E9=80=BB=E8=BE=91=E3=80=82=203?= =?UTF-8?q?=E3=80=81=E5=AF=B9=E6=8E=A5=E8=AE=BE=E5=A4=87=E6=9D=83=E9=99=90?= =?UTF-8?q?=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlwTaskServiceImpl.java | 18 +++++++++++------- .../mapper/workflow/FlwTaskMapper.xml | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) 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 f7b1d35..71ec239 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 @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -41,6 +42,7 @@ import org.dromara.warm.flow.orm.mapper.FlowTaskMapper; 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.TaskAssigneeEnum; import org.dromara.workflow.common.enums.TaskAssigneeType; import org.dromara.workflow.common.enums.TaskStatusEnum; import org.dromara.workflow.domain.bo.*; @@ -908,13 +910,15 @@ public class FlwTaskServiceImpl implements IFlwTaskService { List totalUser = new ArrayList<>(); - if (!first.contains("${handler}")){ - String[] split = first.split("@@"); - for (String handleFlag : split) { - List remoteUserVos = flwTaskAssigneeService.fetchUsersByStorageId(handleFlag); - totalUser.addAll(remoteUserVos); - } - } + if (ObjectUtil.isNotEmpty(first)){ + String[] split = first.split("@@"); + for (String handleFlag : split) { + if (!handleFlag.equals("${handler}")){ + List remoteUserVos = flwTaskAssigneeService.fetchUsersByStorageId(handleFlag); + totalUser.addAll(remoteUserVos); + } + } + } //比较差值 List different = totalUser.stream() diff --git a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml index 141e784..6110a55 100644 --- a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml +++ b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml @@ -115,6 +115,6 @@ From 37f98c55a58d2a9db5758165fa9cbf793bf9f46a Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 6 May 2025 16:37:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[feat]=201=E3=80=81=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=9D=83=E9=99=90=E2=91=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/sample/manage/service/impl/DeviceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java index 09b8a12..aee999d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java @@ -710,7 +710,7 @@ public class DeviceServiceImpl implements IDeviceService { .firmwareVersion(dto.getFirmwareVersion()) .compatibleStatus(dto.getFirmwareStatus() == null ? null : DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != dto.getFirmwareStatus()) - .deviceDesc(dto.getDeviceDesc()) + .deviceDesc(dto.getDeviceDesc()).proId(ObjectUtil.isNotEmpty(dto.getProId())?Integer.valueOf(dto.getProId()):null) .build(); } } From 06ebc2a4ea18a0326d16f2e09e5cd8f96d4d90fd Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 6 May 2025 17:38:22 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E2=91=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/DeviceController.java | 4 +-- .../controller/system/AiLabelController.java | 11 +++++++ .../system/service/IAiLabelService.java | 2 ++ .../service/impl/AiLabelServiceImpl.java | 33 +++++++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java index bd1ca9d..139af62 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java @@ -119,7 +119,7 @@ public class DeviceController { * @param deviceSn * @return */ - @PutMapping("/devices/{device_sn}") + @PutMapping("/{workspace_id}/devices/{device_sn}") @Operation(summary = "更新设备信息。", description = "更新设备信息。") public HttpResultResponse updateDevice(@RequestBody DeviceDTO device, @PathVariable("workspace_id") String workspaceId, @@ -136,7 +136,7 @@ public class DeviceController { * @return */ @Operation(summary = "设备离线固件升级任务。", description = "设备离线固件升级任务。") - @PostMapping("/devices/ota") + @PostMapping("/{workspace_id}/devices/ota") public HttpResultResponse createOtaJob(@PathVariable("workspace_id") String workspaceId, @RequestBody List upgradeDTOS) { return deviceService.createDeviceOtaJob(workspaceId, upgradeDTOS); 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 babe5c3..2a3b69d 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 @@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.system.api.domain.vo.RemoteAiLabelPostVo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -56,6 +57,16 @@ public class AiLabelController extends BaseController { return aiLabelService.allList(); } + /** + * 下拉框集合 + */ + @GetMapping("/{postCode}/list") + public List listPostCodeLabel(@PathVariable("postCode") String postCode) { + return aiLabelService.selectLabelByList(postCode); + } + + + /** * 导出ai 识别类型列表 diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java b/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java index 5a1f009..ede3b27 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java @@ -74,4 +74,6 @@ public interface IAiLabelService { List queryListByLabel(List labelIds); String getFlowCode(String labelCode); + + List selectLabelByList(String postCode); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java index 60ee64f..19cdee1 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.system.service.impl; +import cn.hutool.core.collection.ListUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -9,6 +10,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.system.api.domain.vo.RemoteAiLabelPostVo; +import org.dromara.system.domain.vo.AiLabelPostVo; +import org.dromara.system.domain.vo.SysPostVo; +import org.dromara.system.service.IAiLabelPostService; +import org.dromara.system.service.ISysPostService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.system.domain.bo.AiLabelBo; import org.dromara.system.domain.vo.AiLabelVo; @@ -20,6 +27,7 @@ import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.stream.Collectors; /** * ai 识别类型Service业务层处理 @@ -33,6 +41,12 @@ public class AiLabelServiceImpl implements IAiLabelService { private final AiLabelMapper baseMapper; + @Autowired + private ISysPostService sysPostService; + + @Autowired + private IAiLabelPostService aiLabelPostService; + /** * 查询ai 识别类型 * @@ -148,4 +162,23 @@ public class AiLabelServiceImpl implements IAiLabelService { public String getFlowCode(String labelCode) { return this.baseMapper.selectOne(new LambdaQueryWrapper().eq(AiLabel::getLabelEn, labelCode)).getFlowCode(); } + + @Override + public List selectLabelByList(String postCode) { + SysPostVo sysPostVo = sysPostService.selectLableByList(postCode,null); + if(sysPostVo != null){ + List postVoList = aiLabelPostService.queryListByLabel(sysPostVo.getPostId()); + return postVoList.stream() + .map(aiLabel -> { + AiLabelVo aiLabelVo = new AiLabelVo(); + aiLabelVo.setLabelId(aiLabel.getLabelId()); + aiLabelVo.setLabelEn(aiLabel.getLabelEn()); + aiLabelVo.setLabelCn(aiLabel.getLabelCn()); + aiLabelVo.setAiName(aiLabel.getAiName()); + return aiLabelVo; + }) + .collect(Collectors.toList()); + } + return ListUtil.empty(); + } } From 8aced047e5206e870fc3d5d8b86fc0ae9b6908c5 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Wed, 7 May 2025 16:47:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BB=84=E4=BF=A1=E6=81=AF=E2=91=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/manage/controller/DeviceProController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceProController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceProController.java index 5c24e24..52bce09 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceProController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceProController.java @@ -125,12 +125,12 @@ public class DeviceProController { /** * 根据人员获取项目组(feign调用接口) */ - @GetMapping("/feign/user") - public List listDeviceGroup(@RequestParam("userId") Long userId) { + @GetMapping("/list/pro") + public R> listDeviceGroup(@RequestParam("userId") Long userId) { log.info("----------------------------开始调用feign接口查询项目组----------------------------"); List result = deviceProService.listDeviceGroup(userId); log.info("----------------------------调用feign接口查询项目组结束----------------------------"); - return result; + return R.ok(result); } /**