diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Agent.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Agent.java index bc4b07d..becc5f9 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Agent.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Agent.java @@ -15,7 +15,7 @@ import java.util.Date; *
* * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter @@ -62,21 +62,11 @@ public class Agent implements Serializable { */ private String name; - /** - * 渠道编号(Z:总部;F:分公司;D:代理) - */ - private String channelNo; - /** * 上级id */ private Long supervisorId; - /** - * 上级代理 - */ - private String supervisorName; - /** * 企业地址 */ @@ -137,6 +127,11 @@ public class Agent implements Serializable { */ private Integer level; + /** + * 渠道编号(Z:总部;F:分公司;D:代理) + */ + private String channelNo; + /** * 户名 */ @@ -192,6 +187,36 @@ public class Agent implements Serializable { */ private String shortName; + /** + * 金蝶供应商编号 + */ + private String supplierNo; + + /** + * 开票通讯地址 + */ + private String invoiceAddress; + + /** + * 开票联系电话 + */ + private String invoiceContact; + + /** + * 组织内码 + */ + private String saleOrgInternalId; + + /** + * 客户分组 + */ + private String custerGroupNo; + + /** + * 金蝶内码 + */ + private Long jindieInternalId; + /** * 金蝶客户编号 */ @@ -212,41 +237,16 @@ public class Agent implements Serializable { */ private String saleOrgId; - /** - * 金蝶内码 - */ - private Long jindieInternalId; - - /** - * 组织内码 - */ - private String saleOrgInternalId; - - /** - * 客户分组 - */ - private String custerGroupNo; - - /** - * 金蝶供应商编号 - */ - private String supplierNo; - - /** - * 开票通讯地址 - */ - private String invoiceAddress; - - /** - * 开票联系电话 - */ - private String invoiceContact; - /** * 金蝶客户名称 */ private String jinideName; + /** + * 上级代理 + */ + private String supervisorName; + /** * 最后开票时间 */ diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/AgentManageDistrictAuth.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/AgentManageDistrictAuth.java index 27e8871..4d1c395 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/AgentManageDistrictAuth.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/AgentManageDistrictAuth.java @@ -16,7 +16,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Authority.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Authority.java index e3b6d82..b5d18cd 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Authority.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Authority.java @@ -15,7 +15,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Properyt.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Properyt.java index 36a9581..7045e40 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Properyt.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/Properyt.java @@ -15,7 +15,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter @@ -28,15 +28,10 @@ public class Properyt implements Serializable { private Long id; /** - * 销售id + * 创建id */ private Long createId; - /** - * 销售名称 - */ - private String createName; - /** * 创建时间 */ @@ -62,11 +57,6 @@ public class Properyt implements Serializable { */ private Integer type; - /** - * 金蝶客户名称 - */ - private String jinideName; - /** * 企业名称 */ @@ -77,11 +67,6 @@ public class Properyt implements Serializable { */ private Long agentId; - /** - * 代理名称 - */ - private String agentName; - /** * 企业地址 */ @@ -178,14 +163,14 @@ public class Properyt implements Serializable { private String invoiceName; /** - * 金蝶客户编号 + * 身份编码 */ private String identifier; /** - * 金蝶内码 + * 金蝶客户名称 */ - private Long jindieInternalId; + private String jinideName; /** * 开票通讯地址 @@ -197,6 +182,21 @@ public class Properyt implements Serializable { */ private String invoiceContact; + /** + * 金蝶内码 + */ + private Long jindieInternalId; + + /** + * 销售名称 + */ + private String createName; + + /** + * 代理名称 + */ + private String agentName; + /** * 最后开票时间 */ diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/User.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/User.java index 394ba01..48ac7da 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/User.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m0/User.java @@ -15,7 +15,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter @@ -43,7 +43,7 @@ public class User implements Serializable { private Date modifyTime; /** - * 数据状态(0:启用:1:删除) + * 数据状态 */ private Integer softDelete; @@ -72,6 +72,11 @@ public class User implements Serializable { */ private String password; + /** + * 代理ID + */ + private Long agentId; + /** * 所属公司名称 */ @@ -103,7 +108,7 @@ public class User implements Serializable { private Integer approle; /** - * 系统权限0:管理权限;1:普通权限 + * 角色类别(管理员,主管,其他) */ private Integer roleType; @@ -112,11 +117,6 @@ public class User implements Serializable { */ private Long districtId; - /** - * 代理ID - */ - private Long agentId; - /** * 物业ID */ @@ -128,7 +128,7 @@ public class User implements Serializable { private Long supervisorId; /** - * 考勤状态0:上班;1:下班;2:请假;3休息 + * 工作状态 */ private Integer workStatus; @@ -142,8 +142,6 @@ public class User implements Serializable { */ private String email; - private String emailMask; - /** * 身份证号 */ @@ -175,7 +173,7 @@ public class User implements Serializable { private Integer backHardFlag; /** - * 权限id + * 权限组id */ private Long authorityId; @@ -227,7 +225,7 @@ public class User implements Serializable { private String modifyName; /** - * 物业权限id + * 物业平台权限组id */ private Long propertyAuthorityId; @@ -237,48 +235,24 @@ public class User implements Serializable { private String dingUserId; /** - * 工作中状态0:作业;1:转场;2:空闲;3:休息 + * 工作状态 */ private Integer workAtStatus; - /** - * 年龄 - */ private Integer age; - /** - * 试用期保护0:未启用;1:启用 - */ private Integer probationProtection; - /** - * 备注 - */ private String note; - /** - * 上班时间 - */ private String onTime; - /** - * 下班时间 - */ private String offTime; - /** - * 出纸机权限 - */ private Integer czjAuth; - /** - * 空感权限 - */ private Integer kgAuth; - /** - * 信标权限 - */ private Integer xbAuth; /** @@ -311,16 +285,6 @@ public class User implements Serializable { */ private Integer productOpAuth; - /** - * 金蝶人员销售订单编号 - */ - private String jindieSalerid; - - /** - * 泡沫机APP显示0:关闭;1:打开; - */ - private Integer foamFunctionAuth; - /** * 金蝶内码 */ @@ -351,6 +315,16 @@ public class User implements Serializable { */ private Integer flowAuth; + /** + * 泡沫机APP显示0:关闭;1:打开; + */ + private Integer foamFunctionAuth; + + /** + * 金蝶人员销售订单编号 + */ + private String jindieSalerid; + /** * xiaoqu-ai 用户ID */ @@ -360,44 +334,4 @@ public class User implements Serializable { * 同步到 xiaoqu-ai 的时间 */ private Date xiaoquAiSyncedAt; - - /** - * 0待回填/1已解析/2歧义/3悬空;property_id非空→初始UPDATE=1 - */ - private Byte tenantResolveStatus; - - /** - * 0正常/1身份待核(冲突fail-closed锁B3人证比对;⊥tenant_resolve_status,不进PEP单路) - */ - private Byte idcardResolveStatus; - - /** - * AES-256-GCM(IV‖ct‖tag);canonical后加密;明文绝不落盘 - */ - private byte[] idcardEnc; - - /** - * keyed HMAC-SHA256(canonical idcard);等值/dedup/唯一 - */ - private byte[] idcardBidx; - - /** - * 存储预算掩码 前3后4(默认零解密展示) - */ - private String idcardMask; - - /** - * AES-256-GCM - */ - private byte[] mobileEnc; - - /** - * keyed HMAC-SHA256(canonical mobile);等值查找(非唯一) - */ - private byte[] mobileBidx; - - /** - * 展示掩码 前3后4 - */ - private String mobileMask; } diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m2/WarehouseAgentAuth.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m2/WarehouseAgentAuth.java index ec2dfc0..e47f00c 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m2/WarehouseAgentAuth.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/m2/WarehouseAgentAuth.java @@ -16,7 +16,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AdminUser.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AdminUser.java index 0b9d2c7..3109a64 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AdminUser.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AdminUser.java @@ -16,7 +16,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter @@ -38,7 +38,7 @@ public class AdminUser implements Serializable { private String account; /** - * PBKDF2 加盐密码哈希 + * PBKDF2 加盐密码哈希 */ private String passwordHash; diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentApiKey.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentApiKey.java index 179f1f2..df9f7fc 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentApiKey.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentApiKey.java @@ -16,7 +16,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter @@ -48,7 +48,7 @@ public class AgentApiKey implements Serializable { private String keyHash; /** - * ak 明文 AES-GCM 加密密文(二次获取用),空=历史数据未存 + * ak 明文 AES-GCM 加密密文(Base64: iv‖cipher‖tag),空=历史数据未存 */ private String keyCipher; diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentScope.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentScope.java index d719a60..5068489 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentScope.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AgentScope.java @@ -16,7 +16,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AuditLog.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AuditLog.java index 834727f..7570168 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AuditLog.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/AuditLog.java @@ -16,7 +16,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/ScopeTool.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/ScopeTool.java index 007e5dc..bade36e 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/ScopeTool.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/ScopeTool.java @@ -16,7 +16,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/TokenScope.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/TokenScope.java index e29b30b..6e0c8f7 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/TokenScope.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/TokenScope.java @@ -16,7 +16,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/Tool.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/Tool.java index 6cf9b15..e8b9ad3 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/Tool.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/entity/svc/Tool.java @@ -15,7 +15,7 @@ import java.util.Date; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ @Getter @Setter diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentManageDistrictAuthMapper.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentManageDistrictAuthMapper.java index dd62953..3246a49 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentManageDistrictAuthMapper.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mapper/m0/AgentManageDistrictAuthMapper.java @@ -9,7 +9,7 @@ import me.iiv.agent.entity.m0.AgentManageDistrictAuth; * * * @author codegen - * @since 2026-09-03 + * @since 2026-09-08 */ public interface AgentManageDistrictAuthMapper extends BaseMapper