1. 中铝e办组织机构人员同步联调接口

2. 设置默认文件预览水印为人员加日期

(cherry picked from commit 07c9ead358)

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java

@@ -54,7 +54,7 @@ public interface ErrorCodeConstants {
     // ========== 部门模块 1-002-004-000 ==========
     ErrorCode DEPT_NAME_DUPLICATE = new ErrorCode(1_002_004_000, "已经存在该名字的部门");
     ErrorCode DEPT_PARENT_NOT_EXITS = new ErrorCode(1_002_004_001,"父级部门不存在");
-    ErrorCode DEPT_NOT_FOUND = new ErrorCode(1_002_004_002, "当前部门不存在");
+    ErrorCode DEPT_NOT_FOUND = new ErrorCode(1_002_004_002, "机构不存在或当前账号无权限修改");
     ErrorCode DEPT_EXITS_CHILDREN = new ErrorCode(1_002_004_003, "存在子部门，无法删除");
     ErrorCode DEPT_PARENT_ERROR = new ErrorCode(1_002_004_004, "不能设置自己为父部门");
     ErrorCode DEPT_NOT_ENABLE = new ErrorCode(1_002_004_006, "部门({})不处于开启状态，不允许选择");
@@ -153,6 +153,13 @@ public interface ErrorCodeConstants {
     ErrorCode OAUTH2_CODE_NOT_EXISTS = new ErrorCode(1_002_022_000, "code 不存在");
     ErrorCode OAUTH2_CODE_EXPIRE = new ErrorCode(1_002_022_001, "code 已过期");
 
+    // ========== 同步验证工具 1-002-019-000 ==========
+    ErrorCode SYNC_DECRYPT_TYPE   = new ErrorCode(1_002_019_000, "解密失败");
+    ErrorCode SYNC_ENCRYPT_TYPE   = new ErrorCode(1_002_019_001, "加密失败");
+    ErrorCode SYNC_SIGNATURE_UNSUPPORTED_TYPE   = new ErrorCode(1_002_019_002, "签名类型不存在");
+    // 同步签名验证失败
+    ErrorCode SYNC_SIGNATURE_VERIFY_FAILED      = new ErrorCode(1_002_019_003, "签名验证失败");
+
     // ========== 邮箱账号 1-002-023-000 ==========
     ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1_002_023_000, "邮箱账号不存在");
     ErrorCode MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS = new ErrorCode(1_002_023_001, "无法删除，该邮箱账号还有邮件模板");

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java

@@ -44,7 +44,6 @@ public class DeptSaveReqVO {
     private String email;
 
     @Schema(description = "状态,见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "状态不能为空")
     @InEnum(value = CommonStatusEnum.class, message = "修改状态必须是 {value}")
     private Integer status;
 

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/SyncBaseResponseVO.java

@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.system.controller.admin.sync.vo;
+
+import lombok.Data;
+
+/**
+ * @author chenbowen
+ */
+@Data
+public class SyncBaseResponseVO {
+    private String bimRequestId;
+    private String resultCode;
+    private String message;
+
+    public SyncBaseResponseVO() {}
+    public SyncBaseResponseVO(String bimRequestId, String resultCode, String message) {
+        this.bimRequestId = bimRequestId;
+        this.resultCode = resultCode;
+        this.message = message;
+    }
+    
+}

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgCreateRequestVO.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.system.controller.admin.sync.vo.org;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "对外接口 - 机构创建 请求 VO")
+@Data
+public class OrgCreateRequestVO {
+    @Schema(description = "用户名", required = true)
+    private String bimRemoteUser;
+    @Schema(description = "密码", required = true)
+    private String bimRemotePwd;
+    @Schema(description = "请求ID", required = true)
+    private String bimRequestId;
+    @Schema(description = "机构 名称", required = true)
+    private String name;
+    @Schema(description = "机构 父Id", required = true)
+    private Long parentId;
+    @Schema(description = "机构 负责人Id")
+    private Long leaderUserId;
+    @Schema(description = "机构 电话")
+    private String phone;
+    @Schema(description = "机构 邮件")
+    private String email;
+    @Schema(description = "机构 状态", required = true)
+    private Integer status;
+    @Schema(description = "机构 是否公司")
+    private Boolean isCompany;
+    @Schema(description = "机构 是否集团")
+    private Boolean isGroup;
+}

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgCreateResponseVO.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.system.controller.admin.sync.vo.org;
+
+import cn.iocoder.yudao.module.system.controller.admin.sync.vo.SyncBaseResponseVO;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 对外接口机构创建响应 VO
+ */
+@Data
+@Schema(description = "对外接口机构创建响应 VO")
+@JsonPropertyOrder({"bimRequestId", "uid"})
+public class OrgCreateResponseVO extends SyncBaseResponseVO {
+    @Schema(description = "请求ID", required = true)
+    private String bimRequestId;
+
+    @Schema(description = "机构ID", required = true)
+    private String uid;
+}

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgDeleteRequestVO.java

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.system.controller.admin.sync.vo.org;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "对外接口 - 机构删除 请求 VO")
+@Data
+public class OrgDeleteRequestVO {
+    @Schema(description = "用户名", required = true)
+    private String bimRemoteUser;
+    @Schema(description = "密码", required = true)
+    private String bimRemotePwd;
+    @Schema(description = "请求 ID", required = true)
+    private String bimRequestId;
+    @Schema(description = "组织 ID", required = true)
+    private Long bimOrgId;
+
+}

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgDeleteResponseVO.java

@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.system.controller.admin.sync.vo.org;
+
+import cn.iocoder.yudao.module.system.controller.admin.sync.vo.SyncBaseResponseVO;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 对外接口机构删除响应 VO
+ */
+@Data
+@Schema(description = "对外接口机构删除响应 VO")
+@JsonPropertyOrder({"bimRequestId", "resultCode", "message"})
+public class OrgDeleteResponseVO extends SyncBaseResponseVO {
+    @Schema(description = "请求ID", required = true)
+    private String bimRequestId;
+
+    @Schema(description = "结果编码", required = true)
+    private String resultCode;
+
+    @Schema(description = "描述信息", required = true)
+    private String message;
+}

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgGetRequestVO.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.system.controller.admin.sync.vo.org;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author chenbowen
+ */
+@Schema(description = "对外接口 - 根据 ID 查询机构 请求 VO")
+@Data
+public class OrgGetRequestVO {
+    @Schema(description = "用户名", required = true)
+    private String bimRemoteUser;
+    @Schema(description = "密码", required = true)
+    private String bimRemotePwd;
+    @Schema(description = "请求 ID", required = true)
+    private String bimRequestId;
+    @Schema(description = "组织 UID", required = true)
+    private String bimOrgId;
+}

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgGetResponseVO.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.system.controller.admin.sync.vo.org;
+
+import cn.iocoder.yudao.module.system.controller.admin.sync.vo.SyncBaseResponseVO;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * 对外接口根据 ID 查询机构 响应 VO
+ */
+@Data
+@Schema(description = "对外接口根据 ID 查询机构 响应 VO")
+@JsonPropertyOrder({"bimRequestId", "resultCode", "organization", "message"})
+public class OrgGetResponseVO extends SyncBaseResponseVO {
+    @Schema(description = "请求ID", required = true)
+    private String bimRequestId;
+
+    @Schema(description = "结果编码", required = true)
+    private String resultCode;
+
+    @Schema(description = "机构信息 Map", required = true)
+    private Map<String, Object> organization;
+
+    @Schema(description = "描述信息", required = true)
+    private String message;
+}