From e4ebe2d791737030f8609dfc4979e91a430a7810 Mon Sep 17 00:00:00 2001
From: PushM <584406942@qq.com>
Date: Tue, 4 Jun 2024 20:39:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=98=B2=E6=8A=A4=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E5=92=8C=E7=99=BD=E5=90=8D=E5=8D=95=E6=8C=89id=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/defense/object/ProtectObject.java  | 10 ++++++
 .../entity/whitelist/WhiteListObject.java     |  8 +++++
 .../resources/mappers/ProtectObjectMapper.xml | 33 ++++++++++++++++---
 .../resources/mappers/WhiteListMapper.xml     | 10 +++++-
 .../object/ProtectObjectServiceTest.java      | 10 ++++++
 .../whitelist/WhiteListServiceTest.java       |  7 ++++
 6 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/realtime/protection/configuration/entity/defense/object/ProtectObject.java b/src/main/java/com/realtime/protection/configuration/entity/defense/object/ProtectObject.java
index c202d99..3a5a250 100644
--- a/src/main/java/com/realtime/protection/configuration/entity/defense/object/ProtectObject.java
+++ b/src/main/java/com/realtime/protection/configuration/entity/defense/object/ProtectObject.java
@@ -10,6 +10,8 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class ProtectObject {
     @JsonProperty("proobj_id")
@@ -88,4 +90,12 @@ public class ProtectObject {
     @JsonProperty("audit_user_depart")
     @Schema(description = "审核用户部门", example = "部门1")
     private String auditUserDepart;
+
+    @JsonProperty("create_time")
+    @Schema(description = "创建时间", example = "")
+    private LocalDateTime createTime;
+
+    @JsonProperty("modify_time")
+    @Schema(description = "修改时间", example = "")
+    private LocalDateTime modifyTime;
 }
diff --git a/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java b/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java
index c71566f..512846d 100644
--- a/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java
+++ b/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java
@@ -10,6 +10,8 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class WhiteListObject {
     @JsonProperty("whiteobj_id")
@@ -88,4 +90,10 @@ public class WhiteListObject {
     @Schema(description = "审核用户部门", example = "部门1")
     private String auditUserDepart;
 
+    @JsonProperty("create_time")
+    @Schema(description = "创建时间", example = "")
+    private LocalDateTime createTime;
+    @JsonProperty("modify_time")
+    @Schema(description = "修改时间", example = "")
+    private LocalDateTime modifyTime;
 }
diff --git a/src/main/resources/mappers/ProtectObjectMapper.xml b/src/main/resources/mappers/ProtectObjectMapper.xml
index bb365e8..3f0773f 100644
--- a/src/main/resources/mappers/ProtectObjectMapper.xml
+++ b/src/main/resources/mappers/ProtectObjectMapper.xml
@@ -10,12 +10,14 @@
                                      protect_object_ip, protect_object_port, protect_object_url,
                                      protect_object_protocol,
                                      protect_object_create_username, protect_object_create_depart,
-                                     protect_object_create_user_id, protect_object_display_id)
+                                     protect_object_create_user_id, protect_object_display_id
+        ,create_time, modify_time)
             VALUE (#{proobj.protectObjectId}, #{proobj.protectObjectName}, #{proobj.protectObjectSystemName},
                    INET_ATON(#{proobj.protectObjectIPAddress}), #{proobj.protectObjectPort}, #{proobj.protectObjectURL},
                    #{proobj.protectObjectProtocol},
                    #{proobj.protectObjectCreateUsername}, #{proobj.protectObjectCreateDepart},
-                   #{proobj.protectObjectCreateUserId}, #{proobj.protectObjectDisplayId})
+                   #{proobj.protectObjectCreateUserId}, #{proobj.protectObjectDisplayId},
+                   NOW(), NOW())
     </insert>
 
     <insert id="newProtectObjects" parameterType="List">
@@ -23,14 +25,14 @@
         protect_object_ip, protect_object_port, protect_object_url,
         protect_object_protocol,
         protect_object_create_username, protect_object_create_depart,
-        protect_object_create_user_id, protect_object_display_id)
+        protect_object_create_user_id, protect_object_display_id, create_time, modify_time)
         VALUES
         <foreach collection="proobjs" item="proobj" separator=",">
             (#{proobj.protectObjectId}, #{proobj.protectObjectName}, #{proobj.protectObjectSystemName},
             INET_ATON(#{proobj.protectObjectIPAddress}), #{proobj.protectObjectPort}, #{proobj.protectObjectURL},
             #{proobj.protectObjectProtocol},
             #{proobj.protectObjectCreateUsername}, #{proobj.protectObjectCreateDepart},
-            #{proobj.protectObjectCreateUserId}, #{proobj.protectObjectDisplayId})
+            #{proobj.protectObjectCreateUserId}, #{proobj.protectObjectDisplayId}, NOW(), NOW()
         </foreach>
     </insert>
     <insert id="insertStaticRuleStatusLog">
@@ -131,6 +133,7 @@
         <id column="protect_object_id" property="protectObjectId"/>
         <result column="protect_object_name" property="protectObjectName"/>
         <result column="protect_object_system_name" property="protectObjectSystemName"/>
+
         <result column="protect_object_ip" property="protectObjectIPAddress"/>
         <result column="protect_object_port" property="protectObjectPort"/>
         <result column="protect_object_url" property="protectObjectURL"/>
@@ -138,6 +141,16 @@
         <result column="protect_object_audit_status" property="protectObjectAuditStatus"/>
         <result column="protect_object_display_id" property="protectObjectDisplayId"/>
 
+        <result column="protect_object_create_username" property="protectObjectCreateUsername"/>
+        <result column="protect_object_create_user_id" property="protectObjectCreateUserId"/>
+        <result column="protect_object_create_user_depart" property="protectObjectCreateDepart"/>
+        <result column="audit_user_name" property="auditUserName"/>
+        <result column="audit_user_id" property="auditUserId"/>
+        <result column="audit_user_depart" property="auditUserDepart"/>
+        <result column="create_time" property="createTime"/>
+        <result column="modify_time" property="modifyTime"/>
+
+
     </resultMap>
 
     <select id="queryProtectObjects" resultMap="protectObjectMap">
@@ -189,7 +202,17 @@
                protect_object_port,
                protect_object_url,
                protect_object_protocol,
-               protect_object_audit_status,protect_object_display_id
+               protect_object_audit_status,
+               protect_object_display_id,
+               protect_object_create_username,
+                protect_object_create_user_id,
+                protect_object_create_depart,
+                audit_user_name,
+                audit_user_id,
+                audit_user_deaprt,
+                create_time,
+                modify_time
+
         FROM t_protect_object
         WHERE protect_object_id = #{proobj_id}
     </select>
diff --git a/src/main/resources/mappers/WhiteListMapper.xml b/src/main/resources/mappers/WhiteListMapper.xml
index 709f454..866835a 100644
--- a/src/main/resources/mappers/WhiteListMapper.xml
+++ b/src/main/resources/mappers/WhiteListMapper.xml
@@ -146,6 +146,14 @@
         <result column="white_list_protocol" property="whiteListProtocol"/>
         <result column="white_list_audit_status" property="whiteListAuditStatus"/>
         <result column="white_list_display_id" property="whiteListDisplayId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="modify_time" property="modifyTime"/>
+        <result column="create_username" property="createUserName"/>
+        <result column="create_user_department" property="createUserDepartment"/>
+        <result column="create_user_id" property="createUserId"/>
+        <result column="audit_user_name" property="auditUserName"/>
+        <result column="audit_user_id" property="auditUserId"/>
+        <result column="audit_user_depart" property="auditUserDepart"/>
 
     </resultMap>
 
@@ -173,7 +181,7 @@
     </select>
 
     <select id="queryWhiteListObjectById" resultMap="whiteListMap">
-        select *
+        select *, INET_NTOA(white_list_ip) as white_list_ip_d
         from t_white_list
         where white_list_id = #{whiteListId}
     </select>
diff --git a/src/test/java/com/realtime/protection/server/defense/object/ProtectObjectServiceTest.java b/src/test/java/com/realtime/protection/server/defense/object/ProtectObjectServiceTest.java
index 3a7c35d..2b8095b 100644
--- a/src/test/java/com/realtime/protection/server/defense/object/ProtectObjectServiceTest.java
+++ b/src/test/java/com/realtime/protection/server/defense/object/ProtectObjectServiceTest.java
@@ -56,6 +56,16 @@ class ProtectObjectServiceTest extends ProtectionApplicationTests {
 //        Boolean success = protectObjectService.newProtectObjects(protectObjects);
 //        assertTrue(success);
     }
+    @Test
+    void queryProtectObjectByid() {
+
+        protectObjectService.newProtectObject(protectObject);
+
+        System.out.println(protectObjectService.queryProtectObject(protectObject.getProtectObjectId()));
+
+
+    }
+
 
     @Test
     void queryProtectObject() {
diff --git a/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java b/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java
index 5e5a5b6..db8168d 100644
--- a/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java
+++ b/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java
@@ -141,6 +141,13 @@ class WhiteListServiceTest extends ProtectionApplicationTests {
         List<WhiteListObject> whiteListObjects = whiteListService.queryWhiteListObject(null, null, null, null, null, 1, 2);
         System.out.println(whiteListObjects);
     }
+    @Test
+    void testQueryWhiteListObjectbyid() {
+        List<WhiteListObject> whiteListObjects = whiteListService.queryWhiteListObject(null, null, null, null, null, 1, 2);
+        System.out.println(
+                whiteListService.queryWhiteListObjectById(
+                        whiteListObjects.get(0).getWhiteListId()));
+    }
 
     @Test
     void testUpdateAuditStatusByIdBatch() {