Browse Source

去掉多余的

xusl 1 year ago
parent
commit
8ea509f38b
100 changed files with 287 additions and 2666 deletions
  1. 2 2
      backend/src/main/java/com/jiayue/pfr/SsiApplication.java
  2. 1 1
      backend/src/main/java/com/jiayue/pfr/annotation/AgainVerify.java
  3. 7 13
      backend/src/main/java/com/jiayue/pfr/aspectj/AgainVerifyAspect.java
  4. 1 1
      backend/src/main/java/com/jiayue/pfr/backenum/PasswordRuleEnum.java
  5. 1 1
      backend/src/main/java/com/jiayue/pfr/config/CaptchaConfig.java
  6. 3 3
      backend/src/main/java/com/jiayue/pfr/config/EnvironmentPreparedListener.java
  7. 3 3
      backend/src/main/java/com/jiayue/pfr/config/GlobalExceptionAdvice.java
  8. 1 1
      backend/src/main/java/com/jiayue/pfr/config/MybatisPlusConfig.java
  9. 2 5
      backend/src/main/java/com/jiayue/pfr/config/SaTokenConfiguration.java
  10. 12 0
      backend/src/main/java/com/jiayue/pfr/constant/CacheConstants.java
  11. 1 4
      backend/src/main/java/com/jiayue/pfr/constant/Constants.java
  12. 1 1
      backend/src/main/java/com/jiayue/pfr/constant/CustomException.java
  13. 1 1
      backend/src/main/java/com/jiayue/pfr/constant/PermissionContextHolder.java
  14. 1 1
      backend/src/main/java/com/jiayue/pfr/constant/SecretKeyConstants.java
  15. 1 1
      backend/src/main/java/com/jiayue/pfr/constant/UserConstants.java
  16. 9 9
      backend/src/main/java/com/jiayue/pfr/controller/SysMenuController.java
  17. 41 66
      backend/src/main/java/com/jiayue/pfr/controller/SysParameterController.java
  18. 5 5
      backend/src/main/java/com/jiayue/pfr/controller/SysPolicyController.java
  19. 6 13
      backend/src/main/java/com/jiayue/pfr/controller/SysRoleController.java
  20. 8 21
      backend/src/main/java/com/jiayue/pfr/controller/SysUserController.java
  21. 11 34
      backend/src/main/java/com/jiayue/pfr/controller/UserLoginController.java
  22. 1 1
      backend/src/main/java/com/jiayue/pfr/entity/BaseEntity.java
  23. 1 1
      backend/src/main/java/com/jiayue/pfr/entity/SysMenu.java
  24. 1 1
      backend/src/main/java/com/jiayue/pfr/entity/SysParameter.java
  25. 1 1
      backend/src/main/java/com/jiayue/pfr/entity/SysPolicy.java
  26. 1 1
      backend/src/main/java/com/jiayue/pfr/entity/SysRole.java
  27. 1 1
      backend/src/main/java/com/jiayue/pfr/entity/SysRoleMenu.java
  28. 1 1
      backend/src/main/java/com/jiayue/pfr/entity/SysUser.java
  29. 1 1
      backend/src/main/java/com/jiayue/pfr/entity/SysUserRole.java
  30. 1 1
      backend/src/main/java/com/jiayue/pfr/entity/TreeSelect.java
  31. 2 2
      backend/src/main/java/com/jiayue/pfr/entity/vo/MetaVo.java
  32. 1 1
      backend/src/main/java/com/jiayue/pfr/entity/vo/RouterVo.java
  33. 1 1
      backend/src/main/java/com/jiayue/pfr/filter/InterfaceLimitFilter.java
  34. 1 1
      backend/src/main/java/com/jiayue/pfr/handler/MyMetaObjectHandler.java
  35. 2 2
      backend/src/main/java/com/jiayue/pfr/mapper/SysMenuMapper.java
  36. 2 2
      backend/src/main/java/com/jiayue/pfr/mapper/SysParameterMapper.java
  37. 2 2
      backend/src/main/java/com/jiayue/pfr/mapper/SysPolicyMapper.java
  38. 2 2
      backend/src/main/java/com/jiayue/pfr/mapper/SysRoleMapper.java
  39. 3 3
      backend/src/main/java/com/jiayue/pfr/mapper/SysRoleMenuMapper.java
  40. 2 2
      backend/src/main/java/com/jiayue/pfr/mapper/SysUserMapper.java
  41. 2 2
      backend/src/main/java/com/jiayue/pfr/mapper/SysUserRoleMapper.java
  42. 4 4
      backend/src/main/java/com/jiayue/pfr/service/SysMenuService.java
  43. 2 5
      backend/src/main/java/com/jiayue/pfr/service/SysParameterService.java
  44. 2 2
      backend/src/main/java/com/jiayue/pfr/service/SysPolicyService.java
  45. 2 2
      backend/src/main/java/com/jiayue/pfr/service/SysRoleService.java
  46. 2 2
      backend/src/main/java/com/jiayue/pfr/service/SysUserRoleService.java
  47. 51 0
      backend/src/main/java/com/jiayue/pfr/service/SysUserService.java
  48. 2 2
      backend/src/main/java/com/jiayue/pfr/service/UmsAdminService.java
  49. 13 14
      backend/src/main/java/com/jiayue/pfr/service/impl/SysMenuServiceImpl.java
  50. 4 4
      backend/src/main/java/com/jiayue/pfr/service/impl/SysParameterServiceImpl.java
  51. 2 2
      backend/src/main/java/com/jiayue/pfr/service/impl/SysPermissionService.java
  52. 4 4
      backend/src/main/java/com/jiayue/pfr/service/impl/SysPolicyServiceImpl.java
  53. 9 10
      backend/src/main/java/com/jiayue/pfr/service/impl/SysRoleServiceImpl.java
  54. 4 4
      backend/src/main/java/com/jiayue/pfr/service/impl/SysUserRoleServiceImpl.java
  55. 9 120
      backend/src/main/java/com/jiayue/pfr/service/impl/SysUserServiceImpl.java
  56. 7 14
      backend/src/main/java/com/jiayue/pfr/service/impl/UmsAdminServiceImpl.java
  57. 1 1
      backend/src/main/java/com/jiayue/pfr/util/DateUtils.java
  58. 1 1
      backend/src/main/java/com/jiayue/pfr/util/FileUtil.java
  59. 1 1
      backend/src/main/java/com/jiayue/pfr/util/IPUtils.java
  60. 1 1
      backend/src/main/java/com/jiayue/pfr/util/IdUtils.java
  61. 1 1
      backend/src/main/java/com/jiayue/pfr/util/InterfaceLimitUtil.java
  62. 1 1
      backend/src/main/java/com/jiayue/pfr/util/LocalCache.java
  63. 1 1
      backend/src/main/java/com/jiayue/pfr/util/NumberUtils.java
  64. 2 2
      backend/src/main/java/com/jiayue/pfr/util/PasswordRuleUtil.java
  65. 1 1
      backend/src/main/java/com/jiayue/pfr/util/RandomPwd.java
  66. 1 1
      backend/src/main/java/com/jiayue/pfr/util/RegexUtil.java
  67. 2 2
      backend/src/main/java/com/jiayue/pfr/util/RyStringUtils.java
  68. 2 2
      backend/src/main/java/com/jiayue/pfr/util/SM2CryptUtils.java
  69. 1 1
      backend/src/main/java/com/jiayue/pfr/util/SaResultRefit.java
  70. 1 3
      backend/src/main/java/com/jiayue/pfr/util/SecurityContextUtil.java
  71. 1 1
      backend/src/main/java/com/jiayue/pfr/util/SecurityValidate.java
  72. 2 2
      backend/src/main/java/com/jiayue/pfr/util/ServletUtils.java
  73. 1 1
      backend/src/main/java/com/jiayue/pfr/util/SpringUtils.java
  74. 1 1
      backend/src/main/java/com/jiayue/pfr/util/UUID.java
  75. 1 1
      backend/src/main/java/com/jiayue/pfr/util/UtilException.java
  76. 0 38
      backend/src/main/java/com/jiayue/ssi/backenum/ApproveOperaterEnum.java
  77. 0 26
      backend/src/main/java/com/jiayue/ssi/backenum/ApproveResultEnum.java
  78. 0 26
      backend/src/main/java/com/jiayue/ssi/backenum/ApproveStatusEnum.java
  79. 0 48
      backend/src/main/java/com/jiayue/ssi/backenum/AuditAblesEventEnum.java
  80. 0 19
      backend/src/main/java/com/jiayue/ssi/backenum/AuditType.java
  81. 0 20
      backend/src/main/java/com/jiayue/ssi/backenum/BusinessStatus.java
  82. 0 91
      backend/src/main/java/com/jiayue/ssi/backenum/BusinessType.java
  83. 0 37
      backend/src/main/java/com/jiayue/ssi/backenum/HttpMethod.java
  84. 0 24
      backend/src/main/java/com/jiayue/ssi/backenum/OperatorType.java
  85. 0 25
      backend/src/main/java/com/jiayue/ssi/backenum/ResponseEnum.java
  86. 0 13
      backend/src/main/java/com/jiayue/ssi/constant/ApproveConstants.java
  87. 0 96
      backend/src/main/java/com/jiayue/ssi/constant/CacheConstants.java
  88. 0 27
      backend/src/main/java/com/jiayue/ssi/constant/LoginConstants.java
  89. 0 37
      backend/src/main/java/com/jiayue/ssi/constant/PermissionCharacter.java
  90. 0 115
      backend/src/main/java/com/jiayue/ssi/controller/ElectricFieldController.java
  91. 0 275
      backend/src/main/java/com/jiayue/ssi/controller/SysApproveController.java
  92. 0 205
      backend/src/main/java/com/jiayue/ssi/controller/SysLogininforController.java
  93. 0 260
      backend/src/main/java/com/jiayue/ssi/controller/SysOperlogController.java
  94. 0 19
      backend/src/main/java/com/jiayue/ssi/dto/ActiveUserDto.java
  95. 0 25
      backend/src/main/java/com/jiayue/ssi/dto/UserVisitInfoDto.java
  96. 0 62
      backend/src/main/java/com/jiayue/ssi/entity/ElectricField.java
  97. 0 243
      backend/src/main/java/com/jiayue/ssi/entity/Server.java
  98. 0 94
      backend/src/main/java/com/jiayue/ssi/entity/SysApprove.java
  99. 0 136
      backend/src/main/java/com/jiayue/ssi/entity/SysLogininfor.java
  100. 0 276
      backend/src/main/java/com/jiayue/ssi/entity/SysOperLog.java

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/SsiApplication.java → backend/src/main/java/com/jiayue/pfr/SsiApplication.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi;
+package com.jiayue.pfr;
 
 //import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
 import org.mybatis.spring.annotation.MapperScan;
@@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @version 3.0
  */
 @SpringBootApplication
-@MapperScan("com.jiayue.ssi.mapper")
+@MapperScan("com.jiayue.pfr.mapper")
 //@EnableEncryptableProperties
 public class SsiApplication {
     public static void main(String[] args) {

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/annotation/AgainVerify.java → backend/src/main/java/com/jiayue/pfr/annotation/AgainVerify.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.annotation;
+package com.jiayue.pfr.annotation;
 
 import java.lang.annotation.*;
 

+ 7 - 13
backend/src/main/java/com/jiayue/ssi/aspectj/AgainVerifyAspect.java → backend/src/main/java/com/jiayue/pfr/aspectj/AgainVerifyAspect.java

@@ -1,15 +1,13 @@
-package com.jiayue.ssi.aspectj;
+package com.jiayue.pfr.aspectj;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.crypto.SmUtil;
-import com.jiayue.ssi.annotation.AgainVerify;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.util.ResponseVO;
-import com.jiayue.ssi.util.SM2CryptUtils;
-import com.jiayue.ssi.util.SaResultRefit;
-import com.jiayue.ssi.util.SecurityContextUtil;
+import com.jiayue.pfr.annotation.AgainVerify;
+import com.jiayue.pfr.constant.SecretKeyConstants;
+import com.jiayue.pfr.entity.SysUser;
+import com.jiayue.pfr.service.SysUserService;
+import com.jiayue.pfr.util.SM2CryptUtils;
+import com.jiayue.pfr.util.SaResultRefit;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -18,15 +16,11 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
 
 /**
 * 重新鉴别

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/backenum/PasswordRuleEnum.java → backend/src/main/java/com/jiayue/pfr/backenum/PasswordRuleEnum.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.pfr.backenum;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/config/CaptchaConfig.java → backend/src/main/java/com/jiayue/pfr/config/CaptchaConfig.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.config;
+package com.jiayue.pfr.config;
 
 import com.google.code.kaptcha.impl.DefaultKaptcha;
 import com.google.code.kaptcha.util.Config;

+ 3 - 3
backend/src/main/java/com/jiayue/ssi/config/EnvironmentPreparedListener.java → backend/src/main/java/com/jiayue/pfr/config/EnvironmentPreparedListener.java

@@ -1,11 +1,11 @@
-package com.jiayue.ssi.config;
+package com.jiayue.pfr.config;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.util.SM2CryptUtils;
+import com.jiayue.pfr.constant.SecretKeyConstants;
+import com.jiayue.pfr.util.SM2CryptUtils;
 import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
 import org.springframework.boot.env.OriginTrackedMapPropertySource;
 import org.springframework.context.ApplicationListener;

+ 3 - 3
backend/src/main/java/com/jiayue/ssi/config/GlobalExceptionAdvice.java → backend/src/main/java/com/jiayue/pfr/config/GlobalExceptionAdvice.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.config;
+package com.jiayue.pfr.config;
 
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.util.IPUtils;
+import com.jiayue.pfr.constant.CustomException;
+import com.jiayue.pfr.util.IPUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/config/MybatisPlusConfig.java → backend/src/main/java/com/jiayue/pfr/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.config;
+package com.jiayue.pfr.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

+ 2 - 5
backend/src/main/java/com/jiayue/ssi/config/SaTokenConfiguration.java → backend/src/main/java/com/jiayue/pfr/config/SaTokenConfiguration.java

@@ -1,21 +1,18 @@
-package com.jiayue.ssi.config;
+package com.jiayue.pfr.config;
 
 import cn.dev33.satoken.config.SaTokenConfig;
 //import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
 import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.filter.SaServletFilter;
-import cn.dev33.satoken.interceptor.SaInterceptor;
 import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
 import cn.dev33.satoken.router.SaHttpMethod;
 import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
-import cn.dev33.satoken.util.SaResult;
-import com.jiayue.ssi.util.SaResultRefit;
+import com.jiayue.pfr.util.SaResultRefit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**

+ 12 - 0
backend/src/main/java/com/jiayue/pfr/constant/CacheConstants.java

@@ -0,0 +1,12 @@
+package com.jiayue.pfr.constant;
+/**
+ * 缓存的key 常量
+ *
+ * @author ruoyi
+ */
+public class CacheConstants {
+    /**
+     * 验证码 redis key
+     */
+    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+}

+ 1 - 4
backend/src/main/java/com/jiayue/ssi/constant/Constants.java → backend/src/main/java/com/jiayue/pfr/constant/Constants.java

@@ -1,10 +1,7 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.pfr.constant;
 
 //import io.jsonwebtoken.Claims;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * 通用常量信息
  *

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/constant/CustomException.java → backend/src/main/java/com/jiayue/pfr/constant/CustomException.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.pfr.constant;
 /**
 * 自定义异常
 *

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/constant/PermissionContextHolder.java → backend/src/main/java/com/jiayue/pfr/constant/PermissionContextHolder.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.pfr.constant;
 
 import cn.hutool.core.convert.Convert;
 import org.springframework.web.context.request.RequestAttributes;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/constant/SecretKeyConstants.java → backend/src/main/java/com/jiayue/pfr/constant/SecretKeyConstants.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.constant;/**
+package com.jiayue.pfr.constant;/**
 * 密钥类
 *
 * @author xsl

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/constant/UserConstants.java → backend/src/main/java/com/jiayue/pfr/constant/UserConstants.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.pfr.constant;
 
 /**
  * 用户常量信息

+ 9 - 9
backend/src/main/java/com/jiayue/ssi/controller/SysMenuController.java → backend/src/main/java/com/jiayue/pfr/controller/SysMenuController.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.pfr.controller;
 
 import java.util.HashMap;
 import java.util.List;
@@ -6,14 +6,14 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.util.NumberUtil;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.constant.UserConstants;
-import com.jiayue.ssi.entity.SysMenu;
-import com.jiayue.ssi.entity.SysRole;
-import com.jiayue.ssi.service.SysMenuService;
-import com.jiayue.ssi.service.SysRoleService;
-import com.jiayue.ssi.util.RyStringUtils;
-import com.jiayue.ssi.util.SaResultRefit;
+import com.jiayue.pfr.constant.CustomException;
+import com.jiayue.pfr.constant.UserConstants;
+import com.jiayue.pfr.entity.SysMenu;
+import com.jiayue.pfr.entity.SysRole;
+import com.jiayue.pfr.service.SysMenuService;
+import com.jiayue.pfr.service.SysRoleService;
+import com.jiayue.pfr.util.RyStringUtils;
+import com.jiayue.pfr.util.SaResultRefit;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+ 41 - 66
backend/src/main/java/com/jiayue/ssi/controller/SysParameterController.java → backend/src/main/java/com/jiayue/pfr/controller/SysParameterController.java

@@ -1,13 +1,12 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.pfr.controller;
 
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.SysParameter;
-import com.jiayue.ssi.service.SysParameterService;
-import com.jiayue.ssi.util.ResponseVO;
+import com.jiayue.pfr.constant.CustomException;
+import com.jiayue.pfr.entity.SysParameter;
+import com.jiayue.pfr.service.SysParameterService;
+import com.jiayue.pfr.util.SaResultRefit;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -34,42 +33,39 @@ public class SysParameterController {
      * @return 执行结果
      */
     @PostMapping(value = "/addParameter")
-    public ResponseVO addParameter(@RequestBody SysParameter sysParameter) throws CustomException {
+    public SaResultRefit addParameter(@RequestBody SysParameter sysParameter) throws CustomException {
         try {
             if (StringUtils.isEmpty(sysParameter.getSysKey()) || StringUtils.isEmpty(sysParameter.getSysKey().trim())) {
-                return ResponseVO.fail("参数名不能为空!");
+                return SaResultRefit.errorTips("参数名不能为空!");
             } else {
                 String sysKey = sysParameter.getSysKey().trim();
                 if (sysKey.contains(" ")){
-                    return ResponseVO.fail("参数名不能含有空格!");
+                    return SaResultRefit.errorTips("参数名不能含有空格!");
                 }
                 if (!"null".equals(sysParameterService.queryByKey(sysKey, "null"))) {
-                    return ResponseVO.fail(sysKey + "参数名已存在!");
+                    return SaResultRefit.errorTips(sysKey + "参数名已存在!");
                 } else if (sysKey.length() > 50) {
-                    return ResponseVO.fail("参数名长度不能超过50个字符!");
+                    return SaResultRefit.errorTips("参数名长度不能超过50个字符!");
                 }
             }
 
             if (StringUtils.isEmpty(sysParameter.getSysValue())) {
-                return ResponseVO.fail("参数值不能为空!");
+                return SaResultRefit.errorTips("参数值不能为空!");
             } else if (sysParameter.getSysValue().length() > 50) {
-                return ResponseVO.fail("参数值长度不能超过50个字符!");
+                return SaResultRefit.errorTips("参数值长度不能超过50个字符!");
             }
 
             if (StringUtils.isEmpty(sysParameter.getSysDescribe())) {
-                return ResponseVO.fail("参数描述不能为空!");
+                return SaResultRefit.errorTips("参数描述不能为空!");
             } else if (sysParameter.getSysDescribe().length() > 200) {
-                return ResponseVO.fail("参数描述长度不能超过200个字符!");
+                return SaResultRefit.errorTips("参数描述长度不能超过200个字符!");
             }
             boolean bo = sysParameterService.save(sysParameter);
             if (bo) {
-                if ("useSendMail".equals(sysParameter.getSysKey())) {
-                    CacheConstants.use_send_mail = Boolean.parseBoolean(sysParameter.getSysValue());
-                }
-                return ResponseVO.success("添加参数信息成功");
+                return SaResultRefit.ok("添加参数信息成功");
             } else {
                 log.error("添加参数信息失败");
-                return ResponseVO.fail("添加参数信息失败");
+                return SaResultRefit.errorTips("添加参数信息失败");
             }
         } catch (Exception e) {
             throw new CustomException("添加参数信息异常", e);
@@ -83,55 +79,52 @@ public class SysParameterController {
      * @return 执行结果
      */
     @PostMapping(value = "/updateParameter")
-    public ResponseVO updateParameter(@RequestBody SysParameter sysParameter) throws CustomException {
+    public SaResultRefit updateParameter(@RequestBody SysParameter sysParameter) throws CustomException {
         try {
             SysParameter existSysParameter = sysParameterService.getById(sysParameter.getId());
             if (existSysParameter == null) {
-                return ResponseVO.fail("非法访问不能修改!");
+                return SaResultRefit.errorTips("非法访问不能修改!");
             }
 
             if (StringUtils.isEmpty(sysParameter.getSysKey()) || StringUtils.isEmpty(sysParameter.getSysKey().trim())) {
-                return ResponseVO.fail("参数名不能为空!");
+                return SaResultRefit.errorTips("参数名不能为空!");
             } else {
                 String sysKey = sysParameter.getSysKey().trim();
                 if (sysKey.contains(" ")){
-                    return ResponseVO.fail("参数名不能含有空格!");
+                    return SaResultRefit.errorTips("参数名不能含有空格!");
                 }
                 if (sysKey.length() > 50) {
-                    return ResponseVO.fail("参数名长度不能超过50个字符!");
+                    return SaResultRefit.errorTips("参数名长度不能超过50个字符!");
                 } else if (!existSysParameter.getSysKey().equals(sysKey)) {
                     if (!"null".equals(sysParameterService.queryByKey(sysKey, "null"))) {
-                        return ResponseVO.fail(sysKey + "参数名已存在!");
+                        return SaResultRefit.errorTips(sysKey + "参数名已存在!");
                     }
                 }
             }
 
             if (StringUtils.isEmpty(sysParameter.getSysValue())) {
-                return ResponseVO.fail("参数值不能为空!");
+                return SaResultRefit.errorTips("参数值不能为空!");
             } else if (sysParameter.getSysValue().length() > 50) {
-                return ResponseVO.fail("参数值长度不能超过50个字符!");
+                return SaResultRefit.errorTips("参数值长度不能超过50个字符!");
             }
 
             if (StringUtils.isEmpty(sysParameter.getSysDescribe())) {
-                return ResponseVO.fail("参数描述不能为空!");
+                return SaResultRefit.errorTips("参数描述不能为空!");
             } else if (sysParameter.getSysDescribe().length() > 200) {
-                return ResponseVO.fail("参数描述长度不能超过200个字符!");
+                return SaResultRefit.errorTips("参数描述长度不能超过200个字符!");
             }
 
             SysParameter oldSysParameter = sysParameterService.getById(sysParameter.getId());
             if (sysParameter.getVersion().intValue() != oldSysParameter.getVersion().intValue()){
-                return ResponseVO.fail("此数据被操作过,自动刷新列表后请重试操作!");
+                return SaResultRefit.errorTips("此数据被操作过,自动刷新列表后请重试操作!");
             }
 
             boolean bo = sysParameterService.updateById(sysParameter);
             if (bo) {
-                if ("useSendMail".equals(sysParameter.getSysKey())) {
-                    CacheConstants.use_send_mail = Boolean.parseBoolean(sysParameter.getSysValue());
-                }
-                return ResponseVO.success("修改参数信息成功");
+                return SaResultRefit.ok("修改参数信息成功");
             } else {
                 log.error("修改参数信息失败");
-                return ResponseVO.fail("修改参数信息失败");
+                return SaResultRefit.errorTips("修改参数信息失败");
             }
         } catch (Exception e) {
             throw new CustomException("修改参数信息异常", e);
@@ -142,25 +135,22 @@ public class SysParameterController {
      * 删除用户信息
      */
     @PostMapping(value = "/deleteParameter")
-    public ResponseVO deleteParameter(String id) throws CustomException {
+    public SaResultRefit deleteParameter(String id) throws CustomException {
         try {
             if (StringUtils.isEmpty(id)) {
-                return ResponseVO.fail("id不能为空!");
+                return SaResultRefit.errorTips("id不能为空!");
             }
             SysParameter sysParameter = sysParameterService.getById(Integer.parseInt(id));
             if (sysParameter == null) {
-                return ResponseVO.fail("此数据被操作过,自动刷新列表后请重试操作!");
+                return SaResultRefit.errorTips("此数据被操作过,自动刷新列表后请重试操作!");
             }
 
-            if ("useSendMail".equals(sysParameter.getSysKey())) {
-                CacheConstants.use_send_mail = true;
-            }
             boolean bo = sysParameterService.removeById(Integer.parseInt(id));
             if (bo) {
-                return ResponseVO.success("删除参数信息成功");
+                return SaResultRefit.ok("删除参数信息成功");
             } else {
                 log.error("删除用户信息失败");
-                return ResponseVO.fail("删除参数信息失败");
+                return SaResultRefit.errorTips("删除参数信息失败");
             }
         } catch (Exception e) {
             throw new CustomException("删除参数信息异常", e);
@@ -173,7 +163,7 @@ public class SysParameterController {
      * @return 参数信息
      */
     @GetMapping(value = "/getAll")
-    public ResponseVO getAll(String currentPage, String pageSize, String keywords) throws CustomException {
+    public SaResultRefit getAll(String currentPage, String pageSize, String keywords) throws CustomException {
         try {
             Integer cp;
             if (StringUtils.isNotEmpty(currentPage)) {
@@ -181,11 +171,11 @@ public class SysParameterController {
                     cp = Integer.parseInt(currentPage);
                 }
                 else{
-                    return ResponseVO.fail("currentPage不是整数!");
+                    return SaResultRefit.errorTips("currentPage不是整数!");
                 }
             }
             else{
-                return ResponseVO.fail("currentPage不能是空!");
+                return SaResultRefit.errorTips("currentPage不能是空!");
             }
 
             Integer ps;
@@ -194,15 +184,15 @@ public class SysParameterController {
                     ps = Integer.parseInt(pageSize);
                 }
                 else{
-                    return ResponseVO.fail("pageSize不是整数!");
+                    return SaResultRefit.errorTips("pageSize不是整数!");
                 }
             }
             else{
-                return ResponseVO.fail("pageSize不能是空!");
+                return SaResultRefit.errorTips("pageSize不能是空!");
             }
             if (StringUtils.isNotEmpty(keywords)) {
                 if (keywords.length() > 200) {
-                    return ResponseVO.fail("参数描述长度不能超过200个字符!");
+                    return SaResultRefit.errorTips("参数描述长度不能超过200个字符!");
                 }
             }
             QueryWrapper<SysParameter> wrapper = new QueryWrapper<>();
@@ -210,24 +200,9 @@ public class SysParameterController {
                 wrapper.eq("sys_key", keywords);
             }
             Page<SysParameter> result = sysParameterService.page(new Page<>(cp, ps), wrapper);
-            return ResponseVO.success(result);
+            return SaResultRefit.data(result);
         } catch (Exception e) {
             throw new CustomException("获取参数异常", e);
         }
     }
-
-    /**
-     * 获取是否邮箱口令参数
-     *
-     * @return 邮箱口令
-     */
-    @GetMapping(value = "/getUseSendMail")
-    public ResponseVO getUseSendMail() throws CustomException {
-        try {
-            String useSendMail = sysParameterService.queryByKey("useSendMail", "true");
-            return ResponseVO.success(useSendMail);
-        } catch (Exception e) {
-            throw new CustomException("获取邮箱口令参数异常", e);
-        }
-    }
 }

+ 5 - 5
backend/src/main/java/com/jiayue/ssi/controller/SysPolicyController.java → backend/src/main/java/com/jiayue/pfr/controller/SysPolicyController.java

@@ -1,10 +1,10 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.pfr.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.pfr.constant.CustomException;
+import com.jiayue.pfr.entity.SysPolicy;
+import com.jiayue.pfr.service.SysPolicyService;
+import com.jiayue.pfr.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 6 - 13
backend/src/main/java/com/jiayue/ssi/controller/SysRoleController.java → backend/src/main/java/com/jiayue/pfr/controller/SysRoleController.java

@@ -1,17 +1,14 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.pfr.controller;
 
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.constant.PermissionCharacter;
-import com.jiayue.ssi.constant.UserConstants;
-import com.jiayue.ssi.entity.SysRole;
-import com.jiayue.ssi.service.SysRoleService;
-import com.jiayue.ssi.util.ResponseVO;
-import com.jiayue.ssi.util.SaResultRefit;
-import com.jiayue.ssi.util.SecurityContextUtil;
+import com.jiayue.pfr.constant.CustomException;
+import com.jiayue.pfr.constant.UserConstants;
+import com.jiayue.pfr.entity.SysRole;
+import com.jiayue.pfr.service.SysRoleService;
+import com.jiayue.pfr.util.SaResultRefit;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,10 +87,6 @@ public class SysRoleController {
 
             // 获取当前操作用户的角色
             SysRole sysRole = roleService.selectRoleListByUserId();
-            if (!PermissionCharacter.P_XTGL.equals(sysRole.getRoleKey())){
-                // 不是系统管理员角色,只查询业务类角色
-                wrapper.eq("role_type","1");
-            }
 
             Page<SysRole> result = roleService.page(new Page<>(cp, ps), wrapper);
             return SaResultRefit.data(result);

+ 8 - 21
backend/src/main/java/com/jiayue/ssi/controller/SysUserController.java → backend/src/main/java/com/jiayue/pfr/controller/SysUserController.java

@@ -1,33 +1,22 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.pfr.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
-import cn.dev33.satoken.util.SaResult;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.IdcardUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.crypto.SmUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.annotation.AgainVerify;
-import com.jiayue.ssi.backenum.ApproveOperaterEnum;
-import com.jiayue.ssi.backenum.ApproveStatusEnum;
-import com.jiayue.ssi.constant.ApproveConstants;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.entity.*;
-import com.jiayue.ssi.service.*;
-import com.jiayue.ssi.service.impl.SysPermissionService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.pfr.annotation.AgainVerify;
+import com.jiayue.pfr.constant.CustomException;
+import com.jiayue.pfr.constant.SecretKeyConstants;
+import com.jiayue.pfr.entity.*;
+import com.jiayue.pfr.service.*;
+import com.jiayue.pfr.service.impl.SysPermissionService;
+import com.jiayue.pfr.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -48,8 +37,6 @@ public class SysUserController {
     @Autowired
     SysUserRoleService sysUserRoleService;
     @Autowired
-    SysApproveService sysApproveService;
-    @Autowired
     SysRoleService sysRoleService;
     @Autowired
     SysPolicyService sysPolicyService;

+ 11 - 34
backend/src/main/java/com/jiayue/ssi/controller/UserLoginController.java → backend/src/main/java/com/jiayue/pfr/controller/UserLoginController.java

@@ -1,21 +1,18 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.pfr.controller;
 
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.SysMenu;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.factory.LoginFactory;
-import com.jiayue.ssi.service.SysMenuService;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.service.UmsAdminService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.pfr.constant.CacheConstants;
+import com.jiayue.pfr.constant.CustomException;
+import com.jiayue.pfr.entity.SysMenu;
+import com.jiayue.pfr.entity.SysPolicy;
+import com.jiayue.pfr.entity.SysUser;
+import com.jiayue.pfr.service.SysMenuService;
+import com.jiayue.pfr.service.SysPolicyService;
+import com.jiayue.pfr.service.SysUserService;
+import com.jiayue.pfr.service.UmsAdminService;
+import com.jiayue.pfr.util.*;
 import com.wf.captcha.SpecCaptcha;
 import com.wf.captcha.base.Captcha;
 import lombok.extern.slf4j.Slf4j;
@@ -111,26 +108,6 @@ public class UserLoginController {
     }
 
     /**
-     * 刷新token
-     *
-     * @param httpServletRequest
-     * @param httpServletResponse
-     * @throws IOException
-     */
-    @PostMapping("/refreshToken")
-    public ResponseVO refreshToken(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)
-            throws CustomException {
-        try {
-            String oldToken = httpServletRequest.getHeader("Authorization");
-            String newToken = "";
-            CacheConstants.LOGIN_TOKEN_MAP.put("", newToken);
-            return ResponseVO.success(newToken);
-        } catch (Exception e) {
-            throw new CustomException("刷新token异常", e);
-        }
-    }
-
-    /**
      * 获取路由菜单信息
      *
      * @return 路由菜单信息

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/entity/BaseEntity.java → backend/src/main/java/com/jiayue/pfr/entity/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.pfr.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/entity/SysMenu.java → backend/src/main/java/com/jiayue/pfr/entity/SysMenu.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.pfr.entity;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/entity/SysParameter.java → backend/src/main/java/com/jiayue/pfr/entity/SysParameter.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.pfr.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/entity/SysPolicy.java → backend/src/main/java/com/jiayue/pfr/entity/SysPolicy.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.pfr.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/entity/SysRole.java → backend/src/main/java/com/jiayue/pfr/entity/SysRole.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.pfr.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/entity/SysRoleMenu.java → backend/src/main/java/com/jiayue/pfr/entity/SysRoleMenu.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.pfr.entity;
 
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/entity/SysUser.java → backend/src/main/java/com/jiayue/pfr/entity/SysUser.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.pfr.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/entity/SysUserRole.java → backend/src/main/java/com/jiayue/pfr/entity/SysUserRole.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.pfr.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/entity/TreeSelect.java → backend/src/main/java/com/jiayue/pfr/entity/TreeSelect.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.pfr.entity;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/entity/vo/MetaVo.java → backend/src/main/java/com/jiayue/pfr/entity/vo/MetaVo.java

@@ -1,6 +1,6 @@
-package com.jiayue.ssi.entity.vo;
+package com.jiayue.pfr.entity.vo;
 
-import com.jiayue.ssi.util.RyStringUtils;
+import com.jiayue.pfr.util.RyStringUtils;
 
 /**
  * 路由显示信息

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/entity/vo/RouterVo.java → backend/src/main/java/com/jiayue/pfr/entity/vo/RouterVo.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity.vo;
+package com.jiayue.pfr.entity.vo;
 
 import java.util.List;
 

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/filter/InterfaceLimitFilter.java → backend/src/main/java/com/jiayue/pfr/filter/InterfaceLimitFilter.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.filter;
+package com.jiayue.pfr.filter;
 
 
 import lombok.RequiredArgsConstructor;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/handler/MyMetaObjectHandler.java → backend/src/main/java/com/jiayue/pfr/handler/MyMetaObjectHandler.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.handler;
+package com.jiayue.pfr.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/mapper/SysMenuMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/SysMenuMapper.java

@@ -1,9 +1,9 @@
-package com.jiayue.ssi.mapper;
+package com.jiayue.pfr.mapper;
 
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jiayue.ssi.entity.SysMenu;
+import com.jiayue.pfr.entity.SysMenu;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/mapper/SysParameterMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/SysParameterMapper.java

@@ -1,6 +1,6 @@
-package com.jiayue.ssi.mapper;
+package com.jiayue.pfr.mapper;
 
-import com.jiayue.ssi.entity.SysParameter;
+import com.jiayue.pfr.entity.SysParameter;
 import org.apache.ibatis.annotations.Mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/mapper/SysPolicyMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/SysPolicyMapper.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.mapper;
+package com.jiayue.pfr.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jiayue.ssi.entity.SysPolicy;
+import com.jiayue.pfr.entity.SysPolicy;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/mapper/SysRoleMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/SysRoleMapper.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.mapper;
+package com.jiayue.pfr.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jiayue.ssi.entity.SysRole;
+import com.jiayue.pfr.entity.SysRole;
 import org.apache.ibatis.annotations.Mapper;
 
 

+ 3 - 3
backend/src/main/java/com/jiayue/ssi/mapper/SysRoleMenuMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/SysRoleMenuMapper.java

@@ -1,8 +1,8 @@
-package com.jiayue.ssi.mapper;
+package com.jiayue.pfr.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jiayue.ssi.entity.SysRole;
-import com.jiayue.ssi.entity.SysRoleMenu;
+import com.jiayue.pfr.entity.SysRole;
+import com.jiayue.pfr.entity.SysRoleMenu;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/mapper/SysUserMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/SysUserMapper.java

@@ -1,6 +1,6 @@
-package com.jiayue.ssi.mapper;
+package com.jiayue.pfr.mapper;
 
-import com.jiayue.ssi.entity.SysUser;
+import com.jiayue.pfr.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Update;

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/mapper/SysUserRoleMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/SysUserRoleMapper.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.mapper;
+package com.jiayue.pfr.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jiayue.ssi.entity.SysUserRole;
+import com.jiayue.pfr.entity.SysUserRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 4 - 4
backend/src/main/java/com/jiayue/ssi/service/SysMenuService.java → backend/src/main/java/com/jiayue/pfr/service/SysMenuService.java

@@ -1,12 +1,12 @@
-package com.jiayue.ssi.service;
+package com.jiayue.pfr.service;
 
 import java.util.List;
 import java.util.Set;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jiayue.ssi.entity.SysMenu;
-import com.jiayue.ssi.entity.TreeSelect;
-import com.jiayue.ssi.entity.vo.RouterVo;
+import com.jiayue.pfr.entity.SysMenu;
+import com.jiayue.pfr.entity.TreeSelect;
+import com.jiayue.pfr.entity.vo.RouterVo;
 
 /**
  * 菜单服务类

+ 2 - 5
backend/src/main/java/com/jiayue/ssi/service/SysParameterService.java → backend/src/main/java/com/jiayue/pfr/service/SysParameterService.java

@@ -1,10 +1,7 @@
-package com.jiayue.ssi.service;
-
-import java.util.List;
+package com.jiayue.pfr.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jiayue.ssi.entity.SysParameter;
-import com.jiayue.ssi.entity.SysUser;
+import com.jiayue.pfr.entity.SysParameter;
 
 /**
 * 参数管理接口

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/service/SysPolicyService.java → backend/src/main/java/com/jiayue/pfr/service/SysPolicyService.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.service;
+package com.jiayue.pfr.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jiayue.ssi.entity.SysPolicy;
+import com.jiayue.pfr.entity.SysPolicy;
 
 
 /**

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/service/SysRoleService.java → backend/src/main/java/com/jiayue/pfr/service/SysRoleService.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.service;
+package com.jiayue.pfr.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jiayue.ssi.entity.SysRole;
+import com.jiayue.pfr.entity.SysRole;
 
 /**
  * 角色业务层

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/service/SysUserRoleService.java → backend/src/main/java/com/jiayue/pfr/service/SysUserRoleService.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.service;
+package com.jiayue.pfr.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jiayue.ssi.entity.SysUserRole;
+import com.jiayue.pfr.entity.SysUserRole;
 
 /**
 * 用户角色联合接口

+ 51 - 0
backend/src/main/java/com/jiayue/pfr/service/SysUserService.java

@@ -0,0 +1,51 @@
+package com.jiayue.pfr.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jiayue.pfr.entity.SysUser;
+
+import java.util.List;
+
+/**
+* 用户管理接口
+* @author xsl
+* @date 2023/2/16
+*/
+public interface SysUserService extends IService<SysUser> {
+    /**
+     * 更新用户
+     * @param sysUser
+     * @return boolean
+     */
+    boolean updateUser(SysUser sysUser);
+    /**
+     * 根据账号查找
+     * @param username
+     * @return SysUser
+     */
+    SysUser queryUserName(String username);
+    /**
+     * 初始/重置密码
+     * @param id            主键id
+     * @param initPassword  初始密码
+     * @return
+     */
+    boolean resetPassword(Integer id,String initPassword,String checkPassword,String bakPassword);
+    /**
+     * 解锁用户
+     * @param id
+     * @return
+     */
+    boolean relockUserById(Integer id);
+    /**
+     * 用户授权角色
+     *
+     * @param userId 用户ID
+     * @param roleId 角色组
+     */
+    int insertUserAuth(Long userId, Long roleId);
+    /**
+     * 获取全部用户数据,并且字段解密后的
+     * @return
+     */
+    List<SysUser> queryAllUserByDecrypt();
+}

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/service/UmsAdminService.java → backend/src/main/java/com/jiayue/pfr/service/UmsAdminService.java

@@ -1,8 +1,8 @@
-package com.jiayue.ssi.service;
+package com.jiayue.pfr.service;
 
 import cn.dev33.satoken.stp.SaTokenInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jiayue.ssi.entity.SysUser;
+import com.jiayue.pfr.entity.SysUser;
 
 public interface UmsAdminService  extends IService<SysUser> {
     SaTokenInfo login(String password, SysUser sysUsers);

+ 13 - 14
backend/src/main/java/com/jiayue/ssi/service/impl/SysMenuServiceImpl.java → backend/src/main/java/com/jiayue/pfr/service/impl/SysMenuServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.service.impl;
+package com.jiayue.pfr.service.impl;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -6,19 +6,18 @@ import java.util.stream.Collectors;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.constant.UserConstants;
-import com.jiayue.ssi.entity.SysMenu;
-import com.jiayue.ssi.entity.SysRole;
-import com.jiayue.ssi.entity.TreeSelect;
-import com.jiayue.ssi.entity.vo.MetaVo;
-import com.jiayue.ssi.entity.vo.RouterVo;
-import com.jiayue.ssi.mapper.SysMenuMapper;
-import com.jiayue.ssi.mapper.SysRoleMapper;
-import com.jiayue.ssi.mapper.SysRoleMenuMapper;
-import com.jiayue.ssi.service.SysMenuService;
-import com.jiayue.ssi.util.SecurityContextUtil;
-import com.jiayue.ssi.util.RyStringUtils;
+import com.jiayue.pfr.constant.Constants;
+import com.jiayue.pfr.constant.UserConstants;
+import com.jiayue.pfr.entity.SysMenu;
+import com.jiayue.pfr.entity.SysRole;
+import com.jiayue.pfr.entity.TreeSelect;
+import com.jiayue.pfr.entity.vo.MetaVo;
+import com.jiayue.pfr.entity.vo.RouterVo;
+import com.jiayue.pfr.mapper.SysMenuMapper;
+import com.jiayue.pfr.mapper.SysRoleMapper;
+import com.jiayue.pfr.mapper.SysRoleMenuMapper;
+import com.jiayue.pfr.service.SysMenuService;
+import com.jiayue.pfr.util.RyStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

+ 4 - 4
backend/src/main/java/com/jiayue/ssi/service/impl/SysParameterServiceImpl.java → backend/src/main/java/com/jiayue/pfr/service/impl/SysParameterServiceImpl.java

@@ -1,8 +1,8 @@
-package com.jiayue.ssi.service.impl;
+package com.jiayue.pfr.service.impl;
 
-import com.jiayue.ssi.entity.SysParameter;
-import com.jiayue.ssi.mapper.SysParameterMapper;
-import com.jiayue.ssi.service.SysParameterService;
+import com.jiayue.pfr.entity.SysParameter;
+import com.jiayue.pfr.mapper.SysParameterMapper;
+import com.jiayue.pfr.service.SysParameterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/service/impl/SysPermissionService.java → backend/src/main/java/com/jiayue/pfr/service/impl/SysPermissionService.java

@@ -1,6 +1,6 @@
-package com.jiayue.ssi.service.impl;
+package com.jiayue.pfr.service.impl;
 
-import com.jiayue.ssi.service.SysMenuService;
+import com.jiayue.pfr.service.SysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

+ 4 - 4
backend/src/main/java/com/jiayue/ssi/service/impl/SysPolicyServiceImpl.java → backend/src/main/java/com/jiayue/pfr/service/impl/SysPolicyServiceImpl.java

@@ -1,9 +1,9 @@
-package com.jiayue.ssi.service.impl;
+package com.jiayue.pfr.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.mapper.SysPolicyMapper;
-import com.jiayue.ssi.service.SysPolicyService;
+import com.jiayue.pfr.entity.SysPolicy;
+import com.jiayue.pfr.mapper.SysPolicyMapper;
+import com.jiayue.pfr.service.SysPolicyService;
 import org.springframework.stereotype.Service;
 
 /**

+ 9 - 10
backend/src/main/java/com/jiayue/ssi/service/impl/SysRoleServiceImpl.java → backend/src/main/java/com/jiayue/pfr/service/impl/SysRoleServiceImpl.java

@@ -1,19 +1,18 @@
-package com.jiayue.ssi.service.impl;
+package com.jiayue.pfr.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jiayue.ssi.constant.UserConstants;
-import com.jiayue.ssi.entity.SysRole;
+import com.jiayue.pfr.constant.UserConstants;
+import com.jiayue.pfr.entity.SysRole;
 
-import com.jiayue.ssi.entity.SysRoleMenu;
-import com.jiayue.ssi.mapper.SysRoleMapper;
+import com.jiayue.pfr.entity.SysRoleMenu;
+import com.jiayue.pfr.mapper.SysRoleMapper;
 
-import com.jiayue.ssi.mapper.SysRoleMenuMapper;
-import com.jiayue.ssi.mapper.SysUserRoleMapper;
-import com.jiayue.ssi.service.SysRoleService;
+import com.jiayue.pfr.mapper.SysRoleMenuMapper;
+import com.jiayue.pfr.mapper.SysUserRoleMapper;
+import com.jiayue.pfr.service.SysRoleService;
 
-import com.jiayue.ssi.util.RyStringUtils;
-import com.jiayue.ssi.util.SecurityContextUtil;
+import com.jiayue.pfr.util.RyStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

+ 4 - 4
backend/src/main/java/com/jiayue/ssi/service/impl/SysUserRoleServiceImpl.java → backend/src/main/java/com/jiayue/pfr/service/impl/SysUserRoleServiceImpl.java

@@ -1,9 +1,9 @@
-package com.jiayue.ssi.service.impl;
+package com.jiayue.pfr.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jiayue.ssi.entity.SysUserRole;
-import com.jiayue.ssi.mapper.SysUserRoleMapper;
-import com.jiayue.ssi.service.SysUserRoleService;
+import com.jiayue.pfr.entity.SysUserRole;
+import com.jiayue.pfr.mapper.SysUserRoleMapper;
+import com.jiayue.pfr.service.SysUserRoleService;
 import org.springframework.stereotype.Service;
 
 /**

+ 9 - 120
backend/src/main/java/com/jiayue/ssi/service/impl/SysUserServiceImpl.java → backend/src/main/java/com/jiayue/pfr/service/impl/SysUserServiceImpl.java

@@ -1,35 +1,22 @@
-package com.jiayue.ssi.service.impl;
+package com.jiayue.pfr.service.impl;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jiayue.ssi.backenum.ApproveOperaterEnum;
-import com.jiayue.ssi.backenum.ApproveStatusEnum;
-import com.jiayue.ssi.constant.ApproveConstants;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.entity.SysApprove;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.entity.SysUserRole;
-import com.jiayue.ssi.mapper.SysApproveMapper;
-import com.jiayue.ssi.mapper.SysUserMapper;
-import com.jiayue.ssi.mapper.SysUserRoleMapper;
-import com.jiayue.ssi.service.SysApproveService;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.util.ResponseVO;
-import com.jiayue.ssi.util.SM2CryptUtils;
-import org.apache.commons.lang3.StringUtils;
+import com.jiayue.pfr.constant.SecretKeyConstants;
+import com.jiayue.pfr.entity.SysUser;
+import com.jiayue.pfr.entity.SysUserRole;
+import com.jiayue.pfr.mapper.SysUserMapper;
+import com.jiayue.pfr.mapper.SysUserRoleMapper;
+import com.jiayue.pfr.service.SysUserService;
+import com.jiayue.pfr.util.SM2CryptUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,30 +30,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     SysUserMapper sysUserMapper;
     @Autowired
     SysUserRoleMapper sysUserRoleMapper;
-    @Autowired
-    SysApproveMapper sysApproveMapper;
-    @Autowired
-    SysApproveService sysApproveService;
 
     /**
-     * 获取所有用户
-     * @return List<SysUser>
-     */
-    @Override
-    public List<SysUser> queryAllUsers(){
-        return this.list();
-    }
-    /**
-     * 保存用户
-     * @param sysUser
-     * @return boolean
-     */
-    @Override
-    @Transactional(propagation= Propagation.REQUIRED, rollbackFor = Exception.class)
-    public boolean saveUser(SysUser sysUser){
-       return this.save(sysUser);
-    }
-    /**
      * 更新用户
      * @param sysUser
      * @return boolean
@@ -76,16 +41,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public boolean updateUser(SysUser sysUser){
         return this.updateById(sysUser);
     }
-    /**
-     * 删除用户
-     * @param id
-     * @return
-     */
-    @Override
-    @Transactional(propagation= Propagation.REQUIRED, rollbackFor = Exception.class)
-    public boolean deleteUser(String id){
-        return this.removeById(id);
-    }
+
     /**
      * 根据账号查找
      * @param username
@@ -98,47 +54,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = sysUserMapper.selectOne(queryWrapper);
         return sysUser;
     }
-    /**
-     * 根据邮箱查找
-     * @param mailbox
-     * @return SysUser
-     */
-    @Override
-    public SysUser queryMailBox(String mailbox){
-        LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SysUser::getMailbox,mailbox);
-        SysUser sysUser = sysUserMapper.selectOne(queryWrapper);
-        return sysUser;
-    }
-    /**
-     * 删除用户
-     * @param sysUser
-     * @return
-     */
-    @Override
-    @Transactional(propagation= Propagation.REQUIRED, rollbackFor = Exception.class)
-    public boolean removeUserById(SysUser sysUser) {
-        // 插入审批表
-        SysApprove sysApprove = new SysApprove();
-        sysApprove.setModuleName(ApproveConstants.MODULE_NAME_USER);
-        sysApprove.setOperation(String.valueOf(ApproveOperaterEnum.DELETE.getCode()));
-        sysApprove.setApproveStatus(String.valueOf(ApproveStatusEnum.DSP.getCode()));
-        sysApprove.setEntityName("SysUser");
-        sysApprove.setParameterContent(JSONUtil.parse(sysUser).toString());
-        sysApprove.setMasterId(String.valueOf(sysUser.getId()));
-        int count = sysApproveMapper.insert(sysApprove);
-        if (count > 0) {
-            return true;
-        }
-        return false;
 
-//        LambdaUpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<SysUser>().lambda();
-//        updateWrapper.eq(SysUser::getId, id).set(SysUser::getDelFlag, 1);
-//        int count = sysUserMapper.update(new SysUser(), updateWrapper);
-//        if (count > 0) {
-//            return true;
-//        }
-    }
     /**
      * 初始/重置密码
      * @param id            主键id
@@ -192,17 +108,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     /**
-     * 通过角色ID查找用户
-     * @param roleId 角色Id
-     * @return
-     */
-    @Override
-    public List<SysUser> selectUserByRole(String roleId){
-        return sysUserMapper.selectUserByRole(roleId);
-
-    }
-
-    /**
      * 获取全部用户数据,并且字段解密后的
      * @return
      */
@@ -218,20 +123,4 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         return sysUserList;
     }
-
-    /**
-     * 新增用户
-     * @param id
-     * @param sysApprove
-     * @return
-     */
-    @Override
-    @Transactional(propagation= Propagation.REQUIRED, rollbackFor = Exception.class)
-    public boolean addUserByApprove(Long id,SysApprove sysApprove) {
-        LambdaUpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<SysUser>().lambda();
-        updateWrapper.eq(SysUser::getId, id).set(SysUser::getSignstr, "1");
-        sysUserMapper.update(new SysUser(), updateWrapper);
-        boolean bo = sysApproveService.save(sysApprove);
-        return bo;
-    }
 }

+ 7 - 14
backend/src/main/java/com/jiayue/ssi/service/impl/UmsAdminServiceImpl.java → backend/src/main/java/com/jiayue/pfr/service/impl/UmsAdminServiceImpl.java

@@ -1,22 +1,15 @@
-package com.jiayue.ssi.service.impl;
+package com.jiayue.pfr.service.impl;
 
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.crypto.SmUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.entity.SysUserRole;
-import com.jiayue.ssi.factory.LoginFactory;
-import com.jiayue.ssi.mapper.SysUserMapper;
-import com.jiayue.ssi.mapper.SysUserRoleMapper;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.service.UmsAdminService;
-import com.jiayue.ssi.util.SM2CryptUtils;
+import com.jiayue.pfr.constant.SecretKeyConstants;
+import com.jiayue.pfr.entity.SysUser;
+import com.jiayue.pfr.mapper.SysUserMapper;
+import com.jiayue.pfr.service.SysPolicyService;
+import com.jiayue.pfr.service.UmsAdminService;
+import com.jiayue.pfr.util.SM2CryptUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/DateUtils.java → backend/src/main/java/com/jiayue/pfr/util/DateUtils.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/FileUtil.java → backend/src/main/java/com/jiayue/pfr/util/FileUtil.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/IPUtils.java → backend/src/main/java/com/jiayue/pfr/util/IPUtils.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/IdUtils.java → backend/src/main/java/com/jiayue/pfr/util/IdUtils.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 /**
  * ID生成器工具类

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/InterfaceLimitUtil.java → backend/src/main/java/com/jiayue/pfr/util/InterfaceLimitUtil.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Iterator;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/LocalCache.java → backend/src/main/java/com/jiayue/pfr/util/LocalCache.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.cache.impl.TimedCache;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/NumberUtils.java → backend/src/main/java/com/jiayue/pfr/util/NumberUtils.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import lombok.extern.slf4j.Slf4j;
 

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/util/PasswordRuleUtil.java → backend/src/main/java/com/jiayue/pfr/util/PasswordRuleUtil.java

@@ -1,6 +1,6 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
-import com.jiayue.ssi.backenum.PasswordRuleEnum;
+import com.jiayue.pfr.backenum.PasswordRuleEnum;
 
 /**
  * 密码规则验证工具

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/RandomPwd.java → backend/src/main/java/com/jiayue/pfr/util/RandomPwd.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/RegexUtil.java → backend/src/main/java/com/jiayue/pfr/util/RegexUtil.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import cn.hutool.crypto.SmUtil;
 

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/util/RyStringUtils.java → backend/src/main/java/com/jiayue/pfr/util/RyStringUtils.java

@@ -1,9 +1,9 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import java.util.*;
 
 import cn.hutool.core.text.StrFormatter;
-import com.jiayue.ssi.constant.Constants;
+import com.jiayue.pfr.constant.Constants;
 import org.springframework.util.AntPathMatcher;
 
 

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/util/SM2CryptUtils.java → backend/src/main/java/com/jiayue/pfr/util/SM2CryptUtils.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import cn.hutool.core.util.HexUtil;
 import cn.hutool.crypto.BCUtil;
@@ -6,7 +6,7 @@ import cn.hutool.crypto.ECKeyUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.SM2;
 import cn.hutool.crypto.SmUtil;
-import com.jiayue.ssi.constant.SecretKeyConstants;
+import com.jiayue.pfr.constant.SecretKeyConstants;
 import org.bouncycastle.crypto.engines.SM2Engine;
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
 import org.bouncycastle.crypto.signers.PlainDSAEncoding;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/SaResultRefit.java → backend/src/main/java/com/jiayue/pfr/util/SaResultRefit.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import cn.dev33.satoken.util.SaResult;
 

+ 1 - 3
backend/src/main/java/com/jiayue/ssi/util/SecurityContextUtil.java → backend/src/main/java/com/jiayue/pfr/util/SecurityContextUtil.java

@@ -1,6 +1,4 @@
-package com.jiayue.ssi.util;
-
-import com.jiayue.ssi.entity.SysUser;
+package com.jiayue.pfr.util;
 
 /**
 * SecurityContext获取

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/SecurityValidate.java → backend/src/main/java/com/jiayue/pfr/util/SecurityValidate.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 /**
 * sql注入,路径操作,http响应拦截,日志伪造验证类
 *

+ 2 - 2
backend/src/main/java/com/jiayue/ssi/util/ServletUtils.java → backend/src/main/java/com/jiayue/pfr/util/ServletUtils.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import cn.hutool.core.convert.Convert;
-import com.jiayue.ssi.constant.Constants;
+import com.jiayue.pfr.constant.Constants;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/SpringUtils.java → backend/src/main/java/com/jiayue/pfr/util/SpringUtils.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeansException;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/UUID.java → backend/src/main/java/com/jiayue/pfr/util/UUID.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/util/UtilException.java → backend/src/main/java/com/jiayue/pfr/util/UtilException.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.util;
+package com.jiayue.pfr.util;
 
 /**
  * 工具类异常

+ 0 - 38
backend/src/main/java/com/jiayue/ssi/backenum/ApproveOperaterEnum.java

@@ -1,38 +0,0 @@
-package com.jiayue.ssi.backenum;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
-* 审批操作枚举
-*
-* @author xsl
-* @since 2023/04/13
-*/
-@Getter
-@AllArgsConstructor
-public enum ApproveOperaterEnum {
-    /**
-     * 新增
-     */
-    INSERT(0, "新增"),
-    /**
-     * 修改
-     */
-    UPDATE(1, "修改"),
-    /**
-     * 删除
-     */
-    DELETE(2, "删除"),
-    /**
-     * 授权
-     */
-    APPROVE(3, "授权"),
-    /**
-     * 解锁
-     */
-    RELOCK(4, "解锁");
-
-    private Integer code;
-    private String message;
-}

+ 0 - 26
backend/src/main/java/com/jiayue/ssi/backenum/ApproveResultEnum.java

@@ -1,26 +0,0 @@
-package com.jiayue.ssi.backenum;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
-* 审批结果枚举
-*
-* @author xsl
-* @since 2023/04/13
-*/
-@Getter
-@AllArgsConstructor
-public enum ApproveResultEnum {
-    /**
-     * 通过
-     */
-    TG(0, "通过"),
-    /**
-     * 未通过
-     */
-    WTG(1, "未通过");
-
-    private Integer code;
-    private String message;
-}

+ 0 - 26
backend/src/main/java/com/jiayue/ssi/backenum/ApproveStatusEnum.java

@@ -1,26 +0,0 @@
-package com.jiayue.ssi.backenum;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
-* 审批状态枚举
-*
-* @author xsl
-* @since 2023/04/13
-*/
-@Getter
-@AllArgsConstructor
-public enum ApproveStatusEnum {
-    /**
-     * 待审批
-     */
-    DSP(0, "待审批"),
-    /**
-     * 已审批
-     */
-    YSP(1, "已审批");
-
-    private Integer code;
-    private String message;
-}

+ 0 - 48
backend/src/main/java/com/jiayue/ssi/backenum/AuditAblesEventEnum.java

@@ -1,48 +0,0 @@
-package com.jiayue.ssi.backenum;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
-* 审计策略配置枚举
-*
-* @author xsl
-* @since 2023/08/18
-*/
-@Getter
-public enum AuditAblesEventEnum {
-    /**
-     * nwp
-     */
-    NWP(0, "/nwpController/getAll"),
-    /**
-     * 短期
-     */
-    DQ(1, "/forecastPowerShortTermController/getAll");
-
-    private Integer code;
-    private String message;
-
-    AuditAblesEventEnum(Integer code, String msg) {
-        this.code = code;
-        this.message = msg;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-
-    public String getMsg() {
-        return message;
-    }
-
-    public static AuditAblesEventEnum getByCode(Integer code) {
-        for (AuditAblesEventEnum type : values()) {
-            if (type.getCode().intValue()==code.intValue()) {
-                return type;
-            }
-        }
-        return null;
-    }
-}

+ 0 - 19
backend/src/main/java/com/jiayue/ssi/backenum/AuditType.java

@@ -1,19 +0,0 @@
-package com.jiayue.ssi.backenum;
-
-/**
- * 审计类型
- *
- * @author xsl
- */
-public enum AuditType
-{
-    /**
-     * 系统
-     */
-    SYS,
-
-    /**
-     * 业务
-     */
-    BIZ
-}

+ 0 - 20
backend/src/main/java/com/jiayue/ssi/backenum/BusinessStatus.java

@@ -1,20 +0,0 @@
-package com.jiayue.ssi.backenum;
-
-/**
- * 操作状态
- *
- * @author ruoyi
- *
- */
-public enum BusinessStatus
-{
-    /**
-     * 成功
-     */
-    SUCCESS,
-
-    /**
-     * 失败
-     */
-    FAIL,
-}

+ 0 - 91
backend/src/main/java/com/jiayue/ssi/backenum/BusinessType.java

@@ -1,91 +0,0 @@
-package com.jiayue.ssi.backenum;
-
-/**
- * 业务操作类型
- *
- * @author ruoyi
- */
-public enum BusinessType
-{
-    /**
-     * 查询
-     */
-    QUERY,
-    /**
-     * 解锁
-     */
-    UNLOCK,
-    /**
-     * 越权访问
-     */
-    BAC,
-    /**
-     * 其它
-     */
-    OTHER,
-    /**
-     * 初始/重置密码
-     */
-    RESETPWD,
-
-    /**
-     * 新增
-     */
-    INSERT,
-
-    /**
-     * 修改
-     */
-    UPDATE,
-    /**
-     * 个人密码修改
-     */
-    PWDUPDATE,
-
-    /**
-     * 删除
-     */
-    DELETE,
-
-    /**
-     * 授权
-     */
-    GRANT,
-    /**
-     * 获取角色信息
-     */
-    GETROLE,
-
-    /**
-     * 导出
-     */
-    EXPORT,
-
-    /**
-     * 导入
-     */
-    IMPORT,
-
-    /**
-     * 强退
-     */
-    FORCE,
-
-    /**
-     * 生成代码
-     */
-    GENCODE,
-
-    /**
-     * 清空数据
-     */
-    CLEAN,
-    /**
-     * 连接超时
-     */
-    CTO,
-    /**
-     * IP异常
-     */
-    IPYC,
-}

+ 0 - 37
backend/src/main/java/com/jiayue/ssi/backenum/HttpMethod.java

@@ -1,37 +0,0 @@
-package com.jiayue.ssi.backenum;
-
-import org.springframework.lang.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 请求方式
- *
- * @author ruoyi
- */
-public enum HttpMethod
-{
-    GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
-
-    private static final Map<String, HttpMethod> mappings = new HashMap<>(16);
-
-    static
-    {
-        for (HttpMethod httpMethod : values())
-        {
-            mappings.put(httpMethod.name(), httpMethod);
-        }
-    }
-
-    @Nullable
-    public static HttpMethod resolve(@Nullable String method)
-    {
-        return (method != null ? mappings.get(method) : null);
-    }
-
-    public boolean matches(String method)
-    {
-        return (this == resolve(method));
-    }
-}

+ 0 - 24
backend/src/main/java/com/jiayue/ssi/backenum/OperatorType.java

@@ -1,24 +0,0 @@
-package com.jiayue.ssi.backenum;
-
-/**
- * 操作人类别
- *
- * @author ruoyi
- */
-public enum OperatorType
-{
-    /**
-     * 其它
-     */
-    OTHER,
-
-    /**
-     * 后台用户
-     */
-    MANAGE,
-
-    /**
-     * 手机端用户
-     */
-    MOBILE
-}

+ 0 - 25
backend/src/main/java/com/jiayue/ssi/backenum/ResponseEnum.java

@@ -1,25 +0,0 @@
-package com.jiayue.ssi.backenum;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 数据信息状态枚举类
- *
- * @author zzy
- * @version 1.0
- * @since 2019/6/24 9:34
- */
-@Getter
-@AllArgsConstructor
-public enum ResponseEnum {
-    /**
-     * 0 表示返回成功
-     */
-    SUCCESS(0, "操作成功!"),
-    FAILED(1, "操作失败!"),
-    ERROR(2, "系统错误!");
-
-    private Integer code;
-    private String message;
-}

+ 0 - 13
backend/src/main/java/com/jiayue/ssi/constant/ApproveConstants.java

@@ -1,13 +0,0 @@
-package com.jiayue.ssi.constant;/**
-* 审批常量类
-*
-* @author xsl
-* @since 2023/04/13
-*/
-public class ApproveConstants {
-    /**
-     * 模块名称
-     */
-    public static final String MODULE_NAME_USER = "用户管理";
-
-}

+ 0 - 96
backend/src/main/java/com/jiayue/ssi/constant/CacheConstants.java

@@ -1,96 +0,0 @@
-package com.jiayue.ssi.constant;
-
-import com.jiayue.ssi.dto.ActiveUserDto;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * 缓存的key 常量
- *
- * @author ruoyi
- */
-public class CacheConstants {
-    /**
-     * 登录用户 redis key
-     */
-    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
-
-    /**
-     * 验证码 redis key
-     */
-    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
-
-    /**
-     * 邮箱口令 key
-     */
-    public static final String MAIL_CODE_KEY = "mail_codes:";
-    /**
-     * 非活动退出 key
-     */
-    public static final String REACTIVE_KEY = "reactive:";
-    /**
-     * 防止邮箱口令频繁访问
-     */
-    public static final String PREVENT_MAIL_CODE = "prevent_mail_codes:";
-
-    /**
-     * 参数管理 cache key
-     */
-    public static final String SYS_CONFIG_KEY = "sys_config:";
-
-    /**
-     * 字典管理 cache key
-     */
-    public static final String SYS_DICT_KEY = "sys_dict:";
-
-    /**
-     * 防重提交 redis key
-     */
-    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
-
-    /**
-     * 限流 redis key
-     */
-    public static final String RATE_LIMIT_KEY = "rate_limit:";
-
-    /**
-     * 登录账户密码错误次数 redis key
-     */
-    public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
-    /**
-     * 服务端心跳
-     */
-    public static final String HEART_KEY = "heart:";
-    /**
-     * 登录token存储,map<用户名,token:授权时间>
-     */
-    public static Map<String,String> LOGIN_TOKEN_MAP = new ConcurrentHashMap<String,String>();
-    /**
-     * 是否使用邮箱口令 默认:true使用
-     */
-    public static boolean use_send_mail = true;
-
-    /**
-     * 用户名对应明文密码缓存
-     */
-    public static ConcurrentMap<String, String> usernamePasswordMap = new ConcurrentHashMap<>();
-    /**
-     * 当前服务端访问的IP集合<IP,用户名>
-     */
-    public static ConcurrentMap<String, String> IP_USER_MAP = new ConcurrentHashMap<>();
-    /**
-     * 用于用户心跳
-     */
-    public static Map<String, ActiveUserDto> ACTIVE_USER_MAP = new ConcurrentHashMap<String,ActiveUserDto>();
-    /**
-     * 用于被踢用户的request存储
-     */
-    public static Map<String, HttpServletRequest> KICKED_USER_MAP = new ConcurrentHashMap<String, HttpServletRequest>();
-    /**
-     * 用于被踢用户的sessionId
-     */
-    public static Map<String, String> SESSIONID_USER_MAP = new ConcurrentHashMap<String, String>();
-}

+ 0 - 27
backend/src/main/java/com/jiayue/ssi/constant/LoginConstants.java

@@ -1,27 +0,0 @@
-package com.jiayue.ssi.constant;
-
-import com.jiayue.ssi.dto.UserVisitInfoDto;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
-* 登录用到的常量
-*
-* @author xsl
-* @since 2023/03/20
-*/
-public class LoginConstants {
-    /**
-     * 登录锁定后多久时间重试(毫秒)
-     */
-    public static final Long LOGIN_LOCK = 100000L;
-
-    /**
-     * 并发会话存储<用户名,访问信息>
-     */
-    public static ConcurrentMap<String, UserVisitInfoDto> sessionMap = new ConcurrentHashMap<>();
-}

+ 0 - 37
backend/src/main/java/com/jiayue/ssi/constant/PermissionCharacter.java

@@ -1,37 +0,0 @@
-package com.jiayue.ssi.constant;
-/**
-* 权限字符
-*
-* @author xsl
-* @since 2023/06/02
-*/
-public class PermissionCharacter {
-    /**
-     * 系统管理
-     */
-    public static final String P_XTGL = "XTGL";
-    /**
-     * 审计管理
-     */
-    public static final String P_SJGL = "SJGL";
-    /**
-     * 审计业务
-     */
-    public static final String P_SJYW = "SJYW";
-    /**
-     * 审核管理
-     */
-    public static final String P_SHGL = "SHGL";
-    /**
-     * 业务管理
-     */
-    public static final String P_YWGL = "YWGL";
-    /**
-     * 业务配置
-     */
-    public static final String P_YWPZ = "YWPZ";
-    /**
-     * 业务操作
-     */
-    public static final String P_YWCZ = "YWCZ";
-}

+ 0 - 115
backend/src/main/java/com/jiayue/ssi/controller/ElectricFieldController.java

@@ -1,115 +0,0 @@
-package com.jiayue.ssi.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.ElectricField;
-import com.jiayue.ssi.service.ElectricFieldService;
-import com.jiayue.ssi.util.ResponseVO;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- * 场站接口
- *
- * @author xsl
- * @since 2023/03/13
- */
-@RestController
-@RequestMapping("/electricField")
-@Slf4j
-public class ElectricFieldController {
-
-    @Autowired
-    ElectricFieldService electricFieldService;
-
-    /**
-     * 获取场站信息
-     *
-     * @return 场站信息
-     */
-    @GetMapping(value = "/getAll")
-    public ResponseVO getAll() throws CustomException {
-        try {
-            ElectricField electricField = electricFieldService.getOne(new QueryWrapper<>());
-            return ResponseVO.success(electricField);
-        } catch (Exception e) {
-            throw new CustomException("获取场站信息异常", e);
-        }
-    }
-
-    /**
-     * 保存场站
-     */
-    @PostMapping
-    public ResponseVO update(@RequestBody ElectricField electricField) throws CustomException {
-        try {
-            if (StringUtils.isEmpty(electricField.getStationCode())) {
-                return ResponseVO.fail("场站编号不能为空!");
-            } else if (electricField.getStationCode().length() > 6) {
-                return ResponseVO.fail(electricField.getStationCode() + "场站编号长度不能超过6个字符!");
-            }
-
-            if (StringUtils.isEmpty(electricField.getName())) {
-                return ResponseVO.fail("场站名称不能为空!");
-            } else if (electricField.getName().length() > 50) {
-                return ResponseVO.fail(electricField.getName() + "场站名称长度不能超过50个字符!");
-            }
-
-            if (StringUtils.isEmpty(electricField.getSign())) {
-                return ResponseVO.fail("场站标识不能为空!");
-            } else if (electricField.getSign().length() > 10) {
-                return ResponseVO.fail(electricField.getSign() + "场站标识长度不能超过10个字符!");
-            }
-
-
-            String pattern = "^[0-9]{1,8}+\\.{0,1}[0-9]{0,2}$";
-            if (electricField.getCapacity() == null) {
-                return ResponseVO.fail("装机容量不能为空!");
-            } else if (!electricField.getCapacity().toString().matches(pattern)) {
-                return ResponseVO.fail("装机容量整数位不能超过8位,小数位不能超过2位!");
-            }
-
-            if (electricField.getGridce() == null) {
-                return ResponseVO.fail("并网设备数不能为空!");
-            } else if (!String.valueOf(electricField.getGridce()).matches("^([0-9][0-9]{0,1}|100)$")) {
-                return ResponseVO.fail("并网设备数请输入0-100整数");
-            }
-
-            if (StringUtils.isEmpty(electricField.getFieldType())) {
-                return ResponseVO.fail("场站类型不能为空!");
-            } else if (electricField.getFieldType().length() > 1) {
-                return ResponseVO.fail("场站类型长度不能超过1个字符!");
-            }
-
-            if (StringUtils.isEmpty(electricField.getCompany())) {
-                return ResponseVO.fail("所属公司不能为空!");
-            } else if (electricField.getCompany().length() > 100) {
-                return ResponseVO.fail("所属公司长度不能超过100个字符!");
-            }
-
-            if (StringUtils.isEmpty(electricField.getLocation())) {
-                return ResponseVO.fail("场站位置不能为空!");
-            } else if (electricField.getLocation().length() > 100) {
-                return ResponseVO.fail("场站位置长度不能超过100个字符!");
-            }
-
-            ElectricField oldElectricField = electricFieldService.getById(electricField.getId());
-            if (electricField.getVersion().intValue() != oldElectricField.getVersion().intValue()){
-                return ResponseVO.fail("此数据被操作过,自动刷新列表后请重试操作!");
-            }
-
-            boolean bo = electricFieldService.saveOrUpdate(electricField);
-            if (bo) {
-                return ResponseVO.success("场站信息保存成功");
-            } else {
-                return ResponseVO.fail("场站信息保存失败");
-            }
-        } catch (Exception e) {
-            throw new CustomException("场站信息保存异常", e);
-        }
-    }
-
-}

+ 0 - 275
backend/src/main/java/com/jiayue/ssi/controller/SysApproveController.java

@@ -1,275 +0,0 @@
-package com.jiayue.ssi.controller;
-
-import cn.hutool.core.util.DesensitizedUtil;
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.backenum.ApproveOperaterEnum;
-import com.jiayue.ssi.constant.ApproveConstants;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.entity.SysApprove;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.service.SysApproveService;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.util.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 审核接口
- *
- * @author xsl
- * @since 2023/03/13
- */
-@RestController
-@RequestMapping("/sysApproveController")
-@Slf4j
-public class SysApproveController {
-    @Autowired
-    SysApproveService sysApproveService;
-    @Autowired
-    SysUserService sysUserService;
-
-    /**
-     * 获取用户分页信息
-     *
-     * @return 用户信息
-     */
-    @GetMapping(value = "/getAll")
-    public ResponseVO getAll(String currentPage, String pageSize, String approveStatus, String approveResult) throws CustomException {
-        try {
-            Integer cp;
-            if (StringUtils.isNotEmpty(currentPage)) {
-                if (NumberUtil.isInteger(currentPage)){
-                    cp = Integer.parseInt(currentPage);
-                }
-                else{
-                    return ResponseVO.fail("currentPage不是整数!");
-                }
-            }
-            else{
-                return ResponseVO.fail("currentPage不能是空!");
-            }
-
-            Integer ps;
-            if (StringUtils.isNotEmpty(pageSize)) {
-                if (NumberUtil.isInteger(pageSize)){
-                    ps = Integer.parseInt(pageSize);
-                }
-                else{
-                    return ResponseVO.fail("pageSize不是整数!");
-                }
-            }
-            else{
-                return ResponseVO.fail("pageSize不能是空!");
-            }
-
-            QueryWrapper<SysApprove> wrapper = new QueryWrapper<>();
-            if (StringUtils.isNotEmpty(approveStatus)) {
-                wrapper.eq("approve_status", approveStatus);
-            }
-            if (StringUtils.isNotEmpty(approveResult)) {
-                wrapper.eq("approve_result", approveResult);
-            }
-            Page<SysApprove> result = sysApproveService.page(new Page<>(cp, ps), wrapper);
-            List<SysApprove> records = result.getRecords();
-            //遍历对象数组的方法
-            records.forEach(
-                    record -> {
-                        if (record.getModuleName().equals(ApproveConstants.MODULE_NAME_USER)){
-                            if (record.getOperation().equals(String.valueOf(ApproveOperaterEnum.INSERT.getCode()))){
-                                // 敏感数据先解密
-                                String idcard = SM2CryptUtils.decrypt(record.getIdcard(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String nickname = SM2CryptUtils.decrypt(record.getNickname(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String mailbox = SM2CryptUtils.decrypt(record.getMailbox(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String phonenumber = SM2CryptUtils.decrypt(record.getPhonenumber(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                // 脱密处理
-                                idcard = DesensitizedUtil.idCardNum(idcard,5,2);
-                                nickname = DesensitizedUtil.chineseName(nickname);
-                                mailbox = DesensitizedUtil.email(mailbox);
-                                phonenumber = DesensitizedUtil.mobilePhone(phonenumber);
-                                // 封装新增操作
-                                StringBuffer parameterContent = new StringBuffer("");
-                                parameterContent.append("账号:"+record.getUsername());
-                                parameterContent.append(",身份证号码:"+idcard);
-                                if ("0".equals(record.getUsertype())){
-                                    parameterContent.append(",用户类型:管理员");
-                                }
-                                else {
-                                    parameterContent.append(",用户类型:业务用户");
-                                }
-
-                                parameterContent.append(",姓名:"+nickname);
-                                parameterContent.append(",邮箱:"+mailbox);
-                                parameterContent.append(",手机号码:"+phonenumber);
-                                if (record.getExpDate()==null){
-
-                                }
-                                else {
-                                    parameterContent.append(",账号有效期:"+DateFormatUtils.format(record.getExpDate(),"yyyy-MM-dd"));
-                                }
-                                record.setParameterContent(parameterContent.toString());
-                            }
-                            else if (record.getOperation().equals(String.valueOf(ApproveOperaterEnum.UPDATE.getCode()))){
-                                // 根据用户主键ID获取用户表里原有数据
-                                StringBuffer parameterContent = new StringBuffer("");
-                                String oldInfo = record.getParameterContent();
-                                SysUser oldSysUser = JSONUtil.toBean(oldInfo,SysUser.class);
-                                parameterContent.append("修改前内容:\n");
-                                String oldidcard = SM2CryptUtils.decrypt(oldSysUser.getIdcard(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String oldnickname = SM2CryptUtils.decrypt(oldSysUser.getNickname(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String oldmailbox = SM2CryptUtils.decrypt(oldSysUser.getMailbox(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String oldphonenumber = SM2CryptUtils.decrypt(oldSysUser.getPhonenumber(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                // 脱密处理
-                                String tmidcard = DesensitizedUtil.idCardNum(oldidcard,5,2);
-                                String tmnickname = DesensitizedUtil.chineseName(oldnickname);
-                                String tmailbox = DesensitizedUtil.email(oldmailbox);
-                                String tmphonenumber = DesensitizedUtil.mobilePhone(oldphonenumber);
-                                parameterContent.append("账号:"+oldSysUser.getUsername());
-                                parameterContent.append(",身份证号码:"+tmidcard);
-                                if ("0".equals(oldSysUser.getUsertype())){
-                                    parameterContent.append(",用户类型:管理员");
-                                }
-                                else {
-                                    parameterContent.append(",用户类型:业务用户");
-                                }
-                                parameterContent.append(",姓名:"+tmnickname);
-                                parameterContent.append(",邮箱:"+tmailbox);
-                                parameterContent.append(",手机号码:"+tmphonenumber);
-                                if (oldSysUser.getExpDate()==null){
-                                }
-                                else {
-                                    parameterContent.append(",账号有效期:"+DateFormatUtils.format(oldSysUser.getExpDate(),"yyyy-MM-dd"));
-                                }
-                                parameterContent.append("\n");
-
-                                // 审批表里的记录敏感数据先解密
-                                String idcard = SM2CryptUtils.decrypt(record.getIdcard(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String nickname = SM2CryptUtils.decrypt(record.getNickname(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String mailbox = SM2CryptUtils.decrypt(record.getMailbox(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String phonenumber = SM2CryptUtils.decrypt(record.getPhonenumber(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                // 脱密处理
-                                idcard = DesensitizedUtil.idCardNum(idcard,5,2);
-                                nickname = DesensitizedUtil.chineseName(nickname);
-                                mailbox = DesensitizedUtil.email(mailbox);
-                                phonenumber = DesensitizedUtil.mobilePhone(phonenumber);
-                                parameterContent.append("修改后内容:\n");
-                                parameterContent.append("账号:"+record.getUsername());
-                                parameterContent.append(",身份证号码:"+idcard);
-                                if ("0".equals(record.getUsertype())){
-                                    parameterContent.append(",用户类型:管理员");
-                                }
-                                else {
-                                    parameterContent.append(",用户类型:业务用户");
-                                }
-
-                                parameterContent.append(",姓名:"+nickname);
-                                parameterContent.append(",邮箱:"+mailbox);
-                                parameterContent.append(",手机号码:"+phonenumber);
-                                if (record.getExpDate()==null){
-
-                                }
-                                else {
-                                    parameterContent.append(",账号有效期:"+DateFormatUtils.format(record.getExpDate(),"yyyy-MM-dd"));
-                                }
-                                record.setParameterContent(parameterContent.toString());
-                            }
-                            else if (record.getOperation().equals(String.valueOf(ApproveOperaterEnum.DELETE.getCode()))){
-                                // 敏感数据先解密
-                                String idcard = SM2CryptUtils.decrypt(record.getIdcard(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String nickname = SM2CryptUtils.decrypt(record.getNickname(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String mailbox = SM2CryptUtils.decrypt(record.getMailbox(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String phonenumber = SM2CryptUtils.decrypt(record.getPhonenumber(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                // 脱密处理
-                                idcard = DesensitizedUtil.idCardNum(idcard,5,2);
-                                nickname = DesensitizedUtil.chineseName(nickname);
-                                mailbox = DesensitizedUtil.email(mailbox);
-                                phonenumber = DesensitizedUtil.mobilePhone(phonenumber);
-                                // 封装新增操作
-                                StringBuffer parameterContent = new StringBuffer("");
-                                parameterContent.append("账号:"+record.getUsername());
-                                parameterContent.append(",身份证号码:"+idcard);
-                                if ("0".equals(record.getUsertype())){
-                                    parameterContent.append(",用户类型:管理员");
-                                }
-                                else {
-                                    parameterContent.append(",用户类型:业务用户");
-                                }
-
-                                parameterContent.append(",姓名:"+nickname);
-                                parameterContent.append(",邮箱:"+mailbox);
-                                parameterContent.append(",手机号码:"+phonenumber);
-                                if (record.getExpDate()==null){
-
-                                }
-                                else {
-                                    parameterContent.append(",账号有效期:"+DateFormatUtils.format(record.getExpDate(),"yyyy-MM-dd"));
-                                }
-                                record.setParameterContent(parameterContent.toString());
-                            }
-//                            else if (record.getOperation().equals(String.valueOf(ApproveOperaterEnum.RELOCK.getCode()))){
-//                                // 敏感数据先解密
-//                                String idcard = SM2CryptUtils.decrypt(record.getIdcard(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-//                                String nickname = SM2CryptUtils.decrypt(record.getNickname(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-//                                String mailbox = SM2CryptUtils.decrypt(record.getMailbox(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-//                                String phonenumber = SM2CryptUtils.decrypt(record.getPhonenumber(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-//                                // 脱密处理
-//                                idcard = DesensitizedUtil.idCardNum(idcard,5,2);
-//                                nickname = DesensitizedUtil.chineseName(nickname);
-//                                mailbox = DesensitizedUtil.email(mailbox);
-//                                phonenumber = DesensitizedUtil.mobilePhone(phonenumber);
-//                                // 封装新增操作
-//                                StringBuffer parameterContent = new StringBuffer("");
-//                                parameterContent.append("账号:"+record.getUsername());
-//                                parameterContent.append(",身份证号码:"+idcard);
-//                                if ("0".equals(record.getUsertype())){
-//                                    parameterContent.append(",用户类型:管理员");
-//                                }
-//                                else {
-//                                    parameterContent.append(",用户类型:业务用户");
-//                                }
-//
-//                                parameterContent.append(",姓名:"+nickname);
-//                                parameterContent.append(",邮箱:"+mailbox);
-//                                parameterContent.append(",手机号码:"+phonenumber);
-//                                if (record.getExpDate()==null){
-//
-//                                }
-//                                else {
-//                                    parameterContent.append(",账号有效期:"+DateFormatUtils.format(record.getExpDate(),"yyyy-MM-dd"));
-//                                }
-//                                record.setParameterContent(parameterContent.toString());
-//                            }
-                        }
-                    }
-            );
-            return ResponseVO.success(result);
-        } catch (Exception e) {
-            throw new CustomException("获取所有审核异常", e);
-        }
-    }
-
-    /**
-     * 审批结果提交
-     */
-    @PostMapping(value = "/submitApprove")
-    public ResponseVO submitApprove(@RequestBody SysApprove sysApprove) throws CustomException {
-        try {
-            SysApprove oldSysApprove = sysApproveService.getById(sysApprove.getId());
-            if (sysApprove.getVersion().intValue() != oldSysApprove.getVersion().intValue()){
-                return ResponseVO.fail("此数据被操作过,自动刷新列表后请重试操作!");
-            }
-            sysApproveService.submitApprove(sysApprove);
-            return ResponseVO.success("审核提交成功");
-        } catch (Exception e) {
-            throw new CustomException("审核提交异常", e);
-        }
-    }
-}

+ 0 - 205
backend/src/main/java/com/jiayue/ssi/controller/SysLogininforController.java

@@ -1,205 +0,0 @@
-package com.jiayue.ssi.controller;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.NumberUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.SysLogininfor;
-import com.jiayue.ssi.service.SysLogininforService;
-import com.jiayue.ssi.util.DateUtils;
-import com.jiayue.ssi.util.ResponseVO;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 系统访问记录
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/sysLogininforController")
-@Slf4j
-public class SysLogininforController {
-    @Autowired
-    SysLogininforService sysLogininforService;
-
-    /**
-     * 获取列表分页信息
-     *
-     * @return 列表信息
-     */
-    @GetMapping(value = "/getAll")
-    public ResponseVO getAll(String currentPage, String pageSize, String ipaddr, String userName,
-                             String status, String startLoginTime, String endLoginTime, String sortOrder) throws CustomException {
-        try {
-            Integer cp;
-            if (StringUtils.isNotEmpty(currentPage)) {
-                if (NumberUtil.isInteger(currentPage)){
-                    cp = Integer.parseInt(currentPage);
-                }
-                else{
-                    return ResponseVO.fail("currentPage不是整数!");
-                }
-            }
-            else{
-                return ResponseVO.fail("currentPage不能是空!");
-            }
-
-            Integer ps;
-            if (StringUtils.isNotEmpty(pageSize)) {
-                if (NumberUtil.isInteger(pageSize)){
-                    ps = Integer.parseInt(pageSize);
-                }
-                else{
-                    return ResponseVO.fail("pageSize不是整数!");
-                }
-            }
-            else{
-                return ResponseVO.fail("pageSize不能是空!");
-            }
-
-            if (StringUtils.isNotEmpty(ipaddr)) {
-                if (ipaddr.length() > 128) {
-                    return ResponseVO.fail("登录地址长度不能超过128个字符!");
-                }
-            }
-            if (StringUtils.isNotEmpty(userName)) {
-                if (userName.length() > 50) {
-                    return ResponseVO.fail("用户账号长度不能超过50个字符!");
-                }
-            }
-            QueryWrapper<SysLogininfor> wrapper = new QueryWrapper<>();
-            if (StringUtils.isNotEmpty(ipaddr)) {
-                wrapper.eq("ipaddr", ipaddr);
-            }
-            if (StringUtils.isNotEmpty(userName)) {
-                wrapper.eq("user_name", userName);
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                wrapper.eq("status", status);
-            }
-            if (StringUtils.isNotEmpty(startLoginTime)) {
-                wrapper.ge("login_time", DateUtils.getDayStartTime(DateUtil.parseDate(startLoginTime)));
-            }
-            if (StringUtils.isNotEmpty(endLoginTime)) {
-                wrapper.le("login_time", DateUtils.getDayLastTime(DateUtil.parseDate(endLoginTime)));
-            }
-
-            if (StringUtils.isNotEmpty(sortOrder)) {
-                String[] orders = sortOrder.replaceAll("&","&").split("&");
-                String sortDbField = "";
-                if ("loginTime".equals(orders[0])) {
-                    sortDbField = "login_time";
-                } else if ("userName".equals(orders[0])) {
-                    sortDbField = "user_name";
-                }
-
-                if ("asc".equals(orders[1])) {
-                    wrapper.orderByAsc(sortDbField);
-                } else {
-                    wrapper.orderByDesc(sortDbField);
-                }
-            }
-
-            Page<SysLogininfor> result = sysLogininforService.page(new Page<>(cp, ps), wrapper);
-            return ResponseVO.success(result);
-        } catch (Exception e) {
-            throw new CustomException("获取登录日志列表异常", e);
-        }
-    }
-
-    /**
-     * 删除登录信息
-     */
-    @PostMapping(value = "/delLoginInfo")
-    public ResponseVO delLoginInfo(String infoId) throws CustomException {
-        try {
-            if (StringUtils.isEmpty(infoId)) {
-                return ResponseVO.fail("id不能为空!");
-            }
-
-            boolean bo = sysLogininforService.removeLoginInfoById(Long.parseLong(infoId));
-            if (bo) {
-                return ResponseVO.success("删除登录信息成功");
-            } else {
-                log.error("删除用户信息失败");
-                return ResponseVO.fail("删除登录信息失败");
-            }
-        } catch (Exception e) {
-            throw new CustomException("删除登录信息异常", e);
-        }
-    }
-
-    /**
-     * 清空登录信息
-     */
-    @PostMapping("/cleanLogininfor")
-    public ResponseVO cleanLogininfor() throws CustomException {
-        try {
-            boolean bo = sysLogininforService.cleanLogininfor();
-            if (bo) {
-                return ResponseVO.success("登录日志清空成功");
-            } else {
-                log.error("登录日志清空失败");
-                return ResponseVO.fail("登录日志清空失败");
-            }
-        } catch (Exception e) {
-            throw new CustomException("登录日志清空异常", e);
-        }
-    }
-
-    /**
-     * 登录日志统计分析
-     *
-     * @return 列表信息
-     */
-    @GetMapping(value = "/logininforTotal")
-    public ResponseVO logininforTotal(String startLoginTime, String endLoginTime) throws CustomException {
-        try {
-            QueryWrapper<SysLogininfor> wrapper = new QueryWrapper<>();
-            if (StringUtils.isNotEmpty(startLoginTime)) {
-                wrapper.ge("login_time", DateUtils.getDayStartTime(DateUtil.parseDate(startLoginTime)));
-            }
-            if (StringUtils.isNotEmpty(endLoginTime)) {
-                wrapper.le("login_time", DateUtils.getDayLastTime(DateUtil.parseDate(endLoginTime)));
-            }
-            List<SysLogininfor> sysLogininforList = sysLogininforService.list(wrapper);
-            Map<String, List<SysLogininfor>> map = sysLogininforList.stream().collect(Collectors.groupingBy(item -> DateUtil.format(item.getLoginTime(), "yyyy-MM-dd")));
-            List<Map<String, String>> resultList = new ArrayList<>();
-            map.forEach((key, value) -> {
-                List<SysLogininfor> list = value;
-                Map<String, String> recordMap = new HashMap<>();
-                recordMap.put("day", key);
-                recordMap.put("count", list.size() + "");
-                // 登录成功统计
-                List<SysLogininfor> successList = list.stream().filter(sysLogininfor -> "0".equals(sysLogininfor.getStatus())).collect(Collectors.toList());
-                recordMap.put("success", successList.size() + "");
-                // 登录失败统计
-                List<SysLogininfor> failList = list.stream().filter(sysLogininfor -> "1".equals(sysLogininfor.getStatus()) && "登录失败".equals(sysLogininfor.getMsg())).collect(Collectors.toList());
-                recordMap.put("fail", failList.size() + "");
-                // 连续登录失败统计
-                List<SysLogininfor> lxfailList = list.stream().filter(sysLogininfor -> "1".equals(sysLogininfor.getStatus()) && "连续登录失败".equals(sysLogininfor.getMsg())).collect(Collectors.toList());
-                recordMap.put("lxfail", lxfailList.size() + "");
-                // 登录ip个数统计
-                int ips = list.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(s -> s.getIpaddr()))), ArrayList::new)).size();
-                recordMap.put("ips", ips + "");
-                resultList.add(recordMap);
-            });
-            Collections.sort(resultList, new Comparator<Map<String, String>>() {
-                @Override
-                public int compare(Map<String, String> o1, Map<String, String> o2) {
-                    return o1.get("day").compareTo(o2.get("day"));
-                }
-            });
-            return ResponseVO.success(resultList);
-        } catch (Exception e) {
-            throw new CustomException("获取登录日志统计列表异常", e);
-        }
-    }
-}

+ 0 - 260
backend/src/main/java/com/jiayue/ssi/controller/SysOperlogController.java

@@ -1,260 +0,0 @@
-package com.jiayue.ssi.controller;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.NumberUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.constant.PermissionCharacter;
-import com.jiayue.ssi.entity.SysOperLog;
-import com.jiayue.ssi.entity.SysRole;
-import com.jiayue.ssi.service.SysOperLogService;
-import com.jiayue.ssi.service.SysRoleService;
-import com.jiayue.ssi.util.DateUtils;
-import com.jiayue.ssi.util.ResponseVO;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 操作日志记录
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/sysOperlogController")
-@Slf4j
-public class SysOperlogController {
-    @Autowired
-    SysOperLogService sysOperLogService;
-    @Autowired
-    SysRoleService sysRoleService;
-
-    /**
-     * 获取审计类型
-     */
-    @GetMapping(value = "/getAuditType")
-    public ResponseVO getAuditType() throws CustomException {
-        List<Map> list = new ArrayList<>();
-        try {
-            // 根据当前用户获取角色
-            SysRole sysRole = sysRoleService.selectRoleListByUserId();
-            if (PermissionCharacter.P_SJYW.equals(sysRole.getRoleKey())){
-                // 业务审计员
-                Map<String,String> map = new HashMap<>();
-                map.put("value","1");
-                map.put("label","业务");
-                list.add(map);
-            }
-            else {
-                Map<String,String> map1 = new HashMap<>();
-                map1.put("value","0");
-                map1.put("label","系统");
-                list.add(map1);
-                Map<String,String> map2 = new HashMap<>();
-                map2.put("value","1");
-                map2.put("label","业务");
-                list.add(map2);
-            }
-        } catch (Exception e) {
-            throw new CustomException("获取审计类型异常", e);
-        }
-        return ResponseVO.success(list);
-    }
-
-    /**
-     * 获取列表分页信息
-     *
-     * @return 列表信息
-     */
-    @GetMapping(value = "/getAll")
-    public ResponseVO getAll(String currentPage, String pageSize, String title, String operName, String auditType,
-                             String businessType, String status, String startOperTime, String endOperTime, String sortOrder) throws CustomException {
-        try {
-            Integer cp;
-            if (StringUtils.isNotEmpty(currentPage)) {
-                if (NumberUtil.isInteger(currentPage)){
-                    cp = Integer.parseInt(currentPage);
-                }
-                else{
-                    return ResponseVO.fail("currentPage不是整数!");
-                }
-            }
-            else{
-                return ResponseVO.fail("currentPage不能是空!");
-            }
-
-            Integer ps;
-            if (StringUtils.isNotEmpty(pageSize)) {
-                if (NumberUtil.isInteger(pageSize)){
-                    ps = Integer.parseInt(pageSize);
-                }
-                else{
-                    return ResponseVO.fail("pageSize不是整数!");
-                }
-            }
-            else{
-                return ResponseVO.fail("pageSize不能是空!");
-            }
-            if (StringUtils.isNotEmpty(title)) {
-                if (title.length() > 50) {
-                    return ResponseVO.fail("系统模块长度不能超过50个字符!");
-                }
-            }
-            if (StringUtils.isNotEmpty(operName)) {
-                if (operName.length() > 50) {
-                    return ResponseVO.fail("操作人员长度不能超过50个字符!");
-                }
-            }
-            QueryWrapper<SysOperLog> wrapper = new QueryWrapper<>();
-            if (StringUtils.isNotEmpty(title)) {
-                wrapper.like("title", title);
-            }
-            if (StringUtils.isNotEmpty(operName)) {
-                wrapper.like("oper_name", operName);
-            }
-            if (StringUtils.isNotEmpty(auditType)) {
-                wrapper.eq("audit_type", auditType);
-            }
-            if (StringUtils.isNotEmpty(businessType)) {
-                wrapper.eq("business_type", businessType);
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                wrapper.eq("status", status);
-            }
-            if (StringUtils.isNotEmpty(startOperTime)) {
-                wrapper.ge("oper_time", DateUtils.getDayStartTime(DateUtil.parseDate(startOperTime)));
-            }
-            if (StringUtils.isNotEmpty(endOperTime)) {
-                wrapper.le("oper_time", DateUtils.getDayLastTime(DateUtil.parseDate(endOperTime)));
-            }
-            if (StringUtils.isNotEmpty(sortOrder)) {
-                String[] orders = sortOrder.replaceAll("&","&").split("&");
-                String sortDbField = "";
-                if ("operTime".equals(orders[0])) {
-                    sortDbField = "oper_time";
-                } else if ("title".equals(orders[0])) {
-                    sortDbField = "title";
-                } else if ("operName".equals(orders[0])) {
-                    sortDbField = "oper_name";
-                }
-
-                if ("asc".equals(orders[1])) {
-                    wrapper.orderByAsc(sortDbField);
-                } else {
-                    wrapper.orderByDesc(sortDbField);
-                }
-            }
-            SysRole sysRole = sysRoleService.selectRoleListByUserId();
-            if (PermissionCharacter.P_SJYW.equals(sysRole.getRoleKey())){
-                // 业务审计员
-                wrapper.eq("audit_type", "1");
-            }
-
-            Page<SysOperLog> result = sysOperLogService.page(new Page<>(cp, ps), wrapper);
-            return ResponseVO.success(result);
-        } catch (Exception e) {
-            throw new CustomException("获取操作日志列表异常", e);
-        }
-    }
-
-    /**
-     * 删除登录信息
-     */
-    @PostMapping(value = "/delOperlog")
-    public ResponseVO delOperlog(String operId) throws CustomException {
-        try {
-            if (StringUtils.isEmpty(operId)) {
-                return ResponseVO.fail("id不能为空!");
-            }
-            boolean bo = sysOperLogService.removeOperlogById(Long.parseLong(operId));
-            if (bo) {
-                return ResponseVO.success("操作日志删除成功");
-            } else {
-                log.error("操作日志删除失败");
-                return ResponseVO.fail("操作日志删除失败");
-            }
-        } catch (Exception e) {
-            throw new CustomException("操作日志删除异常", e);
-        }
-    }
-
-    /**
-     * 操作日志清空
-     */
-    @PostMapping("/cleanOperLog")
-    public ResponseVO cleanOperLog() throws CustomException {
-        try {
-            boolean bo = sysOperLogService.cleanOperLog();
-            if (bo) {
-                return ResponseVO.success("操作日志清空成功");
-            } else {
-                log.error("操作日志清空失败");
-                return ResponseVO.fail("操作日志清空失败");
-            }
-        } catch (Exception e) {
-            throw new CustomException("操作日志清空异常", e);
-        }
-    }
-
-    /**
-     * 操作日志统计分析
-     *
-     * @return 列表信息
-     */
-    @GetMapping(value = "/sysOperlogTotal")
-    public ResponseVO sysOperlogTotal(String startLoginTime, String endLoginTime) throws CustomException {
-        try {
-            QueryWrapper<SysOperLog> wrapper = new QueryWrapper<>();
-            if (StringUtils.isNotEmpty(startLoginTime)) {
-                wrapper.ge("oper_time", DateUtils.getDayStartTime(DateUtil.parseDate(startLoginTime)));
-            }
-            if (StringUtils.isNotEmpty(endLoginTime)) {
-                wrapper.le("oper_time", DateUtils.getDayLastTime(DateUtil.parseDate(endLoginTime)));
-            }
-            List<SysOperLog> sysOperLogList = sysOperLogService.list(wrapper);
-            Map<String, List<SysOperLog>> map = sysOperLogList.stream().collect(Collectors.groupingBy(item -> DateUtil.format(item.getOperTime(), "yyyy-MM-dd")));
-            List<Map<String, String>> resultList = new ArrayList<>();
-            map.forEach((key, value) -> {
-                List<SysOperLog> list = value;
-                Map<String, String> recordMap = new HashMap<>();
-                recordMap.put("day", key);
-                // 系统类型统计
-                List<SysOperLog> sysTypeList = list.stream().filter(sysOperLog -> sysOperLog.getAuditType() == 0).collect(Collectors.toList());
-                recordMap.put("syscount", sysTypeList.size() + "");
-                // 业务类型统计
-                List<SysOperLog> bizTypeList = list.stream().filter(sysOperLog -> sysOperLog.getAuditType() == 1).collect(Collectors.toList());
-                recordMap.put("bizcount", bizTypeList.size() + "");
-                // 操作成功统计
-                List<SysOperLog> successList = list.stream().filter(sysOperLog -> sysOperLog.getStatus() == 0).collect(Collectors.toList());
-                recordMap.put("success", successList.size() + "");
-                // 操作失败统计
-                List<SysOperLog> failList = list.stream().filter(sysOperLog -> sysOperLog.getStatus() == 1).collect(Collectors.toList());
-                recordMap.put("fail", failList.size() + "");
-                // 操作ip个数统计
-                int ips = list.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(s -> s.getOperIp()))), ArrayList::new)).size();
-                recordMap.put("ips", ips + "");
-                // 越权访问统计
-                List<SysOperLog> yqfwList = list.stream().filter(sysOperLog -> sysOperLog.getBusinessType() == 2).collect(Collectors.toList());
-                recordMap.put("yqfw", yqfwList.size() + "");
-                // IP地址异常统计
-                List<SysOperLog> ipycList = list.stream().filter(sysOperLog -> sysOperLog.getBusinessType() == 17).collect(Collectors.toList());
-                recordMap.put("ipyc", ipycList.size() + "");
-                resultList.add(recordMap);
-            });
-            Collections.sort(resultList, new Comparator<Map<String, String>>() {
-                @Override
-                public int compare(Map<String, String> o1, Map<String, String> o2) {
-                    return o1.get("day").compareTo(o2.get("day"));
-                }
-            });
-            return ResponseVO.success(resultList);
-        } catch (Exception e) {
-            throw new CustomException("获取操作日志统计列表异常", e);
-        }
-    }
-}

+ 0 - 19
backend/src/main/java/com/jiayue/ssi/dto/ActiveUserDto.java

@@ -1,19 +0,0 @@
-package com.jiayue.ssi.dto;
-
-import com.jiayue.ssi.entity.SysUser;
-import lombok.Data;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
-* 应用Map<String, HttpServletRequest> ACTIVE_USER的DTO
-*
-* @author xsl
-* @since 2023/08/17
-*/
-@Data
-public class ActiveUserDto {
-    private HttpServletRequest httpServletRequest;
-    private SysUser sysUser;
-    private Long loginTime;
-}

+ 0 - 25
backend/src/main/java/com/jiayue/ssi/dto/UserVisitInfoDto.java

@@ -1,25 +0,0 @@
-package com.jiayue.ssi.dto;
-
-import lombok.Data;
-
-/**
-* 用户访问信息
-*
-* @author xsl
-* @since 2023/06/28
-*/
-@Data
-public class UserVisitInfoDto {
-    /** 账号 */
-    private String username;
-    /** 登录ip */
-    private String ip;
-    /** 访问时间 */
-    private Long vtime;
-    /** 登录地点 */
-    private String loginLocation;
-    /** 客户端浏览器 */
-    private String browser;
-    /** 客户端操作系统 */
-    private String os;
-}

+ 0 - 62
backend/src/main/java/com/jiayue/ssi/entity/ElectricField.java

@@ -1,62 +0,0 @@
-package com.jiayue.ssi.entity;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.Digits;
-import java.math.BigDecimal;
-
-/**
- * 场站表
- *
- * @author xsl
- * @version 3.0
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName(value = "t_electric_field")
-public class ElectricField extends BaseEntity {
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-    /**
-     * 场站编码
-     */
-    private String stationCode;
-    /**
-     * 场站名称
-     */
-    private String name;
-    /**
-     * 场站标识
-     */
-    private String sign;
-    /**
-     * 场站装机容量(MW)
-     */
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal capacity;
-    /**
-     * 并网设备数
-     */
-    private Integer gridce;
-    /**
-     * 场站类型(0光伏 1风电)
-     */
-    private String fieldType;
-    /**
-     * 场站所属公司
-     */
-    private String company;
-    /**
-     * 场站位置
-     */
-    private String location;
-    //乐观锁
-    @Version
-    private Integer version;
-}

+ 0 - 243
backend/src/main/java/com/jiayue/ssi/entity/Server.java

@@ -1,243 +0,0 @@
-package com.jiayue.ssi.entity;
-
-import com.jiayue.ssi.entity.server.*;
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
-import com.jiayue.ssi.util.Arith;
-import com.jiayue.ssi.util.IPUtils;
-import oshi.SystemInfo;
-import oshi.hardware.CentralProcessor;
-import oshi.hardware.CentralProcessor.TickType;
-import oshi.hardware.GlobalMemory;
-import oshi.hardware.HardwareAbstractionLayer;
-import oshi.software.os.FileSystem;
-import oshi.software.os.OSFileStore;
-import oshi.software.os.OperatingSystem;
-import oshi.util.Util;
-
-
-/**
- * 服务器相关信息
- *
- * @author ruoyi
- */
-public class Server
-{
-    private static final int OSHI_WAIT_SECOND = 1000;
-
-    /**
-     * CPU相关信息
-     */
-    private Cpu cpu = new Cpu();
-
-    /**
-     * 內存相关信息
-     */
-    private Mem mem = new Mem();
-
-    /**
-     * JVM相关信息
-     */
-    private Jvm jvm = new Jvm();
-
-    /**
-     * 服务器相关信息
-     */
-    private Sys sys = new Sys();
-
-    /**
-     * 磁盘相关信息
-     */
-    private List<SysFile> sysFiles = new LinkedList<SysFile>();
-
-    public Cpu getCpu()
-    {
-        return cpu;
-    }
-
-    public void setCpu(Cpu cpu)
-    {
-        this.cpu = cpu;
-    }
-
-    public Mem getMem()
-    {
-        return mem;
-    }
-
-    public void setMem(Mem mem)
-    {
-        this.mem = mem;
-    }
-
-    public Jvm getJvm()
-    {
-        return jvm;
-    }
-
-    public void setJvm(Jvm jvm)
-    {
-        this.jvm = jvm;
-    }
-
-    public Sys getSys()
-    {
-        return sys;
-    }
-
-    public void setSys(Sys sys)
-    {
-        this.sys = sys;
-    }
-
-    public List<SysFile> getSysFiles()
-    {
-        return sysFiles;
-    }
-
-    public void setSysFiles(List<SysFile> sysFiles)
-    {
-        this.sysFiles = sysFiles;
-    }
-
-    public void copyTo() throws Exception
-    {
-        SystemInfo si = new SystemInfo();
-        HardwareAbstractionLayer hal = si.getHardware();
-
-        setCpuInfo(hal.getProcessor());
-
-        setMemInfo(hal.getMemory());
-
-        setSysInfo();
-
-        setJvmInfo();
-
-        setSysFiles(si.getOperatingSystem());
-    }
-
-    /**
-     * 设置CPU信息
-     */
-    private void setCpuInfo(CentralProcessor processor)
-    {
-        // CPU信息
-        long[] prevTicks = processor.getSystemCpuLoadTicks();
-        Util.sleep(OSHI_WAIT_SECOND);
-        long[] ticks = processor.getSystemCpuLoadTicks();
-        long nice = ticks[TickType.NICE.getIndex()] - prevTicks[TickType.NICE.getIndex()];
-        long irq = ticks[TickType.IRQ.getIndex()] - prevTicks[TickType.IRQ.getIndex()];
-        long softirq = ticks[TickType.SOFTIRQ.getIndex()] - prevTicks[TickType.SOFTIRQ.getIndex()];
-        long steal = ticks[TickType.STEAL.getIndex()] - prevTicks[TickType.STEAL.getIndex()];
-        long cSys = ticks[TickType.SYSTEM.getIndex()] - prevTicks[TickType.SYSTEM.getIndex()];
-        long user = ticks[TickType.USER.getIndex()] - prevTicks[TickType.USER.getIndex()];
-        long iowait = ticks[TickType.IOWAIT.getIndex()] - prevTicks[TickType.IOWAIT.getIndex()];
-        long idle = ticks[TickType.IDLE.getIndex()] - prevTicks[TickType.IDLE.getIndex()];
-        long totalCpu = user + nice + cSys + idle + iowait + irq + softirq + steal;
-        cpu.setCpuNum(processor.getLogicalProcessorCount());
-        cpu.setTotal(totalCpu);
-        cpu.setSys(cSys);
-        cpu.setUsed(user);
-        cpu.setWait(iowait);
-        cpu.setFree(idle);
-    }
-
-    /**
-     * 设置内存信息
-     */
-    private void setMemInfo(GlobalMemory memory)
-    {
-        mem.setTotal(memory.getTotal());
-        mem.setUsed(memory.getTotal() - memory.getAvailable());
-        mem.setFree(memory.getAvailable());
-    }
-
-    /**
-     * 设置服务器信息
-     */
-    private void setSysInfo()
-    {
-        Properties props = System.getProperties();
-        sys.setComputerName(IPUtils.getHostName());
-        sys.setComputerIp(IPUtils.getHostIp());
-        sys.setOsName(props.getProperty("os.name"));
-        sys.setOsArch(props.getProperty("os.arch"));
-        sys.setUserDir(props.getProperty("user.dir"));
-    }
-
-    /**
-     * 设置Java虚拟机
-     */
-    private void setJvmInfo() throws UnknownHostException
-    {
-        Properties props = System.getProperties();
-        jvm.setTotal(Runtime.getRuntime().totalMemory());
-        jvm.setMax(Runtime.getRuntime().maxMemory());
-        jvm.setFree(Runtime.getRuntime().freeMemory());
-        jvm.setVersion(props.getProperty("java.version"));
-        jvm.setHome(props.getProperty("java.home"));
-    }
-
-    /**
-     * 设置磁盘信息
-     */
-    private void setSysFiles(OperatingSystem os)
-    {
-        FileSystem fileSystem = os.getFileSystem();
-        List<OSFileStore> fsArray = fileSystem.getFileStores();
-        for (OSFileStore fs : fsArray)
-        {
-            long free = fs.getUsableSpace();
-            long total = fs.getTotalSpace();
-            long used = total - free;
-            SysFile sysFile = new SysFile();
-            sysFile.setDirName(fs.getMount());
-            sysFile.setSysTypeName(fs.getType());
-            sysFile.setTypeName(fs.getName());
-            sysFile.setTotal(convertFileSize(total));
-            sysFile.setFree(convertFileSize(free));
-            sysFile.setUsed(convertFileSize(used));
-            sysFile.setUsage(Arith.mul(Arith.div(used, total, 4), 100));
-            sysFiles.add(sysFile);
-        }
-    }
-
-    /**
-     * 字节转换
-     *
-     * @param size 字节大小
-     * @return 转换后值
-     */
-    public String convertFileSize(long size)
-    {
-        long kb = 1024;
-        long mb = kb * 1024;
-        long gb = mb * 1024;
-        if (size >= gb)
-        {
-            return String.format("%.1f GB", (float) size / gb);
-        }
-        else if (size >= mb)
-        {
-            float f = (float) size / mb;
-            return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f);
-        }
-        else if (size >= kb)
-        {
-            float f = (float) size / kb;
-            return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f);
-        }
-        else
-        {
-            return String.format("%d B", size);
-        }
-    }
-}

+ 0 - 94
backend/src/main/java/com/jiayue/ssi/entity/SysApprove.java

@@ -1,94 +0,0 @@
-package com.jiayue.ssi.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 审批表
- *
- * @author xsl
- * @version 3.0
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName(value = "sys_approve")
-public class SysApprove extends BaseEntity{
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 模块名称
-     */
-    private String moduleName;
-    /**
-     * 操作
-     */
-    private String operation;
-    /**
-     * 审批状态(0待审批 1已审批)
-     */
-    private String approveStatus;
-    /**
-     * 审批结果(0通过 1未通过)
-     */
-    private String approveResult;
-    /**
-     * 实体名称
-     */
-    private String entityName;
-    /**
-     * 实体内容
-     */
-    private String parameterContent;
-    /**
-     * 用户表主键ID号
-     */
-    private String masterId;
-    /**
-     * 用户账号
-     */
-    private String username;
-    /**
-     * 身份证号
-     */
-    private String idcard;
-    /**
-     * 用户姓名
-     */
-    private String nickname;
-    /**
-     * 账号状态(0正常、1锁定(休眠)、2注销)
-     */
-    private String status;
-    /**
-     * 邮箱
-     */
-    private String mailbox;
-    /**
-     * 手机号码
-     */
-    private String phonenumber;
-    /**
-     * 用户类型(0管理员、1业务用户)
-     */
-    private String usertype;
-    /**
-     * 分配角色ID
-     */
-    private String roleId;
-    /**
-     * 账号有效期
-     */
-    @TableField(value = "exp_date",fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
-    private Date expDate;
-
-    //乐观锁
-    @Version
-    private Integer version;
-}

+ 0 - 136
backend/src/main/java/com/jiayue/ssi/entity/SysLogininfor.java

@@ -1,136 +0,0 @@
-package com.jiayue.ssi.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-/**
- * 系统访问记录表 sys_logininfor
- *
- * @author ruoyi
- */
-public class SysLogininfor extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    @TableId(type = IdType.AUTO)
-    private Long infoId;
-
-    /** 用户账号 */
-    private String userName;
-
-    /** 登录状态 0成功 1失败 */
-    private String status;
-
-    /** 登录IP地址 */
-    private String ipaddr;
-
-    /** 登录地点 */
-    private String loginLocation;
-
-    /** 浏览器类型 */
-    private String browser;
-
-    /** 操作系统 */
-    private String os;
-
-    /** 提示消息 */
-    private String msg;
-
-    /** 访问时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date loginTime;
-
-    public Long getInfoId()
-    {
-        return infoId;
-    }
-
-    public void setInfoId(Long infoId)
-    {
-        this.infoId = infoId;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getLoginLocation()
-    {
-        return loginLocation;
-    }
-
-    public void setLoginLocation(String loginLocation)
-    {
-        this.loginLocation = loginLocation;
-    }
-
-    public String getBrowser()
-    {
-        return browser;
-    }
-
-    public void setBrowser(String browser)
-    {
-        this.browser = browser;
-    }
-
-    public String getOs()
-    {
-        return os;
-    }
-
-    public void setOs(String os)
-    {
-        this.os = os;
-    }
-
-    public String getMsg()
-    {
-        return msg;
-    }
-
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
-
-    public Date getLoginTime()
-    {
-        return loginTime;
-    }
-
-    public void setLoginTime(Date loginTime)
-    {
-        this.loginTime = loginTime;
-    }
-}

+ 0 - 276
backend/src/main/java/com/jiayue/ssi/entity/SysOperLog.java

@@ -1,276 +0,0 @@
-package com.jiayue.ssi.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-/**
- * 操作日志记录表 oper_lo
- *
- * @author ruoyi
- */
-public class SysOperLog extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /** 日志主键 */
-    @TableId(type = IdType.AUTO)
-    private Long operId;
-
-    /** 操作模块 */
-    private String title;
-
-    /** 业务类型(0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据) */
-    private Integer businessType;
-
-    /** 审计类型(0=系统,1=业务) */
-    private Integer auditType;
-
-    /** 业务类型数组 */
-    @TableField(exist = false)
-    private Integer[] businessTypes;
-
-    public String getOperdesc() {
-        return operdesc;
-    }
-
-    public void setOperdesc(String operdesc) {
-        this.operdesc = operdesc;
-    }
-
-    /** 操作描述 */
-    private String operdesc;
-
-    /** 请求方法 */
-    private String method;
-
-    /** 请求方式 */
-    private String requestMethod;
-
-    /** 操作类别(0其它 1后台用户 2手机端用户) */
-    private Integer operatorType;
-
-    /** 操作人员 */
-    private String operName;
-
-    /** 部门名称 */
-    private String deptName;
-
-    /** 请求url */
-    private String operUrl;
-
-    /** 操作地址 */
-    private String operIp;
-
-    /** 操作地点 */
-    private String operLocation;
-
-    /** 请求参数 */
-    private String operParam;
-
-    /** 返回参数 */
-//    private String jsonResult;
-
-    /** 操作状态(0正常 1异常) */
-    private Integer status;
-
-    /** 错误消息 */
-    private String errorMsg;
-
-    /** 操作时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date operTime;
-
-    /** 消耗时间 毫秒*/
-    private Long costTime;
-
-    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 Integer[] getBusinessTypes()
-    {
-        return businessTypes;
-    }
-
-    public void setBusinessTypes(Integer[] businessTypes)
-    {
-        this.businessTypes = businessTypes;
-    }
-
-    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 String getJsonResult()
-//    {
-//        return jsonResult;
-//    }
-//
-//    public void setJsonResult(String jsonResult)
-//    {
-//        this.jsonResult = jsonResult;
-//    }
-
-    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;
-    }
-
-    public Long getCostTime()
-    {
-        return costTime;
-    }
-
-    public void setCostTime(Long costTime)
-    {
-        this.costTime = costTime;
-    }
-
-    public Integer getAuditType() {
-        return auditType;
-    }
-
-    public void setAuditType(Integer auditType) {
-        this.auditType = auditType;
-    }
-}

Some files were not shown because too many files changed in this diff