gfwleak/enderbyendera-realtime-protection
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、防护对象和白名单按id查询 增加返回全部字段

Browse Source
This commit is contained in:
PushM
2024-06-04 20:39:10 +08:00
parent 6e3d48c63e
commit e4ebe2d791
6 changed files with 72 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/realtime/protection/configuration/entity/defense/object/ProtectObject.java
View File

@@ -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;
}

8
src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java
View File

@@ -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;
}

33
src/main/resources/mappers/ProtectObjectMapper.xml
View File

@@ -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>

10
src/main/resources/mappers/WhiteListMapper.xml
View File

@@ -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>

10
src/test/java/com/realtime/protection/server/defense/object/ProtectObjectServiceTest.java
View File

@@ -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() {

7
src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java
View File

@@ -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() {