From e61920cbde29e6ca53c81c7b0b6c12ab9c2a6367 Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 1 Sep 2023 14:35:29 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E7=A7=9F=E6=88=B7=E5=A5=97=E9=A4=90=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=88=A0=E9=99=A4=20sys=5Ftenant=5F?= =?UTF-8?q?menu=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/admin/api/entity/SysFile.java | 6 ++ .../{SysTenantMenu.java => SysFileGroup.java} | 75 +++++++++---------- .../pigx/admin/api/entity/SysTenant.java | 35 +++++++++ .../admin/api/feign/RemoteDeptService.java | 53 +++++++++++++ .../admin/api/feign/RemoteParamService.java | 14 ++++ .../admin/api/feign/RemoteRoleService.java | 44 +++++++++++ .../admin/api/feign/RemoteUserService.java | 37 ++++++++- .../main/resources/META-INF/spring.factories | 10 --- ...mework.cloud.openfeign.FeignClient.imports | 11 +++ 9 files changed, 230 insertions(+), 55 deletions(-) rename pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/{SysTenantMenu.java => SysFileGroup.java} (60%) create mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDeptService.java create mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteRoleService.java delete mode 100755 pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories create mode 100644 pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java index 8884b4a5b..9521627bb 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java @@ -69,6 +69,12 @@ public class SysFile extends Model { @Schema(description = "文件类型") private String type; + /** + * 文件组 + */ + @Schema(description = "文件组") + private Long groupId; + /** * 文件大小 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenantMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFileGroup.java similarity index 60% rename from pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenantMenu.java rename to pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFileGroup.java index 6c481d32b..2a490ce25 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenantMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFileGroup.java @@ -9,67 +9,52 @@ import lombok.EqualsAndHashCode; import java.time.LocalDateTime; /** - * 租户菜单 + * 文件类型 + * + * @author lengleng + * @date 2023/7/25 */ @Data -@Schema(description = "租户菜单") +@Schema(description = "文件") @EqualsAndHashCode(callSuper = true) -public class SysTenantMenu extends Model { +public class SysFileGroup extends Model { + + private static final long serialVersionUID = 1L; - /** - * id - */ @TableId(type = IdType.ASSIGN_ID) - @Schema(description = "id") + @Schema(description = "主键ID") private Long id; - /** - * 租户菜单名称 - */ - @Schema(description = "租户菜单名称") + @Schema(description = "父级ID") + private Long pid; + + @Schema(description = "分类类型: [10=图片,20=视频]") + private Long type; + + @Schema(description = "分类名称") private String name; /** - * 菜单id集合 - */ - @Schema(description = "菜单id集合") - private String menuIds; - - /** - * 0正常 9-冻结 - */ - @Schema(description = "租户菜单,9:冻结,0:正常") - private String status; - - /** - * 创建人 + * 上传人 */ @TableField(fill = FieldFill.INSERT) - @Schema(description = "创建人") + @Schema(description = "创建者") private String createBy; /** - * 修改人 - */ - @TableField(fill = FieldFill.UPDATE) - @Schema(description = "修改人") - private String updateBy; - - /** - * 删除标记 - */ - @TableLogic - @TableField(fill = FieldFill.INSERT) - @Schema(description = "删除标记,1:已删除,0:正常") - private String delFlag; - - /** - * 创建时间 + * 上传时间 */ @TableField(fill = FieldFill.INSERT) @Schema(description = "创建时间") private LocalDateTime createTime; + /** + * 更新人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "更新者") + private String updateBy; + /** * 更新时间 */ @@ -77,4 +62,12 @@ public class SysTenantMenu extends Model { @Schema(description = "更新时间") private LocalDateTime updateTime; + /** + * 删除标识：1-删除，0-正常 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description = "删除标记,1:已删除,0:正常") + private String delFlag; + } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java index 31be48661..6ca064f6f 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java @@ -68,6 +68,41 @@ public class SysTenant extends Model { @ExcelProperty("租户域名") private String tenantDomain; + /** + * 网站名称 + */ + @Schema(description = "网站名称") + @ExcelProperty("网站名称") + private String websiteName; + + /** + * logo + */ + @Schema(description = "logo") + @ExcelProperty("logo") + private String logo; + + /** + * footer + */ + @Schema(description = "footer") + @ExcelProperty("footer") + private String footer; + + /** + * 移动端二维码 + */ + @Schema(description = "移动端二维码") + @ExcelProperty("移动端二维码") + private String miniQr; + + /** + * 登录页图片 + */ + @Schema(description = "登录页图片") + @ExcelProperty("登录页图片") + private String background; + /** * 开始时间 */ 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 new file mode 100644 index 000000000..6cdab9b04 --- /dev/null +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDeptService.java @@ -0,0 +1,53 @@ +/* + * + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + * + */ + +package com.pig4cloud.pigx.admin.api.feign; + +import com.pig4cloud.pigx.admin.api.entity.SysDept; +import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants; +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 java.util.List; + +/** + * @author lengleng + * @date 2018/6/22 + */ +@FeignClient(contextId = "remoteDeptService", value = ServiceNameConstants.UPMS_SERVICE) +public interface RemoteDeptService { + + /** + * 获取所有部门接口 + * @return R 返回结果对象，包含所有部门信息列表 + */ + @GetMapping("/dept/list") + R> getAllDept(); + + /** + * 通过部门ID获取负责人列表 + * @param deptId 部门ID + * @return 负责人ID列表 + */ + @GetMapping("/dept/leader/{deptId}") + R> getAllDeptLeader(@PathVariable("deptId") Long deptId); + +} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteParamService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteParamService.java index de21f9f67..9068e2b57 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteParamService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteParamService.java @@ -3,10 +3,14 @@ package com.pig4cloud.pigx.admin.api.feign; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants; import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.core.util.RetOps; 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.RequestHeader; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.Map; /** * @author lengleng @@ -26,4 +30,14 @@ public interface RemoteParamService { @GetMapping("/param/publicValue/{key}") R getByKey(@PathVariable("key") String key, @RequestHeader(SecurityConstants.FROM) String from); + /** + * 通过keys 查询参数配置 + * @param keys keys + * @param from 声明成内部调用，避免MQ 等无法调用 + * @return map + */ + @GetMapping("/param/publicValues") + R> getByKeys(@RequestParam("keys") String[] keys, + @RequestHeader(SecurityConstants.FROM) String from); + } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteRoleService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteRoleService.java new file mode 100644 index 000000000..f34485dbc --- /dev/null +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteRoleService.java @@ -0,0 +1,44 @@ +/* + * + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + * + */ + +package com.pig4cloud.pigx.admin.api.feign; + +import com.pig4cloud.pigx.admin.api.entity.SysRole; +import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants; +import com.pig4cloud.pigx.common.core.util.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +/** + * @author lengleng + * @date 2018/6/22 + */ +@FeignClient(contextId = "remoteRoleService", value = ServiceNameConstants.UPMS_SERVICE) +public interface RemoteRoleService { + + /** + * 获取所有部门接口 + * @return R 返回结果对象，包含所有部门信息列表 + */ + @GetMapping("/role/list") + R> getAllRole(); + +} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java index b437fd05c..4b77182e1 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java @@ -25,10 +25,7 @@ import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants; 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.PutMapping; -import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -48,6 +45,14 @@ public interface RemoteUserService { @GetMapping("/user/info/{username}") R info(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM) String from); + /** + * 根据用户ID获取用户 + * @param userId ID + * @return SysUser + */ + @GetMapping("/user/details/{userId}") + R getUserById(@PathVariable("userId") Long userId); + /** * 通过社交账号或手机号查询用户、角色信息 * @param inStr appid@code @@ -74,4 +79,28 @@ public interface RemoteUserService { @PutMapping("/user/lock/{username}") R lockUser(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM) String from); + /** + * 根据角色ID查询用户列表 + * @param roleIdList 角色ID列表 + * @return 用户ID列表 + */ + @GetMapping("/user/getUserIdListByRoleIdList") + R> getUserIdListByRoleIdList(@RequestParam("roleIdList") List roleIdList); + + /** + * 根据部门ID列表获取用户ID列表接口 + * @param deptIdList 部门ID列表 + * @return 用户ID列表 + */ + @GetMapping("/user/getUserIdListByDeptIdList") + R> getUserIdListByDeptIdList(@RequestParam("deptIdList") List deptIdList); + + /** + * 通过用户名查询用户列表 + * @param userName 用户名 + * @return 用户列表 + */ + @GetMapping("/user/getUserListByUserName") + R> getUserListByUserName(@RequestParam("username") String userName); + } diff --git a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories deleted file mode 100755 index 187003309..000000000 --- a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,10 +0,0 @@ -com.pig4cloud.pigx.common.feign.PigxFeignAutoConfiguration=\ - com.pig4cloud.pigx.admin.api.feign.RemoteDataScopeService,\ - com.pig4cloud.pigx.admin.api.feign.RemoteClientDetailsService,\ - com.pig4cloud.pigx.admin.api.feign.RemoteLogService,\ - com.pig4cloud.pigx.admin.api.feign.RemoteParamService,\ - com.pig4cloud.pigx.admin.api.feign.RemoteTenantService,\ - com.pig4cloud.pigx.admin.api.feign.RemoteTokenService,\ - com.pig4cloud.pigx.admin.api.feign.RemoteUserService,\ - com.pig4cloud.pigx.admin.api.feign.RemoteDictService,\ - com.pig4cloud.pigx.admin.api.feign.RemoteAuditLogService diff --git a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports new file mode 100644 index 000000000..8e911a8d6 --- /dev/null +++ b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports @@ -0,0 +1,11 @@ +com.pig4cloud.pigx.admin.api.feign.RemoteDataScopeService +com.pig4cloud.pigx.admin.api.feign.RemoteClientDetailsService +com.pig4cloud.pigx.admin.api.feign.RemoteLogService +com.pig4cloud.pigx.admin.api.feign.RemoteParamService +com.pig4cloud.pigx.admin.api.feign.RemoteTenantService +com.pig4cloud.pigx.admin.api.feign.RemoteTokenService +com.pig4cloud.pigx.admin.api.feign.RemoteUserService +com.pig4cloud.pigx.admin.api.feign.RemoteRoleService +com.pig4cloud.pigx.admin.api.feign.RemoteDeptService +com.pig4cloud.pigx.admin.api.feign.RemoteDictService +com.pig4cloud.pigx.admin.api.feign.RemoteAuditLogService