dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-09-04 03:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 !pr164 代码结构与修复一些问题

Browse Source
This commit is contained in:
疯狂的狮子Li
2024-06-03 16:20:43 +08:00
parent 992adc8589
commit bc05aabd5e
40 changed files with 198 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java
View File

@@ -3,7 +3,7 @@ package org.dromara.system.api;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.system.api.domain.bo.RemoteUserBo;
import org.dromara.system.api.domain.dto.UserDTO;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.dromara.system.api.model.LoginUser;
import org.dromara.system.api.model.XcxLoginUser;
@@ -84,6 +84,14 @@ public interface RemoteUserService {
*/
String selectNicknameById(Long userId);
/**
* 通过用户ID查询用户账户
*
* @param userIds 用户ID 多个用逗号隔开
* @return 用户名称
*/
String selectNicknameByIds(String userIds);
/**
* 通过用户ID查询用户手机号
*
@@ -114,7 +122,7 @@ public interface RemoteUserService {
* @param userIds 用户ids
* @return 用户列表
*/
List<UserDTO> selectListByIds(List<Long> userIds);
List<RemoteUserVo> selectListByIds(List<Long> userIds);
/**
* 通过角色ID查询用户ID

4
ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/dto/UserDTO.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteUserVo.java
View File

@@ -1,4 +1,4 @@
package org.dromara.system.api.domain.dto;
package org.dromara.system.api.domain.vo;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -15,7 +15,7 @@ import java.util.Date;
*/
@Data
@NoArgsConstructor
public class UserDTO implements Serializable {
public class RemoteUserVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

7
ruoyi-api/ruoyi-api-workflow/pom.xml
View File

@@ -12,7 +12,7 @@
<artifactId>ruoyi-api-workflow</artifactId>
<description>
ruoyi-api-resource 资源服务接口模块
ruoyi-api-workflow 工作流接口模块
</description>
<dependencies>
@@ -23,11 +23,6 @@
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-translation</artifactId>
</dependency>
</dependencies>
</project>

16
ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/RemoteWorkflowService.java
View File

@@ -1,7 +1,5 @@
package org.dromara.workflow.api.domain;
import org.dromara.workflow.api.domain.dto.BusinessInstanceDTO;
import java.util.List;
import java.util.Map;
@@ -35,20 +33,6 @@ public interface RemoteWorkflowService {
*/
String getBusinessStatus(String businessKey);
/**
* 获取流程实例对象
*
* @param businessKey 业务id
*/
BusinessInstanceDTO getBusinessInstance(String businessKey);
/**
* 获取流程实例对象
*
* @param businessKeys 业务id集合
*/
List<BusinessInstanceDTO> getBusinessInstance(List<String> businessKeys);
/**
* 设置流程变量(全局变量)
*

43
ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/bo/ProcessInstanceBo.java
View File

@@ -1,43 +0,0 @@
package org.dromara.workflow.api.domain.bo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 流程实例请求对象
*
* @author may
*/
@Data
public class ProcessInstanceBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 流程名称
*/
private String name;
/**
* 流程key
*/
private String key;
/**
* 任务发起人
*/
private String startUserId;
/**
* 业务id
*/
private String businessKey;
/**
* 模型分类
*/
private String categoryCode;
}

31
ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/bo/ProcessInvalidBo.java
View File

@@ -1,31 +0,0 @@
package org.dromara.workflow.api.domain.bo;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import java.io.Serial;
import java.io.Serializable;
/**
* 流程实例作废请求对象
*
* @author may
*/
@Data
public class ProcessInvalidBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 业务id
*/
@NotBlank(message = "业务id不能为空", groups = {AddGroup.class})
private String businessKey;
/**
* 作废原因
*/
private String deleteReason;
}

34
ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/bo/TaskUrgingBo.java
View File

@@ -1,34 +0,0 @@
package org.dromara.workflow.api.domain.bo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* 任务催办
*
* @author may
*/
@Data
public class TaskUrgingBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 流程实例id
*/
private String processInstanceId;
/**
* 消息类型
*/
private List<String> messageType;
/**
* 催办内容（为空默认系统内置信息）
*/
private String message;
}

72
ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/dto/BusinessInstanceDTO.java
View File

@@ -1,72 +0,0 @@
package org.dromara.workflow.api.domain.dto;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 业务与流程实例关联对象
*
* @Author ZETA
* @Date 2024/6/3
*/
@Data
@NoArgsConstructor
public class BusinessInstanceDTO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 流程实例id
*/
private String id;
/**
* 流程定义id
*/
private String processDefinitionId;
/**
* 流程定义名称
*/
private String name;
/**
* 业务id
*/
private String businessKey;
/**
* 租户id
*/
private String tenantId;
/**
* 启动时间
*/
private Date startTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 启动人id
*/
private String startUserId;
/**
* 流程状态
*/
private String businessStatus;
/**
* 流程状态
*/
private String businessStatusName;
}

7
ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/event/ProcessEvent.java
View File

@@ -1,6 +1,5 @@
package org.dromara.workflow.api.domain.event;
import jakarta.servlet.http.HttpServletRequest;
import lombok.Data;
import java.io.Serial;
@@ -38,10 +37,4 @@ public class ProcessEvent implements Serializable {
*/
private boolean submit;
/**
* 请求体
*/
private HttpServletRequest request;
}

6
ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/event/ProcessTaskEvent.java
View File

@@ -1,6 +1,5 @@
package org.dromara.workflow.api.domain.event;
import jakarta.servlet.http.HttpServletRequest;
import lombok.Data;
import java.io.Serial;
@@ -33,9 +32,4 @@ public class ProcessTaskEvent implements Serializable {
*/
private String businessKey;
/**
* 请求体
*/
private HttpServletRequest request;
}