1.移除浙政钉诗画代码 2.增加酒店管理

2026-09-28 22:20:09 +08:00
1 parent 33c93c3e18
commit 1845f5865c
@@ -1,62 +1,26 @@
-/*
- *
- *      Copyright (c) 2018-2025, pjcloud 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: pjcloud
- *
- */
-
 package com.bsd.pjcloud.thirdparty.api.feign;
+
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
 import com.bsd.pjcloud.thirdparty.entity.ThirdPartyUserEntity;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;

 import java.util.List;

 /**
- * @author pjcloud
- * @date 2018/6/22
+ * 第三方用户相关 Feign（浙政钉/诗画单点已移除）。
 */
@FeignClient(contextId = "remoterThirdPartyAuthService", value = ServiceNameConstants.THIRDPARTY_SERVICE)
 public interface RemoterThirdPartyAuthService {

 	/**
-	 * zzd单点
-	 * @param token
-	 * @return
-	 */
-	@NoToken
-	@GetMapping("/thirdPartyOAth2/zzd/sso")
-	R zzdsso(@RequestParam("token") String token);
-
-
-	@NoToken
-	@GetMapping("/thirdPartyOAth2/zzd/shjnsso")
-	R shjnsso(@RequestParam("accountId") String accountId,@RequestParam("sessionId") String sessionId);
-
-	/**
-	 * 根据钉钉号查询第三方表里面是否有这个人，也就是浙政钉总体系人员表
-	 * @param employeeCode
-	 * @return
+	 * 按员工编码查询第三方用户表
 	 */
 	@NoToken
 	@GetMapping("/thirdPartyUser/getUserByEmployeeCode")
 	R<List<ThirdPartyUserEntity>> getUserByEmployeeCode(@RequestParam("employeeCode") String employeeCode);

-
-
 }
@@ -1,21 +0,0 @@
-package com.bsd.pjcloud.thirdparty.constant;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 出库入口
- */
-@AllArgsConstructor
-@Getter
-public enum UserTypeEnum {
-
-    ZZD("1", "浙政钉用户登录失败"),
-    SH("2", "诗画用户登录失败"),
-    ;
-    private final String type;
-    private final String description;
-
-
-
-}
@@ -1,14 +0,0 @@
-package com.bsd.pjcloud.thirdparty.dto;
-
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Data
-public class SHJNSSODTO {
-
-    @NotNull(message = "账号id不能为空")
-    private String accountId;
-
-    @NotNull(message = "会员id不能为空")
-    private String sessionId;
-}
@@ -1,9 +0,0 @@
-package com.bsd.pjcloud.thirdparty.dto;
-
-
-import lombok.Data;
-
-@Data
-public class UrlTokenDTO {
-    private String token;
-}
@@ -1,11 +0,0 @@
-package com.bsd.pjcloud.thirdparty.dto;
-
-import lombok.Data;
-
-@Data
-public class ZZDResponse {
-
-    private String code;
-    private String description;
-    private String data;
-}
@@ -1,17 +0,0 @@
-package com.bsd.pjcloud.thirdparty.dto;
-
-import lombok.Data;
-
-@Data
-public class ZZDUser {
-    private String username;
-    private int organizationId;
-    private int userId;
-    private String nickName;
-    private String mobile;
-    private String regionCode;
-    private String ext;
-
-    private String employeeCode;
-
-}
@@ -1,28 +0,0 @@
-package com.bsd.pjcloud.thirdparty.dto;
-
-import lombok.Data;
-
-@Data
-public class ZZDUserDTO {
-    private String username;
-    private int organizationId;
-    private int userId;
-    private String nickName;
-    private String mobile;
-    private String regionCode;
-    private Ext ext;
-
-    @Data
-    public class Ext {
-        private String employeeCode;
-        private String organizationCode;
-        private String nickNameCn;
-        private String openid;
-        private String realmId;
-        private String mobile;
-        //以下字段，诗画独有
-        private String headImgUrl;
-
-    }
-
-}
@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
 import java.time.LocalDateTime;

 /**
- * 浙政钉用户表
+ * 第三方用户表
 *
 * @author zjf
 * @date 2024-12-03 13:38:08
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
@TenantTable
@TableName("third_party_user")
@EqualsAndHashCode(callSuper = true)
-@Schema(description = "浙政钉用户表")
+@Schema(description = "第三方用户表")
 public class ThirdPartyUserEntity extends Model<ThirdPartyUserEntity> {


@@ -68,9 +68,9 @@ public class ThirdPartyUserEntity extends Model<ThirdPartyUserEntity> {
    private String nickName;

 	/**
-	* 员工浙政钉编码
+	* 员工钉钉编码
 	*/
-    @Schema(description="员工浙政钉编码")
+    @Schema(description="员工钉钉编码")
    private String dingtalkEmployeeCode;

 	/**