角色管理测试完成

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/basic/Gender.java

@@ -1,9 +1,7 @@
 package cn.com.taiji.core.entity.dict.basic;
 
 /**
- * @Author weicailin
- * @Date 2023/3/22 17:38
- * @Email 13079168756@163.com
+ * 性别
  */
 public enum Gender {
     MALE("男") {},

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/user/IsEnable.java

@@ -5,10 +5,6 @@ import org.springframework.util.StringUtils;
 
 /**
  * 启用/停用
- *
- * @Author weicailin
- * @Date 2023/3/7 9:37
- * @Email 13079168756@163.com
  **/
 public enum IsEnable {
     ENABLE("启用", 1) {},

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/user/RbacSource.java

@@ -3,9 +3,6 @@ package cn.com.taiji.core.entity.dict.user;
 
 /***
  * rbac的三种系统来源
- * @Author weicailin
- * @Date 2023/3/28 11:42
- * @Email 13079168756@163.com
  */
 public enum RbacSource {
     WEB("Web端") {},

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/user/RbacStatus.java

@@ -1,10 +1,6 @@
 package cn.com.taiji.core.entity.dict.user;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 9:37
- * @Email 13079168756@163.com
- **/
+
 public enum RbacStatus {
     ENABLE ("可使用", 1) {},
     DISABLE("禁用", 2) {},

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/user/SystemType.java

@@ -5,9 +5,6 @@ import java.util.Objects;
 /**
  * 系统类型
  *
- * @Author weicailin
- * @Date 2023/3/10 12:07
- * @Email 13079168756@163.com
  **/
 public enum SystemType {
 

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/AccountUserRole.java

@@ -11,10 +11,6 @@ import javax.persistence.*;
 
 /**
  * 账户角色中间表
- *
- * @Author weicailin
- * @Date 2023/3/1 10:57
- * @Email 13079168756@163.com
  **/
 @Getter
 @Setter

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/UserMenu.java

@@ -13,10 +13,6 @@ import javax.persistence.*;
 
 /**
  * 菜单类
- *
- * @Author weicailin
- * @Date 2023/3/1 10:40
- * @Email 13079168756@163.com
  **/
 @Setter
 @Getter

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/UserPerm.java

@@ -13,9 +13,6 @@ import javax.persistence.*;
 
 /***
  * 菜单中的按钮
- * @Author weicailin
- * @Date 2023/4/17 16:04
- * @Email 13079168756@163.com
  */
 @Getter
 @Setter

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/UserRole.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.core.entity.user;
 
 import cn.com.taiji.common.entity.StringUUIDEntity;
+import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
 import cn.com.taiji.core.entity.dict.user.RbacSource;
 import cn.com.taiji.core.entity.dict.user.RbacStatus;
 import cn.com.taiji.core.entity.dict.user.SystemType;
@@ -11,16 +12,12 @@ import javax.persistence.*;
 
 /**
  * 角色类
- *
- * @Author weicailin
- * @Date 2023/3/1 10:35
- * @Email 13079168756@163.com
  **/
-@Setter
 @Getter
+@Setter
 @Entity
 @Table(name = "USER_ROLE")
-public class UserRole extends StringUUIDEntity {
+public class UserRole extends AbstractStringPropertyUUIDEntity {
     /**
      * 角色名字
      */

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/UserRoleMenuPerm.java

@@ -9,12 +9,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-/***
- *
- * @Author weicailin
- * @Date 2023/5/4 11:15
- * @Email 13079168756@163.com
- */
+
 @Getter
 @Setter
 @Entity

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/UserRoleUserMenu.java

@@ -8,11 +8,7 @@ import lombok.Setter;
 
 import javax.persistence.*;
 
-/**
- * @Author weicailin
- * @Date 2023/3/1 10:57
- * @Email 13079168756@163.com
- **/
+
 @Getter
 @Setter
 @Entity

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/weiXin/WxMiniSendMessageRequest.java

@@ -19,10 +19,6 @@ import lombok.Setter;
 
 /**
  * 微信小程序-订阅消息发送
- *
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
  */
 @Getter
 @Setter

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/weiXin/WxMiniSendMessageResponse.java

@@ -5,9 +5,6 @@ import cn.com.taiji.core.model.comm.protocol.ats.AbstractAtsResponse;
 
 /**
  * 微信小程序-订阅消息发送
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
  */
 public class WxMiniSendMessageResponse extends AbstractAtsResponse {
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/weiXin/WxMpSendMessageRequest.java

@@ -19,10 +19,6 @@ import cn.hutool.core.collection.CollectionUtil;
 
 /**
  * 微信公众号-订阅消息发送
- *
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
  */
 
 public class WxMpSendMessageRequest extends AbstractAtsRequest<WxMpSendMessageResponse> {

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/weiXin/WxMpSendMessageResponse.java

@@ -5,9 +5,6 @@ import cn.com.taiji.core.model.comm.protocol.ats.AbstractAtsResponse;
 
 /**
  * 微信公众号-订阅消息发送
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
  */
 public class WxMpSendMessageResponse extends AbstractAtsResponse {
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/HltSendShortRequest.java

@@ -16,9 +16,6 @@ import cn.hutool.core.util.ReUtil;
 
 /***
  * 汇联通-短信消息发送
- * @Author weicailin
- * @Date 2023/5/17 14:18
- * @Email 13079168756@163.com
  */
 public class HltSendShortRequest extends AbstractIasRequest<HltSendShortResponse> {
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/HltSendShortResponse.java

@@ -4,9 +4,6 @@ import cn.com.taiji.core.model.comm.protocol.ias.portal.AbstractPortalResponse;
 
 /***
  * 汇联通-短信消息发送
- * @Author weicailin
- * @Date 2023/5/17 14:18
- * @Email 13079168756@163.com
  */
 public class HltSendShortResponse extends AbstractPortalResponse {
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/JpushAllRidNotificationMessageResponse.java

@@ -6,9 +6,6 @@ import cn.com.taiji.core.model.comm.protocol.ias.portal.AbstractPortalResponse;
 
 /***
  * 极光推送-指定的registrationId列表(android/ios)-通知栏通知和自定义消息
- * @Author weicailin
- * @Date 2023/5/12 15:57
- * @Email 13079168756@163.com
  */
 public class JpushAllRidNotificationMessageResponse extends AbstractPortalResponse {
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/QtkPushSendMessageResponse.java

@@ -5,9 +5,6 @@ import cn.com.taiji.core.model.comm.protocol.ias.portal.AbstractPortalResponse;
 
 /**
  * qtk推送（web）
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
  */
 public class QtkPushSendMessageResponse extends AbstractPortalResponse {
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/dto/FileVo.java

@@ -2,11 +2,7 @@ package cn.com.taiji.core.model.comm.protocol.ias.message.dto;
 
 import java.util.Objects;
 
-/**
- * @Author weicailin
- * @Date 2023/07/18 018 11:31
- * @Email 13079168756@163.com
- */
+
 public class FileVo {
     /**
      * 地址

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/portal/LoginResponse.java

@@ -6,12 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
-/***
- *
- * @Author weicailin
- * @Date 2023/3/14 16:53
- * @Email 13079168756@163.com
- */
+
 @Getter
 @Setter
 @Accessors(chain = true)

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/portal/LogoutResponse.java

@@ -5,12 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
-/***
- *
- * @Author weicailin
- * @Date 2023/3/14 16:53
- * @Email 13079168756@163.com
- */
+
 @Getter
 @Setter
 @Accessors(chain = true)

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/AccountUserRoleRepo.java

@@ -9,11 +9,7 @@ import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
-/**
- * @Author weicailin
- * @Date 2023/3/8 9:57
- * @Email 13079168756@163.com
- **/
+
 public interface AccountUserRoleRepo extends AbstractJpaRepo<AccountUserRole, String>, JpaSpecificationExecutor<AccountUserRole> {
 
     /**

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/UserMenuRepo.java

@@ -10,11 +10,7 @@ import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
-/**
- * @Author weicailin
- * @Date 2023/3/1 10:55
- * @Email 13079168756@163.com
- **/
+
 public interface UserMenuRepo extends AbstractJpaRepo<UserMenu, String> {
 
     @Query("from UserMenu where id=?1")

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/UserPermRepo.java

@@ -7,12 +7,7 @@ import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
-/***
- *
- * @Author weicailin
- * @Date 2023/4/17 17:32
- * @Email 13079168756@163.com
- */
+
 public interface UserPermRepo extends AbstractJpaRepo<UserPerm, String> {
 
 

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/UserRoleMenuPermRepo.java

@@ -6,12 +6,7 @@ import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
-/***
- *
- * @Author weicailin
- * @Date 2023/5/4 11:15
- * @Email 13079168756@163.com
- */
+
 public interface UserRoleMenuPermRepo extends AbstractJpaRepo<UserRoleMenuPerm, String> {
 
     @Query("from UserRoleMenuPerm where  menuId = ?2 and roleId in ?1")

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/UserRoleRepo.java

@@ -8,14 +8,10 @@ import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
-/**
- * @Author weicailin
- * @Date 2023/3/1 10:55
- * @Email 13079168756@163.com
- **/
+
 public interface UserRoleRepo extends AbstractJpaRepo<UserRole, String> {
 
-    @Query("from UserRole where id=?1")
+    @Query(" from UserRole where id=?1")
     UserRole findRoleById(String id);
 
     @Query("select new UserRole(id,name) from UserRole where id=?1")
@@ -24,20 +20,19 @@ public interface UserRoleRepo extends AbstractJpaRepo<UserRole, String> {
     @Query("delete from UserRole where id=?1")
     UserRole deleteRoleById(String id);
 
-    @Query("from UserRole where name=?1")
+    @Query(" from UserRole where name=?1")
     UserRole findRoleByName(String name);
 
-    @Query("from UserRole where name=?1 and systemType=?2")
+    @Query(" from UserRole where name=?1 and systemType=?2")
     UserRole findRoleByNameAndSystemType(String name, SystemType systemType);
 
-    @Query("from UserRole where name=?1 and systemType=?2 and roleSource=?3 and whetherTemplate=?4")
-    UserRole findRoleByNameAndSystemTypeAndRoleSource(String name, SystemType systemType, RbacSource rbacSource, boolean whetherTemplate);
+    @Query(" from UserRole where name=?1 and systemType=?2 and roleSource=?3 and whetherTemplate=?4")
+    UserRole findRoleByNameAndSystemTypeAndRoleSource(String name, SystemType systemType, RbacSource rbacSource, Boolean whetherTemplate);
 
     /**
      * 根据角色归属，返回该指定系统类型的所有角色信息
      */
-    @Query("from UserRole where systemType=?1 and whetherTemplate=?2")
-    List<UserRole> findRoleBySystemType(SystemType systemType, boolean whetherTemplate);
-
+    @Query(" from UserRole where systemType = ?1 and whetherTemplate = ?2")
+    List<UserRole> findRoleBySystemType(SystemType systemType, Boolean whetherTemplate);
 
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/UserRoleUserMenuRepo.java

@@ -6,11 +6,7 @@ import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
-/**
- * @Author weicailin
- * @Date 2023/3/8 9:57
- * @Email 13079168756@163.com
- **/
+
 public interface UserRoleUserMenuRepo extends AbstractJpaRepo<UserRoleUserMenu, String> {
 
     /**

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/portal/PortalManager.java

@@ -6,11 +6,7 @@ import cn.com.taiji.iaw.model.portal.*;
 
 import javax.validation.Valid;
 
-/**
- * @Author weicailin
- * @Date 2023/3/14 16:33
- * @Email 13079168756@163.com
- */
+
 public interface PortalManager {
 
 //    RegisterResponse register(@Valid RegisterRequest req) throws ManagerException;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/enter/InvwEnterApplyManagerImpl.java

@@ -25,9 +25,7 @@ import cn.com.taiji.invw.model.enter.EnterApplyDetailModel;
 import cn.com.taiji.invw.tools.EasyExcelUtil;
 import cn.com.taiji.invw.tools.GenerateNoUtil;
 import cn.com.taiji.invw.tools.SourceTargetMapper;
-import com.alibaba.excel.EasyExcel;
 import org.apache.commons.compress.utils.Lists;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/CouponDeleteRequestDTO.java

@@ -12,8 +12,6 @@ import javax.validation.constraints.NotBlank;
 /**
  * 卡券-删除
  *
- * @author weicailin
- * @Date 2024/03/13 013 11:48
  */
 @ApiModel(description = "卡券-删除")
 @Data

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/CouponDetailImportRequestDTO.java

@@ -11,9 +11,6 @@ import javax.validation.constraints.NotBlank;
 
 /**
  * 卡券详情-批量导入
- *
- * @author weicailin
- * @Date 2024/03/13 013 11:48
  */
 @ApiModel("卡券详情-批量导入")
 @Data

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/CouponEnableListRequestDTO.java

@@ -6,8 +6,7 @@ import cn.com.taiji.managew.model.protocol.AbstractUcListRequest;
 
 /**
  * 卡券列表查询（状态为启用）
- * @author weicailin
- * @Date 2024/03/13 013 11:48
+ *
  */
 public class CouponEnableListRequestDTO extends AbstractBizRequestDTO {
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/api/rbac/RabcSystemTypeController.java

@@ -25,7 +25,7 @@ import java.util.List;
  * @Date 2024/10/2 10:47
  * @Description
  */
-@Api(tags = {"USER-系统类型:RBAC"})
+@Api(tags = {"系统类型"})
 @RestController
 @RequestMapping("/rbac")
 public class RabcSystemTypeController extends MyValidController {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/api/rbac/RbacRoleController.java

@@ -23,7 +23,7 @@ import java.util.List;
  * @Description
  */
 
-@Api(tags = {"USER-角色管理:RBAC"})
+@Api(tags = {"角色管理"})
 @RestController
 @RequestMapping("/rbac")
 public class RbacRoleController extends MyValidController {
@@ -32,57 +32,56 @@ public class RbacRoleController extends MyValidController {
     private RbacRoleManger rbacRoleManger;
 
     @ApiOperation(value = "角色新增")
-    @PostMapping(value = "/roleadd")
-    public ApiResponse<RbacRoleAddResponseDTO> roleadd(@RequestBody @Valid RbacRoleAddRequestDTO dto) throws ManagerException {
+    @PostMapping(value = "/roleAdd")
+    public ApiResponse<RbacRoleAddResponseDTO> roleAdd(@RequestBody @Valid RbacRoleAddRequestDTO dto) throws ManagerException {
         return ApiResponse.of(rbacRoleManger.add(dto)).setMessage("角色新增成功");
     }
 
     @ApiOperation(value = "角色禁用")
-    @PostMapping(value = "/roledisable")
-    public ApiResponse<RbacRoleDisableResponseDTO> roledisable(@RequestBody @Valid RbacRoleDisableRequestDTO dto) throws ManagerException {
+    @PostMapping(value = "/roleDisable")
+    public ApiResponse<RbacRoleDisableResponseDTO> roleDisable(@RequestBody @Valid RbacRoleDisableRequestDTO dto) throws ManagerException {
         return ApiResponse.of(rbacRoleManger.disable(dto)).setMessage("角色禁用成功");
     }
 
     @ApiOperation(value = "角色启用")
-    @PostMapping(value = "/roleenable")
-    public ApiResponse<RbacRoleEnableResponseDTO> roleenable(@RequestBody @Valid RbacRoleEnableRequestDTO dto) throws ManagerException {
+    @PostMapping(value = "/roleEnable")
+    public ApiResponse<RbacRoleEnableResponseDTO> roleEnable(@RequestBody @Valid RbacRoleEnableRequestDTO dto) throws ManagerException {
         return ApiResponse.of(rbacRoleManger.enable(dto)).setMessage("角色启用成功");
     }
 
     @ApiOperation(value = "角色删除")
-    @PostMapping(value = "/roledelete")
-    public ApiResponse<RbacRoleDeleteResponseDTO> roledelete(@RequestBody @Valid RbacRoleDeleteRequestDTO dto) throws ManagerException {
+    @PostMapping(value = "/roleDelete")
+    public ApiResponse<RbacRoleDeleteResponseDTO> roleDelete(@RequestBody @Valid RbacRoleDeleteRequestDTO dto) throws ManagerException {
         return ApiResponse.of(rbacRoleManger.delete(dto)).setMessage("角色删除成功");
     }
 
     @ApiOperation(value = "角色更改")
-    @PostMapping(value = "/rolechange")
-    public ApiResponse<RbacRoleChangeResponseDTO> rolechange(@RequestBody @Valid RbacRoleChangeRequestDTO dto) throws ManagerException {
-        return ApiResponse.of(rbacRoleManger.change(dto)).setMessage("角色删除成功");
-
+    @PostMapping(value = "/roleChange")
+    public ApiResponse<RbacRoleChangeResponseDTO> roleChange(@RequestBody @Valid RbacRoleChangeRequestDTO dto) throws ManagerException {
+        return ApiResponse.of(rbacRoleManger.change(dto)).setMessage("角色修改成功");
     }
 
     @ApiOperation(value = "单个角色查询")
-    @PostMapping(value = "/rolequery")
-    public ApiResponse<RbacRoleQueryResponseDTO> rolequery(@RequestBody @Valid RbacRoleQueryRequestDTO dto) throws FormatException, ManagerException {
+    @PostMapping(value = "/roleQuery")
+    public ApiResponse<RbacRoleQueryResponseDTO> roleQuery(@RequestBody @Valid RbacRoleQueryRequestDTO dto) throws FormatException, ManagerException {
         return ApiResponse.of(rbacRoleManger.query(dto)).setMessage("单个角色查询成功");
     }
 
     @ApiOperation(value = "角色列表多条件分页查询")
-    @PostMapping(value = "/rolepage")
-    public ApiResponse<RbacRolePageResponseDTO> rolepage(@RequestBody @Valid RbacRolePageRequestDTO dto) throws FormatException, ManagerException {
+    @PostMapping(value = "/rolePage")
+    public ApiResponse<RbacRolePageResponseDTO> rolePage(@RequestBody @Valid RbacRolePageRequestDTO dto) throws FormatException, ManagerException {
         return ApiResponse.of(rbacRoleManger.page(dto)).setMessage("角色列表多条件分页查询成功");
     }
 
     @ApiOperation(value = "根据角色获取拥有该角色的用户信息-分页列表")
-    @PostMapping(value = "/getaccountbyrolepage")
-    public ApiResponse<GetAccountInfoByRolePageResponseDTO> getaccountbyrolepage(@RequestBody @Valid GetAccountInfoByRolePageRequestDTO dto) throws ManagerException {
+    @PostMapping(value = "/getAccountByRolePage")
+    public ApiResponse<GetAccountInfoByRolePageResponseDTO> getAccountByRolePage(@RequestBody @Valid GetAccountInfoByRolePageRequestDTO dto) throws ManagerException {
         return ApiResponse.of(rbacRoleManger.getAccountInfoByRolePage(dto)).setMessage("根据角色获取拥有该角色的用户信息分页列表查询成功");
     }
 
     @ApiOperation(value = "根据权限id获取拥有该角色的用户信息-分页列表")
-    @PostMapping(value = "/getaccountbyrolemenupermlist")
-    public ApiResponse<GetAccountInfoByRoleMenuPermListResponseDTO> getaccountbyrolemenupermlist(@RequestBody @Valid GetAccountInfoByRoleMenuPermListRequestDTO dto) throws ManagerException {
+    @PostMapping(value = "/getAccountByRoleMenuPermList")
+    public ApiResponse<GetAccountInfoByRoleMenuPermListResponseDTO> getAccountByRoleMenuPermList(@RequestBody @Valid GetAccountInfoByRoleMenuPermListRequestDTO dto) throws ManagerException {
         return ApiResponse.of(rbacRoleManger.getAccountInfoByRolePage(dto)).setMessage("根据权限id获取拥有该角色的用户信息分页列表查询成功");
     }
 
@@ -93,8 +92,8 @@ public class RbacRoleController extends MyValidController {
     }
 
     @ApiOperation(value = "获取小程序系统下的所有角色")
-    @PostMapping(value = "/rolelistbyminiprogram")
-    public ApiResponse<RbacRoleListByMiniProgramResponseDTO> rolelistbyminiprogram(@RequestBody RbacRoleListByMiniProgramRequestDTO dto) throws ManagerException {
+    @PostMapping(value = "/roleListByMiniProgram")
+    public ApiResponse<RbacRoleListByMiniProgramResponseDTO> roleListByMiniProgram(@RequestBody RbacRoleListByMiniProgramRequestDTO dto) throws ManagerException {
         return ApiResponse.of(rbacRoleManger.getRoleListByMiniProgram(dto)).setMessage("获取小程序系统下的所有角色成功");
     }
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/GetAccountInfoByRoleMenuPermListRequestDTO.java

@@ -2,15 +2,16 @@ package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.util.StringUtils;
 
 /**
  * 根据菜单权限获取拥有该权限的用户信息列表
  *
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
  **/
+@Getter
+@Setter
 public class GetAccountInfoByRoleMenuPermListRequestDTO extends AbstractBizRequestDTO {
 
     /**
@@ -34,19 +35,4 @@ public class GetAccountInfoByRoleMenuPermListRequestDTO extends AbstractBizReque
         return this;
     }
 
-    public String getMenuId() {
-        return menuId;
-    }
-
-    public void setMenuId(String menuId) {
-        this.menuId = menuId;
-    }
-
-    public String getPermId() {
-        return permId;
-    }
-
-    public void setPermId(String permId) {
-        this.permId = permId;
-    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/GetAccountInfoByRoleMenuPermListResponseDTO.java

@@ -9,9 +9,6 @@ import java.util.Map;
 /**
  * 根据菜单权限获取拥有该权限的用户信息列表
  *
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
  **/
 public class GetAccountInfoByRoleMenuPermListResponseDTO extends BaseModel {
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/GetAccountInfoByRolePageRequestDTO.java

@@ -2,14 +2,16 @@ package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.userw.dto.AbstractBizPageRequestDTO;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.util.StringUtils;
 
 /**
  * 根据角色获取拥有该角色的用户信息-分页列表
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
+ *
  **/
+@Getter
+@Setter
 public class GetAccountInfoByRolePageRequestDTO extends AbstractBizPageRequestDTO {
 
     /**
@@ -30,8 +32,4 @@ public class GetAccountInfoByRolePageRequestDTO extends AbstractBizPageRequestDT
         return this;
     }
 
-
-    public String getId() {
-        return id;
-    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/GetAccountInfoByRolePageResponseDTO.java

@@ -9,9 +9,7 @@ import java.util.List;
 
 /**
  * 根据角色获取拥有该角色的用户信息-分页列表
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
+ *
  **/
 public class GetAccountInfoByRolePageResponseDTO extends BaseModel {
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacMenuListBySystemTypeRequestDTO.java

@@ -8,11 +8,7 @@ import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
 
-/**
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
- **/
+
 public class RbacMenuListBySystemTypeRequestDTO extends AbstractBizRequestDTO {
 
     /**

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacMenuListBySystemTypeResponseDTO.java

@@ -6,11 +6,7 @@ import cn.com.taiji.userw.model.rbac.MenuModel;
 
 import java.util.List;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
- **/
+
 public class RbacMenuListBySystemTypeResponseDTO extends BaseModel {
     private List<MenuModel> menuList;
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleAddRequestDTO.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.user.RbacSource;
 import cn.com.taiji.core.entity.dict.user.RbacStatus;
 import cn.com.taiji.core.entity.dict.user.SystemType;
@@ -9,14 +8,13 @@ import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.com.taiji.userw.model.rbac.SetMenuModel;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 
-/**
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
- **/
+@Getter
+@Setter
 public class RbacRoleAddRequestDTO extends AbstractBizRequestDTO {
 
     /**
@@ -45,12 +43,6 @@ public class RbacRoleAddRequestDTO extends AbstractBizRequestDTO {
      */
     private RbacStatus status;
 
-    /**
-     * 登录来源方
-     */
-    private String loginSource;
-
-
     /**
      * 角色所属来源方
      */
@@ -81,7 +73,7 @@ public class RbacRoleAddRequestDTO extends AbstractBizRequestDTO {
             failParamInfo.add("角色所属来源方");
         }
 
-        if (loginSource == null || SourceType.findByCode(loginSource) == null) {
+        if (getOrderSource() == null) {
             failParamInfo.add("登录来源方");
         }
 
@@ -102,35 +94,4 @@ public class RbacRoleAddRequestDTO extends AbstractBizRequestDTO {
     }
 
 
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public SetMenuModel[] getSetMenus() {
-        return setMenus;
-    }
-
-    public SystemType getSystemType() {
-        return systemType;
-    }
-
-    public RbacStatus getStatus() {
-        return status;
-    }
-
-    public String getLoginSource() {
-        return loginSource;
-    }
-
-    public RbacSource getRoleSource() {
-        return roleSource;
-    }
-
-    public Boolean getWhetherTemplate() {
-        return whetherTemplate;
-    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleAddResponseDTO.java

@@ -5,11 +5,7 @@ import cn.com.taiji.common.model.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
- **/
+
 @Setter
 @Getter
 public class RbacRoleAddResponseDTO extends BaseModel {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleChangeRequestDTO.java

@@ -9,14 +9,13 @@ import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.com.taiji.userw.model.rbac.SetMenuModel;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 
-/**
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
- **/
+@Getter
+@Setter
 public class RbacRoleChangeRequestDTO extends AbstractBizRequestDTO {
 
     /**
@@ -47,11 +46,6 @@ public class RbacRoleChangeRequestDTO extends AbstractBizRequestDTO {
      */
     private RbacStatus status;
 
-    /**
-     * 登录来源方
-     */
-    private String loginSource;
-
     /**
      * 角色所属来源方
      */
@@ -81,7 +75,7 @@ public class RbacRoleChangeRequestDTO extends AbstractBizRequestDTO {
         if (status == null) {
             failParamInfo.add("角色状态status");
         }
-        if (loginSource == null || SourceType.findByCode(loginSource) == null) {
+        if (getOrderSource() == null) {
             failParamInfo.add("登录来源方");
         }
 
@@ -105,40 +99,4 @@ public class RbacRoleChangeRequestDTO extends AbstractBizRequestDTO {
 
         return this;
     }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public SetMenuModel[] getSetMenus() {
-        return setMenus;
-    }
-
-    public SystemType getSystemType() {
-        return systemType;
-    }
-
-    public RbacStatus getStatus() {
-        return status;
-    }
-
-    public String getLoginSource() {
-        return loginSource;
-    }
-
-    public RbacSource getRoleSource() {
-        return roleSource;
-    }
-
-    public Boolean getWhetherTemplate() {
-        return whetherTemplate;
-    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleChangeResponseDTO.java

@@ -5,11 +5,7 @@ import cn.com.taiji.common.model.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
- **/
+
 @Getter
 @Setter
 public class RbacRoleChangeResponseDTO extends BaseModel {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleDeleteRequestDTO.java

@@ -5,24 +5,18 @@ import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 
-/**
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
- **/
-
+@Getter
+@Setter
 public class RbacRoleDeleteRequestDTO extends AbstractBizRequestDTO {
 
     /**角色id*/
     private String id;
 
-    /**
-     * 登录来源方
-     */
-    private String loginSource;
 
 
     public RbacRoleDeleteRequestDTO valid() throws ManagerException {
@@ -32,7 +26,7 @@ public class RbacRoleDeleteRequestDTO extends AbstractBizRequestDTO {
             failParamInfo.add("角色id");
         }
 
-        if (loginSource == null || SourceType.findByCode(loginSource) == null) {
+        if (getOrderSource() == null) {
             failParamInfo.add("登录来源方");
         }
 
@@ -44,12 +38,4 @@ public class RbacRoleDeleteRequestDTO extends AbstractBizRequestDTO {
         return this;
     }
 
-
-    public String getId() {
-        return id;
-    }
-
-    public String getLoginSource() {
-        return loginSource;
-    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleDeleteResponseDTO.java

@@ -5,11 +5,7 @@ import cn.com.taiji.common.model.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
- **/
+
 @Getter
 @Setter
 public class RbacRoleDeleteResponseDTO extends BaseModel {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleDisableRequestDTO.java

@@ -5,22 +5,17 @@ import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.com.taiji.userw.model.FormatException;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 
-/**
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
- **/
+@Setter
+@Getter
 public class RbacRoleDisableRequestDTO extends AbstractBizRequestDTO {
     /**角色id*/
     private String id;
 
-    /**
-     * 登录来源方
-     */
-    private String loginSource;
 
     public RbacRoleDisableRequestDTO valid() throws FormatException {
         final ArrayList<String> failParamInfo = Lists.newArrayList();
@@ -29,7 +24,7 @@ public class RbacRoleDisableRequestDTO extends AbstractBizRequestDTO {
         }
 
 
-        if (loginSource == null || SourceType.findByCode(loginSource) == null) {
+        if (getOrderSource() == null) {
             failParamInfo.add("登录来源方");
         }
 
@@ -40,11 +35,4 @@ public class RbacRoleDisableRequestDTO extends AbstractBizRequestDTO {
 
         return this;
     }
-    public String getId() {
-        return id;
-    }
-
-    public String getLoginSource() {
-        return loginSource;
-    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleDisableResponseDTO.java

@@ -5,11 +5,7 @@ import cn.com.taiji.common.model.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
- **/
+
 @Setter
 @Getter
 public class RbacRoleDisableResponseDTO extends BaseModel {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleEnableRequestDTO.java

@@ -5,24 +5,18 @@ import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 
-/**
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
- **/
+@Getter
+@Setter
 public class RbacRoleEnableRequestDTO extends AbstractBizRequestDTO {
 
     /**角色id*/
     private String id;
 
-    /**
-     * 登录来源方
-     */
-    private String loginSource;
-
 
     public RbacRoleEnableRequestDTO valid() throws ManagerException {
         final ArrayList<String> failParamInfo = Lists.newArrayList();
@@ -30,7 +24,7 @@ public class RbacRoleEnableRequestDTO extends AbstractBizRequestDTO {
         if (id == null || id.trim().isEmpty())
             failParamInfo.add("角色id");
 
-        if (loginSource == null || SourceType.findByCode(loginSource) == null) {
+        if (getOrderSource() == null) {
             failParamInfo.add("登录来源方");
         }
 
@@ -43,12 +37,4 @@ public class RbacRoleEnableRequestDTO extends AbstractBizRequestDTO {
         return this;
     }
 
-
-    public String getId() {
-        return id;
-    }
-
-    public String getLoginSource() {
-        return loginSource;
-    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleEnableResponseDTO.java

@@ -5,11 +5,7 @@ import cn.com.taiji.common.model.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
- **/
+
 @Setter
 @Getter
 public class RbacRoleEnableResponseDTO extends BaseModel {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleListByMiniProgramRequestDTO.java

@@ -5,29 +5,21 @@ import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
 /***
  * 获取小程序系统对应所有的角色
- * @Author weicailin
- * @Date 2023/4/4 9:34
- * @Email 13079168756@163.com
+ *
  */
 public class RbacRoleListByMiniProgramRequestDTO extends AbstractBizRequestDTO {
 
-
-
-    /**
-     * 登录来源方
-     */
-    private String loginSource;
-
-
     public RbacRoleListByMiniProgramRequestDTO valid() throws ManagerException {
         final List<String> failParamInfo = Lists.newArrayList();
 
-        if (loginSource == null || SourceType.findByCode(loginSource) == null) {
+        if (getOrderSource() == null) {
             failParamInfo.add("登录来源方");
         }
 
@@ -38,8 +30,4 @@ public class RbacRoleListByMiniProgramRequestDTO extends AbstractBizRequestDTO {
 
         return this;
     }
-
-    public String getLoginSource() {
-        return loginSource;
-    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleListByMiniProgramResponseDTO.java

@@ -7,11 +7,7 @@ import cn.com.taiji.userw.model.rbac.UserRoleModel;
 
 import java.util.List;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
- **/
+
 public class RbacRoleListByMiniProgramResponseDTO extends BaseModel {
     private List<UserRoleModel>  roleList;
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleListBySystemTypeRequestDTO.java

@@ -4,13 +4,12 @@ import cn.com.taiji.common.valid.BaseValidDTO;
 import cn.com.taiji.common.valid.ViolationValidator;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.user.SystemType;
+import lombok.Getter;
+import lombok.Setter;
 
-/**
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
- **/
 
+@Getter
+@Setter
 public class RbacRoleListBySystemTypeRequestDTO extends BaseValidDTO {
 
     /**
@@ -29,30 +28,6 @@ public class RbacRoleListBySystemTypeRequestDTO extends BaseValidDTO {
      */
     private Boolean whetherTemplate;
 
-    public SystemType[] getSystemTypes() {
-        return systemTypes;
-    }
-
-    public void setSystemTypes(SystemType[] systemTypes) {
-        this.systemTypes = systemTypes;
-    }
-
-    public String getLoginSource() {
-        return loginSource;
-    }
-
-    public void setLoginSource(String loginSource) {
-        this.loginSource = loginSource;
-    }
-
-    public Boolean getWhetherTemplate() {
-        return whetherTemplate;
-    }
-
-    public void setWhetherTemplate(Boolean whetherTemplate) {
-        this.whetherTemplate = whetherTemplate;
-    }
-
     @Override
     protected void validate(ViolationValidator validator) {
         validator.validField("systemTypes",systemTypes == null || systemTypes.length == 0,"系统类型列表不能为空");

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRolePageRequestDTO.java

@@ -5,12 +5,11 @@ import cn.com.taiji.core.entity.dict.user.RbacSource;
 import cn.com.taiji.core.entity.dict.user.RbacStatus;
 import cn.com.taiji.core.entity.dict.user.SystemType;
 import cn.com.taiji.userw.dto.AbstractBizPageRequestDTO;
+import lombok.Getter;
+import lombok.Setter;
 
-/**
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
- **/
+@Getter
+@Setter
 public class RbacRolePageRequestDTO extends AbstractBizPageRequestDTO {
 
     /**
@@ -55,28 +54,4 @@ public class RbacRolePageRequestDTO extends AbstractBizPageRequestDTO {
         return this;
     }
 
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public RbacStatus getStatus() {
-        return status;
-    }
-
-    public SystemType getSystemType() {
-        return systemType;
-    }
-
-    public RbacSource getRoleSource() {
-        return roleSource;
-    }
-
-    public Boolean getWhetherTemplate() {
-        return whetherTemplate;
-    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRolePageResponseDTO.java

@@ -9,11 +9,7 @@ import lombok.Setter;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
- **/
+
 @Setter
 @Getter
 public class RbacRolePageResponseDTO extends BaseModel {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleQueryRequestDTO.java

@@ -4,14 +4,13 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 
-/**
- * @Author weicailin
- * @Date 2023/3/6 14:17
- * @Email 13079168756@163.com
- **/
+@Getter
+@Setter
 public class RbacRoleQueryRequestDTO extends AbstractBizRequestDTO {
 
     /**角色id*/

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleQueryResponseDTO.java

@@ -10,11 +10,7 @@ import lombok.Setter;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 9:31
- * @Email 13079168756@163.com
- **/
+
 @Setter
 @Getter
 public class RbacRoleQueryResponseDTO extends BaseModel {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RoleListAndSystemTypeDTO.java

@@ -10,9 +10,6 @@ import java.util.List;
  * 用于根据系统类型列表，返回的对应系统类型和系统类型角色列表 的列表
  * 例子：[{systemType: 1, roleList: []}]
  *
- * @Author weicailin
- * @Date 2023/3/17 16:33
- * @Email 13079168756@163.com
  */
 public class RoleListAndSystemTypeDTO {
     private SystemType systemType;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/SystemTypeListByRbacSourceRequestDTO.java

@@ -5,12 +5,6 @@ import cn.com.taiji.common.valid.ViolationValidator;
 import cn.com.taiji.core.entity.dict.user.RbacSource;
 import lombok.Data;
 
-/***
- *
- * @Author weicailin
- * @Date 2023/3/14 16:53
- * @Email 13079168756@163.com
- */
 
 @Data
 public class SystemTypeListByRbacSourceRequestDTO extends BaseValidDTO {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/rbac/RbacMenuManger.java

@@ -7,11 +7,7 @@ import cn.com.taiji.userw.dto.rbac.RbacMenuListBySystemTypeResponseDTO;
 import cn.com.taiji.userw.dto.rbac.SystemTypeListByRbacSourceRequestDTO;
 import cn.com.taiji.userw.dto.rbac.SystemTypeListByRbacSourceResponseDTO;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 11:00
- * @Email 13079168756@163.com
- **/
+
 public interface RbacMenuManger {
 
     RbacMenuListBySystemTypeResponseDTO getMenuListBySystemType(RbacMenuListBySystemTypeRequestDTO request) throws ServiceHandleException;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/rbac/RbacMenuMangerImpl.java

@@ -23,11 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 11:02
- * @Email 13079168756@163.com
- **/
+
 @Service
 public class RbacMenuMangerImpl extends CommonAbstract implements RbacMenuManger {
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/rbac/RbacRoleManger.java

@@ -5,11 +5,7 @@ import cn.com.taiji.userw.dto.rbac.*;
 
 import java.util.List;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 11:00
- * @Email 13079168756@163.com
- **/
+
 public interface RbacRoleManger {
     /**角色新增*/
     RbacRoleAddResponseDTO add(RbacRoleAddRequestDTO request) throws ManagerException;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/rbac/RbacRoleMangerImpl.java

@@ -36,11 +36,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 11:02
- * @Email 13079168756@163.com
- **/
+
 @Service
 public class RbacRoleMangerImpl extends CommonAbstract implements RbacRoleManger {
 
@@ -73,16 +69,13 @@ public class RbacRoleMangerImpl extends CommonAbstract implements RbacRoleManger
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     @Override
     public RbacRoleAddResponseDTO add(RbacRoleAddRequestDTO request) throws ManagerException {
-
         //入参校验
         request.valid();
-
         //登录来源方校验
         if (!SourceType.WEB.equals(SourceType.findByCode(request.getLoginSource()))) {
             throw new ManagerException("如需新增角色，请管理员前往Web端进行操作！");
         }
 
-        //TODO 系统类型和所属来源方是否匹配
         if (!systemTypeAndRbacSourceUtil.isMatch(request.getSystemType(), request.getRoleSource())) {
             throw new ManagerException("系统类型和所属来源方不匹配！请重新设置！");
         }
@@ -248,8 +241,6 @@ public class RbacRoleMangerImpl extends CommonAbstract implements RbacRoleManger
             throw new ManagerException("如需修改角色，请管理员前往Web端进行操作！");
         }
 
-
-        //TODO 系统类型和所属来源方是否匹配
         if (!systemTypeAndRbacSourceUtil.isMatch(request.getSystemType(), request.getRoleSource())) {
             throw new ManagerException("系统类型和所属来源方不匹配！请重新设置！");
         }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/rbac/AccountInfoSimpleModel.java

@@ -2,9 +2,7 @@ package cn.com.taiji.userw.model.rbac;
 
 /***
  * 简单用户信息
- * @Author weicailin
- * @Date 2023/4/11 11:51
- * @Email 13079168756@163.com
+ *
  */
 public class AccountInfoSimpleModel {
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/rbac/MenuModel.java

@@ -10,11 +10,7 @@ import lombok.Setter;
 
 import java.util.List;
 
-/**
- * @Author weicailin
- * @Date 2023/3/15 22:12
- * @Email 13079168756@163.com
- */
+
 @Getter
 @Setter
 public class MenuModel extends BaseModel {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/rbac/PermModel.java

@@ -10,9 +10,7 @@ import lombok.Setter;
 
 /***
  * 菜单中的权限标识vo类
- * @Author weicailin
- * @Date 2023/4/17 16:04
- * @Email 13079168756@163.com
+ *
  */
 @Getter
 @Setter

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/rbac/SetMenuDto.java

@@ -2,11 +2,7 @@ package cn.com.taiji.userw.model.rbac;
 
 import java.util.List;
 
-/**
- * @Author weicailin
- * @Date 2023/5/5 16:23
- * @Email 13079168756@163.com
- */
+
 public class SetMenuDto {
     private String menuId;
     private List<String> permIds;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/rbac/SetMenuModel.java

@@ -1,11 +1,7 @@
 package cn.com.taiji.userw.model.rbac;
 
 
-/**
- * @Author weicailin
- * @Date 2023/5/4 14:06
- * @Email 13079168756@163.com
- */
+
 public class SetMenuModel {
 
     private String id; //菜单id或权限标识id

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/rbac/SimpleMenuModel.java

@@ -3,11 +3,7 @@ package cn.com.taiji.userw.model.rbac;
 import lombok.Getter;
 import lombok.Setter;
 
-/**
- * @Author weicailin
- * @Date 2023/3/15 22:12
- * @Email 13079168756@163.com
- */
+
 @Getter
 @Setter
 public class SimpleMenuModel {

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/rbac/UserRoleModel.java

@@ -4,11 +4,7 @@ package cn.com.taiji.userw.model.rbac;
 import cn.com.taiji.core.entity.dict.user.RbacSource;
 import cn.com.taiji.core.entity.dict.user.SystemType;
 
-/**
- * @Author weicailin
- * @Date 2023/3/15 22:12
- * @Email 13079168756@163.com
- */
+
 public class UserRoleModel {
     private String id;
     private String name;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/repo/jpa/request/rbac/RbacRolePageableRequest.java

@@ -7,11 +7,7 @@ import cn.com.taiji.core.entity.dict.user.RbacStatus;
 import cn.com.taiji.core.entity.dict.user.SystemType;
 import cn.com.taiji.core.entity.user.UserRole;
 
-/**
- * @Author weicailin
- * @Date 2023/3/7 16:48
- * @Email 13079168756@163.com
- **/
+
 public class RbacRolePageableRequest extends JpaPageableDataRequest<UserRole> {
 
     /**

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/tools/SystemTypeAndSourceUtil.java

@@ -6,12 +6,7 @@ import cn.com.taiji.core.entity.dict.user.RbacSource;
 import cn.com.taiji.core.entity.dict.user.SystemType;
 import org.springframework.stereotype.Component;
 
-/***
- *
- * @Author weicailin
- * @Date 2023/4/25 12:04
- * @Email 13079168756@163.com
- */
+
 @Component
 public class SystemTypeAndSourceUtil {
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/clientConfig/WxManagerImpl.java

@@ -30,9 +30,6 @@ import cn.com.taiji.common.manager.ManagerException;
 /**
  * 微信开发工具（小程序、公众号）
  *
- * @Author weicailin
- * @Date 2023/5/18 16:14
- * @Email 13079168756@163.com
  */
 @Service
 public class WxManagerImpl implements WxManager {

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/tools/gson/PushGsonBuilder.java

@@ -5,10 +5,7 @@ import java.util.Objects;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-/**
- * @Author weicailin
- * @Date 2023/08/16 016 14:39
- */
+
 public class PushGsonBuilder {
     private static final GsonBuilder INSTANCE = new GsonBuilder();
     private static volatile Gson GSON_INSTANCE;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/tools/gson/PushGsonParser.java

@@ -9,8 +9,6 @@ import com.google.gson.stream.JsonReader;
 /**
  * JSON解析器
  *
- * @Author weicailin
- * @Date 2023/08/16 016 14:39
  */
 public class PushGsonParser {
     private static final JsonParser JSON_PARSER = new JsonParser();

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/tools/wx/WxRequestUrls.java

@@ -1,10 +1,6 @@
 package cn.com.taiji.ats.manager.tools.wx;
 
-/**
- * @Author weicailin
- * @Date 2023/5/19 9:49
- * @Email 13079168756@163.com
- */
+
 public class WxRequestUrls {
     //1、token获取
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/tools/wx/WxSendRequestUtil.java

@@ -22,11 +22,7 @@ import cn.com.taiji.ats.manager.AbstractCommManager;
 import cn.com.taiji.ats.manager.request.WxMapRequest;
 import cn.com.taiji.common.manager.ManagerException;
 
-/**
- * @Author weicailin
- * @Date 2023/5/19 10:53
- * @Email 13079168756@163.com
- */
+
 @Component
 public class WxSendRequestUtil extends AbstractCommManager {
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/GetWxTokenResponse.java

@@ -5,9 +5,7 @@ import cn.com.taiji.common.entity.BaseEntity;
 
 /**
  * 微信小程序-订阅消息发送
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
+ *
  */
 public class GetWxTokenResponse extends BaseEntity {
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/WxMiniMessageTemplateListRequest.java

@@ -11,9 +11,6 @@ import cn.hutool.core.collection.CollectionUtil;
 /**
  * 微信小程序-获取消息模板列表
  *
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
  */
 public class WxMiniMessageTemplateListRequest extends BaseEntity {
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/WxMiniMessageTemplateListResponse.java

@@ -5,9 +5,7 @@ import cn.com.taiji.common.entity.BaseEntity;
 
 /**
  * 微信小程序-订阅消息发送
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
+ *
  */
 public class WxMiniMessageTemplateListResponse extends BaseEntity {
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/WxMpMessageTemplateListRequest.java

@@ -11,9 +11,6 @@ import cn.hutool.core.collection.CollectionUtil;
 /**
  * 微信公众号-获取消息模板列表
  *
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
  */
 public class WxMpMessageTemplateListRequest extends BaseEntity {
     private String clientId;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/WxMpMessageTemplateListResponse.java

@@ -5,9 +5,7 @@ import cn.com.taiji.common.entity.BaseEntity;
 
 /**
  * 微信公众号-订阅消息发送
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
+ *
  */
 public class WxMpMessageTemplateListResponse extends BaseEntity {
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/dto/WxMiniMessageTemplateDto.java

@@ -5,9 +5,6 @@ import java.util.List;
 /**
  * 微信小程序-消息模板dto
  *
- * @Author weicailin
- * @Date 2023/5/19 14:49
- * @Email 13079168756@163.com
  */
 public class WxMiniMessageTemplateDto {
     //添加至帐号下的模板 id，发送小程序订阅消息时所需

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/dto/WxMiniSendMessageDto.java

@@ -1,10 +1,6 @@
 package cn.com.taiji.ats.model.protocol.channel.wx.dto;
 
-/**
- * @Author weicailin
- * @Date 2023/5/19 11:51
- * @Email 13079168756@163.com
- */
+
 public class WxMiniSendMessageDto {
     //所需下发的订阅模板id
     private String template_id;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/dto/WxMpMessageTemplateDto.java

@@ -11,9 +11,6 @@ import cn.com.taiji.ats.manager.tools.gson.PushGsonParser;
 /**
  * 微信公众号-消息模板dto
  *
- * @Author weicailin
- * @Date 2023/5/19 14:49
- * @Email 13079168756@163.com
  */
 public class WxMpMessageTemplateDto {
     /**

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/dto/WxMpSendMessageDto.java

@@ -1,10 +1,6 @@
 package cn.com.taiji.ats.model.protocol.channel.wx.dto;
 
-/**
- * @Author weicailin
- * @Date 2023/5/19 11:51
- * @Email 13079168756@163.com
- */
+
 public class WxMpSendMessageDto {
 
     //必填

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/update/WxMiniSendMessageUpdateRequest.java

@@ -16,9 +16,6 @@ import cn.hutool.core.collection.CollectionUtil;
 /**
  * 微信小程序-订阅消息发送-编辑
  *
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
  */
 public class WxMiniSendMessageUpdateRequest extends BaseEntity {
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/update/WxMiniSendMessageUpdateResponse.java

@@ -5,9 +5,7 @@ import cn.com.taiji.common.entity.BaseEntity;
 
 /**
  * 微信小程序-订阅消息发送-编辑
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
+ *
  */
 public class WxMiniSendMessageUpdateResponse extends BaseEntity {
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/update/WxMpSendMessageUpdateRequest.java

@@ -15,10 +15,6 @@ import cn.hutool.core.collection.CollectionUtil;
 
 /**
  * 微信公众号-订阅消息发送-编辑
- *
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
  */
 public class WxMpSendMessageUpdateRequest extends BaseEntity {
     private String id;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/protocol/channel/wx/update/WxMpSendMessageUpdateResponse.java

@@ -5,9 +5,7 @@ import cn.com.taiji.common.entity.BaseEntity;
 
 /**
  * 微信公众号-订阅消息发送-编辑
- * @Author weicailin
- * @Date 2023/5/18 18:15
- * @Email 13079168756@163.com
+ *
  */
 public class WxMpSendMessageUpdateResponse extends BaseEntity {
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/tools/WxRequestAccessTokenUtil.java

@@ -19,9 +19,6 @@ import cn.hutool.json.JSONUtil;
 /**
  * 获取-微信后台接口调用凭证-工具类
  *
- * @Author weicailin
- * @Date 2023/5/19 9:56
- * @Email 13079168756@163.com
  */
 @Component
 public class WxRequestAccessTokenUtil {

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/tools/WxRequestUrls.java

@@ -1,10 +1,6 @@
 package cn.com.taiji.ats.tools;
 
-/**
- * @Author weicailin
- * @Date 2023/5/19 9:49
- * @Email 13079168756@163.com
- */
+
 public class WxRequestUrls {
     //1、token获取
     //微信获取调用后台接口的accessToken的url

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/HltManager.java

@@ -4,9 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.core.model.comm.protocol.ias.message.*;
 /***
  * 汇联通
- * @Author weicailin
- * @Date 2023/5/9 16:15
- * @Email 13079168756@163.com
+ *
  */
 public interface HltManager {
     /**立刻发送-短信*/

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/HltManagerImpl.java

@@ -24,11 +24,7 @@ import cn.com.taiji.ias.manager.tools.ThreadPoolTools;
 import cn.com.taiji.ias.tools.hlt.DesUtil;
 import okhttp3.*;
 
-/**
- * @Author weicailin
- * @Date 2023/4/27 17:54
- * @Email 13079168756@163.com
- */
+
 @Service
 public class HltManagerImpl extends AbstractCommManager implements HltManager {
     private static final Logger logger = LoggerFactory.getLogger(HltManagerImpl.class);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/JpushManager.java

@@ -5,12 +5,7 @@ import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotification
 import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageResponse;
 
 
-/***
- *
- * @Author weicailin
- * @Date 2023/5/9 16:15
- * @Email 13079168756@163.com
- */
+
 public interface JpushManager {
     /**极光推送-全体App用户(android/ios)-自定义消息*/
 //    JpushAllAppMessageResponse sendToAllAppMessage(JpushAllAppMessageRequest request, String apiKey, QtkMessage message) throws ManagerException;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/JpushManagerImpl.java

@@ -13,11 +13,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.CommonAbstract;
 
-/**
- * @Author weicailin
- * @Date 2023/4/27 17:54
- * @Email 13079168756@163.com
- */
+
 @Service
 public class JpushManagerImpl extends CommonAbstract implements JpushManager {
     private final String JPUSH_ALL_MSG_DESC = "极光推送-全体App用户(android/ios)-自定义消息";

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/QtkPushManager.java

@@ -6,9 +6,6 @@ import cn.com.taiji.core.model.comm.protocol.ias.message.*;
 /**
  * qtk推送（web）
  *
- * @Author weicailin
- * @Date 2023/5/30 18:22
- * @Email 13079168756@163.com
  */
 public interface QtkPushManager {
 

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/QtkPushManagerImpl.java

@@ -10,11 +10,7 @@ import cn.com.taiji.core.model.comm.protocol.ias.message.QtkPushSendMessageReque
 import cn.com.taiji.core.model.comm.protocol.ias.message.QtkPushSendMessageResponse;
 import cn.com.taiji.ias.manager.tools.ThreadPoolTools;
 
-/**
- * @Author weicailin
- * @Date 2023/5/30 18:23
- * @Email 13079168756@163.com
- */
+
 @Service
 public class QtkPushManagerImpl implements QtkPushManager {
     private static final Logger logger = LoggerFactory.getLogger(QtkPushManagerImpl.class);