From fbb5bd121cbc30345bc5c0f920c0dfad894c4afc Mon Sep 17 00:00:00 2001 From: PIGCLOUD Date: Fri, 16 Oct 2026 12:32:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(api):=20=E5=88=A0=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E4=BD=BF=E7=94=A8=E7=9A=84=20ConnectConstants?= =?UTF-8?q?=E3=80=81SysDeptRelation=E3=80=81CpUserExcelVo=E3=80=81RoleVO?= =?UTF-8?q?=20=E5=92=8C=20SysSystemSmsConfigVO=20=E7=B1=BB=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 ConnectConstants 接口及其相关常量定义 - 删除 SysDeptRelation 类，涉及部门关系表的定义 - 移除 CpUserExcelVo 类，涉及企业微信用户导入的定义 - 删除 RoleVO 类，涉及角色表的定义 - 移除 SysSystemSmsConfigVO 类，涉及系统短信配置的定义 (cherry picked from commit 7ef91170320ae5920458b6e0d64c97e0c6422f62) --- .../admin/api/constant/ConnectConstants.java | 73 -------------- .../admin/api/entity/SysDeptRelation.java | 54 ----------- .../pigx/admin/api/vo/CpUserExcelVo.java | 64 ------------- .../pig4cloud/pigx/admin/api/vo/RoleVO.java | 94 ------------------- .../admin/api/vo/SysSystemSmsConfigVO.java | 62 ------------ 5 files changed, 347 deletions(-) delete mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/ConnectConstants.java delete mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java delete mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/CpUserExcelVo.java delete mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java delete mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/SysSystemSmsConfigVO.java diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/ConnectConstants.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/ConnectConstants.java deleted file mode 100644 index 5f17ba134..000000000 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/constant/ConnectConstants.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.pig4cloud.pigx.admin.api.constant; - -/** - * 第三方连接常量类 - *

- * 用于定义第三方平台(如钉钉)连接相关的字段名称和常量值 - * - * @author lengleng - * @date 2026/01/10 - */ -public interface ConnectConstants { - - /** - * JSON字段名: 手机号 - */ - String FIELD_MOBILE = "mobile"; - - /** - * JSON字段名: 头像 - */ - String FIELD_AVATAR = "avatar"; - - /** - * JSON字段名: 昵称 - */ - String FIELD_NICKNAME = "nickname"; - - /** - * JSON字段名: 姓名 - */ - String FIELD_NAME = "name"; - - /** - * JSON字段名: 邮箱 - */ - String FIELD_EMAIL = "email"; - - /** - * JSON字段名: 部门ID - */ - String FIELD_DEPT_ID = "dept_id"; - - /** - * JSON字段名: 父部门ID - */ - String FIELD_PARENT_ID = "parent_id"; - - /** - * JSON字段名: 部门顺序列表 - */ - String FIELD_DEPT_ORDER_LIST = "dept_order_list"; - - /** - * JSON字段名: 用户ID列表 - */ - String FIELD_USERID_LIST = "userid_list"; - - /** - * JSON字段名: 返回结果 - */ - String FIELD_RESULT = "result"; - - /** - * 语言代码: 简体中文 - */ - String LANGUAGE_ZH_CN = "zh_CN"; - - /** - * 钉钉根部门ID - */ - Long ROOT_DEPT_ID = 1L; - -} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java deleted file mode 100644 index d14bdfda1..000000000 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * - * Copyright (c) 2018-2026, 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.entity; - -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - *

- * 部门关系表 - *

- * - * @author lengleng - * @since 2018-01-22 - */ -@Data -@Schema(description = "部门关系") -@EqualsAndHashCode(callSuper = true) -public class SysDeptRelation extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 祖先节点 - */ - @Schema(description = "祖先节点") - private Long ancestor; - - /** - * 后代节点 - */ - @Schema(description = "后代节点") - private Long descendant; - -} 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 0374cec1d..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 org.apache.fesod.sheet.annotation.ExcelIgnore; -import org.apache.fesod.sheet.annotation.ExcelProperty; -import com.pig4cloud.pigx.common.excel.annotation.ExcelLine; -import jakarta.validation.constraints.NotBlank; -import lombok.Data; - -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/RoleVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java deleted file mode 100644 index f9028c953..000000000 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2018-2026, 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.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 角色表 - *

- * - * @author lengleng - * @date 2020/2/10 - */ -@Data -@Schema(description = "前端角色展示对象") -public class RoleVO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - @Schema(description = "角色ID") - private Long roleId; - - /** - * 角色名称 - */ - @Schema(description = "角色名称") - private String roleName; - - /** - * 角色标识 - */ - @Schema(description = "角色标识") - private String roleCode; - - /** - * 角色描述 - */ - @Schema(description = "角色描述") - private String roleDesc; - - /** - * 数据权限类型 - */ - @Schema(description = "数据权限类型") - private Integer dsType; - - /** - * 数据权限作用范围 - */ - @Schema(description = "数据权限作用范围") - private String dsScope; - - /** - * 创建时间 - */ - @Schema(description = "创建时间") - private LocalDateTime createTime; - - /** - * 修改时间 - */ - @Schema(description = "修改时间") - private LocalDateTime updateTime; - - /** - * 租户ID - */ - @Schema(description = "用户所属租户id") - private Long tenantId; - -} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/SysSystemSmsConfigVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/SysSystemSmsConfigVO.java deleted file mode 100644 index ea4e857ef..000000000 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/SysSystemSmsConfigVO.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.pig4cloud.pigx.admin.api.vo; - -import com.pig4cloud.pigx.common.sensitive.annotation.Sensitive; -import com.pig4cloud.pigx.common.sensitive.core.SensitiveTypeEnum; -import lombok.Data; - -/** - * 系统短信配置 - * - * @author lengleng - * @date 2024/7/14 - */ -@Data -public class SysSystemSmsConfigVO { - - /** - * 配置标识 - */ - private String configId; - - /** - * 厂商标识 - */ - private String supplier; - - /** - * accessKey - */ - private String accessKeyId; - - /** - * accessKeySecret - */ - @Sensitive(type = SensitiveTypeEnum.KEY) - private String accessKeySecret; - - /** - * 短信签名 - */ - private String signature; - - /** - * 模板ID - */ - private String templateId; - - /** - * sdkAppId - */ - private String sdkAppId; - - /** - * 重试间隔（单位：秒），默认为5秒 - */ - private int retryInterval = 5; - - /** - * 最大发送数量，默认integer上限 - */ - private int maximum = Integer.MAX_VALUE; - -}