From 520cfa8c8d1b6752e038454b08c73c55af53c601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=A0=94=E5=8F=91=E4=B8=AD=E5=BF=83?= Date: Fri, 24 Jan 2020 22:29:35 +0800 Subject: [PATCH 1/3] update yml --- ruoyi-config/src/main/resources/config/ruoyi-auth-dev.yml | 2 +- .../src/main/resources/config/ruoyi-gateway-dev.yml | 2 +- ruoyi-config/src/main/resources/config/ruoyi-gen-dev.yml | 2 +- .../src/main/resources/config/ruoyi-system-dev.yml | 6 +++--- .../src/main/resources/config/ruoyi-system-prod.yml | 2 +- ruoyi-eureka/src/main/resources/application-dev.yml | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ruoyi-config/src/main/resources/config/ruoyi-auth-dev.yml b/ruoyi-config/src/main/resources/config/ruoyi-auth-dev.yml index d3e5900..296283c 100644 --- a/ruoyi-config/src/main/resources/config/ruoyi-auth-dev.yml +++ b/ruoyi-config/src/main/resources/config/ruoyi-auth-dev.yml @@ -2,7 +2,7 @@ spring: redis: database: 1 - host: 192.168.0.185 + host: 127.0.0.1 port: 6379 password: # 密码（默认为空） timeout: 6000ms # 连接超时时长（毫秒） diff --git a/ruoyi-config/src/main/resources/config/ruoyi-gateway-dev.yml b/ruoyi-config/src/main/resources/config/ruoyi-gateway-dev.yml index d6c889e..b58832d 100644 --- a/ruoyi-config/src/main/resources/config/ruoyi-gateway-dev.yml +++ b/ruoyi-config/src/main/resources/config/ruoyi-gateway-dev.yml @@ -1,7 +1,7 @@ spring: redis: database: 1 - host: 192.168.0.185 + host: 127.0.0.1 port: 6379 password: # 密码（默认为空） timeout: 6000ms # 连接超时时长（毫秒） diff --git a/ruoyi-config/src/main/resources/config/ruoyi-gen-dev.yml b/ruoyi-config/src/main/resources/config/ruoyi-gen-dev.yml index 5a1ae08..320d193 100644 --- a/ruoyi-config/src/main/resources/config/ruoyi-gen-dev.yml +++ b/ruoyi-config/src/main/resources/config/ruoyi-gen-dev.yml @@ -2,6 +2,6 @@ spring: datasource: driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ry_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: root \ No newline at end of file diff --git a/ruoyi-config/src/main/resources/config/ruoyi-system-dev.yml b/ruoyi-config/src/main/resources/config/ruoyi-system-dev.yml index 485202e..390e58e 100644 --- a/ruoyi-config/src/main/resources/config/ruoyi-system-dev.yml +++ b/ruoyi-config/src/main/resources/config/ruoyi-system-dev.yml @@ -2,7 +2,7 @@ spring: redis: database: 1 - host: 192.168.0.185 + host: 127.0.0.1 port: 6379 password: # 密码（默认为空） timeout: 6000ms # 连接超时时长（毫秒） @@ -18,14 +18,14 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: root # 从库数据源 slave: #从数据源开关/默认关闭 enabled: false - url: jdbc:mysql://localhost:3306/ry_cloud_read?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: root # 初始连接数 diff --git a/ruoyi-config/src/main/resources/config/ruoyi-system-prod.yml b/ruoyi-config/src/main/resources/config/ruoyi-system-prod.yml index a37d4c0..390e58e 100644 --- a/ruoyi-config/src/main/resources/config/ruoyi-system-prod.yml +++ b/ruoyi-config/src/main/resources/config/ruoyi-system-prod.yml @@ -25,7 +25,7 @@ spring: slave: #从数据源开关/默认关闭 enabled: false - url: jdbc:mysql://localhost:3306/wind?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: root # 初始连接数 diff --git a/ruoyi-eureka/src/main/resources/application-dev.yml b/ruoyi-eureka/src/main/resources/application-dev.yml index 4befcf8..623e97b 100644 --- a/ruoyi-eureka/src/main/resources/application-dev.yml +++ b/ruoyi-eureka/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ eureka: register-with-eureka: false #false表示不向注册中心注册自己。 fetch-registry: false #false表示自己端就是注册中心，我的职责就是维护服务实例，并不需要去检索服务 service-url: - #单机 - #设置与Eureka Server交互的地址查询服务和注册服务都需要依赖这个地址（单机）。 - defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/ - #defaultZone: http://eureka7002.com:7002/eureka/,http://eureka7003.com:7003/eureka/ \ No newline at end of file + #单机 com:7003/eureka/ + #设置与Eureka Server交互的地址查询服务和注册服务都需要依赖这个地址（单机）。 + defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/ + #defaultZone: http://eureka7002.com:7002/eureka/,http://eureka7003. \ No newline at end of file -- Gitee From 821e811b5402e7d03b3f971712a0beb766ad22c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=A0=94=E5=8F=91=E4=B8=AD=E5=BF=83?= Date: Sat, 25 Jan 2020 09:58:06 +0800 Subject: [PATCH 2/3] fix bug --- .../auth/aspect/PreAuthorizeAspect.java | 5 +- .../common/log/LogAutoConfiguration.java | 6 +- .../common/log/aspect/OperLogAspect.java | 9 +- .../ruoyi/common/log/listen/LogListener.java | 14 +- .../common/redis/aspect/RedisAspect.java | 4 +- .../config/RouterFunctionConfiguration.java | 4 +- .../ruoyi/gateway/config/SwaggerProvider.java | 4 +- .../com/ruoyi/gateway/fiflt/AuthFilter.java | 5 +- .../gateway/fiflt/CacheRequestFilter.java | 9 + .../ruoyi/gateway/fiflt/ImgCodeFilter.java | 9 +- .../handler/HystrixFallbackHandler.java | 5 +- .../ruoyi/gateway/handler/ImgCodeHandler.java | 9 +- .../java/com/ruoyi/system/domain/Donate.java | 64 ++++++ .../java/com/ruoyi/system/domain/SysMenu.java | 140 +++++++++++++ .../com/ruoyi/system/domain/SysOperLog.java | 124 +++++++++++ .../java/com/ruoyi/system/domain/SysOss.java | 69 ++++++- .../factory/RemoteDeptFallbackFactory.java | 6 +- .../factory/RemoteLogFallbackFactory.java | 5 +- .../factory/RemoteMenuFallbackFactory.java | 5 +- .../factory/RemoteRoleFallbackFactory.java | 5 +- .../factory/RemoteUserFallbackFactory.java | 5 +- .../controller/ActTaskController.java | 3 +- .../controller/ProcessController.java | 12 +- .../controller/ProcessInsController.java | 8 +- .../com/ruoyi/activiti/domain/ActReModel.java | 110 ++++++++++ .../ruoyi/activiti/domain/ActReProcdef.java | 96 +++++++++ .../com/ruoyi/activiti/domain/BizAudit.java | 111 ++++++++++ .../ruoyi/activiti/domain/BizBusiness.java | 124 +++++++++++ .../com/ruoyi/activiti/domain/BizLeave.java | 92 +++++++++ .../com/ruoyi/activiti/domain/BizNode.java | 35 ++++ .../ruoyi/activiti/domain/BizPurchase.java | 68 +++++++ .../listener/MyProcessExecutionListener.java | 8 +- .../listener/MyTaskCompletedListener.java | 14 +- .../ProcessInstanceHighlightsResource.java | 4 +- .../com/ruoyi/activiti/vo/HiProcInsVo.java | 128 ++++++++++++ .../java/com/ruoyi/activiti/vo/HiTaskVo.java | 176 ++++++++++++++++ .../com/ruoyi/activiti/vo/ProcessInsVo.java | 136 +++++++++++++ .../com/ruoyi/activiti/vo/ProcessNodeVo.java | 56 +++++ .../java/com/ruoyi/activiti/vo/ReProcdef.java | 120 +++++++++++ .../java/com/ruoyi/activiti/vo/RuTask.java | 192 ++++++++++++++++++ .../java/com/ruoyi/auth/form/LoginForm.java | 16 ++ .../java/com/ruoyi/dfs/config/DfsConfig.java | 16 ++ .../ruoyi/dfs/controller/FileController.java | 7 +- .../com/ruoyi/generator/util/GenUtils.java | 2 +- .../ruoyi/system/aspect/DataScopeAspect.java | 8 +- .../ruoyi/system/aspect/DataSourceAspect.java | 2 +- .../ruoyi/system/oss/CloudStorageConfig.java | 147 ++++++++++++++ 47 files changed, 2143 insertions(+), 54 deletions(-) diff --git a/ruoyi-common/ruoyi-common-auth/src/main/java/com/ruoyi/common/auth/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-auth/src/main/java/com/ruoyi/common/auth/aspect/PreAuthorizeAspect.java index dd7956f..2756dd3 100644 --- a/ruoyi-common/ruoyi-common-auth/src/main/java/com/ruoyi/common/auth/aspect/PreAuthorizeAspect.java +++ b/ruoyi-common/ruoyi-common-auth/src/main/java/com/ruoyi/common/auth/aspect/PreAuthorizeAspect.java @@ -10,6 +10,8 @@ import org.aspectj.lang.Signature; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.reflect.MethodSignature; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -26,6 +28,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class PreAuthorizeAspect { + protected final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private RemoteMenuService sysMenuClient; @@ -59,7 +62,7 @@ public class PreAuthorizeAspect if (Optional.ofNullable(tmpUserKey).isPresent()) { Long userId = Long.valueOf(tmpUserKey); - log.debug("userid:{}", userId); + logger.debug("userid:{}", userId); if (userId == 1L) { return true; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/LogAutoConfiguration.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/LogAutoConfiguration.java index e0cbc04..605b004 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/LogAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/LogAutoConfiguration.java @@ -1,5 +1,6 @@ package com.ruoyi.common.log; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -17,12 +18,13 @@ import lombok.AllArgsConstructor; @ConditionalOnWebApplication public class LogAutoConfiguration { - private final RemoteLogService logService; + +// private RemoteLogService logService; @Bean public LogListener sysOperLogListener() { - return new LogListener(logService); + return new LogListener(); } @Bean diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/OperLogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/OperLogAspect.java index 06c5c8d..1d31ebe 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/OperLogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/OperLogAspect.java @@ -16,6 +16,8 @@ import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import com.alibaba.fastjson.JSON; @@ -41,6 +43,7 @@ import lombok.extern.slf4j.Slf4j; @Component public class OperLogAspect { + protected final Logger logger = LoggerFactory.getLogger(getClass()); // 配置织入点 @Pointcut("@annotation(com.ruoyi.common.log.annotation.OperLog)") public void logPointCut() @@ -111,8 +114,8 @@ public class OperLogAspect catch (Exception exp) { // 记录本地异常日志 - log.error("==前置通知异常=="); - log.error("异常信息:{}", exp.getMessage()); + logger.error("==前置通知异常=="); + logger.error("异常信息:{}", exp.getMessage()); exp.printStackTrace(); } } @@ -150,7 +153,7 @@ public class OperLogAspect { List param = new ArrayList<>(Arrays.asList(args)).stream().filter(p -> !(p instanceof ServletResponse)) .collect(Collectors.toList()); - log.debug("args:{}", param); + logger.debug("args:{}", param); String params = JSON.toJSONString(param, true); operLog.setOperParam(StringUtils.substring(params, 0, 2000)); } diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/listen/LogListener.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/listen/LogListener.java index 6953e7b..11869df 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/listen/LogListener.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/listen/LogListener.java @@ -1,5 +1,8 @@ package com.ruoyi.common.log.listen; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; import org.springframework.core.annotation.Order; import org.springframework.scheduling.annotation.Async; @@ -20,7 +23,12 @@ import lombok.extern.slf4j.Slf4j; @AllArgsConstructor public class LogListener { - private final RemoteLogService remoteLogService; + protected final Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private RemoteLogService remoteLogService; + + public LogListener() { + } @Async @Order @@ -29,7 +37,7 @@ public class LogListener { SysOperLog sysOperLog = (SysOperLog) event.getSource(); remoteLogService.insertOperlog(sysOperLog); - log.info("远程操作日志记录成功：{}", sysOperLog); + logger.info("远程操作日志记录成功：{}", sysOperLog); } @Async @@ -39,6 +47,6 @@ public class LogListener { SysLogininfor sysLogininfor = (SysLogininfor) event.getSource(); remoteLogService.insertLoginlog(sysLogininfor); - log.info("远程访问日志记录成功：{}", sysLogininfor); + logger.info("远程访问日志记录成功：{}", sysLogininfor); } } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/aspect/RedisAspect.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/aspect/RedisAspect.java index 707809c..6a4712d 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/aspect/RedisAspect.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/aspect/RedisAspect.java @@ -105,7 +105,9 @@ public class RedisAspect /** * 获取缓存的key * key 定义在注解上，支持SPEL表达式 - * @param pjp + * @param key + * @param method + * @param args * @return */ private String parseKey(String key, Method method, Object[] args) diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java index 90316b0..a357121 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java @@ -36,9 +36,9 @@ import lombok.AllArgsConstructor; @AllArgsConstructor public class RouterFunctionConfiguration { - private final HystrixFallbackHandler hystrixFallbackHandler; + private HystrixFallbackHandler hystrixFallbackHandler; - private final ImgCodeHandler imgCodeHandler; + private ImgCodeHandler imgCodeHandler; @Bean public RouterFunction routerFunction() diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java index 935e0e4..52d2432 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java @@ -27,9 +27,9 @@ public class SwaggerProvider implements SwaggerResourcesProvider { public static final String API_URI = "/v2/api-docs"; - private final RouteLocator routeLocator; + private RouteLocator routeLocator; - private final GatewayProperties gatewayProperties; + private GatewayProperties gatewayProperties; @Override public List get() diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/fiflt/AuthFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/fiflt/AuthFilter.java index 8698b5a..9a0a9af 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/fiflt/AuthFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/fiflt/AuthFilter.java @@ -6,6 +6,8 @@ import java.util.Arrays; import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.core.Ordered; @@ -33,6 +35,7 @@ import reactor.core.publisher.Mono; @Component public class AuthFilter implements GlobalFilter, Ordered { + protected final Logger logger = LoggerFactory.getLogger(getClass()); // 排除过滤的 uri 地址 // swagger排除自行添加 private static final String[] whiteList = {"/auth/login", "/user/register", "/system/v2/api-docs"}; @@ -44,7 +47,7 @@ public class AuthFilter implements GlobalFilter, Ordered public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { String url = exchange.getRequest().getURI().getPath(); - log.info("url:{}", url); + logger.info("url:{}", url); // 跳过不需要验证的路径 if (Arrays.asList(whiteList).contains(url)) { diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/fiflt/CacheRequestFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/fiflt/CacheRequestFilter.java index cb282cd..c320a76 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/fiflt/CacheRequestFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/fiflt/CacheRequestFilter.java @@ -22,6 +22,7 @@ import reactor.core.publisher.Mono; @Component public class CacheRequestFilter extends AbstractGatewayFilterFactory { + public CacheRequestFilter() { super(Config.class); @@ -90,5 +91,13 @@ public class CacheRequestFilter extends AbstractGatewayFilterFactory { + protected final Logger logger = LoggerFactory.getLogger(getClass()); + private final static String AUTH_URL = "/auth/login"; @Autowired @@ -92,10 +96,11 @@ public class ImgCodeFilter extends AbstractGatewayFilterFactory { + protected final Logger logger = LoggerFactory.getLogger(getClass()); @Override public Mono handle(ServerRequest serverRequest) { Optional originalUris = serverRequest.attribute(GATEWAY_ORIGINAL_REQUEST_URL_ATTR); - originalUris.ifPresent(originalUri -> log.error("网关执行请求:{}失败,hystrix服务降级处理", originalUri)); + originalUris.ifPresent(originalUri -> logger.error("网关执行请求:{}失败,hystrix服务降级处理", originalUri)); return ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR.value()).contentType(MediaType.TEXT_PLAIN) .body(BodyInserters.fromObject("服务异常")); } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ImgCodeHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ImgCodeHandler.java index 9e4fa84..6bac334 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ImgCodeHandler.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ImgCodeHandler.java @@ -7,6 +7,8 @@ import java.util.concurrent.TimeUnit; import javax.imageio.ImageIO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.io.ByteArrayResource; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.http.HttpStatus; @@ -30,9 +32,10 @@ import reactor.core.publisher.Mono; @AllArgsConstructor public class ImgCodeHandler implements HandlerFunction { - private final Producer producer; + protected final Logger logger = LoggerFactory.getLogger(getClass()); + private Producer producer; - private final StringRedisTemplate redisTemplate; + private StringRedisTemplate redisTemplate; @Override public Mono handle(ServerRequest serverRequest) @@ -53,7 +56,7 @@ public class ImgCodeHandler implements HandlerFunction } catch (IOException e) { - log.error("ImageIO write err", e); + logger.error("ImageIO write err", e); return Mono.error(e); } return ServerResponse.status(HttpStatus.OK).contentType(MediaType.IMAGE_JPEG).header("randomstr", randomStr) diff --git a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/Donate.java b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/Donate.java index 132fca5..42209e3 100644 --- a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/Donate.java +++ b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/Donate.java @@ -50,4 +50,68 @@ public class Donate @Transient private String endTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getNick() { + return nick; + } + + public void setNick(String nick) { + this.nick = nick; + } + + public Double getAmount() { + return amount; + } + + public void setAmount(Double amount) { + this.amount = amount; + } + + public Integer getCanal() { + return canal; + } + + public void setCanal(Integer canal) { + this.canal = canal; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } } diff --git a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysMenu.java index 5e74939..dea2f5a 100644 --- a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -69,4 +69,144 @@ public class SysMenu extends BaseEntity /** 子菜单 */ private List children = new ArrayList(); + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public Long getMenuId() { + return menuId; + } + + public void setMenuId(Long menuId) { + this.menuId = menuId; + } + + public String getMenuName() { + return menuName; + } + + public void setMenuName(String menuName) { + this.menuName = menuName; + } + + public String getParentName() { + return parentName; + } + + public void setParentName(String parentName) { + this.parentName = parentName; + } + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } + + public String getOrderNum() { + return orderNum; + } + + public void setOrderNum(String orderNum) { + this.orderNum = orderNum; + } + + public String getMenuType() { + return menuType; + } + + public void setMenuType(String menuType) { + this.menuType = menuType; + } + + public String getMenuKey() { + return menuKey; + } + + public void setMenuKey(String menuKey) { + this.menuKey = menuKey; + } + + public String getComponent() { + return component; + } + + public void setComponent(String component) { + this.component = component; + } + + public String getVisible() { + return visible; + } + + public void setVisible(String visible) { + this.visible = visible; + } + + public String getPerms() { + return perms; + } + + public void setPerms(String perms) { + this.perms = perms; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getRedirect() { + return redirect; + } + + public void setRedirect(String redirect) { + this.redirect = redirect; + } + + public Boolean getHiddenChildren() { + return hiddenChildren; + } + + public void setHiddenChildren(Boolean hiddenChildren) { + this.hiddenChildren = hiddenChildren; + } + + public Boolean getHiddenHeader() { + return hiddenHeader; + } + + public void setHiddenHeader(Boolean hiddenHeader) { + this.hiddenHeader = hiddenHeader; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } } diff --git a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysOperLog.java index fb82015..303647d 100644 --- a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -78,4 +78,128 @@ public class SysOperLog extends BaseEntity /** 操作时间 */ @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date operTime; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public Long getOperId() { + return operId; + } + + public void setOperId(Long operId) { + this.operId = operId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getBusinessType() { + return businessType; + } + + public void setBusinessType(Integer businessType) { + this.businessType = businessType; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public String getRequestMethod() { + return requestMethod; + } + + public void setRequestMethod(String requestMethod) { + this.requestMethod = requestMethod; + } + + public Integer getOperatorType() { + return operatorType; + } + + public void setOperatorType(Integer operatorType) { + this.operatorType = operatorType; + } + + public String getOperName() { + return operName; + } + + public void setOperName(String operName) { + this.operName = operName; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getOperUrl() { + return operUrl; + } + + public void setOperUrl(String operUrl) { + this.operUrl = operUrl; + } + + public String getOperIp() { + return operIp; + } + + public void setOperIp(String operIp) { + this.operIp = operIp; + } + + public String getOperLocation() { + return operLocation; + } + + public void setOperLocation(String operLocation) { + this.operLocation = operLocation; + } + + public String getOperParam() { + return operParam; + } + + public void setOperParam(String operParam) { + this.operParam = operParam; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getErrorMsg() { + return errorMsg; + } + + public void setErrorMsg(String errorMsg) { + this.errorMsg = errorMsg; + } + + public Date getOperTime() { + return operTime; + } + + public void setOperTime(Date operTime) { + this.operTime = operTime; + } } diff --git a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysOss.java b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysOss.java index 276079c..605c0d9 100644 --- a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysOss.java +++ b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/domain/SysOss.java @@ -47,6 +47,71 @@ public class SysOss implements Serializable @Transient private Boolean editable; - - + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileSuffix() { + return fileSuffix; + } + + public void setFileSuffix(String fileSuffix) { + this.fileSuffix = fileSuffix; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Integer getService() { + return service; + } + + public void setService(Integer service) { + this.service = service; + } + + public Boolean getEditable() { + return editable; + } + + public void setEditable(Boolean editable) { + this.editable = editable; + } } diff --git a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteDeptFallbackFactory.java b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteDeptFallbackFactory.java index ff0043e..775f937 100644 --- a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteDeptFallbackFactory.java +++ b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteDeptFallbackFactory.java @@ -1,5 +1,8 @@ package com.ruoyi.system.feign.factory; +import org.checkerframework.common.reflection.qual.GetClass; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import com.ruoyi.system.domain.SysDept; @@ -14,10 +17,11 @@ public class RemoteDeptFallbackFactory implements FallbackFactory { + protected final Logger logger = LoggerFactory.getLogger(getClass()); @Override public RemoteLogService create(Throwable throwable) { - log.error(throwable.getMessage()); + logger.error(throwable.getMessage()); return new RemoteLogService() { @Override diff --git a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteMenuFallbackFactory.java b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteMenuFallbackFactory.java index 01b662e..818a7a2 100644 --- a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteMenuFallbackFactory.java +++ b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteMenuFallbackFactory.java @@ -2,6 +2,8 @@ package com.ruoyi.system.feign.factory; import java.util.Set; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import com.ruoyi.system.feign.RemoteMenuService; @@ -13,10 +15,11 @@ import lombok.extern.slf4j.Slf4j; @Component public class RemoteMenuFallbackFactory implements FallbackFactory { + protected Logger logger = LoggerFactory.getLogger(getClass()); @Override public RemoteMenuService create(Throwable throwable) { - log.error(throwable.getMessage()); + logger.error(throwable.getMessage()); return new RemoteMenuService() { diff --git a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteRoleFallbackFactory.java b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteRoleFallbackFactory.java index 59e3d5d..ec9a9c7 100644 --- a/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteRoleFallbackFactory.java +++ b/ruoyi-service-api/ruoyi-system-api/src/main/java/com/ruoyi/system/feign/factory/RemoteRoleFallbackFactory.java @@ -1,5 +1,7 @@ package com.ruoyi.system.feign.factory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import com.ruoyi.system.domain.SysRole; @@ -14,10 +16,11 @@ public class RemoteRoleFallbackFactory implements FallbackFactory { + protected final Logger logger = LoggerFactory.getLogger(getClass()); @Override public RemoteUserService create(Throwable throwable) { - log.error(throwable.getMessage()); + logger.error(throwable.getMessage()); return new RemoteUserService() { @Override diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ActTaskController.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ActTaskController.java index 1556327..35fd432 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ActTaskController.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ActTaskController.java @@ -117,8 +117,7 @@ public class ActTaskController extends BaseController /** * task 已办 * - * @param ruTask - * @param page + * @param hiTaskVo * @return * @author zmr */ diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ProcessController.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ProcessController.java index d54256c..d84e899 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ProcessController.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ProcessController.java @@ -24,6 +24,8 @@ import org.activiti.engine.impl.pvm.PvmTransition; import org.activiti.engine.impl.pvm.process.ActivityImpl; import org.activiti.engine.repository.ProcessDefinition; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -47,6 +49,8 @@ import lombok.extern.slf4j.Slf4j; @RequestMapping("process") public class ProcessController { + protected Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired private RepositoryService repositoryService; @@ -116,13 +120,13 @@ public class ProcessController { // 一并激活流程实例 repositoryService.activateProcessDefinitionById(processId, true, new Date()); - log.info("已激活ID为:{}的流程", processId); + logger.info("已激活ID为:{}的流程", processId); } else if (state.equals("suspend")) { // 一并挂起流程实例 repositoryService.suspendProcessDefinitionById(processId, true, new Date()); - log.info("已挂起ID为:{}的流程", processId); + logger.info("已挂起ID为:{}的流程", processId); } return R.ok(); } @@ -139,7 +143,7 @@ public class ProcessController { if (StringUtils.isBlank(procInstId)) { - log.error("参数为空"); + logger.error("参数为空"); } HistoricProcessInstance processInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(procInstId).singleResult(); @@ -177,7 +181,7 @@ public class ProcessController } catch (IOException e) { - log.error(e.toString()); + logger.error(e.toString()); throw new RuoyiException("读取流程图片失败"); } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ProcessInsController.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ProcessInsController.java index a514e60..6115e5b 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ProcessInsController.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/ProcessInsController.java @@ -12,6 +12,8 @@ import org.activiti.engine.history.HistoricIdentityLink; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.runtime.ProcessInstanceQuery; import org.activiti.engine.task.Task; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -47,6 +49,7 @@ import lombok.extern.slf4j.Slf4j; @RequestMapping("process/ins/") public class ProcessInsController extends BaseController { + protected Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private RuntimeService runtimeService; @@ -75,12 +78,12 @@ public class ProcessInsController extends BaseController if (state.equals("active")) { runtimeService.activateProcessInstanceById(processInstanceId); - log.info("已激活ID为:{}的流程实例", processInstanceId); + logger.info("已激活ID为:{}的流程实例", processInstanceId); } else if (state.equals("suspend")) { runtimeService.suspendProcessInstanceById(processInstanceId); - log.info("已挂起ID为:{}的流程实例", processInstanceId); + logger.info("已挂起ID为:{}的流程实例", processInstanceId); } return R.ok(); } @@ -88,7 +91,6 @@ public class ProcessInsController extends BaseController /** * 获取任务列表 * - * @param rowSize * @param page * @return */ diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/ActReModel.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/ActReModel.java index eb2250c..3d56cbe 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/ActReModel.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/ActReModel.java @@ -65,4 +65,114 @@ public class ActReModel extends BaseEntity /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Long getRev() { + return rev; + } + + public void setRev(Long rev) { + this.rev = rev; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public Date getLastUpdateTime() { + return lastUpdateTime; + } + + public void setLastUpdateTime(Date lastUpdateTime) { + this.lastUpdateTime = lastUpdateTime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public String getMetaInfo() { + return metaInfo; + } + + public void setMetaInfo(String metaInfo) { + this.metaInfo = metaInfo; + } + + public String getDeploymentId() { + return deploymentId; + } + + public void setDeploymentId(String deploymentId) { + this.deploymentId = deploymentId; + } + + public String getEditorSourceValueId() { + return editorSourceValueId; + } + + public void setEditorSourceValueId(String editorSourceValueId) { + this.editorSourceValueId = editorSourceValueId; + } + + public String getEditorSourceExtraValueId() { + return editorSourceExtraValueId; + } + + public void setEditorSourceExtraValueId(String editorSourceExtraValueId) { + this.editorSourceExtraValueId = editorSourceExtraValueId; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + @Override + public Date getCreateTime() { + return createTime; + } + + @Override + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/ActReProcdef.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/ActReProcdef.java index 8c68ea2..e3318c7 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/ActReProcdef.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/ActReProcdef.java @@ -72,4 +72,100 @@ public class ActReProcdef /** 是否挂起 1激活 2挂起 */ @Column(name = "SUSPENSION_STATE_") private Integer suspensionState; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getRev() { + return rev; + } + + public void setRev(String rev) { + this.rev = rev; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getDeploymentId() { + return deploymentId; + } + + public void setDeploymentId(String deploymentId) { + this.deploymentId = deploymentId; + } + + public String getResourceName() { + return resourceName; + } + + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + + public String getDgrmResourceName() { + return dgrmResourceName; + } + + public void setDgrmResourceName(String dgrmResourceName) { + this.dgrmResourceName = dgrmResourceName; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Boolean getHasStartFormKey() { + return hasStartFormKey; + } + + public void setHasStartFormKey(Boolean hasStartFormKey) { + this.hasStartFormKey = hasStartFormKey; + } + + public Integer getSuspensionState() { + return suspensionState; + } + + public void setSuspensionState(Integer suspensionState) { + this.suspensionState = suspensionState; + } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizAudit.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizAudit.java index efbcad3..6593aca 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizAudit.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizAudit.java @@ -57,4 +57,115 @@ public class BizAudit @Transient private String[] taskIds; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTaskId() { + return taskId; + } + + public BizAudit setTaskId(String taskId) { + this.taskId = taskId; + return this; + } + + public Integer getResult() { + return result; + } + + public BizAudit setResult(Integer result) { + this.result = result; + return this; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getProcDefKey() { + return procDefKey; + } + + public BizAudit setProcDefKey(String procDefKey) { + this.procDefKey = procDefKey; + return this; + } + + public String getProcName() { + return procName; + } + + public BizAudit setProcName(String procName) { + this.procName = procName; + return this; + } + + public String getApplyer() { + return applyer; + } + + public BizAudit setApplyer(String applyer) { + this.applyer = applyer; + return this; + } + + public String getAuditor() { + return auditor; + } + + public BizAudit setAuditor(String auditor) { + this.auditor = auditor; + return this; + } + + public Long getAuditorId() { + return auditorId; + } + + public BizAudit setAuditorId(Long auditorId) { + this.auditorId = auditorId; + return this; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getProcInstId() { + return procInstId; + } + + public void setProcInstId(String procInstId) { + this.procInstId = procInstId; + } + + public Long getBusinessKey() { + return businessKey; + } + + public void setBusinessKey(Long businessKey) { + this.businessKey = businessKey; + } + + public String[] getTaskIds() { + return taskIds; + } + + public void setTaskIds(String[] taskIds) { + this.taskIds = taskIds; + } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizBusiness.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizBusiness.java index d95718a..f533ca1 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizBusiness.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizBusiness.java @@ -54,4 +54,128 @@ public class BizBusiness implements Serializable private Date applyTime; private Boolean delFlag; + + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public Long getId() { + return id; + } + + public BizBusiness setId(Long id) { + this.id = id; + return this; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTableId() { + return tableId; + } + + public void setTableId(String tableId) { + this.tableId = tableId; + } + + public String getProcDefId() { + return procDefId; + } + + public BizBusiness setProcDefId(String procDefId) { + this.procDefId = procDefId; + return this; + } + + public String getProcDefKey() { + return procDefKey; + } + + public BizBusiness setProcDefKey(String procDefKey) { + this.procDefKey = procDefKey; + return this; + } + + public String getProcInstId() { + return procInstId; + } + + public BizBusiness setProcInstId(String procInstId) { + this.procInstId = procInstId; + return this; + } + + public String getProcName() { + return procName; + } + + public void setProcName(String procName) { + this.procName = procName; + } + + public String getCurrentTask() { + return currentTask; + } + + public BizBusiness setCurrentTask(String currentTask) { + this.currentTask = currentTask; + return this; + } + + public String getApplyer() { + return applyer; + } + + public void setApplyer(String applyer) { + this.applyer = applyer; + } + + public Integer getStatus() { + return status; + } + + public BizBusiness setStatus(Integer status) { + this.status = status; + return this; + } + + public Integer getResult() { + return result; + } + + public void setResult(Integer result) { + this.result = result; + } + + public Date getApplyTime() { + return applyTime; + } + + public void setApplyTime(Date applyTime) { + this.applyTime = applyTime; + } + + public Boolean getDelFlag() { + return delFlag; + } + + public BizBusiness setDelFlag(Boolean delFlag) { + this.delFlag = delFlag; + return this; + } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizLeave.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizLeave.java index b9f46b0..4322b97 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizLeave.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizLeave.java @@ -68,4 +68,96 @@ public class BizLeave implements Serializable @Transient private String procName; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Double getDuration() { + return duration; + } + + public void setDuration(Double duration) { + this.duration = duration; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Boolean getDelFlag() { + return delFlag; + } + + public void setDelFlag(Boolean delFlag) { + this.delFlag = delFlag; + } + + public String getProcDefId() { + return procDefId; + } + + public void setProcDefId(String procDefId) { + this.procDefId = procDefId; + } + + public String getProcName() { + return procName; + } + + public void setProcName(String procName) { + this.procName = procName; + } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizNode.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizNode.java index eccef74..c8b2958 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizNode.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizNode.java @@ -36,4 +36,39 @@ public class BizNode /** 类型对应负责人的值*/ private Long auditor; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getNodeId() { + return nodeId; + } + + public BizNode setNodeId(String nodeId) { + this.nodeId = nodeId; + return this; + } + + public Integer getType() { + return type; + } + + public BizNode setType(Integer type) { + this.type = type; + return this; + } + + public Long getAuditor() { + return auditor; + } + + public BizNode setAuditor(Long auditor) { + this.auditor = auditor; + return this; + } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizPurchase.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizPurchase.java index f33679d..892e66c 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizPurchase.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizPurchase.java @@ -51,4 +51,72 @@ public class BizPurchase implements Serializable @Transient private String procName; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Double getMoney() { + return money; + } + + public void setMoney(Double money) { + this.money = money; + } + + public Boolean getDelFlag() { + return delFlag; + } + + public void setDelFlag(Boolean delFlag) { + this.delFlag = delFlag; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getProcDefId() { + return procDefId; + } + + public void setProcDefId(String procDefId) { + this.procDefId = procDefId; + } + + public String getProcName() { + return procName; + } + + public void setProcName(String procName) { + this.procName = procName; + } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/listener/MyProcessExecutionListener.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/listener/MyProcessExecutionListener.java index 052f51a..0d19963 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/listener/MyProcessExecutionListener.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/listener/MyProcessExecutionListener.java @@ -2,6 +2,8 @@ package com.ruoyi.activiti.listener; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.ExecutionListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import lombok.extern.slf4j.Slf4j; @@ -14,7 +16,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class MyProcessExecutionListener implements ExecutionListener { - // + protected Logger logger = LoggerFactory.getLogger(getClass()); private static final long serialVersionUID = 6173579003703470015L; @Override @@ -26,11 +28,11 @@ public class MyProcessExecutionListener implements ExecutionListener // start if ("start".equals(eventName)) { - log.info("流程实例[{}]启动", procInstId); + logger.info("流程实例[{}]启动", procInstId); } else if ("end".equals(eventName)) { - log.info("流程实例[{}]结束", procInstId); + logger.info("流程实例[{}]结束", procInstId); } } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/listener/MyTaskCompletedListener.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/listener/MyTaskCompletedListener.java index 53d7225..88c847e 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/listener/MyTaskCompletedListener.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/listener/MyTaskCompletedListener.java @@ -4,6 +4,8 @@ import java.util.Set; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import lombok.extern.slf4j.Slf4j; @@ -19,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class MyTaskCompletedListener implements TaskListener { - // + protected Logger logger = LoggerFactory.getLogger(getClass()); private static final long serialVersionUID = 5808415173145957468L; // 监听任务的事件 @@ -33,29 +35,29 @@ public class MyTaskCompletedListener implements TaskListener // create: 任务被创建，并且所有的属性都被设置好后。 if ("create".equals(eventName)) { - log.info("一个任务[{}]被创建了,由[{}]负责办理,流程实例编号[{}]", name, assignee, processInstanceId); + logger.info("一个任务[{}]被创建了,由[{}]负责办理,流程实例编号[{}]", name, assignee, processInstanceId); } // assignment: 任务被委派给某人后。 // 注意:当流程执行到达一个userTask时，会先触发一个assignment事件，再触发create事件。 else if ("assignment".equals(eventName)) { - log.info("任务[{}]委派给[{}],流程实例编号为[{}]", name, assignee, processInstanceId); + logger.info("任务[{}]委派给[{}],流程实例编号为[{}]", name, assignee, processInstanceId); } // complete:在任务完成后，且被从运行时数据（runtime data）中删除前触发。 else if ("complete".equals(eventName)) { - log.info("任务[{}]由{}执行完成,流程实例编号为:{}", name, assignee, processInstanceId); + logger.info("任务[{}]由{}执行完成,流程实例编号为:{}", name, assignee, processInstanceId); Set variableNames = delegateTask.getVariableNames(); for (String key : variableNames) { Object value = delegateTask.getVariable(key); - log.info("参数{}={}", key, value); + logger.info("参数{}={}", key, value); } } // delete: 在任务将要被删除之前发生。注意，当任务通过completeTask完成任务时，它也会被执行 else if ("delete".equals(eventName)) { - log.info("任务[{}]将被删除,流程实例编号为[{}]", name, processInstanceId); + logger.info("任务[{}]将被删除,流程实例编号为[{}]", name, processInstanceId); } } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/modeler/rest/diagram/services/ProcessInstanceHighlightsResource.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/modeler/rest/diagram/services/ProcessInstanceHighlightsResource.java index 9df0d56..14a055b 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/modeler/rest/diagram/services/ProcessInstanceHighlightsResource.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/modeler/rest/diagram/services/ProcessInstanceHighlightsResource.java @@ -209,9 +209,9 @@ public class ProcessInstanceHighlightsResource { /** * find out single activity's highlighted flowIds * - * @param activity + * @param pvmTransitionList * @param hisActInstList - * @param isExclusive if true only return one flowId(Such as exclusiveGateway, BoundaryEvent On Task) + * @param isParallel if true only return one flowId(Such as exclusiveGateway, BoundaryEvent On Task) * @return */ private List getHighlightedFlows(List pvmTransitionList, LinkedList hisActInstList, boolean isParallel){ diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/HiProcInsVo.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/HiProcInsVo.java index 0a6b9c7..c447f4e 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/HiProcInsVo.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/HiProcInsVo.java @@ -41,4 +41,132 @@ public class HiProcInsVo private Integer status; private Long userId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getProcDefId() { + return procDefId; + } + + public void setProcDefId(String procDefId) { + this.procDefId = procDefId; + } + + public String getProcDefKey() { + return procDefKey; + } + + public void setProcDefKey(String procDefKey) { + this.procDefKey = procDefKey; + } + + public String getProcInstId() { + return procInstId; + } + + public void setProcInstId(String procInstId) { + this.procInstId = procInstId; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public Long getDuration() { + return duration; + } + + public void setDuration(Long duration) { + this.duration = duration; + } + + public String getDeleteReason() { + return deleteReason; + } + + public void setDeleteReason(String deleteReason) { + this.deleteReason = deleteReason; + } + + public String getProcName() { + return procName; + } + + public void setProcName(String procName) { + this.procName = procName; + } + + public String getBusinessKey() { + return businessKey; + } + + public void setBusinessKey(String businessKey) { + this.businessKey = businessKey; + } + + public String getTableId() { + return tableId; + } + + public void setTableId(String tableId) { + this.tableId = tableId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getApplyer() { + return applyer; + } + + public void setApplyer(String applyer) { + this.applyer = applyer; + } + + public Integer getResult() { + return result; + } + + public void setResult(Integer result) { + this.result = result; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/HiTaskVo.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/HiTaskVo.java index 10f0567..b1b6f42 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/HiTaskVo.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/HiTaskVo.java @@ -77,4 +77,180 @@ public class HiTaskVo // 删除原因 completed：任务执行 deleted：流程删除 private String deleteReason; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getProcDefId() { + return procDefId; + } + + public void setProcDefId(String procDefId) { + this.procDefId = procDefId; + } + + public String getProcInstId() { + return procInstId; + } + + public void setProcInstId(String procInstId) { + this.procInstId = procInstId; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getTaskDefKey() { + return taskDefKey; + } + + public void setTaskDefKey(String taskDefKey) { + this.taskDefKey = taskDefKey; + } + + public Long getAuditorId() { + return auditorId; + } + + public void setAuditorId(Long auditorId) { + this.auditorId = auditorId; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public Integer getResult() { + return result; + } + + public void setResult(Integer result) { + this.result = result; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getRouterName() { + return routerName; + } + + public void setRouterName(String routerName) { + this.routerName = routerName; + } + + public Long getDuration() { + return duration; + } + + public void setDuration(Long duration) { + this.duration = duration; + } + + public String getBusinessKey() { + return businessKey; + } + + public void setBusinessKey(String businessKey) { + this.businessKey = businessKey; + } + + public String getProcName() { + return procName; + } + + public void setProcName(String procName) { + this.procName = procName; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getProcDefKey() { + return procDefKey; + } + + public void setProcDefKey(String procDefKey) { + this.procDefKey = procDefKey; + } + + public String getStartUserId() { + return startUserId; + } + + public void setStartUserId(String startUserId) { + this.startUserId = startUserId; + } + + public String getApplyer() { + return applyer; + } + + public void setApplyer(String applyer) { + this.applyer = applyer; + } + + public Boolean getDelFlag() { + return delFlag; + } + + public void setDelFlag(Boolean delFlag) { + this.delFlag = delFlag; + } + + public Long getAuditId() { + return auditId; + } + + public void setAuditId(Long auditId) { + this.auditId = auditId; + } + + public String getAuditor() { + return auditor; + } + + public void setAuditor(String auditor) { + this.auditor = auditor; + } + + public String getDeleteReason() { + return deleteReason; + } + + public void setDeleteReason(String deleteReason) { + this.deleteReason = deleteReason; + } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ProcessInsVo.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ProcessInsVo.java index c90ef54..27c8b43 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ProcessInsVo.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ProcessInsVo.java @@ -65,4 +65,140 @@ public class ProcessInsVo this.tenantId = pi.getTenantId(); this.deployId = pi.getDeploymentId(); } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getBusinessKey() { + return businessKey; + } + + public void setBusinessKey(String businessKey) { + this.businessKey = businessKey; + } + + public String getTableId() { + return tableId; + } + + public void setTableId(String tableId) { + this.tableId = tableId; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getProcDefId() { + return procDefId; + } + + public void setProcDefId(String procDefId) { + this.procDefId = procDefId; + } + + public String getProcInstId() { + return procInstId; + } + + public void setProcInstId(String procInstId) { + this.procInstId = procInstId; + } + + public String getActId() { + return actId; + } + + public void setActId(String actId) { + this.actId = actId; + } + + public Boolean getSuspended() { + return isSuspended; + } + + public void setSuspended(Boolean suspended) { + isSuspended = suspended; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getDeployId() { + return deployId; + } + + public void setDeployId(String deployId) { + this.deployId = deployId; + } + + public String getCurrTaskName() { + return currTaskName; + } + + public void setCurrTaskName(String currTaskName) { + this.currTaskName = currTaskName; + } + + public String getRouteName() { + return routeName; + } + + public void setRouteName(String routeName) { + this.routeName = routeName; + } + + public String getApplyer() { + return applyer; + } + + public void setApplyer(String applyer) { + this.applyer = applyer; + } } diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ProcessNodeVo.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ProcessNodeVo.java index 0cd18c3..785c4ff 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ProcessNodeVo.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ProcessNodeVo.java @@ -27,4 +27,60 @@ public class ProcessNodeVo // 选操作人的部门负责人 private Boolean deptHeader = false; + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public List getUserIds() { + return userIds; + } + + public void setUserIds(List userIds) { + this.userIds = userIds; + } + + public List getDeptIds() { + return deptIds; + } + + public void setDeptIds(List deptIds) { + this.deptIds = deptIds; + } + + public Boolean getDeptHeader() { + return deptHeader; + } + + public void setDeptHeader(Boolean deptHeader) { + this.deptHeader = deptHeader; + } } \ No newline at end of file diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ReProcdef.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ReProcdef.java index 01df695..40db934 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ReProcdef.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/ReProcdef.java @@ -72,4 +72,124 @@ public class ReProcdef this.tenantId = tenantId; this.engineVersion = engineVersion; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getRev() { + return rev; + } + + public void setRev(Integer rev) { + this.rev = rev; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } + + public String getDeploymentId() { + return deploymentId; + } + + public void setDeploymentId(String deploymentId) { + this.deploymentId = deploymentId; + } + + public String getResourceName() { + return resourceName; + } + + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + + public String getDgrmResourceName() { + return dgrmResourceName; + } + + public void setDgrmResourceName(String dgrmResourceName) { + this.dgrmResourceName = dgrmResourceName; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Byte getHasStartFormKey() { + return hasStartFormKey; + } + + public void setHasStartFormKey(Byte hasStartFormKey) { + this.hasStartFormKey = hasStartFormKey; + } + + public Byte getHasGraphicalNotation() { + return hasGraphicalNotation; + } + + public void setHasGraphicalNotation(Byte hasGraphicalNotation) { + this.hasGraphicalNotation = hasGraphicalNotation; + } + + public Integer getSuspensionState() { + return suspensionState; + } + + public void setSuspensionState(Integer suspensionState) { + this.suspensionState = suspensionState; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getEngineVersion() { + return engineVersion; + } + + public void setEngineVersion(String engineVersion) { + this.engineVersion = engineVersion; + } } \ No newline at end of file diff --git a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/RuTask.java b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/RuTask.java index ea9f793..b6c0c30 100644 --- a/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/RuTask.java +++ b/ruoyi-service/ruoyi-activiti/src/main/java/com/ruoyi/activiti/vo/RuTask.java @@ -101,4 +101,196 @@ public class RuTask setPriority(task.getPriority()); setSuspended(task.isSuspended()); } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getRev() { + return rev; + } + + public void setRev(Integer rev) { + this.rev = rev; + } + + public String getExecutionId() { + return executionId; + } + + public void setExecutionId(String executionId) { + this.executionId = executionId; + } + + public String getProcInstId() { + return procInstId; + } + + public void setProcInstId(String procInstId) { + this.procInstId = procInstId; + } + + public String getProcDefId() { + return procDefId; + } + + public void setProcDefId(String procDefId) { + this.procDefId = procDefId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getParentTaskId() { + return parentTaskId; + } + + public void setParentTaskId(String parentTaskId) { + this.parentTaskId = parentTaskId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getTaskDefKey() { + return taskDefKey; + } + + public void setTaskDefKey(String taskDefKey) { + this.taskDefKey = taskDefKey; + } + + public String getOwner() { + return owner; + } + + public void setOwner(String owner) { + this.owner = owner; + } + + public String getAssignee() { + return assignee; + } + + public void setAssignee(String assignee) { + this.assignee = assignee; + } + + public String getApplyer() { + return applyer; + } + + public void setApplyer(String applyer) { + this.applyer = applyer; + } + + public String getDelegation() { + return delegation; + } + + public void setDelegation(String delegation) { + this.delegation = delegation; + } + + public Integer getPriority() { + return priority; + } + + public void setPriority(Integer priority) { + this.priority = priority; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getDueDate() { + return dueDate; + } + + public void setDueDate(Date dueDate) { + this.dueDate = dueDate; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public Boolean getSuspended() { + return suspended; + } + + public void setSuspended(Boolean suspended) { + this.suspended = suspended; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getFormKey() { + return formKey; + } + + public void setFormKey(String formKey) { + this.formKey = formKey; + } + + public String getProcessName() { + return processName; + } + + public void setProcessName(String processName) { + this.processName = processName; + } + + public String getProcessDefName() { + return processDefName; + } + + public void setProcessDefName(String processDefName) { + this.processDefName = processDefName; + } + + public String getProcessDefKey() { + return processDefKey; + } + + public void setProcessDefKey(String processDefKey) { + this.processDefKey = processDefKey; + } + + public String getBusinessKey() { + return businessKey; + } + + public void setBusinessKey(String businessKey) { + this.businessKey = businessKey; + } } \ No newline at end of file diff --git a/ruoyi-service/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginForm.java b/ruoyi-service/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginForm.java index bff25cc..e23b660 100644 --- a/ruoyi-service/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginForm.java +++ b/ruoyi-service/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginForm.java @@ -8,4 +8,20 @@ public class LoginForm private String username; private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } } diff --git a/ruoyi-service/ruoyi-dfs/src/main/java/com/ruoyi/dfs/config/DfsConfig.java b/ruoyi-service/ruoyi-dfs/src/main/java/com/ruoyi/dfs/config/DfsConfig.java index 5f9ca0a..8031421 100644 --- a/ruoyi-service/ruoyi-dfs/src/main/java/com/ruoyi/dfs/config/DfsConfig.java +++ b/ruoyi-service/ruoyi-dfs/src/main/java/com/ruoyi/dfs/config/DfsConfig.java @@ -25,4 +25,20 @@ public class DfsConfig //生产环境建议用nginx绑定域名映射 /** 域名*/ private String domain; + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getDomain() { + return domain; + } + + public void setDomain(String domain) { + this.domain = domain; + } } \ No newline at end of file diff --git a/ruoyi-service/ruoyi-dfs/src/main/java/com/ruoyi/dfs/controller/FileController.java b/ruoyi-service/ruoyi-dfs/src/main/java/com/ruoyi/dfs/controller/FileController.java index d3223ee..c533cf7 100644 --- a/ruoyi-service/ruoyi-dfs/src/main/java/com/ruoyi/dfs/controller/FileController.java +++ b/ruoyi-service/ruoyi-dfs/src/main/java/com/ruoyi/dfs/controller/FileController.java @@ -3,6 +3,8 @@ package com.ruoyi.dfs.controller; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -26,6 +28,7 @@ import lombok.extern.slf4j.Slf4j; @RestController public class FileController { + protected final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private DfsConfig dfsConfig; @@ -58,7 +61,7 @@ public class FileController } catch (Exception e) { - log.error("下载文件失败", e); + logger.error("下载文件失败", e); } } @@ -79,7 +82,7 @@ public class FileController } catch (Exception e) { - log.error("上传文件失败", e); + logger.error("上传文件失败", e); return R.error(e.getMessage()); } } diff --git a/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/GenUtils.java index 82327f2..dd5fb7f 100644 --- a/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/GenUtils.java @@ -168,7 +168,7 @@ public class GenUtils /** * 关键字替换 * - * @param name 需要被替换的名字 + * @param text 需要被替换的名字 * @return 替换后的名字 */ public static String replaceText(String text) diff --git a/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/aspect/DataScopeAspect.java b/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/aspect/DataScopeAspect.java index a5b5b09..3d78c0a 100644 --- a/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/aspect/DataScopeAspect.java +++ b/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/aspect/DataScopeAspect.java @@ -10,6 +10,8 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,6 +36,7 @@ import lombok.extern.slf4j.Slf4j; @Component public class DataScopeAspect { + protected final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private RedisUtils redis; @@ -102,7 +105,7 @@ public class DataScopeAspect } else { - log.warn("数据权限拦截失败,执行对象 currentUser is null"); + logger.warn("数据权限拦截失败,执行对象 currentUser is null"); } } @@ -111,7 +114,8 @@ public class DataScopeAspect * * @param joinPoint 切点 * @param user 用户 - * @param alias 别名 + * @param deptAlias 别名 + * @param userAlias */ public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias) { diff --git a/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/aspect/DataSourceAspect.java b/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/aspect/DataSourceAspect.java index 543f8e2..0b36df7 100644 --- a/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/aspect/DataSourceAspect.java +++ b/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/aspect/DataSourceAspect.java @@ -22,7 +22,7 @@ import com.ruoyi.system.config.DruidProperties; @Component public class DataSourceAspect { - protected Logger logger = LoggerFactory.getLogger(getClass()); + protected Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private DruidProperties druidProperties; diff --git a/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/oss/CloudStorageConfig.java b/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/oss/CloudStorageConfig.java index 34a1202..c155053 100644 --- a/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/oss/CloudStorageConfig.java +++ b/ruoyi-service/ruoyi-system/src/main/java/com/ruoyi/system/oss/CloudStorageConfig.java @@ -96,4 +96,151 @@ public class CloudStorageConfig implements Serializable @NotBlank(message = "所属地区不能为空", groups = QcloudGroup.class) private String qcloudRegion; + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getQiniuDomain() { + return qiniuDomain; + } + + public void setQiniuDomain(String qiniuDomain) { + this.qiniuDomain = qiniuDomain; + } + + public String getQiniuPrefix() { + return qiniuPrefix; + } + + public void setQiniuPrefix(String qiniuPrefix) { + this.qiniuPrefix = qiniuPrefix; + } + + public String getQiniuAccessKey() { + return qiniuAccessKey; + } + + public void setQiniuAccessKey(String qiniuAccessKey) { + this.qiniuAccessKey = qiniuAccessKey; + } + + public String getQiniuSecretKey() { + return qiniuSecretKey; + } + + public void setQiniuSecretKey(String qiniuSecretKey) { + this.qiniuSecretKey = qiniuSecretKey; + } + + public String getQiniuBucketName() { + return qiniuBucketName; + } + + public void setQiniuBucketName(String qiniuBucketName) { + this.qiniuBucketName = qiniuBucketName; + } + + public String getAliyunDomain() { + return aliyunDomain; + } + + public void setAliyunDomain(String aliyunDomain) { + this.aliyunDomain = aliyunDomain; + } + + public String getAliyunPrefix() { + return aliyunPrefix; + } + + public void setAliyunPrefix(String aliyunPrefix) { + this.aliyunPrefix = aliyunPrefix; + } + + public String getAliyunEndPoint() { + return aliyunEndPoint; + } + + public void setAliyunEndPoint(String aliyunEndPoint) { + this.aliyunEndPoint = aliyunEndPoint; + } + + public String getAliyunAccessKeyId() { + return aliyunAccessKeyId; + } + + public void setAliyunAccessKeyId(String aliyunAccessKeyId) { + this.aliyunAccessKeyId = aliyunAccessKeyId; + } + + public String getAliyunAccessKeySecret() { + return aliyunAccessKeySecret; + } + + public void setAliyunAccessKeySecret(String aliyunAccessKeySecret) { + this.aliyunAccessKeySecret = aliyunAccessKeySecret; + } + + public String getAliyunBucketName() { + return aliyunBucketName; + } + + public void setAliyunBucketName(String aliyunBucketName) { + this.aliyunBucketName = aliyunBucketName; + } + + public String getQcloudDomain() { + return qcloudDomain; + } + + public void setQcloudDomain(String qcloudDomain) { + this.qcloudDomain = qcloudDomain; + } + + public String getQcloudPrefix() { + return qcloudPrefix; + } + + public void setQcloudPrefix(String qcloudPrefix) { + this.qcloudPrefix = qcloudPrefix; + } + + public String getQcloudSecretId() { + return qcloudSecretId; + } + + public void setQcloudSecretId(String qcloudSecretId) { + this.qcloudSecretId = qcloudSecretId; + } + + public String getQcloudSecretKey() { + return qcloudSecretKey; + } + + public void setQcloudSecretKey(String qcloudSecretKey) { + this.qcloudSecretKey = qcloudSecretKey; + } + + public String getQcloudBucketName() { + return qcloudBucketName; + } + + public void setQcloudBucketName(String qcloudBucketName) { + this.qcloudBucketName = qcloudBucketName; + } + + public String getQcloudRegion() { + return qcloudRegion; + } + + public void setQcloudRegion(String qcloudRegion) { + this.qcloudRegion = qcloudRegion; + } } -- Gitee From 4058877a81209d1ac7c169f35a4ccc50d709f05f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=A0=94=E5=8F=91=E4=B8=AD=E5=BF=83?= Date: Sat, 25 Jan 2020 23:57:00 +0800 Subject: [PATCH 3/3] update --- ruoyi-gateway/pom.xml | 6 ++++++ .../ruoyi/generator/service/impl/GenTableServiceImpl.java | 2 +- .../main/java/com/ruoyi/generator/util/VelocityUtils.java | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index d588cbe..4251613 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -65,6 +65,12 @@ io.springfox springfox-swagger2 + + + + org.springframework.boot + spring-boot-starter-actuator + diff --git a/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java b/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java index 306646b..6b5a259 100644 --- a/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java +++ b/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java @@ -303,7 +303,7 @@ public class GenTableServiceImpl implements IGenTableService /** * 设置主键列信息 * - * @param genTable 业务表信息 + * @param table 业务表信息 * @param columns 业务字段列表 */ public void setPkColumn(GenTable table, List columns) diff --git a/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index eeaa86d..3461032 100644 --- a/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -209,7 +209,7 @@ public class VelocityUtils /** * 根据列类型获取导入包 * - * @param column 列集合 + * @param columns 列集合 * @return 返回需要导入的包列表 */ public static HashSet getImportList(List columns) @@ -244,7 +244,7 @@ public class VelocityUtils /** * 获取树编码 * - * @param options 生成其他选项 + * @param paramsObj 生成其他选项 * @return 树编码 */ public static String getTreecode(JSONObject paramsObj) @@ -259,7 +259,7 @@ public class VelocityUtils /** * 获取树父编码 * - * @param options 生成其他选项 + * @param paramsObj 生成其他选项 * @return 树父编码 */ public static String getTreeParentCode(JSONObject paramsObj) @@ -274,7 +274,7 @@ public class VelocityUtils /** * 获取树名称 * - * @param options 生成其他选项 + * @param paramsObj 生成其他选项 * @return 树名称 */ public static String getTreeName(JSONObject paramsObj) -- Gitee