From 6d84f73a7daff5ae51fc292c25233f5091fe6de5 Mon Sep 17 00:00:00 2001 From: Xusan <1105644308@QQ.COM> Date: Wed, 15 May 2024 14:15:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/data.sql | 14 ++++++++------ sql/dm_start.sql | 3 ++- .../com/whdc/controller/AddressBookController.java | 2 +- .../java/com/whdc/model/dto/AddressBootDto.java | 3 +++ .../java/com/whdc/model/entity/AddressBook.java | 4 ++++ src/main/resources/mapper/AddressBookMapper.xml | 10 +++++++--- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/sql/data.sql b/sql/data.sql index 968f5ab..5a92057 100644 --- a/sql/data.sql +++ b/sql/data.sql @@ -1,5 +1,4 @@ -insert into "FXKH_TXL"."ORGANIZATION"("OBJ_ID", "NAME") -VALUES +insert into "FXKH_TXL"."ORGANIZATION"("ID", "NAME") VALUES ('1','省防指' ), ('2','省防办' ), ('3','省防指成员单位' ), @@ -9,13 +8,16 @@ VALUES ('7','主要蓄滞洪区' ), ('8','大型水库大坝' ); -insert into "FXKH_TXL"."ADDRESS_BOOK"("NAME", "PHONE", "ORGANIZATION", "POSITION") -VALUES ('超级管理员','18891233883','1','巡视员') +insert into "FXKH_TXL"."ADDRESS_BOOK"("NAME", "PHONE", "ORGANIZATION", "POSITION") VALUES +('超级管理员','18891233883','1','巡视员') ,('政区管理员','18891233883','2','巡视员') ,('普通用户','18891233883','3','巡视员'); -insert into "FXKH_TXL"."UNIT_DICT"("NAME","O_ID") -VALUES ('省水利厅','省水利厅') +insert into "FXKH_TXL"."AB_UD_R"("AD_ID", "DICT_ID", "TYPE") VALUES +('','',''); + +insert into "FXKH_TXL"."UNIT_DICT"("NAME","O_ID") VALUES + ('省水利厅','省水利厅') ,('省水利厅','省财政厅') ,('省公安厅','省公安厅'); diff --git a/sql/dm_start.sql b/sql/dm_start.sql index f80ce2a..6f766e6 100644 --- a/sql/dm_start.sql +++ b/sql/dm_start.sql @@ -67,6 +67,7 @@ COMMENT ON COLUMN "FXKH_TXL"."ORGANIZATION"."OBJ_ID" IS '编号'; COMMENT ON COLUMN "FXKH_TXL"."ORGANIZATION"."SORT" IS '序号'; + CREATE TABLE "FXKH_TXL"."AB_UD_R" ( "AD_ID" INTEGER, @@ -143,7 +144,7 @@ CREATE TABLE "FXKH_TXL"."AB_INFO" "TYPE" CHAR(1) DEFAULT 0, NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; -COMMENT ON TABLE "FXKH_TXL"."AB_INFO" IS '通讯录日志'; +COMMENT ON TABLE "FXKH_TXL"."AB_INFO" IS '通讯录操作日志'; COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."AB_ID" IS '通讯录编号'; COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."CREATE_ID" IS '新增人id'; COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."CREATE_TIME" IS '新增时间'; diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java index 329fd4d..242992f 100644 --- a/src/main/java/com/whdc/controller/AddressBookController.java +++ b/src/main/java/com/whdc/controller/AddressBookController.java @@ -61,7 +61,7 @@ public class AddressBookController { @ApiOperation(value = "分页查询") @PostMapping(value = "page") public ResultJson page(@RequestBody AddressBootDto dto) { - + dto.setUserId(String.valueOf(StpUtil.getLoginId())); return ResultJson.ok(service.page(dto)); } diff --git a/src/main/java/com/whdc/model/dto/AddressBootDto.java b/src/main/java/com/whdc/model/dto/AddressBootDto.java index 6db0bb6..9219599 100644 --- a/src/main/java/com/whdc/model/dto/AddressBootDto.java +++ b/src/main/java/com/whdc/model/dto/AddressBootDto.java @@ -18,4 +18,7 @@ public class AddressBootDto extends CommDto{ @ApiModelProperty(value = "行政区划") private String adcd; + + @ApiModelProperty(value = "登录用户id") + private String userId; } diff --git a/src/main/java/com/whdc/model/entity/AddressBook.java b/src/main/java/com/whdc/model/entity/AddressBook.java index 9c7b26b..2fd766b 100644 --- a/src/main/java/com/whdc/model/entity/AddressBook.java +++ b/src/main/java/com/whdc/model/entity/AddressBook.java @@ -85,4 +85,8 @@ public class AddressBook extends Model implements Serializable { @ApiModelProperty(value = "创建人id") private String createId; + @TableField(exist = false) + @ApiModelProperty(value = "置顶序号") + private String fsort; + } \ No newline at end of file diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml index a62d357..2cdd624 100644 --- a/src/main/resources/mapper/AddressBookMapper.xml +++ b/src/main/resources/mapper/AddressBookMapper.xml @@ -5,10 +5,11 @@