Explorar o código

增加产品信息

zhangqiankun %!s(int64=3) %!d(string=hai) anos
pai
achega
f44da39e05
Modificáronse 100 ficheiros con 640 adicións e 291 borrados
  1. 1 1
      saas-account/src/main/java/com/persagy/AccountServerApplication.java
  2. 1 1
      saas-account/src/main/java/com/persagy/person/aop/GlobalExceptionHandler.java
  3. 1 1
      saas-account/src/main/java/com/persagy/person/config/ApplicationProperties.java
  4. 2 2
      saas-account/src/main/java/com/persagy/person/config/RabbitMQConfig.java
  5. 1 1
      saas-account/src/main/java/com/persagy/person/config/SpringMVCConfig.java
  6. 8 8
      saas-account/src/main/java/com/persagy/person/controller/SaasAccountController.java
  7. 14 14
      saas-account/src/main/java/com/persagy/person/controller/SaasAccountProjectController.java
  8. 6 6
      saas-account/src/main/java/com/persagy/person/controller/SaasAccountRoleController.java
  9. 13 13
      saas-account/src/main/java/com/persagy/person/controller/SaasAreaController.java
  10. 52 0
      saas-account/src/main/java/com/persagy/account/controller/SaasCommonController.java
  11. 11 11
      saas-account/src/main/java/com/persagy/person/controller/SaasFunctionController.java
  12. 8 8
      saas-account/src/main/java/com/persagy/person/controller/SaasGroupController.java
  13. 11 11
      saas-account/src/main/java/com/persagy/person/controller/SaasLoginController.java
  14. 8 8
      saas-account/src/main/java/com/persagy/person/controller/SaasMenuController.java
  15. 84 0
      saas-account/src/main/java/com/persagy/account/controller/SaasProductController.java
  16. 21 21
      saas-account/src/main/java/com/persagy/person/controller/SaasProjectController.java
  17. 9 9
      saas-account/src/main/java/com/persagy/person/controller/SaasRoleController.java
  18. 7 7
      saas-account/src/main/java/com/persagy/person/controller/SaasRoleMenuController.java
  19. 11 12
      saas-account/src/main/java/com/persagy/person/controller/UpgradeController.java
  20. 7 7
      saas-account/src/main/java/com/persagy/person/manage/SaasAccountHandler.java
  21. 10 10
      saas-account/src/main/java/com/persagy/person/manage/SaasAreaProjectHandler.java
  22. 6 6
      saas-account/src/main/java/com/persagy/person/manage/SaasAuthHandler.java
  23. 13 13
      saas-account/src/main/java/com/persagy/person/manage/SaasGroupProjectHandler.java
  24. 6 6
      saas-account/src/main/java/com/persagy/person/manage/SaasProjectExcelDataHandler.java
  25. 5 5
      saas-account/src/main/java/com/persagy/person/manage/SaasProjectSheetWriteHandler.java
  26. 14 14
      saas-account/src/main/java/com/persagy/person/manage/SaasRoleMenuHandler.java
  27. 2 2
      saas-account/src/main/java/com/persagy/person/mapper/SaasAccountMapper.java
  28. 3 3
      saas-account/src/main/java/com/persagy/person/mapper/SaasAccountProjectMapper.java
  29. 3 3
      saas-account/src/main/java/com/persagy/person/mapper/SaasAccountRoleMapper.java
  30. 2 2
      saas-account/src/main/java/com/persagy/person/mapper/SaasAreaMapper.java
  31. 2 2
      saas-account/src/main/java/com/persagy/person/mapper/SaasFunctionMapper.java
  32. 2 2
      saas-account/src/main/java/com/persagy/person/mapper/SaasGroupMapper.java
  33. 2 2
      saas-account/src/main/java/com/persagy/person/mapper/SaasMenuMapper.java
  34. 19 0
      saas-account/src/main/java/com/persagy/account/mapper/SaasProductMapper.java
  35. 2 2
      saas-account/src/main/java/com/persagy/person/mapper/SaasProjectMapper.java
  36. 2 2
      saas-account/src/main/java/com/persagy/person/mapper/SaasRoleMapper.java
  37. 3 3
      saas-account/src/main/java/com/persagy/person/mapper/SaasRoleMenuMapper.java
  38. 1 1
      saas-account/src/main/java/com/persagy/person/mq/CommonConfirmCallback.java
  39. 4 4
      saas-account/src/main/java/com/persagy/person/mq/CommonTopicProducer.java
  40. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/dto/SaasAccount.java
  41. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/dto/SaasAccountProject.java
  42. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/dto/SaasAccountRole.java
  43. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/dto/SaasArea.java
  44. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/dto/SaasFunction.java
  45. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/dto/SaasGroup.java
  46. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/dto/SaasMenu.java
  47. 195 0
      saas-account/src/main/java/com/persagy/account/pojo/dto/SaasProduct.java
  48. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/dto/SaasProject.java
  49. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/dto/SaasRole.java
  50. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/dto/SaasRoleMenu.java
  51. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/BaseGroupVO.java
  52. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/BaseUserVO.java
  53. 2 2
      saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountCreateVO.java
  54. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountGroupVO.java
  55. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountLoginVO.java
  56. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountPageVO.java
  57. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountQueryByNameVO.java
  58. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountQueryVO.java
  59. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/area/SaasAreaCreateVO.java
  60. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/area/SaasAreaDeleteVO.java
  61. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/area/SaasAreaQueryVO.java
  62. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/AccountAreaProjectResetVO.java
  63. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/AccountAreaResetVO.java
  64. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/AccountProjectResetVO.java
  65. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountProjectBatchVO.java
  66. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountProjectCreateVO.java
  67. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountProjectPageVO.java
  68. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountProjectQueryVO.java
  69. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountRoleBatchVO.java
  70. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountRoleCreateVO.java
  71. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountRoleQueryVO.java
  72. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountRoleVO.java
  73. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasMenuFunctionVO.java
  74. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasRoleMenuBatchVO.java
  75. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasRoleMenuCreateVO.java
  76. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasRoleMenuQueryVO.java
  77. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/function/SaasFunctionCreateVO.java
  78. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/function/SaasFunctionDeleteVO.java
  79. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/function/SaasFunctionQueryVO.java
  80. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/group/SaasGroupCreateVO.java
  81. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/group/SaasGroupQueryVO.java
  82. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/menu/SaasMenuCreateVO.java
  83. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/menu/SaasMenuDeleteVO.java
  84. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/menu/SaasMenuQueryVO.java
  85. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/project/SaasProjectAreaUpdateVO.java
  86. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/project/SaasProjectCreateVO.java
  87. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/project/SaasProjectExcel.java
  88. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/project/SaasProjectPageVO.java
  89. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/project/SaasProjectQueryVO.java
  90. 2 2
      saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRoleCreateVO.java
  91. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRoleDeleteVO.java
  92. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRolePageVO.java
  93. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRoleQueryByNameVO.java
  94. 1 1
      saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRoleQueryVO.java
  95. 3 3
      saas-account/src/main/java/com/persagy/person/service/ISaasAccountProjectService.java
  96. 3 3
      saas-account/src/main/java/com/persagy/person/service/ISaasAccountRoleService.java
  97. 2 2
      saas-account/src/main/java/com/persagy/person/service/ISaasAccountService.java
  98. 2 2
      saas-account/src/main/java/com/persagy/person/service/ISaasAreaService.java
  99. 2 2
      saas-account/src/main/java/com/persagy/person/service/ISaasFunctionService.java
  100. 0 0
      saas-account/src/main/java/com/persagy/person/service/ISaasGroupService.java

+ 1 - 1
saas-account/src/main/java/com/persagy/AccountServerApplication.java

@@ -17,7 +17,7 @@ import com.persagy.log.annotation.EnableControllerLog;
 @EnableIdGenerator
 @EnableControllerLog
 @SpringBootApplication
-@EnableFeignClients(basePackages = "com.persagy.person.client")
+@EnableFeignClients(basePackages = "com.persagy.account.client")
 public class AccountServerApplication {
 	
 	public static void main(String[] args) {

+ 1 - 1
saas-account/src/main/java/com/persagy/person/aop/GlobalExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.persagy.person.aop;
+package com.persagy.account.aop;
 
 import java.sql.SQLIntegrityConstraintViolationException;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/config/ApplicationProperties.java

@@ -1,4 +1,4 @@
-package com.persagy.person.config;
+package com.persagy.account.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

+ 2 - 2
saas-account/src/main/java/com/persagy/person/config/RabbitMQConfig.java

@@ -1,4 +1,4 @@
-package com.persagy.person.config;
+package com.persagy.account.config;
 
 import org.springframework.amqp.core.TopicExchange;
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
-import com.persagy.person.mq.CommonConfirmCallback;
+import com.persagy.account.mq.CommonConfirmCallback;
 
 /**
  * 采用jackson序列号消息内容

+ 1 - 1
saas-account/src/main/java/com/persagy/person/config/SpringMVCConfig.java

@@ -1,4 +1,4 @@
-package com.persagy.person.config;
+package com.persagy.account.config;
 
 import java.io.IOException;
 import java.nio.charset.Charset;

+ 8 - 8
saas-account/src/main/java/com/persagy/person/controller/SaasAccountController.java

@@ -1,8 +1,8 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.util.List;
 
-import com.persagy.person.pojo.vo.account.*;
+import com.persagy.account.pojo.vo.account.*;
 import com.persagy.security.util.BouncycastleCipher;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,12 +23,12 @@ import com.persagy.common.model.BaseGroupModel;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.config.ApplicationProperties;
-import com.persagy.person.manage.SaasAccountHandler;
-import com.persagy.person.pojo.dto.SaasAccount;
-import com.persagy.person.pojo.dto.SaasRole;
-import com.persagy.person.service.ISaasAccountService;
-import com.persagy.person.service.ISaasRoleService;
+import com.persagy.account.config.ApplicationProperties;
+import com.persagy.account.manage.SaasAccountHandler;
+import com.persagy.account.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.dto.SaasRole;
+import com.persagy.account.service.ISaasAccountService;
+import com.persagy.account.service.ISaasRoleService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.BooleanUtil;

+ 14 - 14
saas-account/src/main/java/com/persagy/person/controller/SaasAccountProjectController.java

@@ -1,4 +1,4 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.util.List;
 import java.util.Map;
@@ -19,19 +19,19 @@ import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.manage.SaasAuthHandler;
-import com.persagy.person.pojo.dto.SaasAccount;
-import com.persagy.person.pojo.dto.SaasAccountProject;
-import com.persagy.person.pojo.dto.SaasGroup;
-import com.persagy.person.pojo.dto.SaasProject;
-import com.persagy.person.pojo.vo.auth.SaasAccountProjectBatchVO;
-import com.persagy.person.pojo.vo.auth.SaasAccountProjectCreateVO;
-import com.persagy.person.pojo.vo.auth.SaasAccountProjectPageVO;
-import com.persagy.person.pojo.vo.auth.SaasAccountProjectQueryVO;
-import com.persagy.person.service.ISaasAccountProjectService;
-import com.persagy.person.service.ISaasAccountService;
-import com.persagy.person.service.ISaasGroupService;
-import com.persagy.person.service.ISaasProjectService;
+import com.persagy.account.manage.SaasAuthHandler;
+import com.persagy.account.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.dto.SaasAccountProject;
+import com.persagy.account.pojo.dto.SaasGroup;
+import com.persagy.account.pojo.dto.SaasProject;
+import com.persagy.account.pojo.vo.auth.SaasAccountProjectBatchVO;
+import com.persagy.account.pojo.vo.auth.SaasAccountProjectCreateVO;
+import com.persagy.account.pojo.vo.auth.SaasAccountProjectPageVO;
+import com.persagy.account.pojo.vo.auth.SaasAccountProjectQueryVO;
+import com.persagy.account.service.ISaasAccountProjectService;
+import com.persagy.account.service.ISaasAccountService;
+import com.persagy.account.service.ISaasGroupService;
+import com.persagy.account.service.ISaasProjectService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

+ 6 - 6
saas-account/src/main/java/com/persagy/person/controller/SaasAccountRoleController.java

@@ -1,4 +1,4 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.util.List;
 
@@ -16,11 +16,11 @@ import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.pojo.dto.SaasAccountRole;
-import com.persagy.person.pojo.vo.auth.SaasAccountRoleBatchVO;
-import com.persagy.person.pojo.vo.auth.SaasAccountRoleCreateVO;
-import com.persagy.person.pojo.vo.auth.SaasAccountRoleQueryVO;
-import com.persagy.person.service.ISaasAccountRoleService;
+import com.persagy.account.pojo.dto.SaasAccountRole;
+import com.persagy.account.pojo.vo.auth.SaasAccountRoleBatchVO;
+import com.persagy.account.pojo.vo.auth.SaasAccountRoleCreateVO;
+import com.persagy.account.pojo.vo.auth.SaasAccountRoleQueryVO;
+import com.persagy.account.service.ISaasAccountRoleService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

+ 13 - 13
saas-account/src/main/java/com/persagy/person/controller/SaasAreaController.java

@@ -1,4 +1,4 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.util.List;
 import java.util.Map;
@@ -18,18 +18,18 @@ import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.manage.SaasAreaProjectHandler;
-import com.persagy.person.manage.SaasAuthHandler;
-import com.persagy.person.pojo.dto.SaasAccount;
-import com.persagy.person.pojo.dto.SaasArea;
-import com.persagy.person.pojo.dto.SaasProject;
-import com.persagy.person.pojo.vo.BaseGroupVO;
-import com.persagy.person.pojo.vo.area.SaasAreaCreateVO;
-import com.persagy.person.pojo.vo.area.SaasAreaDeleteVO;
-import com.persagy.person.pojo.vo.area.SaasAreaQueryVO;
-import com.persagy.person.service.ISaasAccountService;
-import com.persagy.person.service.ISaasAreaService;
-import com.persagy.person.service.ISaasProjectService;
+import com.persagy.account.manage.SaasAreaProjectHandler;
+import com.persagy.account.manage.SaasAuthHandler;
+import com.persagy.account.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.dto.SaasArea;
+import com.persagy.account.pojo.dto.SaasProject;
+import com.persagy.account.pojo.vo.BaseGroupVO;
+import com.persagy.account.pojo.vo.area.SaasAreaCreateVO;
+import com.persagy.account.pojo.vo.area.SaasAreaDeleteVO;
+import com.persagy.account.pojo.vo.area.SaasAreaQueryVO;
+import com.persagy.account.service.ISaasAccountService;
+import com.persagy.account.service.ISaasAreaService;
+import com.persagy.account.service.ISaasProjectService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

+ 52 - 0
saas-account/src/main/java/com/persagy/account/controller/SaasCommonController.java

@@ -0,0 +1,52 @@
+package com.persagy.account.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.persagy.common.utils.ResponseResult;
+import com.persagy.common.utils.ResponseResultUtil;
+import com.persagy.account.pojo.vo.BaseGroupVO;
+
+import cn.hutool.core.util.BooleanUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 通用controller
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-04-26 15:29:50
+ */
+
+@Api(tags = "通用接口管理")
+@RestController
+@RequestMapping(value = "/common", method = RequestMethod.POST)
+public class SaasCommonController {
+
+	@Autowired
+	private RedisTemplate<String, Object> redisTemplate;
+	
+    /**
+     * 查询菜单历史记录
+     */
+    @ApiOperation(value = "查询菜单历史记录")
+    @RequestMapping(value = "queryMenuHistory")
+    public ResponseResult queryMenuHistory(@RequestBody @Validated BaseGroupVO model) {
+    	Boolean result = null;
+    	String accountId = model.getAccountId() + "_history_menu";
+    	Long size = redisTemplate.opsForZSet().size(accountId);
+    	if (size < 10) {
+    		result = redisTemplate.opsForZSet().add(accountId, model, System.currentTimeMillis());
+		} else {
+		}
+    	return BooleanUtil.isTrue(result) ? ResponseResultUtil.successResult("添加成功") : ResponseResultUtil.errorResult("添加失败");
+    }
+    
+}

+ 11 - 11
saas-account/src/main/java/com/persagy/person/controller/SaasFunctionController.java

@@ -1,4 +1,4 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.util.List;
 
@@ -17,16 +17,16 @@ import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.manage.SaasRoleMenuHandler;
-import com.persagy.person.pojo.dto.SaasFunction;
-import com.persagy.person.pojo.dto.SaasMenu;
-import com.persagy.person.pojo.dto.SaasRole;
-import com.persagy.person.pojo.vo.function.SaasFunctionCreateVO;
-import com.persagy.person.pojo.vo.function.SaasFunctionDeleteVO;
-import com.persagy.person.pojo.vo.function.SaasFunctionQueryVO;
-import com.persagy.person.service.ISaasFunctionService;
-import com.persagy.person.service.ISaasMenuService;
-import com.persagy.person.service.ISaasRoleService;
+import com.persagy.account.manage.SaasRoleMenuHandler;
+import com.persagy.account.pojo.dto.SaasFunction;
+import com.persagy.account.pojo.dto.SaasMenu;
+import com.persagy.account.pojo.dto.SaasRole;
+import com.persagy.account.pojo.vo.function.SaasFunctionCreateVO;
+import com.persagy.account.pojo.vo.function.SaasFunctionDeleteVO;
+import com.persagy.account.pojo.vo.function.SaasFunctionQueryVO;
+import com.persagy.account.service.ISaasFunctionService;
+import com.persagy.account.service.ISaasMenuService;
+import com.persagy.account.service.ISaasRoleService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

+ 8 - 8
saas-account/src/main/java/com/persagy/person/controller/SaasGroupController.java

@@ -1,4 +1,4 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.util.List;
 import java.util.Map;
@@ -18,13 +18,13 @@ import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.manage.SaasAuthHandler;
-import com.persagy.person.manage.SaasGroupProjectHandler;
-import com.persagy.person.mq.CommonTopicProducer;
-import com.persagy.person.pojo.dto.SaasGroup;
-import com.persagy.person.pojo.vo.group.SaasGroupCreateVO;
-import com.persagy.person.pojo.vo.group.SaasGroupQueryVO;
-import com.persagy.person.service.ISaasGroupService;
+import com.persagy.account.manage.SaasAuthHandler;
+import com.persagy.account.manage.SaasGroupProjectHandler;
+import com.persagy.account.mq.CommonTopicProducer;
+import com.persagy.account.pojo.dto.SaasGroup;
+import com.persagy.account.pojo.vo.group.SaasGroupCreateVO;
+import com.persagy.account.pojo.vo.group.SaasGroupQueryVO;
+import com.persagy.account.service.ISaasGroupService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

+ 11 - 11
saas-account/src/main/java/com/persagy/person/controller/SaasLoginController.java

@@ -1,4 +1,4 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
@@ -26,16 +26,16 @@ import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
 import com.persagy.log.core.util.RequestUtil;
-import com.persagy.person.config.ApplicationProperties;
-import com.persagy.person.manage.SaasRoleMenuHandler;
-import com.persagy.person.pojo.dto.SaasAccount;
-import com.persagy.person.pojo.dto.SaasGroup;
-import com.persagy.person.pojo.dto.SaasMenu;
-import com.persagy.person.pojo.vo.account.SaasAccountLoginVO;
-import com.persagy.person.pojo.vo.account.SaasAccountQueryVO;
-import com.persagy.person.pojo.vo.menu.SaasMenuQueryVO;
-import com.persagy.person.service.ISaasAccountService;
-import com.persagy.person.service.ISaasGroupService;
+import com.persagy.account.config.ApplicationProperties;
+import com.persagy.account.manage.SaasRoleMenuHandler;
+import com.persagy.account.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.dto.SaasGroup;
+import com.persagy.account.pojo.dto.SaasMenu;
+import com.persagy.account.pojo.vo.account.SaasAccountLoginVO;
+import com.persagy.account.pojo.vo.account.SaasAccountQueryVO;
+import com.persagy.account.pojo.vo.menu.SaasMenuQueryVO;
+import com.persagy.account.service.ISaasAccountService;
+import com.persagy.account.service.ISaasGroupService;
 import com.persagy.security.constant.CipherConstans;
 import com.persagy.security.util.BouncycastleCipher;
 import com.persagy.security.util.SecureAES;

+ 8 - 8
saas-account/src/main/java/com/persagy/person/controller/SaasMenuController.java

@@ -1,4 +1,4 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -19,13 +19,13 @@ import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.manage.SaasRoleMenuHandler;
-import com.persagy.person.pojo.dto.SaasMenu;
-import com.persagy.person.pojo.vo.menu.SaasMenuCreateVO;
-import com.persagy.person.pojo.vo.menu.SaasMenuDeleteVO;
-import com.persagy.person.pojo.vo.menu.SaasMenuQueryVO;
-import com.persagy.person.service.ISaasMenuService;
-import com.persagy.person.service.ISaasRoleMenuService;
+import com.persagy.account.manage.SaasRoleMenuHandler;
+import com.persagy.account.pojo.dto.SaasMenu;
+import com.persagy.account.pojo.vo.menu.SaasMenuCreateVO;
+import com.persagy.account.pojo.vo.menu.SaasMenuDeleteVO;
+import com.persagy.account.pojo.vo.menu.SaasMenuQueryVO;
+import com.persagy.account.service.ISaasMenuService;
+import com.persagy.account.service.ISaasRoleMenuService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

+ 84 - 0
saas-account/src/main/java/com/persagy/account/controller/SaasProductController.java

@@ -0,0 +1,84 @@
+package com.persagy.account.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.google.common.collect.Lists;
+import com.persagy.common.utils.ResponseResult;
+import com.persagy.common.utils.ResponseResultUtil;
+import com.persagy.account.pojo.dto.SaasProduct;
+import com.persagy.account.pojo.dto.SaasProduct.Builder;
+import com.persagy.account.service.ISaasProductService;
+
+import cn.hutool.core.collection.CollectionUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 产品信息
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-04-26 15:45:41
+ */
+
+@Api(tags = "产品信息")
+@RestController
+@RequestMapping(value = "/saasProduct", method = RequestMethod.POST)
+public class SaasProductController {
+    @Autowired
+    private ISaasProductService saasProductService;
+    
+    /**
+     * 列表查询
+     */
+    @ApiOperation(value = "列表查询")
+    @RequestMapping(value = "querySaasProductList")
+    public ResponseResult querySaasProductList(@RequestBody SaasProduct saasProduct) {
+    	Builder builder = new SaasProduct.Builder().createQueryWrapper();
+    	LambdaQueryWrapper<SaasProduct> queryWrapper = builder.builderQueryWrapper();
+    	List<SaasProduct> list = this.saasProductService.list(queryWrapper);
+    	if (CollectionUtil.isEmpty(list)) {
+			return ResponseResultUtil.successResult(Lists.newArrayList(), 0L);
+		}
+        return ResponseResultUtil.successResult(list, (long)list.size());
+    }
+
+    /**
+     * 新增
+     */
+	@ApiOperation(value = "保存")
+	@RequestMapping(value = "createSaasProduct")
+    public ResponseResult createSaasProduct(@RequestBody SaasProduct saasProduct) {
+        boolean result = this.saasProductService.save(saasProduct);
+        return result ? ResponseResultUtil.successResult("保存成功") : ResponseResultUtil.errorResult("保存失败");
+    }
+    
+    /**
+     * 更新
+     */
+	@ApiOperation(value = "更新")
+	@RequestMapping(value = "updateSaasProduct")
+    public ResponseResult updateSaasProduct(@RequestBody SaasProduct saasProduct) {
+        boolean result = this.saasProductService.updateById(saasProduct);
+        return result ? ResponseResultUtil.successResult("更新成功") : ResponseResultUtil.errorResult("更新失败");
+    }
+
+    /**
+     * 物理删除
+     */
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "deleteSaasProduct")
+    public ResponseResult deleteSaasProduct(@RequestBody SaasProduct saasProduct) {
+        boolean result = this.saasProductService.removeById(saasProduct.getId());
+        return result ? ResponseResultUtil.successResult("删除成功") : ResponseResultUtil.errorResult("删除失败");
+    }
+    
+}

+ 21 - 21
saas-account/src/main/java/com/persagy/person/controller/SaasProjectController.java

@@ -1,4 +1,4 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -32,26 +32,26 @@ import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
 import com.persagy.log.core.annotation.IgnoreLog;
-import com.persagy.person.manage.SaasAreaProjectHandler;
-import com.persagy.person.manage.SaasAuthHandler;
-import com.persagy.person.manage.SaasGroupProjectHandler;
-import com.persagy.person.manage.SaasProjectExcelDataHandler;
-import com.persagy.person.manage.SaasProjectSheetWriteHandler;
-import com.persagy.person.pojo.dto.SaasAccountProject;
-import com.persagy.person.pojo.dto.SaasArea;
-import com.persagy.person.pojo.dto.SaasGroup;
-import com.persagy.person.pojo.dto.SaasProject;
-import com.persagy.person.pojo.vo.BaseGroupVO;
-import com.persagy.person.pojo.vo.group.SaasGroupQueryVO;
-import com.persagy.person.pojo.vo.project.SaasProjectAreaUpdateVO;
-import com.persagy.person.pojo.vo.project.SaasProjectCreateVO;
-import com.persagy.person.pojo.vo.project.SaasProjectExcel;
-import com.persagy.person.pojo.vo.project.SaasProjectPageVO;
-import com.persagy.person.pojo.vo.project.SaasProjectQueryVO;
-import com.persagy.person.service.ISaasAccountProjectService;
-import com.persagy.person.service.ISaasAreaService;
-import com.persagy.person.service.ISaasGroupService;
-import com.persagy.person.service.ISaasProjectService;
+import com.persagy.account.manage.SaasAreaProjectHandler;
+import com.persagy.account.manage.SaasAuthHandler;
+import com.persagy.account.manage.SaasGroupProjectHandler;
+import com.persagy.account.manage.SaasProjectExcelDataHandler;
+import com.persagy.account.manage.SaasProjectSheetWriteHandler;
+import com.persagy.account.pojo.dto.SaasAccountProject;
+import com.persagy.account.pojo.dto.SaasArea;
+import com.persagy.account.pojo.dto.SaasGroup;
+import com.persagy.account.pojo.dto.SaasProject;
+import com.persagy.account.pojo.vo.BaseGroupVO;
+import com.persagy.account.pojo.vo.group.SaasGroupQueryVO;
+import com.persagy.account.pojo.vo.project.SaasProjectAreaUpdateVO;
+import com.persagy.account.pojo.vo.project.SaasProjectCreateVO;
+import com.persagy.account.pojo.vo.project.SaasProjectExcel;
+import com.persagy.account.pojo.vo.project.SaasProjectPageVO;
+import com.persagy.account.pojo.vo.project.SaasProjectQueryVO;
+import com.persagy.account.service.ISaasAccountProjectService;
+import com.persagy.account.service.ISaasAreaService;
+import com.persagy.account.service.ISaasGroupService;
+import com.persagy.account.service.ISaasProjectService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

+ 9 - 9
saas-account/src/main/java/com/persagy/person/controller/SaasRoleController.java

@@ -1,9 +1,9 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.persagy.person.pojo.vo.role.*;
+import com.persagy.account.pojo.vo.role.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -20,13 +20,13 @@ import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.manage.SaasRoleMenuHandler;
-import com.persagy.person.pojo.dto.SaasGroup;
-import com.persagy.person.pojo.dto.SaasRole;
-import com.persagy.person.service.ISaasAccountRoleService;
-import com.persagy.person.service.ISaasGroupService;
-import com.persagy.person.service.ISaasRoleMenuService;
-import com.persagy.person.service.ISaasRoleService;
+import com.persagy.account.manage.SaasRoleMenuHandler;
+import com.persagy.account.pojo.dto.SaasGroup;
+import com.persagy.account.pojo.dto.SaasRole;
+import com.persagy.account.service.ISaasAccountRoleService;
+import com.persagy.account.service.ISaasGroupService;
+import com.persagy.account.service.ISaasRoleMenuService;
+import com.persagy.account.service.ISaasRoleService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

+ 7 - 7
saas-account/src/main/java/com/persagy/person/controller/SaasRoleMenuController.java

@@ -1,4 +1,4 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.util.List;
 
@@ -14,12 +14,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.collect.Lists;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
-import com.persagy.person.manage.SaasRoleMenuHandler;
-import com.persagy.person.pojo.dto.SaasRoleMenu;
-import com.persagy.person.pojo.vo.auth.SaasRoleMenuBatchVO;
-import com.persagy.person.pojo.vo.auth.SaasRoleMenuCreateVO;
-import com.persagy.person.pojo.vo.auth.SaasRoleMenuQueryVO;
-import com.persagy.person.service.ISaasRoleMenuService;
+import com.persagy.account.manage.SaasRoleMenuHandler;
+import com.persagy.account.pojo.dto.SaasRoleMenu;
+import com.persagy.account.pojo.vo.auth.SaasRoleMenuBatchVO;
+import com.persagy.account.pojo.vo.auth.SaasRoleMenuCreateVO;
+import com.persagy.account.pojo.vo.auth.SaasRoleMenuQueryVO;
+import com.persagy.account.service.ISaasRoleMenuService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

+ 11 - 12
saas-account/src/main/java/com/persagy/person/controller/UpgradeController.java

@@ -1,4 +1,4 @@
-package com.persagy.person.controller;
+package com.persagy.account.controller;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,15 +18,15 @@ import com.persagy.common.constant.SaasCommonConstant;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.pojo.dto.SaasAccount;
-import com.persagy.person.pojo.dto.SaasAccountProject;
-import com.persagy.person.pojo.dto.SaasArea;
-import com.persagy.person.pojo.dto.SaasProject;
-import com.persagy.person.pojo.vo.BaseUserVO;
-import com.persagy.person.service.ISaasAccountProjectService;
-import com.persagy.person.service.ISaasAccountService;
-import com.persagy.person.service.ISaasAreaService;
-import com.persagy.person.service.ISaasProjectService;
+import com.persagy.account.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.dto.SaasAccountProject;
+import com.persagy.account.pojo.dto.SaasArea;
+import com.persagy.account.pojo.dto.SaasProject;
+import com.persagy.account.pojo.vo.BaseUserVO;
+import com.persagy.account.service.ISaasAccountProjectService;
+import com.persagy.account.service.ISaasAccountService;
+import com.persagy.account.service.ISaasAreaService;
+import com.persagy.account.service.ISaasProjectService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;
@@ -119,9 +119,8 @@ public class UpgradeController {
     
     /**
      * 20210413号迭代升级,清空redis缓存
-     * 为防止多次调用,这里采用 REPLACE INTO
      */
-    @ApiOperation(value = "新增区域权限表,兼容老数据接口")
+    @ApiOperation(value = "清空redis中token缓存")
     @RequestMapping(value = "clearRedisCache")
     public ResponseResult clearRedisCache(@RequestBody @Validated BaseUserVO userVO) {
     	// 查询出所有的账号信息,包含停用的

+ 7 - 7
saas-account/src/main/java/com/persagy/person/manage/SaasAccountHandler.java

@@ -1,4 +1,4 @@
-package com.persagy.person.manage;
+package com.persagy.account.manage;
 
 import java.util.List;
 
@@ -11,12 +11,12 @@ import com.persagy.common.constant.SaasCommonConstant;
 import com.persagy.common.exception.BusinessException;
 import com.persagy.common.model.BaseGroupModel;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.mq.CommonTopicProducer;
-import com.persagy.person.pojo.dto.SaasAccount;
-import com.persagy.person.pojo.vo.auth.SaasAccountRoleVO;
-import com.persagy.person.service.ISaasAccountProjectService;
-import com.persagy.person.service.ISaasAccountRoleService;
-import com.persagy.person.service.ISaasAccountService;
+import com.persagy.account.mq.CommonTopicProducer;
+import com.persagy.account.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.vo.auth.SaasAccountRoleVO;
+import com.persagy.account.service.ISaasAccountProjectService;
+import com.persagy.account.service.ISaasAccountRoleService;
+import com.persagy.account.service.ISaasAccountService;
 import com.persagy.security.util.BouncycastleCipher;
 
 import cn.hutool.core.collection.CollectionUtil;

+ 10 - 10
saas-account/src/main/java/com/persagy/person/manage/SaasAreaProjectHandler.java

@@ -1,4 +1,4 @@
-package com.persagy.person.manage;
+package com.persagy.account.manage;
 
 import java.util.HashMap;
 import java.util.List;
@@ -15,15 +15,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.persagy.common.constant.SaasCommonConstant;
 import com.persagy.common.exception.BusinessException;
-import com.persagy.person.pojo.dto.SaasAccountProject;
-import com.persagy.person.pojo.dto.SaasArea;
-import com.persagy.person.pojo.dto.SaasGroup;
-import com.persagy.person.pojo.dto.SaasProject;
-import com.persagy.person.pojo.vo.area.SaasAreaQueryVO;
-import com.persagy.person.pojo.vo.project.SaasProjectQueryVO;
-import com.persagy.person.service.ISaasAccountProjectService;
-import com.persagy.person.service.ISaasAreaService;
-import com.persagy.person.service.ISaasProjectService;
+import com.persagy.account.pojo.dto.SaasAccountProject;
+import com.persagy.account.pojo.dto.SaasArea;
+import com.persagy.account.pojo.dto.SaasGroup;
+import com.persagy.account.pojo.dto.SaasProject;
+import com.persagy.account.pojo.vo.area.SaasAreaQueryVO;
+import com.persagy.account.pojo.vo.project.SaasProjectQueryVO;
+import com.persagy.account.service.ISaasAccountProjectService;
+import com.persagy.account.service.ISaasAreaService;
+import com.persagy.account.service.ISaasProjectService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.BooleanUtil;

+ 6 - 6
saas-account/src/main/java/com/persagy/person/manage/SaasAuthHandler.java

@@ -1,4 +1,4 @@
-package com.persagy.person.manage;
+package com.persagy.account.manage;
 
 import java.util.HashMap;
 import java.util.List;
@@ -12,11 +12,11 @@ import com.google.common.collect.Lists;
 import com.persagy.common.constant.SaasCommonConstant;
 import com.persagy.common.exception.BusinessException;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.pojo.dto.SaasAccount;
-import com.persagy.person.pojo.dto.SaasArea;
-import com.persagy.person.pojo.dto.SaasGroup;
-import com.persagy.person.service.ISaasAccountService;
-import com.persagy.person.service.ISaasGroupService;
+import com.persagy.account.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.dto.SaasArea;
+import com.persagy.account.pojo.dto.SaasGroup;
+import com.persagy.account.service.ISaasAccountService;
+import com.persagy.account.service.ISaasGroupService;
 
 /**
  * @version 

+ 13 - 13
saas-account/src/main/java/com/persagy/person/manage/SaasGroupProjectHandler.java

@@ -1,4 +1,4 @@
-package com.persagy.person.manage;
+package com.persagy.account.manage;
 
 import java.util.List;
 import java.util.Map;
@@ -16,18 +16,18 @@ import com.persagy.common.exception.BusinessException;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseResultUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.mq.CommonTopicProducer;
-import com.persagy.person.pojo.dto.SaasAccount;
-import com.persagy.person.pojo.dto.SaasAccountProject;
-import com.persagy.person.pojo.dto.SaasGroup;
-import com.persagy.person.pojo.dto.SaasProject;
-import com.persagy.person.pojo.vo.group.SaasGroupQueryVO;
-import com.persagy.person.service.ISaasAccountProjectService;
-import com.persagy.person.service.ISaasAccountService;
-import com.persagy.person.service.ISaasAreaService;
-import com.persagy.person.service.ISaasGroupService;
-import com.persagy.person.service.ISaasProjectService;
-import com.persagy.person.service.ISaasRoleService;
+import com.persagy.account.mq.CommonTopicProducer;
+import com.persagy.account.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.dto.SaasAccountProject;
+import com.persagy.account.pojo.dto.SaasGroup;
+import com.persagy.account.pojo.dto.SaasProject;
+import com.persagy.account.pojo.vo.group.SaasGroupQueryVO;
+import com.persagy.account.service.ISaasAccountProjectService;
+import com.persagy.account.service.ISaasAccountService;
+import com.persagy.account.service.ISaasAreaService;
+import com.persagy.account.service.ISaasGroupService;
+import com.persagy.account.service.ISaasProjectService;
+import com.persagy.account.service.ISaasRoleService;
 
 import cn.hutool.core.collection.CollectionUtil;
 

+ 6 - 6
saas-account/src/main/java/com/persagy/person/manage/SaasProjectExcelDataHandler.java

@@ -1,4 +1,4 @@
-package com.persagy.person.manage;
+package com.persagy.account.manage;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -15,11 +15,11 @@ import com.persagy.common.constant.SaasCommonConstant;
 import com.persagy.common.model.BaseUserModel;
 import com.persagy.common.utils.IdGenerator;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.pojo.dto.SaasArea;
-import com.persagy.person.pojo.dto.SaasProject;
-import com.persagy.person.pojo.vo.project.SaasProjectExcel;
-import com.persagy.person.service.ISaasAreaService;
-import com.persagy.person.service.ISaasProjectService;
+import com.persagy.account.pojo.dto.SaasArea;
+import com.persagy.account.pojo.dto.SaasProject;
+import com.persagy.account.pojo.vo.project.SaasProjectExcel;
+import com.persagy.account.service.ISaasAreaService;
+import com.persagy.account.service.ISaasProjectService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.extern.slf4j.Slf4j;

+ 5 - 5
saas-account/src/main/java/com/persagy/person/manage/SaasProjectSheetWriteHandler.java

@@ -1,4 +1,4 @@
-package com.persagy.person.manage;
+package com.persagy.account.manage;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -23,10 +23,10 @@ import com.google.common.collect.Lists;
 import com.persagy.common.constant.SaasCommonConstant;
 import com.persagy.common.utils.ExcelUtil;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.pojo.dto.SaasArea;
-import com.persagy.person.pojo.dto.SaasGroup;
-import com.persagy.person.pojo.vo.area.SaasAreaQueryVO;
-import com.persagy.person.pojo.vo.group.SaasGroupQueryVO;
+import com.persagy.account.pojo.dto.SaasArea;
+import com.persagy.account.pojo.dto.SaasGroup;
+import com.persagy.account.pojo.vo.area.SaasAreaQueryVO;
+import com.persagy.account.pojo.vo.group.SaasGroupQueryVO;
 
 import cn.hutool.core.collection.CollectionUtil;
 

+ 14 - 14
saas-account/src/main/java/com/persagy/person/manage/SaasRoleMenuHandler.java

@@ -1,4 +1,4 @@
-package com.persagy.person.manage;
+package com.persagy.account.manage;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -15,19 +15,19 @@ import com.google.common.collect.Lists;
 import com.persagy.common.constant.SaasCommonConstant;
 import com.persagy.common.exception.BusinessException;
 import com.persagy.common.utils.StringUtil;
-import com.persagy.person.pojo.dto.SaasAccountRole;
-import com.persagy.person.pojo.dto.SaasFunction;
-import com.persagy.person.pojo.dto.SaasMenu;
-import com.persagy.person.pojo.dto.SaasRole;
-import com.persagy.person.pojo.dto.SaasRoleMenu;
-import com.persagy.person.pojo.vo.auth.SaasMenuFunctionVO;
-import com.persagy.person.pojo.vo.menu.SaasMenuQueryVO;
-import com.persagy.person.pojo.vo.role.SaasRoleDeleteVO;
-import com.persagy.person.service.ISaasAccountRoleService;
-import com.persagy.person.service.ISaasFunctionService;
-import com.persagy.person.service.ISaasMenuService;
-import com.persagy.person.service.ISaasRoleMenuService;
-import com.persagy.person.service.ISaasRoleService;
+import com.persagy.account.pojo.dto.SaasAccountRole;
+import com.persagy.account.pojo.dto.SaasFunction;
+import com.persagy.account.pojo.dto.SaasMenu;
+import com.persagy.account.pojo.dto.SaasRole;
+import com.persagy.account.pojo.dto.SaasRoleMenu;
+import com.persagy.account.pojo.vo.auth.SaasMenuFunctionVO;
+import com.persagy.account.pojo.vo.menu.SaasMenuQueryVO;
+import com.persagy.account.pojo.vo.role.SaasRoleDeleteVO;
+import com.persagy.account.service.ISaasAccountRoleService;
+import com.persagy.account.service.ISaasFunctionService;
+import com.persagy.account.service.ISaasMenuService;
+import com.persagy.account.service.ISaasRoleMenuService;
+import com.persagy.account.service.ISaasRoleService;
 
 import cn.hutool.core.collection.CollectionUtil;
 

+ 2 - 2
saas-account/src/main/java/com/persagy/person/mapper/SaasAccountMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mapper;
+package com.persagy.account.mapper;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.person.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.dto.SaasAccount;
 
 /**
  * 账号信息

+ 3 - 3
saas-account/src/main/java/com/persagy/person/mapper/SaasAccountProjectMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mapper;
+package com.persagy.account.mapper;
 
 import java.util.List;
 import java.util.Set;
@@ -7,8 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.person.pojo.dto.SaasAccountProject;
-import com.persagy.person.pojo.vo.auth.AccountProjectResetVO;
+import com.persagy.account.pojo.dto.SaasAccountProject;
+import com.persagy.account.pojo.vo.auth.AccountProjectResetVO;
 
 /**
  * 账号-集团项目关联信息

+ 3 - 3
saas-account/src/main/java/com/persagy/person/mapper/SaasAccountRoleMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mapper;
+package com.persagy.account.mapper;
 
 import java.util.List;
 
@@ -6,8 +6,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.person.pojo.dto.SaasAccountRole;
-import com.persagy.person.pojo.vo.auth.SaasAccountRoleVO;
+import com.persagy.account.pojo.dto.SaasAccountRole;
+import com.persagy.account.pojo.vo.auth.SaasAccountRoleVO;
 
 /**
  * 账号-角色关联信息

+ 2 - 2
saas-account/src/main/java/com/persagy/person/mapper/SaasAreaMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mapper;
+package com.persagy.account.mapper;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.person.pojo.dto.SaasArea;
+import com.persagy.account.pojo.dto.SaasArea;
 
 /**
  * 区域信息

+ 2 - 2
saas-account/src/main/java/com/persagy/person/mapper/SaasFunctionMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mapper;
+package com.persagy.account.mapper;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.person.pojo.dto.SaasFunction;
+import com.persagy.account.pojo.dto.SaasFunction;
 
 /**
  * 功能信息

+ 2 - 2
saas-account/src/main/java/com/persagy/person/mapper/SaasGroupMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mapper;
+package com.persagy.account.mapper;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.person.pojo.dto.SaasGroup;
+import com.persagy.account.pojo.dto.SaasGroup;
 
 /**
  * 集团信息

+ 2 - 2
saas-account/src/main/java/com/persagy/person/mapper/SaasMenuMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mapper;
+package com.persagy.account.mapper;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.person.pojo.dto.SaasMenu;
+import com.persagy.account.pojo.dto.SaasMenu;
 
 /**
  * 菜单信息

+ 19 - 0
saas-account/src/main/java/com/persagy/account/mapper/SaasProductMapper.java

@@ -0,0 +1,19 @@
+package com.persagy.account.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.account.pojo.dto.SaasProduct;
+
+/**
+ * 产品信息
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-04-26 15:45:41
+ */
+@Mapper
+public interface SaasProductMapper extends BaseMapper<SaasProduct> {
+
+}

+ 2 - 2
saas-account/src/main/java/com/persagy/person/mapper/SaasProjectMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mapper;
+package com.persagy.account.mapper;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.person.pojo.dto.SaasProject;
+import com.persagy.account.pojo.dto.SaasProject;
 
 /**
  * 项目信息

+ 2 - 2
saas-account/src/main/java/com/persagy/person/mapper/SaasRoleMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mapper;
+package com.persagy.account.mapper;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.person.pojo.dto.SaasRole;
+import com.persagy.account.pojo.dto.SaasRole;
 
 /**
  * 角色信息

+ 3 - 3
saas-account/src/main/java/com/persagy/person/mapper/SaasRoleMenuMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mapper;
+package com.persagy.account.mapper;
 
 import java.util.List;
 
@@ -6,8 +6,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.person.pojo.dto.SaasRoleMenu;
-import com.persagy.person.pojo.vo.auth.SaasMenuFunctionVO;
+import com.persagy.account.pojo.dto.SaasRoleMenu;
+import com.persagy.account.pojo.vo.auth.SaasMenuFunctionVO;
 
 /**
  * 角色-菜单功能关联信息

+ 1 - 1
saas-account/src/main/java/com/persagy/person/mq/CommonConfirmCallback.java

@@ -1,4 +1,4 @@
-package com.persagy.person.mq;
+package com.persagy.account.mq;
 
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.connection.CorrelationData;

+ 4 - 4
saas-account/src/main/java/com/persagy/person/mq/CommonTopicProducer.java

@@ -1,13 +1,13 @@
-package com.persagy.person.mq;
+package com.persagy.account.mq;
 
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.alibaba.fastjson.JSON;
-import com.persagy.person.config.ApplicationProperties;
-import com.persagy.person.pojo.dto.SaasAccount;
-import com.persagy.person.pojo.dto.SaasGroup;
+import com.persagy.account.config.ApplicationProperties;
+import com.persagy.account.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.dto.SaasGroup;
 
 import lombok.extern.slf4j.Slf4j;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/dto/SaasAccount.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.dto;
+package com.persagy.account.pojo.dto;
 
 import java.util.Date;
 import java.util.List;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/dto/SaasAccountProject.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.dto;
+package com.persagy.account.pojo.dto;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/dto/SaasAccountRole.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.dto;
+package com.persagy.account.pojo.dto;
 
 import java.util.List;
 import java.util.Set;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/dto/SaasArea.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.dto;
+package com.persagy.account.pojo.dto;
 
 import java.util.Date;
 import java.util.List;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/dto/SaasFunction.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.dto;
+package com.persagy.account.pojo.dto;
 
 import java.util.Date;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/dto/SaasGroup.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.dto;
+package com.persagy.account.pojo.dto;
 
 import java.util.Date;
 import java.util.List;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/dto/SaasMenu.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.dto;
+package com.persagy.account.pojo.dto;
 
 import java.util.Date;
 import java.util.List;

+ 195 - 0
saas-account/src/main/java/com/persagy/account/pojo/dto/SaasProduct.java

@@ -0,0 +1,195 @@
+package com.persagy.account.pojo.dto;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.persagy.common.model.BaseEntity;
+import com.persagy.common.utils.StringUtil;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 产品信息
+ * 
+ * @version 1.0.0
+ * @company persagy
+ * @author zhangqiankun
+ * @date 2021-04-26 15:45:41
+ */
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+@TableName("saas_product")
+public class SaasProduct extends BaseEntity<SaasProduct> {
+	private static final long serialVersionUID = -7374882065014346250L;
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String productCode; // 产品编码
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String productName; // 产品名称
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String productIcon; // 产品图标
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String productState; // 产品状态,0-建设中,1-已完成,2-已关联
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String productMenu; // 产品是否关联菜单,0-未关联,1-已关联
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private Date createTime; // 创建时间
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private Date updateTime; // 更新时间
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String updateUser; // 最后一次操作者ID
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String remark; // 备注
+
+	public static class Builder {
+
+		private LambdaQueryWrapper<SaasProduct> queryWrapper = null;
+
+		private LambdaUpdateWrapper<SaasProduct> updateWrapper = null;
+
+		public Builder createQueryWrapper() {
+			queryWrapper = new LambdaQueryWrapper<SaasProduct>();
+			return this;
+		}
+
+		public Builder createUpdateWrapper() {
+			updateWrapper = new LambdaUpdateWrapper<SaasProduct>();
+			return this;
+		}
+
+		public Builder idEq(String id) {
+			if (StringUtil.isNotBlank(id)) {
+				if (updateWrapper != null) {
+					updateWrapper.eq(SaasProduct::getId, id);
+				} else {
+					queryWrapper.eq(SaasProduct::getId, id);
+				}
+			}
+			return this;
+		}
+
+		public Builder productCodeEq(String productCode) {
+			if (StringUtil.isNotBlank(productCode)) {
+				if (updateWrapper != null) {
+					updateWrapper.eq(SaasProduct::getProductCode, productCode);
+				} else {
+					queryWrapper.eq(SaasProduct::getProductCode, productCode);
+				}
+			}
+			return this;
+		}
+
+		public Builder productNameEq(String productName) {
+			if (StringUtil.isNotBlank(productName)) {
+				if (updateWrapper != null) {
+					updateWrapper.eq(SaasProduct::getProductName, productName);
+				} else {
+					queryWrapper.eq(SaasProduct::getProductName, productName);
+				}
+			}
+			return this;
+		}
+
+		public Builder productIconEq(String productIcon) {
+			if (StringUtil.isNotBlank(productIcon)) {
+				if (updateWrapper != null) {
+					updateWrapper.eq(SaasProduct::getProductIcon, productIcon);
+				} else {
+					queryWrapper.eq(SaasProduct::getProductIcon, productIcon);
+				}
+			}
+			return this;
+		}
+
+		public Builder productStateEq(String productState) {
+			if (StringUtil.isNotBlank(productState)) {
+				if (updateWrapper != null) {
+					updateWrapper.eq(SaasProduct::getProductState, productState);
+				} else {
+					queryWrapper.eq(SaasProduct::getProductState, productState);
+				}
+			}
+			return this;
+		}
+
+		public Builder productMenuEq(String productMenu) {
+			if (StringUtil.isNotBlank(productMenu)) {
+				if (updateWrapper != null) {
+					updateWrapper.eq(SaasProduct::getProductMenu, productMenu);
+				} else {
+					queryWrapper.eq(SaasProduct::getProductMenu, productMenu);
+				}
+			}
+			return this;
+		}
+
+		public Builder createTimeEq(Date createTime) {
+			if (null != createTime) {
+				if (updateWrapper != null) {
+					updateWrapper.eq(SaasProduct::getCreateTime, createTime);
+				} else {
+					queryWrapper.eq(SaasProduct::getCreateTime, createTime);
+				}
+			}
+			return this;
+		}
+
+		public Builder updateTimeEq(Date updateTime) {
+			if (null != updateTime) {
+				if (updateWrapper != null) {
+					updateWrapper.eq(SaasProduct::getUpdateTime, updateTime);
+				} else {
+					queryWrapper.eq(SaasProduct::getUpdateTime, updateTime);
+				}
+			}
+			return this;
+		}
+
+		public Builder updateUserEq(String updateUser) {
+			if (StringUtil.isNotBlank(updateUser)) {
+				if (updateWrapper != null) {
+					updateWrapper.eq(SaasProduct::getUpdateUser, updateUser);
+				} else {
+					queryWrapper.eq(SaasProduct::getUpdateUser, updateUser);
+				}
+			}
+			return this;
+		}
+
+		public Builder remarkEq(String remark) {
+			if (StringUtil.isNotBlank(remark)) {
+				if (updateWrapper != null) {
+					updateWrapper.eq(SaasProduct::getRemark, remark);
+				} else {
+					queryWrapper.eq(SaasProduct::getRemark, remark);
+				}
+			}
+			return this;
+		}
+
+		public LambdaQueryWrapper<SaasProduct> builderQueryWrapper() {
+			return queryWrapper;
+		}
+
+		public LambdaUpdateWrapper<SaasProduct> builderUpdateWrapper() {
+			return updateWrapper;
+		}
+	}
+}

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/dto/SaasProject.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.dto;
+package com.persagy.account.pojo.dto;
 
 import java.util.Date;
 import java.util.Set;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/dto/SaasRole.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.dto;
+package com.persagy.account.pojo.dto;
 
 import java.util.Date;
 import java.util.Set;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/dto/SaasRoleMenu.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.dto;
+package com.persagy.account.pojo.dto;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/BaseGroupVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo;
+package com.persagy.account.pojo.vo;
 
 import com.persagy.common.model.BaseUserModel;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/BaseUserVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo;
+package com.persagy.account.pojo.vo;
 
 import javax.validation.constraints.NotBlank;
 

+ 2 - 2
saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountCreateVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.account;
+package com.persagy.account.pojo.vo.account;
 
 import java.util.Date;
 import java.util.List;
@@ -7,7 +7,7 @@ import java.util.Set;
 import javax.validation.constraints.NotBlank;
 
 import com.persagy.common.constant.SaasCommonConstant;
-import com.persagy.person.pojo.vo.auth.SaasAccountRoleVO;
+import com.persagy.account.pojo.vo.auth.SaasAccountRoleVO;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountGroupVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.account;
+package com.persagy.account.pojo.vo.account;
 
 import com.persagy.common.model.BaseUserModel;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountLoginVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.account;
+package com.persagy.account.pojo.vo.account;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountPageVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.account;
+package com.persagy.account.pojo.vo.account;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountQueryByNameVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.account;
+package com.persagy.account.pojo.vo.account;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountQueryVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.account;
+package com.persagy.account.pojo.vo.account;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/area/SaasAreaCreateVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.area;
+package com.persagy.account.pojo.vo.area;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/area/SaasAreaDeleteVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.area;
+package com.persagy.account.pojo.vo.area;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/area/SaasAreaQueryVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.area;
+package com.persagy.account.pojo.vo.area;
 
 import com.persagy.common.model.BaseGroupModel;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/AccountAreaProjectResetVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import java.util.List;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/AccountAreaResetVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/AccountProjectResetVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountProjectBatchVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import java.util.List;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountProjectCreateVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountProjectPageVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountProjectQueryVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import com.persagy.common.model.BaseUserModel;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountRoleBatchVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import java.util.List;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountRoleCreateVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountRoleQueryVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import java.util.Set;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasAccountRoleVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasMenuFunctionVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasRoleMenuBatchVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import java.util.List;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasRoleMenuCreateVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/auth/SaasRoleMenuQueryVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.auth;
+package com.persagy.account.pojo.vo.auth;
 
 import com.persagy.common.model.BaseGroupModel;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/function/SaasFunctionCreateVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.function;
+package com.persagy.account.pojo.vo.function;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/function/SaasFunctionDeleteVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.function;
+package com.persagy.account.pojo.vo.function;
 
 import com.persagy.common.model.BaseUserModel;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/function/SaasFunctionQueryVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.function;
+package com.persagy.account.pojo.vo.function;
 
 import com.persagy.common.model.BaseUserModel;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/group/SaasGroupCreateVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.group;
+package com.persagy.account.pojo.vo.group;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/group/SaasGroupQueryVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.group;
+package com.persagy.account.pojo.vo.group;
 
 import com.persagy.common.constant.SaasCommonConstant;
 import com.persagy.common.model.BaseUserModel;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/menu/SaasMenuCreateVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.menu;
+package com.persagy.account.pojo.vo.menu;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/menu/SaasMenuDeleteVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.menu;
+package com.persagy.account.pojo.vo.menu;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/menu/SaasMenuQueryVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.menu;
+package com.persagy.account.pojo.vo.menu;
 
 import com.persagy.common.model.BaseUserModel;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/project/SaasProjectAreaUpdateVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.project;
+package com.persagy.account.pojo.vo.project;
 
 import java.util.List;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/project/SaasProjectCreateVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.project;
+package com.persagy.account.pojo.vo.project;
 
 import java.util.Date;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/project/SaasProjectExcel.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.project;
+package com.persagy.account.pojo.vo.project;
 
 import java.util.ArrayList;
 import java.util.List;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/project/SaasProjectPageVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.project;
+package com.persagy.account.pojo.vo.project;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/project/SaasProjectQueryVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.project;
+package com.persagy.account.pojo.vo.project;
 
 import java.util.Date;
 import java.util.Set;

+ 2 - 2
saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRoleCreateVO.java

@@ -1,11 +1,11 @@
-package com.persagy.person.pojo.vo.role;
+package com.persagy.account.pojo.vo.role;
 
 import java.util.List;
 
 import javax.validation.constraints.NotBlank;
 
 import com.persagy.common.model.BaseUserModel;
-import com.persagy.person.pojo.vo.auth.SaasMenuFunctionVO;
+import com.persagy.account.pojo.vo.auth.SaasMenuFunctionVO;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRoleDeleteVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.role;
+package com.persagy.account.pojo.vo.role;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRolePageVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.role;
+package com.persagy.account.pojo.vo.role;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRoleQueryByNameVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.role;
+package com.persagy.account.pojo.vo.role;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRoleQueryVO.java

@@ -1,4 +1,4 @@
-package com.persagy.person.pojo.vo.role;
+package com.persagy.account.pojo.vo.role;
 
 import java.util.Set;
 

+ 3 - 3
saas-account/src/main/java/com/persagy/person/service/ISaasAccountProjectService.java

@@ -1,11 +1,11 @@
-package com.persagy.person.service;
+package com.persagy.account.service;
 
 import java.util.List;
 import java.util.Set;
 
 import com.persagy.common.service.ISuperService;
-import com.persagy.person.pojo.dto.SaasAccountProject;
-import com.persagy.person.pojo.vo.auth.AccountProjectResetVO;
+import com.persagy.account.pojo.dto.SaasAccountProject;
+import com.persagy.account.pojo.vo.auth.AccountProjectResetVO;
 
 /**
  * 账号-集团项目关联信息

+ 3 - 3
saas-account/src/main/java/com/persagy/person/service/ISaasAccountRoleService.java

@@ -1,10 +1,10 @@
-package com.persagy.person.service;
+package com.persagy.account.service;
 
 import java.util.List;
 
 import com.persagy.common.service.ISuperService;
-import com.persagy.person.pojo.dto.SaasAccountRole;
-import com.persagy.person.pojo.vo.auth.SaasAccountRoleVO;
+import com.persagy.account.pojo.dto.SaasAccountRole;
+import com.persagy.account.pojo.vo.auth.SaasAccountRoleVO;
 
 /**
  * 账号-角色关联信息

+ 2 - 2
saas-account/src/main/java/com/persagy/person/service/ISaasAccountService.java

@@ -1,11 +1,11 @@
-package com.persagy.person.service;
+package com.persagy.account.service;
 
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.common.service.ISuperService;
-import com.persagy.person.pojo.dto.SaasAccount;
+import com.persagy.account.pojo.dto.SaasAccount;
 
 /**
  * 账号信息

+ 2 - 2
saas-account/src/main/java/com/persagy/person/service/ISaasAreaService.java

@@ -1,9 +1,9 @@
-package com.persagy.person.service;
+package com.persagy.account.service;
 
 import java.util.List;
 
 import com.persagy.common.service.ISuperService;
-import com.persagy.person.pojo.dto.SaasArea;
+import com.persagy.account.pojo.dto.SaasArea;
 
 /**
  * 区域信息

+ 2 - 2
saas-account/src/main/java/com/persagy/person/service/ISaasFunctionService.java

@@ -1,9 +1,9 @@
-package com.persagy.person.service;
+package com.persagy.account.service;
 
 import java.util.List;
 
 import com.persagy.common.service.ISuperService;
-import com.persagy.person.pojo.dto.SaasFunction;
+import com.persagy.account.pojo.dto.SaasFunction;
 
 /**
  * 功能信息

+ 0 - 0
saas-account/src/main/java/com/persagy/person/service/ISaasGroupService.java


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio