From 989269f2a2475f7882819d4c4b74d82ea4b07f69 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 11:53:07 +0800
Subject: [PATCH] 提交
---
server/service/src/main/java/com/doumee/biz/zbom/model/IamFcodeModel.java | 22 +++++++
server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateShopModel.java | 24 ++++++++
server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateUserModel.java | 26 ++++++++
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/IamCategoryModel.java | 21 +++++++
server/service/src/main/java/com/doumee/biz/zbom/model/IamUserJobModel.java | 4 +
server/service/src/main/java/com/doumee/biz/zbom/model/IamUserTypeModel.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java | 20 ++++--
8 files changed, 113 insertions(+), 8 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
index 765c74e..fcb1d80 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
@@ -16,8 +16,6 @@
*/
@Service
public interface ZbomZhongTaiService {
-
-
ZTUserGetTokenResponse getUserToken(ZTUserGetTokenRequest param);
ZTBaseResponse userUpdateInfo(ZTUserInfoUpdateRequest param);
boolean userLogout(ZTBaseRequst param);
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/IamCategoryModel.java b/server/service/src/main/java/com/doumee/biz/zbom/model/IamCategoryModel.java
index 3683a6f..1ae89d7 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/IamCategoryModel.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/IamCategoryModel.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
@@ -10,82 +11,102 @@
@ApiModel("蹇楅偊IAM缁勭粐鏇存柊鎺ㄩ�丼code鍙傛暟")
public class IamCategoryModel {
@JsonProperty("relevanceCode")
+ @JSONField(name="relevanceCode")
@SerializedName("relevanceCode")
@ApiModelProperty(value = "涓�浣撳晢鐮侊紙s鐮�)")
private String relevanceCode;
@JsonProperty("customerNumber")
+ @JSONField(name="customerNumber")
@ApiModelProperty(value = "鍔犵洘鍟嗙紪鐮�")
@SerializedName("customerNumber")
private String customerNumber;
@JsonProperty("accountSiteId")
+ @JSONField(name="accountSiteId")
@ApiModelProperty(value = "鍝佺墝id")
@SerializedName("accountSiteId")
private String accountSiteId;
@JsonProperty("siteCode")
+ @JSONField(name="siteCode")
@ApiModelProperty(value = "瀹㈡埛绫诲瀷")
@SerializedName("siteCode")
private String siteCode;
@JsonProperty("cityAddress")
+ @JSONField(name="cityAddress")
@ApiModelProperty(value = "钀ラ攢鍩庡競")
@SerializedName("cityAddress")
private String cityAddress;
@JsonProperty("unitCode")
+ @JSONField(name="unitCode")
@ApiModelProperty(value = "鍝佺墝Code")
@SerializedName("unitCode")
private String unitCode;
@JsonProperty("territoryId")
+ @JSONField(name="territoryId")
@ApiModelProperty(value = "钀ラ攢鍖哄煙id路")
@SerializedName("territoryId")
private String territoryId;
@JsonProperty("segment1")
+ @JSONField(name="segment1")
@ApiModelProperty(value = "钀ラ攢鍖哄煙-涓績缂栫爜")
@SerializedName("segment1")
private String segment1;
@JsonProperty("segment2")
+ @JSONField(name="segment2")
@ApiModelProperty(value = "钀ラ攢鍖哄煙-鐪佸尯缂栫爜")
@SerializedName("segment2")
private String segment2;
@JsonProperty("segment3")
+ @JSONField(name="segment3")
@ApiModelProperty(value = "钀ラ攢鍖哄煙-鐗囧尯缂栫爜")
@SerializedName("segment3")
private String segment3;
@JsonProperty("meaning1")
+ @JSONField(name="meaning1")
@ApiModelProperty(value = "钀ラ攢鍖哄煙-涓績")
@SerializedName("meaning1")
private String meaning1;
@JsonProperty("meaning2")
+ @JSONField(name="meaning2")
@ApiModelProperty(value = "钀ラ攢鍖哄煙-鐪佸尯")
@SerializedName("meaning2")
private String meaning2;
@JsonProperty("meaning3")
+ @JSONField(name="meaning3")
@ApiModelProperty(value = "閿�鍖哄煙-鐗囧尯")
@SerializedName("meaning3")
private String meaning3;
@JsonProperty("shipToPerson")
+ @JSONField(name="shipToPerson")
@ApiModelProperty(value = "鏀惰揣浜�")
@SerializedName("shipToPerson")
private String shipToPerson;
@JsonProperty("shipToAddress")
+ @JSONField(name="shipToAddress")
@ApiModelProperty(value = "鏀惰揣鍦板潃")
@SerializedName("shipToAddress")
private String shipToAddress;
@JsonProperty("shipToPhone")
+ @JSONField(name="shipToPhone")
@ApiModelProperty(value = "鏀惰揣浜哄彿鐮�")
@SerializedName("shipToPhone")
private String shipToPhone;
@JsonProperty("operationStatus")
+ @JSONField(name="operationStatus")
@ApiModelProperty(value = "鍝佺墝鐘舵��:NORMAL 姝ｅ父锛孨O-ORDER 涓涓嬪崟锛孨O-SHIPMENT 涓鍙戣揣锛孴ERMINATED 缁堟")
@SerializedName("operationStatus")
private String operationStatus;
@JsonProperty("oldAccountNumber")
+ @JSONField(name="oldAccountNumber")
@ApiModelProperty(value = "瀵瑰簲鍔犵洘鍟�")
@SerializedName("oldAccountNumber")
private String oldAccountNumber;
@JsonProperty("relation")
+ @JSONField(name="relation")
@ApiModelProperty(value = "涓�浣撳晢鎿嶄綔锛�1 鏂板銆�2 鍚堝苟銆�3 鍙樻洿銆�4 浼樺寲")
@SerializedName("relation")
private String relation;
@JsonProperty("solutionId")
+ @JSONField(name="solutionId")
@ApiModelProperty(value = "solutionId")
@SerializedName("solutionId")
private String solutionId;
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/IamFcodeModel.java b/server/service/src/main/java/com/doumee/biz/zbom/model/IamFcodeModel.java
index 084ba42..7fba50c 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/IamFcodeModel.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/IamFcodeModel.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
@@ -10,86 +11,107 @@
@ApiModel("蹇楅偊IAM缁勭粐鏇存柊鎺ㄩ�丼code鍙傛暟")
public class IamFcodeModel {
@JsonProperty("relevanceCode")
+ @JSONField(name="relevanceCode")
@SerializedName("relevanceCode")
@ApiModelProperty(value = "涓�浣撳晢鐮侊紙s鐮�)")
private String relevanceCode;
@JsonProperty("custAccountId")
+ @JSONField(name="custAccountId")
@SerializedName("custAccountId")
@ApiModelProperty(value = "鍔犵洘鍟唅d")
private String custAccountId;
@JsonProperty("customerNumber")
+ @JSONField(name="customerNumber")
@ApiModelProperty(value = "鍔犵洘鍟嗙紪鐮�")
@SerializedName("customerNumber")
private String customerNumber;
@JsonProperty("customerName")
+ @JSONField(name="customerName")
@ApiModelProperty(value = "鍔犵洘鍟嗗悕绉�")
@SerializedName("customerName")
private String customerName;
@JsonProperty("customerShortName")
+ @JSONField(name="customerShortName")
@ApiModelProperty(value = "鍔犵洘鍟嗙畝绉�")
@SerializedName("customerShortName")
private String customerShortName;
@JsonProperty("registrationAddress")
+ @JSONField(name="registrationAddress")
@ApiModelProperty(value = "娉ㄥ唽鍦板潃")
@SerializedName("registrationAddress")
private String registrationAddress;
@JsonProperty("country")
+ @JSONField(name="country")
@ApiModelProperty(value = "鍥藉")
@SerializedName("country")
private String country;
@JsonProperty("provinceNum")
+ @JSONField(name="provinceNum")
@ApiModelProperty(value = "鐪佸尯缂栫爜路")
@SerializedName("provinceNum")
private String provinceNum;
+ @JSONField(name="provinceName")
@JsonProperty("provinceName")
@ApiModelProperty(value = "鐪佸尯鍚嶇О")
@SerializedName("provinceName")
private String provinceName;
+ @JSONField(name="cityNum")
@JsonProperty("cityNum")
@ApiModelProperty(value = "甯傜紪鐮�")
@SerializedName("cityNum")
private String cityNum;
@JsonProperty("cityName")
+ @JSONField(name="cityName")
@ApiModelProperty(value = "甯傚悕绉�")
@SerializedName("cityName")
private String cityName;
@JsonProperty("countyNum")
+ @JSONField(name="countyNum")
@ApiModelProperty(value = "鍖哄幙缂栫爜")
@SerializedName("countyNum")
private String countyNum;
@JsonProperty("countyName")
+ @JSONField(name="countyName")
@ApiModelProperty(value = "鍖哄幙鍚嶇О")
@SerializedName("countyName")
private String countyName;
@JsonProperty("town")
+ @JSONField(name="town")
@ApiModelProperty(value = "涔￠晣")
@SerializedName("town")
private String town;
@JsonProperty("status")
+ @JSONField(name="status")
@ApiModelProperty(value = "鐘舵�� 涓彴鍙戝竷鐨勭姸鎬侊紝瀵逛笅娓哥郴缁熸棤鎰忎箟锛屼笅娓哥郴缁熷彲涓嶆帴")
@SerializedName("status")
private String status;
@JsonProperty("contactPhone")
+ @JSONField(name="contactPhone")
@ApiModelProperty(value = "娉曚汉鎵嬫満鍙风爜")
@SerializedName("contactPhone")
private String contactPhone;
@JsonProperty("legalPerson")
+ @JSONField(name="legalPerson")
@ApiModelProperty(value = "娉曚汉")
@SerializedName("legalPerson")
private String legalPerson;
@JsonProperty("legalIdentification")
+ @JSONField(name="legalIdentification")
@ApiModelProperty(value = "娉曚汉韬唤璇佸彿鐮�")
@SerializedName("legalIdentification")
private String legalIdentification;
@JsonProperty("accountOwner")
+ @JSONField(name="accountOwner")
@ApiModelProperty(value = "瀹炴帶浜�")
@SerializedName("accountOwner")
private String accountOwner;
@JsonProperty("accountIdentification")
+ @JSONField(name="accountIdentification")
@ApiModelProperty(value = "瀹炴帶浜鸿韩浠借瘉")
@SerializedName("accountIdentification")
private String accountIdentification;
@JsonProperty("taxRegistrationNum")
+ @JSONField(name="taxRegistrationNum")
@ApiModelProperty(value = "绾崇◣鐧昏璇佸彿鐮�")
@SerializedName("taxRegistrationNum")
private String taxRegistrationNum;
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateShopModel.java b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateShopModel.java
index f0b3c0b..ea2728e 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateShopModel.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateShopModel.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
@@ -12,95 +13,118 @@
@Data
@ApiModel("蹇楅偊IAM缁勭粐鏇存柊鎺ㄩ�佸弬鏁�")
public class IamUpateShopModel implements Serializable {
+ @JSONField(name="idt_org__id")
@JsonProperty("idt_org__id")
@SerializedName("idt_org__id")
@ApiModelProperty(value = "閮ㄩ棬ID")
private String idtOrgId;
+ @JSONField(name="idt_org__old_id")
@JsonProperty("idt_org__old_id")
@SerializedName("idt_org__old_id")
@ApiModelProperty(value = "U瀹㈢粍缁嘔D锛屽瓨鏀綰瀹㈣�佺殑缁勭粐id锛屽鏋滄槸IAM鏂板鐨勭粍缁囷紝璇ュ瓧娈靛�间负绌恒��")
private String idtOrgOldId;
+ @JSONField(name="idt_org__name")
@JsonProperty("idt_org__name")
@ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
@SerializedName("idt_org__name")
private String idtOrgName;
+ @JSONField(name="idt_org__parent_id")
@JsonProperty("idt_org__parent_id")
@ApiModelProperty(value = "涓婄骇缁勭粐ID")
@SerializedName("idt_org__parent_id")
private String idtOrgParentId;
+ @JSONField(name="idt_org__remark")
@JsonProperty("idt_org__remark")
@ApiModelProperty(value = "澶囨敞")
@SerializedName("idt_org__remark")
private String idtOrgRemark;
@JsonProperty("idt_org__status")
+ @JSONField(name="idt_org__status")
@ApiModelProperty(value = "鐘舵�� 0鍋滅敤锛�1姝ｅ父锛�-1鍒犻櫎")
@SerializedName("idt_org__status")
private String idtOrgStatus;
@JsonProperty("idt_org__order_num")
+ @JSONField(name="idt_org__order_num")
@ApiModelProperty(value = "鏄剧ず鎺掑簭")
@SerializedName("idt_org__order_num")
private String idtOrgOrderNum;
+ @JSONField(name="idt_org__org_code")
@JsonProperty("idt_org__org_code")
@ApiModelProperty(value = "缁勭粐缂栫爜路")
@SerializedName("idt_org__org_code")
private String idtOrgCode;
+ @JSONField(name="idt_org__sup_org_code")
@JsonProperty("idt_org__sup_org_code")
@ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜")
@SerializedName("idt_org__sup_org_code")
private String idtOrgSupOrgCode;
@JsonProperty("idt_org__source_code")
+ @JSONField(name="idt_org__source_code")
@ApiModelProperty(value = "瀛樻斁S,F锛屽簵闈㈠疄浣撶紪鐮佺瓑")
@SerializedName("idt_org__source_code")
private String idtOrgSourceCode;
+ @JSONField(name="idt_org__first_level_type")
@JsonProperty("idt_org__first_level_type")
@ApiModelProperty(value = "銆愪竴绾х粍缁囩被鍨嬨�戯紙1:HR銆�2:鍔犵洘鍟嗐��3:铏氭嫙缁勭粐锛�")
@SerializedName("idt_org__first_level_type")
private Integer idtOrgFirstLevelType;
@JsonProperty("idt_org__second_level_type")
+ @JSONField(name="idt_org__second_level_type")
@ApiModelProperty(value = "浜岀骇缁勭粐绫诲瀷銆�(1:S(鍔�) , 2:F(鍔�) ,3:搴楅潰(鍔�)锛�4:閮ㄩ棬(HR/鍔�)锛�5:铏氭嫙搴楅潰(鍔�/铏�) ")
@SerializedName("idt_org__second_level_type")
private Integer idtOrgSecondLevelType;
@JsonProperty("idt_org__org_attribute")
+ @JSONField(name="idt_org__org_attribute")
@ApiModelProperty(value = "銆愰儴闂ㄥ睘鎬с�戯紙1:瀹炰綋搴楅潰銆�2:铏氭嫙搴楅潰銆�3:鐢靛晢閮ㄣ��4:娓犻亾閮ㄣ��5:璐㈠姟閮級")
@SerializedName("idt_org__org_attribute")
private Integer idtOrgAttribute;
@JsonProperty("idt_org__work_weixin_id")
+ @JSONField(name="idt_org__work_weixin_id")
@ApiModelProperty(value = "浼佷笟寰俊缁勭粐ID")
@SerializedName("idt_org__work_weixin_id")
private String idtOrgWorkWeixinId;
@JsonProperty("idt_org__dingding_department_id")
+ @JSONField(name="idt_org__dingding_department_id")
@ApiModelProperty(value = "閽夐拤閮ㄩ棬ID")
@SerializedName("idt_org__dingding_department_id")
private String idtOrgDingdingDepartId;
+ @JSONField(name="idt_org__create_time")
@JsonProperty("idt_org__create_time")
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@SerializedName("idt_org__create_time")
private String idtOrgCreateTime;
@JsonProperty("idt_org__creator")
+ @JSONField(name="idt_org__creator")
@ApiModelProperty(value = "鍒涘缓浜�")
@SerializedName("idt_org__creator")
private String idtOrgCreator;
+ @JSONField(name="idt_org__updater")
@JsonProperty("idt_org__updater")
@ApiModelProperty(value = "淇敼浜�")
@SerializedName("idt_org__updater")
private String idtOrgUpdater;
+ @JSONField(name="idt_org__update_time")
@JsonProperty("idt_org__update_time")
@ApiModelProperty(value = "淇敼鏃堕棿")
@SerializedName("idt_org__update_time")
private String idtOrgUpdateTime;
+ @JSONField(name="scode")
@JsonProperty("scode")
@ApiModelProperty(value = "S鐮佷俊鎭� 褰搃dt_org__second_level_type 涓篠鏃讹紝scode鏈夊�硷紝鍚﹀垯鏄痭ull")
@SerializedName("scode")
private IamScodeModel scode;
+ @JSONField(name="fcode")
@JsonProperty("fcode")
@ApiModelProperty(value = "F鐮佷俊鎭� 褰搃dt_org__second_level_type 涓篎鏃讹紝fcode鏈夊�硷紝鍚﹀垯鏄痭ull")
@SerializedName("fcode")
private IamFcodeModel fcode;
+ @JSONField(name="shop")
@JsonProperty("shop")
@ApiModelProperty(value = "搴楅潰淇℃伅 褰搃dt_org__second_level_type 涓哄簵闈㈡椂锛宑ode鏈夊�硷紝鍚﹀垯鏄痭ull")
@SerializedName("shop")
private IamShopModel shop;
@JsonProperty("category")
+ @JSONField(name="category")
@ApiModelProperty(value = "鍝佺被淇℃伅 褰搃dt_org__second_level_type 涓篎鏃讹紝ccategory鏈夊�硷紝鍚﹀垯鏄痆]")
@SerializedName("category")
private List<IamCategoryModel> category;
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateUserModel.java b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateUserModel.java
index e3964f8..db0560b 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateUserModel.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateUserModel.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
@@ -17,102 +18,127 @@
* 瀛樺湪锛屽垯闇�瑕佸啀鏍规嵁鎺ㄩ�佺殑鐧诲綍璐﹀彿(app_account__account_no)鍘绘暟鎹簱鏌ヨ鐧诲綍璐﹀彿锛屽鏋滄煡璇㈢殑缁撴灉鏄� 1鏉℃暟鎹苟涓� id 璺熷綋鍓嶆帹閫佺敤鎴� id 鐩稿悓锛屽垯鏇存柊褰撳墠鏁版嵁锛屽惁鍒欐彁绀衡�滆鐢ㄦ埛绯荤粺宸茬粡瀛樺湪锛屾洿鏂板け璐モ��;
* 涓嶅瓨鍦紝涔熼渶瑕佹瘮瀵圭櫥褰曡处鍙�(app_account__account_no)鏄惁璺熷叾瀹冭处鍙风殑鐧诲綍璐﹀彿鐩稿悓,濡傛灉鐩稿悓锛屾彁绀衡�滆鐢ㄦ埛绯荤粺宸茬粡瀛樺湪锛屾柊澧炲け璐モ��:濡傛灉涓嶅瓨鍦紝鍒欐柊澧炴暟鎹��
*/
+ @JSONField(name="idt_user__id")
@JsonProperty("idt_user__id")
@SerializedName("idt_user__id")
@ApiModelProperty(value = "IAM鐢ㄦ埛涓婚敭")
private String idtUserId;
@JsonProperty("idt_user__old_id")
+ @JSONField(name="idt_user__old_id")
@SerializedName("idt_user__old_id")
@ApiModelProperty(value = "鐢ㄦ埛鑰佺殑涓婚敭id锛屽瓨鏀綰瀹㈣�佺敤鎴穒d锛屽鏋滄槸IAM鏂板鐨勭敤鎴凤紝璇ュ瓧娈靛�间负绌猴紝涓嬫父绯荤粺濡傛灉浣跨敤U瀹㈢殑鐢ㄦ埛id浣滀负涓氬姟澶勭悊閫昏緫鐨勪緷鎹紝闇�瑕佸悓姝ヨ瀛楁")
private String idtUserOldId;
+ @JSONField(name="app_account__app_id")
@JsonProperty("app_account__app_id")
@ApiModelProperty(value = "搴旂敤id锛屼笅娓哥郴缁熷彲涓嶅叧蹇�")
@SerializedName("app_account__app_id")
private String appAccountAppId;
+ @JSONField(name="idt_org__parent_id")
@JsonProperty("idt_org__parent_id")
@ApiModelProperty(value = "涓婄骇缁勭粐ID")
@SerializedName("idt_org__parent_id")
private String idtOrgParentId;
+ @JSONField(name="app_account__account_no")
@JsonProperty("app_account__account_no")
@ApiModelProperty(value = "鐢ㄦ埛璐﹀彿锛岃鐪嬬壒鍒鏄�")
@SerializedName("app_account__account_no")
private String appAccountNo;
+ @JSONField(name="app_account__account_pwd")
@JsonProperty("app_account__account_pwd")
@ApiModelProperty(value = "瀵嗙爜")
@SerializedName("app_account__account_pwd")
private String appAccountPwd;
+ @JSONField(name="idt_user__user_name")
@JsonProperty("idt_user__user_name")
@ApiModelProperty(value = "濮撳悕")
@SerializedName("idt_user__user_name")
private String idtUserName;
+ @JSONField(name="idt_user__gender")
@JsonProperty("idt_user__gender")
@ApiModelProperty(value = "鎬у埆 0鐢� 1濂陈�")
@SerializedName("idt_user__gender")
private String idtUserGender;
+ @JSONField(name="idt_user__email")
@JsonProperty("idt_user__email")
@ApiModelProperty(value = "浼佷笟閭")
@SerializedName("idt_user__email")
private String idtUserEmail;
@JsonProperty("idt_user__mobile")
+ @JSONField(name="idt_user__mobile")
@ApiModelProperty(value = "鎵嬫満鍙风爜锛岃鐪嬬壒鍒鏄�")
@SerializedName("idt_user__mobile")
private String idtUserMobile;
+ @JSONField(name="idt_user__uc_job_id")
@JsonProperty("idt_user__uc_job_id")
@ApiModelProperty(value = "U瀹㈠矖浣峣d")
@SerializedName("idt_user__uc_job_id")
private String idtUserUcJobId;
+ @JSONField(name="idt_org__second_level_type")
@JsonProperty("idt_org__second_level_type")
@ApiModelProperty(value = "浜岀骇缁勭粐绫诲瀷銆�(1:S(鍔�) , 2:F(鍔�) ,3:搴楅潰(鍔�)锛�4:閮ㄩ棬(HR/鍔�)锛�5:铏氭嫙搴楅潰(鍔�/铏�) ")
@SerializedName("idt_org__second_level_type")
private String idtOrgSecondLevelType;
+ @JSONField(name="app_account__status")
@JsonProperty("app_account__status")
@ApiModelProperty(value = "璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤")
@SerializedName("app_account__status")
private String appAccountStatus;
+ @JSONField(name="app_account__creator")
@JsonProperty("app_account__creator")
@ApiModelProperty(value = "鍒涘缓鑰�")
@SerializedName("app_account__creator")
private String appAccountCreator;
+ @JSONField(name="app_account__create_time")
@JsonProperty("app_account__create_time")
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@SerializedName("app_account__create_time")
private String appAccountCreateTime;
+ @JSONField(name="app_account__updater")
@JsonProperty("app_account__updater")
@ApiModelProperty(value = "鏇存柊鑰�")
@SerializedName("app_account__updater")
private String appAccountUpdater;
+ @JSONField(name="app_account__update_time")
@JsonProperty("app_account__update_time")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@SerializedName("app_account__update_time")
private String appAccountUpdateTime;
+ @JSONField(name="idt_user__work_no")
@JsonProperty("idt_user__work_no")
@ApiModelProperty(value = "宸ュ彿锛岃鐪嬬壒鍒鏄�")
@SerializedName("idt_user__work_no")
private String idtUserWorkNo;
+ @JSONField(name="idt_user__ding_id")
@JsonProperty("idt_user__ding_id")
@ApiModelProperty(value = "閽夐拤鐢ㄦ埛ID")
@SerializedName("idt_user__ding_id")
private String idtUserDingdingId;
+ @JSONField(name="userTypes")
@JsonProperty("userTypes")
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛屼骇鍝佹敮鎸佷竴浜哄涓敤鎴风被鍨�")
@SerializedName("userTypes")
private List<IamUserTypeModel> userTypes;
+ @JSONField(name="idt_org__updater")
@JsonProperty("idt_org__updater")
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛屼骇鍝佹敮鎸佷竴浜哄涓敤鎴风被鍨�")
@SerializedName("idt_org__updater")
private String idtOrgUpdater;
+ @JSONField(name="work_weixin_id")
@JsonProperty("work_weixin_id")
@ApiModelProperty(value = "浼佷笟寰俊鐢ㄦ埛openId")
@SerializedName("work_weixin_id")
private String workWeixinId;
+ @JSONField(name="roles")
@JsonProperty("roles")
@ApiModelProperty(value = "璐﹀彿鍖呭惈鐨勮鑹蹭俊鎭紝鏀寔澶氫釜")
@SerializedName("roles")
private List<IamUserRoleModel> roles;
+ @JSONField(name="orgs")
@JsonProperty("orgs")
@ApiModelProperty(value = "缁勭粐淇℃伅 涓嬫父绯荤粺鍙笉鍏冲績锛岄�氳繃jobs灞炴�у彲浠ュ彇鍒扮粍缁囦俊鎭�")
@SerializedName("orgs")
private List<IamUserOrgModel> orgs;
+ @JSONField(name="jobs")
@JsonProperty("jobs")
@ApiModelProperty(value = "澶氱粍缁囧矖浣嶄俊鎭�")
@SerializedName("jobs")
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserJobModel.java b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserJobModel.java
index b58e30f..29132a9 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserJobModel.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserJobModel.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
@@ -11,14 +12,17 @@
@Data
@ApiModel("蹇楅偊IAM浜哄憳璐﹀彿宀椾綅鍙傛暟")
public class IamUserJobModel implements Serializable {
+ @JSONField(name="idt_user_job_link__org_id")
@JsonProperty("idt_user_job_link__org_id")
@SerializedName("idt_user_job_link__org_id")
@ApiModelProperty(value = "缁勭粐id")
private String orgId;
+ @JSONField(name="idt_org__first_level_type")
@JsonProperty("idt_org__first_level_type")
@SerializedName("idt_org__first_level_type")
@ApiModelProperty(value = "銆愪竴绾х粍缁囩被鍨嬨�戯紙1:HR銆�2:鍔犵洘鍟嗐��3:铏氭嫙缁勭粐锛�")
private String firstLevelType;
+ @JSONField(name="idt_user_job_link__job_id")
@JsonProperty("idt_user_job_link__job_id")
@SerializedName("idt_user_job_link__job_id")
@ApiModelProperty(value = "宀椾綅Id")
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java
index ecb83bf..a3c2981 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
@@ -12,31 +13,38 @@
@ApiModel("蹇楅偊IAM浜哄憳璐﹀彿鎵�灞炵粍缁囧弬鏁�")
public class IamUserOrgModel implements Serializable {
@JsonProperty("idt_org__id")
+ @JSONField(name="idt_org__id")
@SerializedName("idt_org__id")
@ApiModelProperty(value = "缁勭粐id")
private String orgId;
+ @JSONField(name="idt_org__first_level_type")
@JsonProperty("idt_org__first_level_type")
@SerializedName("idt_org__first_level_type")
@ApiModelProperty(value = "銆愪竴绾х粍缁囩被鍨嬨�戯紙1:HR銆�2:鍔犵洘鍟嗐��3:铏氭嫙缁勭粐锛�")
private String firstLevelType;
+ @JSONField(name="idt_org__second_level_type")
@JsonProperty("idt_org__second_level_type")
@SerializedName("idt_org__second_level_type")
@ApiModelProperty(value = "銆愪簩绾х粍缁囩被鍨嬨��")
private String secondLevelType;
- @JsonProperty(" idt_org__old_id")
- @SerializedName(" idt_org__old_id")
+ @JSONField(name="idt_org__old_id")
+ @JsonProperty("idt_org__old_id")
+ @SerializedName("idt_org__old_id")
@ApiModelProperty(value = "鑰両d")
private String orgOldId;
- @JsonProperty(" idt_org__name")
- @SerializedName(" idt_org__name")
+ @JsonProperty("idt_org__name")
+ @JSONField(name="idt_org__name")
+ @SerializedName("idt_org__name")
@ApiModelProperty(value = "缁勭粐鍚嶇О")
private String orgName;
+ @JSONField(name="idt_org__org_code")
@JsonProperty("idt_org__org_code")
@SerializedName("idt_org__org_code")
@ApiModelProperty(value = "缁勭粐缂栫爜")
private String orgCode;
- @JsonProperty(" idt_org__parent_id")
- @SerializedName(" idt_org__parent_id")
+ @JsonProperty("idt_org__parent_id")
+ @JSONField(name="idt_org__parent_id")
+ @SerializedName("idt_org__parent_id")
@ApiModelProperty(value = "涓婄骇id")
private String orgParentId;
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserTypeModel.java b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserTypeModel.java
index b684ac8..a19cf3f 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserTypeModel.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserTypeModel.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
@@ -12,6 +13,7 @@
@Data
@ApiModel("蹇楅偊IAM浜哄憳璐﹀彿绫诲瀷鍙傛暟")
public class IamUserTypeModel implements Serializable {
+ @JSONField(name="idt_user_type__code")
@JsonProperty("idt_user_type__code")
@SerializedName("idt_user_type__code")
@ApiModelProperty(value = "鐢ㄦ埛鏍囪锛堢敤鎴风被鍨嬶紝鍖哄垎HR鍐呴儴鍛樺伐鍜屽姞鐩熷晢鍛樺伐锛�10001鍔犵洘鍟嗭紝10002HR鍐呴儴鍛樺伐")
--
Gitblit v1.9.3