From 10d7a2f908fbdc8171894cd18ef73ad560daece7 Mon Sep 17 00:00:00 2001 From: lianlonggang Date: Fri, 3 Apr 2026 13:52:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor(consultation):=20=E4=B8=BA=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=20@TableId=20=E6=B3=A8=E8=A7=A3=E5=B9=B6=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 部分自增主键注解有问题 - 更新信创后置sql --- db/xcsql/consult.sql | 4 +++- db/xcsql/watch.sql | 4 ++-- db/xcsql/更新表解释.sql | 9 ++++----- .../java/com/renkang/consultation/entity/ConCostLog.java | 3 +++ .../renkang/consultation/entity/ConCostStatistics.java | 2 +- .../com/renkang/consultation/entity/ConHelperOnline.java | 2 +- .../java/com/renkang/consultation/entity/ConPhrases.java | 2 +- .../java/com/renkang/consultation/entity/ConPropose.java | 2 +- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/db/xcsql/consult.sql b/db/xcsql/consult.sql index 1766f43..19900c2 100644 --- a/db/xcsql/consult.sql +++ b/db/xcsql/consult.sql @@ -67,4 +67,6 @@ ALTER TABLE IM_MSG_RECORD_ALL RENAME TO QH_CON_IM_MSG_ALL; ALTER TABLE QH_CON_EVALUATE RENAME COLUMN "CONTEXT" TO EVA_CONTEXT; ALTER TABLE QH_CON_RESOURCE RENAME COLUMN "LEVEL" TO RESOURCE_LEVEL; -DROP TABLE IF EXISTS QH_CON_HEALTH_CHD; \ No newline at end of file +DROP TABLE IF EXISTS QH_CON_HEALTH_CHD; +DROP TABLE IF EXISTS QH_CON_PAUSE_SRVC; +DROP TABLE IF EXISTS QH_CON_SCHD; \ No newline at end of file diff --git a/db/xcsql/watch.sql b/db/xcsql/watch.sql index 6074a15..e9b87a7 100644 --- a/db/xcsql/watch.sql +++ b/db/xcsql/watch.sql @@ -3,7 +3,6 @@ -- 以下所有sql均包含前缀, 后续部署, 如果不需要, 可以批量删除前缀 -- 更新表名(47张) -ALTER TABLE "ARCHIVES_BODY_TYPE" RENAME TO "QH_WAT_ARCHIVES_BODY_TYPE"; ALTER TABLE "DEPT_STATISTIC_DATA" RENAME TO "QH_WAT_DEPT_STAT_DATA"; ALTER TABLE "USER_RECORD_SPORTS_DAY" RENAME TO "QH_WAT_USER_REC_SPORT_DAY"; ALTER TABLE "USER_RECORD_SPORTS_INFO" RENAME TO "QH_WAT_USER_REC_SPORT_INF"; @@ -55,4 +54,5 @@ ALTER TABLE "WATCH_USER_DATA" RENAME TO "QH_WAT_USER_DATA"; DROP TABLE "QH_WAT_BIND_HIS_BAK"; DROP TABLE "QH_WAT_BIND_HIS_COPY1"; DROP TABLE "QH_WAT_BIND_HIS_COPY2"; -DROP TABLE "QH_WAT_ABNORMAL_RECORD"; \ No newline at end of file +DROP TABLE "QH_WAT_ABNORMAL_RECORD"; +DROP TABLE "QH_WAT_ARCHIVES_BODY_TYPE"; \ No newline at end of file diff --git a/db/xcsql/更新表解释.sql b/db/xcsql/更新表解释.sql index 542ca68..3544c25 100644 --- a/db/xcsql/更新表解释.sql +++ b/db/xcsql/更新表解释.sql @@ -28,11 +28,11 @@ COMMENT ON TABLE QH_CON_KNOW IS '知识库表'; COMMENT ON TABLE QH_CON_KNOW_CATE IS '知识库分类'; COMMENT ON TABLE QH_CON_MEDREC IS '病历档案表'; COMMENT ON TABLE QH_CON_NOTICE IS '咨询须知'; -COMMENT ON TABLE QH_CON_PAUSE_SRVC IS '停诊表'; +-- COMMENT ON TABLE QH_CON_PAUSE_SRVC IS '停诊表'; COMMENT ON TABLE QH_CON_PHRASES IS '常用语表'; COMMENT ON TABLE QH_CON_PROPOSE IS '建议反馈表'; COMMENT ON TABLE QH_CON_RESOURCE IS '医院信息表'; -COMMENT ON TABLE QH_CON_SCHD IS '排班表'; +-- COMMENT ON TABLE QH_CON_SCHD IS '排班表'; COMMENT ON TABLE QH_CON_SESSION IS '会话信息表'; COMMENT ON TABLE QH_CON_SESS_RESV_DT IS '咨询预约时间'; COMMENT ON TABLE QH_CON_SESS_VID IS '音视频咨询信息表'; @@ -147,7 +147,6 @@ COMMENT ON TABLE QH_SYS_VERSION_APP IS 'APP版本信息'; COMMENT ON TABLE QH_SYS_VERSION_INFO IS 'APP版本详情'; -- 可穿戴设备（手表）相关表 -COMMENT ON TABLE QH_WAT_ARCHIVES_BODY_TYPE IS '用户体格信息'; COMMENT ON TABLE QH_WAT_BIND_HIS IS '设备绑定历史'; COMMENT ON TABLE QH_WAT_DATA IS '设备监测数据'; COMMENT ON TABLE QH_WAT_DATA_CALORIE IS '卡路里数据'; @@ -304,8 +303,8 @@ COMMENT ON COLUMN "QH_CON_KNOW_CATE"."SORT" IS '排序序号'; COMMENT ON COLUMN "QH_CON_MEDREC"."ID" IS '主键'; COMMENT ON COLUMN "QH_CON_NOTICE"."ID" IS '主键'; COMMENT ON COLUMN "QH_CON_NOTICE"."CONTENT" IS '内容'; -COMMENT ON COLUMN "QH_CON_PAUSE_SRVC"."ID" IS '主键'; -COMMENT ON COLUMN "QH_CON_SCHD"."ID" IS '主键'; +-- COMMENT ON COLUMN "QH_CON_PAUSE_SRVC"."ID" IS '主键'; +-- COMMENT ON COLUMN "QH_CON_SCHD"."ID" IS '主键'; COMMENT ON COLUMN "QH_CON_SESSION"."DOCTOR_JOB" IS '职称'; COMMENT ON COLUMN "QH_CON_SESSION"."DOCTOR_TYPE" IS '专家类型'; COMMENT ON COLUMN "QH_CON_SESSION"."DOCTOR_STATUS" IS '专家状态'; diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConCostLog.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConCostLog.java index 9e68914..aaf9a1f 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConCostLog.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConCostLog.java @@ -1,6 +1,8 @@ package com.renkang.consultation.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -27,6 +29,7 @@ public class ConCostLog { /** * id */ + @TableId(type = IdType.AUTO) @Excel(name = "id", width = 15) @Schema(title = "id") private String id; diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConCostStatistics.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConCostStatistics.java index d67e5fe..002750d 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConCostStatistics.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConCostStatistics.java @@ -31,7 +31,7 @@ public class ConCostStatistics extends ConPage implements Serializable { /** * 流水号 */ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.AUTO) @Schema(title = "流水号") private Integer id; /** diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConHelperOnline.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConHelperOnline.java index 6b8c3b0..414b6a6 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConHelperOnline.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConHelperOnline.java @@ -32,7 +32,7 @@ public class ConHelperOnline implements Serializable { /** * 主键 */ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.AUTO) @Schema(title = "主键") private Integer id; /** diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConPhrases.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConPhrases.java index 6fb7bfe..268c9ad 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConPhrases.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConPhrases.java @@ -22,7 +22,7 @@ public class ConPhrases extends ConPage implements Serializable { /** * 主键id */ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.AUTO) @Schema(title = "主键id") private String id; /** diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConPropose.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConPropose.java index 30ad2d2..b29cdec 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConPropose.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConPropose.java @@ -32,7 +32,7 @@ public class ConPropose implements Serializable { /** * 主键 */ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.AUTO) @Schema(title = "主键") private Integer id; /**