From 72ceb070a8ed1ab26d128dd18b6f519949380691 Mon Sep 17 00:00:00 2001 From: ASxx <2075995406@qq.com> Date: Mon, 21 Aug 2023 15:31:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=AE=89=E5=85=A8=E7=9B=91?= =?UTF-8?q?=E7=AE=A1=E6=A3=80=E6=B5=8B=E5=AF=B9=E8=B1=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZongzhiSentimentCountResponse.java | 7 ++++-- .../response/ZongzhiSuperviseResponse.java | 10 ++++---- .../mapper/ZongzhiScreenSaftyMapper.java | 8 +++---- .../service/ZongzhiScreenSaftyService.java | 2 +- .../impl/ZongzhiScreenSaftyServiceImpl.java | 23 ++++++++++--------- .../screen/ZongzhiScreenOpinionMapper.xml | 2 +- 6 files changed, 29 insertions(+), 23 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSentimentCountResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSentimentCountResponse.java index 64b91ab..8d6abc8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSentimentCountResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSentimentCountResponse.java @@ -19,7 +19,6 @@ public class ZongzhiSentimentCountResponse { private Integer count; - /** * 舆情类型1.敏感 2.非敏感 3.本地相关信息 * 4.推送预警信息 5.聚焦本地媒体信息 @@ -27,5 +26,9 @@ public class ZongzhiSentimentCountResponse { @ApiModelProperty(value = "舆情类型1.敏感 2.非敏感 3.本地相关信息 4.推送预警信息 5.聚焦本地媒体信息") private Integer type; - + /** + * 百分比 + */ + @ApiModelProperty(value = "百分比") + private double pt; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSuperviseResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSuperviseResponse.java index 7b3171c..c87d34d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSuperviseResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSuperviseResponse.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * 安全检测监管对象响应类 */ @@ -16,13 +18,13 @@ public class ZongzhiSuperviseResponse { * 等保系统响应类 */ @ApiModelProperty(value = "等保系统响应类") - private ZongzhiDengbaoSystemResponse zongzhiDengbaoSystemResponse; + private List zongzhiDengbaoSystemResponse; /** * 等保单位响应类 */ @ApiModelProperty(value = "等保单位响应类") - private ZongzhiDengbaoUnitResponse zongzhiDengbaoUnitResponse; + private List zongzhiDengbaoUnitResponse; @@ -30,7 +32,7 @@ public class ZongzhiSuperviseResponse { * 政府网站响应类 */ @ApiModelProperty(value = "政府网站响应类") - private ZongzhiZhengfuResponse zongzhiZhengfuResponse; + private List zongzhiZhengfuResponse; @@ -38,5 +40,5 @@ public class ZongzhiSuperviseResponse { * IDC响应类 */ @ApiModelProperty(value = "IDC响应类") - private ZongzhiIdcResponse zongzhiIdcResponse; + private List zongzhiIdcResponse; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenSaftyMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenSaftyMapper.java index ac7d024..7565104 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenSaftyMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenSaftyMapper.java @@ -32,24 +32,24 @@ public interface ZongzhiScreenSaftyMapper { /** * 等保系统 */ - public ZongzhiDengbaoSystemResponse getDengbaoSystem(); + public List getDengbaoSystem(); /** * 等保单位 */ - public ZongzhiDengbaoUnitResponse getDengbaoUnit(); + public List getDengbaoUnit(); /** * 政府网站 */ - public ZongzhiZhengfuResponse getZhengfu(); + public List getZhengfu(); /** * idc */ - public ZongzhiIdcResponse getIdc(); + public List getIdc(); /** * 各地区攻击次数 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenSaftyService.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenSaftyService.java index 3557adf..7be8990 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenSaftyService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenSaftyService.java @@ -30,7 +30,7 @@ public interface ZongzhiScreenSaftyService { /** * 安全检测监管对象 */ - public ZongzhiSuperviseResponse getsupervise(); + public List getsupervise(); /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenSaftyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenSaftyServiceImpl.java index 01e69ea..d797692 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenSaftyServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenSaftyServiceImpl.java @@ -6,6 +6,7 @@ import com.ruoyi.screen.service.ZongzhiScreenSaftyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -32,21 +33,21 @@ public class ZongzhiScreenSaftyServiceImpl implements ZongzhiScreenSaftyService } @Override - public ZongzhiSuperviseResponse getsupervise() { - ZongzhiSuperviseResponse zongzhiSuperviseResponse = new ZongzhiSuperviseResponse(); + public List getsupervise() { + List list = new ArrayList<>(); //等保系统 - ZongzhiDengbaoSystemResponse zongzhiDengbaoSystemResponse = zongzhiScreenSaftyMapper.getDengbaoSystem(); + List zongzhiDengbaoSystemResponse = zongzhiScreenSaftyMapper.getDengbaoSystem(); //等保单位 - ZongzhiDengbaoUnitResponse zongzhiDengbaoUnitResponse=zongzhiScreenSaftyMapper.getDengbaoUnit(); + List zongzhiDengbaoUnitResponse = zongzhiScreenSaftyMapper.getDengbaoUnit(); //政府网站 - ZongzhiZhengfuResponse zongzhiZhengfuResponse=zongzhiScreenSaftyMapper.getZhengfu(); + List zongzhiZhengfuResponse = zongzhiScreenSaftyMapper.getZhengfu(); //idc单位 - ZongzhiIdcResponse zongzhiIdcResponse=zongzhiScreenSaftyMapper.getIdc(); - zongzhiSuperviseResponse.setZongzhiDengbaoSystemResponse(zongzhiDengbaoSystemResponse); - zongzhiSuperviseResponse.setZongzhiDengbaoUnitResponse(zongzhiDengbaoUnitResponse); - zongzhiSuperviseResponse.setZongzhiZhengfuResponse(zongzhiZhengfuResponse); - zongzhiSuperviseResponse.setZongzhiIdcResponse(zongzhiIdcResponse); - return zongzhiSuperviseResponse; + List zongzhiIdcResponse = zongzhiScreenSaftyMapper.getIdc(); + list.addAll(zongzhiDengbaoSystemResponse); + list.addAll(zongzhiDengbaoUnitResponse); + list.addAll(zongzhiZhengfuResponse); + list.addAll(zongzhiIdcResponse); + return list; } @Override diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml index 111568b..2804c3c 100644 --- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml @@ -43,7 +43,7 @@