From e5a508299f986d7d47201ce2b79f259a6fa7a2a7 Mon Sep 17 00:00:00 2001 From: lbw Date: Thu, 9 Nov 2023 16:13:51 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20Improving=20structure=20/=20format=20of?= =?UTF-8?q?=20the=20code.=20=E7=BB=9F=E4=B8=80VO=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/auth/endpoint/PigxTokenEndpoint.java | 10 +-- .../admin/api/feign/RemoteDeptService.java | 4 +- .../pigx/admin/api/vo/CpUserExcelVo.java | 64 ------------------- .../vo/{DeptExcelVo.java => DeptExcelVO.java} | 4 +- .../pigx/admin/api/vo/DingUserExcelVo.java | 51 --------------- .../pigx/admin/api/vo/PostExcelVO.java | 4 +- .../pigx/admin/api/vo/RoleExcelVO.java | 2 +- .../api/vo/{TokenVo.java => TokenVO.java} | 2 +- .../pigx/admin/api/vo/UserExcelVO.java | 2 +- 9 files changed, 15 insertions(+), 128 deletions(-) delete mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/CpUserExcelVo.java rename pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/{DeptExcelVo.java => DeptExcelVO.java} (93%) delete mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DingUserExcelVo.java rename pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/{TokenVo.java => TokenVO.java} (93%) diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index 801913c78..928444a45 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -25,7 +25,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; import com.pig4cloud.pigx.admin.api.entity.SysTenant; import com.pig4cloud.pigx.admin.api.feign.RemoteClientDetailsService; import com.pig4cloud.pigx.admin.api.feign.RemoteTenantService; -import com.pig4cloud.pigx.admin.api.vo.TokenVo; +import com.pig4cloud.pigx.admin.api.vo.TokenVO; import com.pig4cloud.pigx.auth.support.handler.PigxAuthenticationFailureEventHandler; import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.CommonConstants; @@ -201,18 +201,18 @@ public class PigxTokenEndpoint { */ @Inner @PostMapping("/page") - public R> tokenList(@RequestBody Map params) { + public R> tokenList(@RequestBody Map params) { // 根据分页参数获取对应数据 String key = String.format("%s::%s::*", tenantKeyStrResolver.key(), CacheConstants.PROJECT_OAUTH_ACCESS); int current = MapUtil.getInt(params, CommonConstants.CURRENT); int size = MapUtil.getInt(params, CommonConstants.SIZE); Set keys = redisTemplate.keys(key); List pages = keys.stream().skip((current - 1) * size).limit(size).collect(Collectors.toList()); - Page result = new Page(current, size); + Page result = new Page(current, size); - List tokenVoList = redisTemplate.opsForValue().multiGet(pages).stream().map(obj -> { + List tokenVoList = redisTemplate.opsForValue().multiGet(pages).stream().map(obj -> { OAuth2Authorization authorization = (OAuth2Authorization) obj; - TokenVo tokenVo = new TokenVo(); + TokenVO tokenVo = new TokenVO(); tokenVo.setClientId(authorization.getRegisteredClientId()); tokenVo.setId(authorization.getId()); tokenVo.setUsername(authorization.getPrincipalName()); diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDeptService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDeptService.java index 6cdab9b04..05308af10 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDeptService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDeptService.java @@ -25,6 +25,7 @@ import com.pig4cloud.pigx.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -37,10 +38,11 @@ public interface RemoteDeptService { /** * 获取所有部门接口 + * @param parentDeptId 父部门ID * @return R 返回结果对象，包含所有部门信息列表 */ @GetMapping("/dept/list") - R> getAllDept(); + R> getAllDept(@RequestParam("parentDeptId") Long parentDeptId); /** * 通过部门ID获取负责人列表 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/CpUserExcelVo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/CpUserExcelVo.java deleted file mode 100644 index 0429bfbda..000000000 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/CpUserExcelVo.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.pig4cloud.pigx.admin.api.vo; - -import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelProperty; -import com.pig4cloud.pigx.common.excel.annotation.ExcelLine; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * 企业微信用户导入 - */ -@Data -public class CpUserExcelVo implements Serializable { - - /** - * 导入时候回显行号 - */ - @ExcelLine - @ExcelIgnore - private Long lineNum; - - @NotBlank(message = "帐号不能为空") - @ExcelProperty("帐号") - private String username; - - /** - * 手机号 - */ - @NotBlank(message = "手机号不能为空") - @ExcelProperty("手机") - private String phone; - - /** - * 姓名 - */ - @NotBlank(message = "姓名不能为空") - @ExcelProperty("姓名") - private String name; - - /** - * 别名 - */ - @ExcelProperty("别名") - private String nickname; - - /** - * 部门名称 - */ - @NotBlank(message = "部门不能为空") - @ExcelProperty("部门") - private String deptName; - - @ExcelProperty("企业邮箱") - private String email; - - /** - * 锁定标记 - */ - @ExcelProperty("激活状态,0:已激活,9:未激活") - private String lockFlag; - -} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVO.java similarity index 93% rename from pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java rename to pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVO.java index 058fb8b0a..9b196cedb 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVO.java @@ -3,16 +3,16 @@ package com.pig4cloud.pigx.admin.api.vo; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.pig4cloud.pigx.common.excel.annotation.ExcelLine; +import javax.validation.constraints.NotBlank; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.io.Serializable; /** * 部门导入导出 */ @Data -public class DeptExcelVo implements Serializable { +public class DeptExcelVO implements Serializable { /** * 导入时候回显行号 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DingUserExcelVo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DingUserExcelVo.java deleted file mode 100644 index 596ce2b63..000000000 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DingUserExcelVo.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.pig4cloud.pigx.admin.api.vo; - -import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelProperty; -import com.pig4cloud.pigx.common.excel.annotation.ExcelLine; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -@Data -public class DingUserExcelVo implements Serializable { - - /** - * 导入时候回显行号 - */ - @ExcelLine - @ExcelIgnore - private Long lineNum; - - /** - * 手机号 - */ - @NotBlank(message = "手机号不能为空") - @ExcelProperty("手机号") - private String phone; - - /** - * 姓名 - */ - @NotBlank(message = "姓名不能为空") - @ExcelProperty("姓名") - private String name; - - /** - * 部门名称 - */ - @NotBlank(message = "部门不能为空") - @ExcelProperty("部门") - private String deptName; - - @ExcelProperty("邮箱") - private String email; - - /** - * 锁定标记 - */ - @ExcelProperty("激活状态,0:是,9:否") - private String lockFlag; - -} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/PostExcelVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/PostExcelVO.java index edf8489ec..b2709b2a4 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/PostExcelVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/PostExcelVO.java @@ -4,10 +4,10 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.pig4cloud.pigx.common.excel.annotation.ExcelLine; -import lombok.Data; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleExcelVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleExcelVO.java index 1f290e542..04b612ad6 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleExcelVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleExcelVO.java @@ -4,9 +4,9 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.pig4cloud.pigx.common.excel.annotation.ExcelLine; +import javax.validation.constraints.NotBlank; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TokenVo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TokenVO.java similarity index 93% rename from pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TokenVo.java rename to pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TokenVO.java index 820862d64..f3aa039d9 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TokenVo.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TokenVO.java @@ -9,7 +9,7 @@ import lombok.Data; * @date 2022/6/2 */ @Data -public class TokenVo { +public class TokenVO { private String id; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java index dc1e3f7cb..312dc629b 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java @@ -4,9 +4,9 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.pig4cloud.pigx.common.excel.annotation.ExcelLine; +import javax.validation.constraints.NotBlank; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.time.LocalDateTime;