From 9e1ae6ad422e0e81c3bb1655ff6a691a6dfc9b1a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 17 Oct 2022 11:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=BC=93=E5=AD=98=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E4=B8=AA=E6=88=BF=E4=B8=BB=E5=A7=93=E5=90=8D=EF=BC=8C?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D=EF=BC=8C=E8=BA=AB=E4=BB=BD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migration/V0.0.24__alter_log_operation.sql   |  2 ++
 .../tools/redis/common/bean/HouseInfoCache.java  | 15 +++++++++++++++
 .../java/com/epmet/dto/result/HouseInfoDTO.java  | 16 ++++++++++++++++
 .../src/main/resources/mapper/IcHouseDao.xml     |  5 ++++-
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.24__alter_log_operation.sql

diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.24__alter_log_operation.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.24__alter_log_operation.sql
new file mode 100644
index 0000000000..cba42020bb
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.24__alter_log_operation.sql
@@ -0,0 +1,2 @@
+
+ALTER TABLE log_operation MODIFY COLUMN CATEGORY varchar(64) not null COMMENT '操作类型大类。例如login和logout都属于login大类。项目立项，项目流转，项目结案都属于项目大类；data_tm:数据脱敏；';
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java
index 1fe656fef6..d3df049dab 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java
@@ -107,4 +107,19 @@ public class HouseInfoCache implements Serializable {
      * 二维码地址
      */
     private String houseQrcodeUrl;
+
+    /**
+     * 房主姓名
+     */
+    private String ownerName;
+
+    /**
+     * 房主电话
+     */
+    private String ownerPhone;
+
+    /**
+     * 房主身份证
+     */
+    private String ownerIdCard;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java
index fffaae071c..f6be2d8f83 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java
@@ -108,4 +108,20 @@ public class HouseInfoDTO implements Serializable {
      * 二维码地址
      */
     private String houseQrcodeUrl;
+
+
+    /**
+     * 房主姓名
+     */
+    private String ownerName;
+
+    /**
+     * 房主电话
+     */
+    private String ownerPhone;
+
+    /**
+     * 房主身份证
+     */
+    private String ownerIdCard;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index ed9bc5acd9..6e417b0aed 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -276,7 +276,10 @@
         gr.GRID_NAME,
         ih.HOUSE_CODE,
         ih.CODING,
-        ih.HOUSE_QRCODE_URL
+        ih.HOUSE_QRCODE_URL,
+        ih.owner_name,
+        ih.owner_phone,
+        ih.owner_id_card
         FROM ic_house ih
         left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id AND n.DEL_FLAG = '0')
         left JOIN ic_building ib ON ( ih.BUILDING_ID = ib.id AND ib.DEL_FLAG = '0')