update 调整用户，用户组查询

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java

@@ -1,14 +1,11 @@
 package org.dromara.workflow.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.json.utils.JsonUtils;
@@ -17,27 +14,17 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.domain.SysRole;
-import org.dromara.system.domain.SysUser;
-import org.dromara.system.mapper.SysRoleMapper;
-import org.dromara.system.mapper.SysUserMapper;
-import org.dromara.system.service.ISysUserService;
 import org.dromara.workflow.domain.bo.ModelBo;
 import org.dromara.workflow.domain.vo.AccountVo;
-import org.dromara.workflow.domain.vo.GroupRepresentation;
 import org.dromara.workflow.domain.vo.ResultListDataRepresentation;
-import org.dromara.workflow.domain.vo.UserRepresentation;
 import org.dromara.workflow.service.IActModelService;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.repository.Model;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.MultiValueMap;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -55,10 +42,6 @@ public class ActModelController extends BaseController {
 
     private final IActModelService iActModelService;
 
-    private final SysUserMapper sysUserMapper;
-
-    private final SysRoleMapper sysRoleMapper;
-
 
     /**
      * 分页查询模型
@@ -166,20 +149,7 @@ public class ActModelController extends BaseController {
      */
     @GetMapping(value = "/rest/editor-users")
     public ResultListDataRepresentation getUsers(@RequestParam(value = "filter", required = false) String filter) {
-        LambdaQueryWrapper<SysUser> wrapper = Wrappers.lambdaQuery();
+        return iActModelService.getUsers(filter);
-        wrapper.like(StringUtils.isNotBlank(filter), SysUser::getNickName, filter);
-        List<SysUser> sysUsers = sysUserMapper.selectList(wrapper);
-        List<UserRepresentation> userRepresentations = new ArrayList<>();
-        for (SysUser sysUser : sysUsers) {
-            UserRepresentation userRepresentation = new UserRepresentation();
-            userRepresentation.setFullName(sysUser.getNickName());
-            userRepresentation.setLastName(sysUser.getNickName());
-            userRepresentation.setTenantId(sysUser.getTenantId());
-            userRepresentation.setEmail(sysUser.getEmail());
-            userRepresentation.setId(sysUser.getUserId().toString());
-            userRepresentations.add(userRepresentation);
-        }
-        return new ResultListDataRepresentation(userRepresentations);
     }
 
     /**
@@ -189,18 +159,7 @@ public class ActModelController extends BaseController {
      */
     @GetMapping(value = "/rest/editor-groups")
     public ResultListDataRepresentation getGroups(@RequestParam(required = false, value = "filter") String filter) {
-        LambdaQueryWrapper<SysRole> wrapper = Wrappers.lambdaQuery();
+        return iActModelService.getGroups(filter);
-        wrapper.like(StringUtils.isNotBlank(filter), SysRole::getRoleName, filter);
-        List<SysRole> sysRoles = sysRoleMapper.selectList(wrapper);
-        List<GroupRepresentation> result = new ArrayList<>();
-        for (SysRole sysRole : sysRoles) {
-            GroupRepresentation groupRepresentation = new GroupRepresentation();
-            groupRepresentation.setId(sysRole.getRoleId().toString());
-            groupRepresentation.setName(sysRole.getRoleName());
-            groupRepresentation.setType(sysRole.getRoleKey());
-            result.add(groupRepresentation);
-        }
-        return new ResultListDataRepresentation(result);
     }
 
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import jakarta.servlet.http.HttpServletResponse;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.workflow.domain.bo.ModelBo;
+import org.dromara.workflow.domain.vo.ResultListDataRepresentation;
 import org.flowable.engine.repository.Model;
 import org.springframework.util.MultiValueMap;
 
@@ -61,4 +62,20 @@ public interface IActModelService {
      * @param response 相应
      */
     void exportZip(String modelId, HttpServletResponse response);
+
+    /**
+     * 查询用户
+     *
+     * @param filter 参数
+     * @return 结果
+     */
+    ResultListDataRepresentation getUsers(String filter);
+
+    /**
+     * 查询用户组
+     *
+     * @param filter 参数
+     * @return 结果
+     */
+    ResultListDataRepresentation getGroups(String filter);
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java

@@ -7,6 +7,8 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import jakarta.servlet.http.HttpServletResponse;
@@ -17,7 +19,14 @@ import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.mapper.SysRoleMapper;
+import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.workflow.domain.bo.ModelBo;
+import org.dromara.workflow.domain.vo.GroupRepresentation;
+import org.dromara.workflow.domain.vo.ResultListDataRepresentation;
+import org.dromara.workflow.domain.vo.UserRepresentation;
 import org.dromara.workflow.service.IActModelService;
 import org.dromara.workflow.utils.WorkflowUtils;
 import org.flowable.bpmn.model.BpmnModel;
@@ -35,6 +44,7 @@ import org.springframework.util.MultiValueMap;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -54,6 +64,8 @@ import static org.flowable.editor.constants.ModelDataJsonConstants.*;
 public class ActModelServiceImpl implements IActModelService {
 
     private final RepositoryService repositoryService;
+    private final SysUserMapper sysUserMapper;
+    private final SysRoleMapper sysRoleMapper;
 
     /**
      * 分页查询模型
@@ -334,4 +346,40 @@ public class ActModelServiceImpl implements IActModelService {
             }
         }
     }
+
+    @Override
+    public ResultListDataRepresentation getUsers(String filter) {
+
+        LambdaQueryWrapper<SysUser> wrapper = Wrappers.lambdaQuery();
+        wrapper.like(org.dromara.common.core.utils.StringUtils.isNotBlank(filter), SysUser::getNickName, filter);
+        List<SysUser> sysUsers = sysUserMapper.selectList(wrapper);
+        List<UserRepresentation> userRepresentations = new ArrayList<>();
+        for (SysUser sysUser : sysUsers) {
+            UserRepresentation userRepresentation = new UserRepresentation();
+            userRepresentation.setFullName(sysUser.getNickName());
+            userRepresentation.setLastName(sysUser.getNickName());
+            userRepresentation.setTenantId(sysUser.getTenantId());
+            userRepresentation.setEmail(sysUser.getEmail());
+            userRepresentation.setId(sysUser.getUserId().toString());
+            userRepresentations.add(userRepresentation);
+        }
+        return new ResultListDataRepresentation(userRepresentations);
+    }
+
+    @Override
+    public ResultListDataRepresentation getGroups(String filter) {
+
+        LambdaQueryWrapper<SysRole> wrapper = Wrappers.lambdaQuery();
+        wrapper.like(org.dromara.common.core.utils.StringUtils.isNotBlank(filter), SysRole::getRoleName, filter);
+        List<SysRole> sysRoles = sysRoleMapper.selectList(wrapper);
+        List<GroupRepresentation> result = new ArrayList<>();
+        for (SysRole sysRole : sysRoles) {
+            GroupRepresentation groupRepresentation = new GroupRepresentation();
+            groupRepresentation.setId(sysRole.getRoleId().toString());
+            groupRepresentation.setName(sysRole.getRoleName());
+            groupRepresentation.setType(sysRole.getRoleKey());
+            result.add(groupRepresentation);
+        }
+        return new ResultListDataRepresentation(result);
+    }
 }