From 8c79cf3e254954d1325c822bb7c161debb9b8bbb Mon Sep 17 00:00:00 2001 From: PushM <584406942@qq.com> Date: Thu, 9 May 2024 21:58:05 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81task=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2bugfix=202=E3=80=81=E6=96=B0=E5=A2=9E=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BA=BA=E5=B1=9E=E6=80=A7=203=E3=80=81loginservice?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E7=B3=BB=E7=BB=9Furl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e943a787d40524f9c20508d2cb7ac2a662a6c42d) --- .../entity/defense/object/ProtectObject.java | 10 ++++++++++ .../entity/defense/template/Template.java | 10 ++++++++++ .../entity/rule/dynamicrule/DynamicRuleObject.java | 10 ++++++++++ .../entity/rule/staticrule/StaticRuleObject.java | 11 +++++++++++ .../protection/configuration/entity/task/Task.java | 10 ++++++++++ .../entity/whitelist/WhiteListObject.java | 10 ++++++++++ .../realtime/protection/server/task/TaskService.java | 1 + .../protection/server/user/login/LoginService.java | 4 ++-- src/main/resources/mappers/TaskMapper.xml | 2 +- .../server/defense/template/TemplateServiceTest.java | 12 ++++++++++++ .../protection/server/task/TaskServiceTest.java | 10 ++++++++-- 11 files changed, 85 insertions(+), 5 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 973cc72..c202d99 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 @@ -78,4 +78,14 @@ public class ProtectObject { @ExcelIgnore @Schema(description = "防护对象创建人ID", example = "0") private Integer protectObjectCreateUserId; + + @JsonProperty("audit_user_name") + @Schema(description = "审核用户名称", example = "user11") + private String auditUserName; + @JsonProperty("audit_user_id") + @Schema(description = "审核用户id", example = "11111") + private String auditUserId; + @JsonProperty("audit_user_depart") + @Schema(description = "审核用户部门", example = "部门1") + private String auditUserDepart; } diff --git a/src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java b/src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java index 30471eb..7c30294 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java +++ b/src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java @@ -81,6 +81,16 @@ public class Template { @Schema(description = "策略模板展示id", accessMode = Schema.AccessMode.READ_ONLY) private String templateDisplayId; + @JsonProperty("audit_user_name") + @Schema(description = "审核用户名称", example = "user11") + private String auditUserName; + @JsonProperty("audit_user_id") + @Schema(description = "审核用户id", example = "11111") + private String auditUserId; + @JsonProperty("audit_user_depart") + @Schema(description = "审核用户部门", example = "部门1") + private String auditUserDepart; + /** * 设置是否含有日常/应急/紧急防护等级态字段的字段 diff --git a/src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java b/src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java index 3a08a62..453c2ce 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java +++ b/src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java @@ -106,6 +106,16 @@ public class DynamicRuleObject { @Schema(description = "动态规则审核状态（0为未审核，1为已退回，2为审核通过）", example = "2", accessMode = Schema.AccessMode.READ_ONLY) private Integer auditStatus; + @JsonProperty("audit_user_name") + @Schema(description = "审核用户名称", example = "user11") + private String auditUserName; + @JsonProperty("audit_user_id") + @Schema(description = "审核用户id", example = "11111") + private String auditUserId; + @JsonProperty("audit_user_depart") + @Schema(description = "审核用户部门", example = "部门1") + private String auditUserDepart; + public void checkAuditStatusValidate(AuditStatusEnum newAuditStatus) { if (!List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum()).contains(this.getAuditStatus())) { throw new IllegalArgumentException("规则《" + this.getDynamicRuleName() + "》原审批状态非法"); diff --git a/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java b/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java index 5894df0..ac7350a 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java +++ b/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java @@ -150,6 +150,17 @@ public class StaticRuleObject { @Schema(description = "频率，最低为1", example = "1", requiredMode = Schema.RequiredMode.REQUIRED) private Integer staticRuleFrequency; + @JsonProperty("audit_user_name") + @Schema(description = "审核用户名称", example = "user11") + private String auditUserName; + @JsonProperty("audit_user_id") + @Schema(description = "审核用户id", example = "11111") + private String auditUserId; + @JsonProperty("audit_user_depart") + @Schema(description = "审核用户部门", example = "部门1") + private String auditUserDepart; + + public void checkAuditStatusValidate(AuditStatusEnum newAuditStatus) { if (!List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum()).contains(this.getAuditStatus())) { throw new IllegalArgumentException("规则《" + this.getStaticRuleName() + "》原审批状态非法"); diff --git a/src/main/java/com/realtime/protection/configuration/entity/task/Task.java b/src/main/java/com/realtime/protection/configuration/entity/task/Task.java index 7439607..4b60c74 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/task/Task.java +++ b/src/main/java/com/realtime/protection/configuration/entity/task/Task.java @@ -91,4 +91,14 @@ public class Task { @NotNull(message = "task_range字段不能为空。") @Schema(description = "局点范围，由规则移动到任务", example = "1009") private String taskRange; + + @JsonProperty("audit_user_name") + @Schema(description = "审核用户名称", example = "user11") + private String auditUserName; + @JsonProperty("audit_user_id") + @Schema(description = "审核用户id", example = "11111") + private String auditUserId; + @JsonProperty("audit_user_depart") + @Schema(description = "审核用户部门", example = "部门1") + private String auditUserDepart; } 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 a9cea7c..c71566f 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 @@ -78,4 +78,14 @@ public class WhiteListObject { @Schema(description = "白名单对象创建人部门") private String createUserDepartment; + @JsonProperty("audit_user_name") + @Schema(description = "审核用户名称", example = "user11") + private String auditUserName; + @JsonProperty("audit_user_id") + @Schema(description = "审核用户id", example = "11111") + private String auditUserId; + @JsonProperty("audit_user_depart") + @Schema(description = "审核用户部门", example = "部门1") + private String auditUserDepart; + } diff --git a/src/main/java/com/realtime/protection/server/task/TaskService.java b/src/main/java/com/realtime/protection/server/task/TaskService.java index 0918148..bcd6a3e 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskService.java +++ b/src/main/java/com/realtime/protection/server/task/TaskService.java @@ -229,6 +229,7 @@ public class TaskService { if (task == null) { continue; } + task.setStaticRuleIds(taskMapper.queryStaticRuleIdsFromTaskId(task.getTaskId(), List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum()))); task.setDynamicRuleIds(taskMapper.queryDynamicRuleIdsFromTaskId(task.getTaskId(), diff --git a/src/main/java/com/realtime/protection/server/user/login/LoginService.java b/src/main/java/com/realtime/protection/server/user/login/LoginService.java index 4eefae8..fe38adc 100644 --- a/src/main/java/com/realtime/protection/server/user/login/LoginService.java +++ b/src/main/java/com/realtime/protection/server/user/login/LoginService.java @@ -51,7 +51,7 @@ public class LoginService { ObjectMapper objectMapper = new ObjectMapper(); OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder() - .url("http://114.243.134.122:9217/passport/accessToken?grant_type=client_credentials") + .url("https://114.243.134.122:10217/passport/accessToken?grant_type=client_credentials") // .url("https://passport.iam.pub/passport/accessToken?grant_type=client_credentials") .header("Authorization", "Basic TlNBRERAWlguT1JHOk14a1hHZ1ltOUNROUE3TCRSOCNLRW02R1pSeEhwd1c2") .post(okhttp3.internal.Util.EMPTY_REQUEST) @@ -76,7 +76,7 @@ public class LoginService { RequestBody body = new MultipartBody.Builder().setType(MultipartBody.FORM) .addFormDataPart("sessionData", sessionData).build(); request = new Request.Builder() - .url("http://114.243.134.122:9217/passport/accessApplication") + .url("https://114.243.134.122:10217/passport/accessApplication") // .url("https://passport.iam.pub/passport/accessToken?grant_type=client_credentials") .header("Authorization", "Bearer " + accessToken) diff --git a/src/main/resources/mappers/TaskMapper.xml b/src/main/resources/mappers/TaskMapper.xml index 33a1cc2..808f5d7 100644 --- a/src/main/resources/mappers/TaskMapper.xml +++ b/src/main/resources/mappers/TaskMapper.xml @@ -344,7 +344,7 @@