大屏安全监管检测对象接口修改

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

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> zongzhiDengbaoSystemResponse;
 
     /**
      * 等保单位响应类
      */
     @ApiModelProperty(value = "等保单位响应类")
-    private ZongzhiDengbaoUnitResponse zongzhiDengbaoUnitResponse;
+    private List<ZongzhiDengbaoUnitResponse> zongzhiDengbaoUnitResponse;
 
 
 
@@ -30,7 +32,7 @@ public class ZongzhiSuperviseResponse {
      * 政府网站响应类
      */
     @ApiModelProperty(value = "政府网站响应类")
-    private ZongzhiZhengfuResponse zongzhiZhengfuResponse;
+    private List<ZongzhiZhengfuResponse> zongzhiZhengfuResponse;
 
 
 
@@ -38,5 +40,5 @@ public class ZongzhiSuperviseResponse {
      * IDC响应类
      */
     @ApiModelProperty(value = "IDC响应类")
-    private  ZongzhiIdcResponse zongzhiIdcResponse;
+    private  List<ZongzhiIdcResponse> zongzhiIdcResponse;
 }

ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenSaftyMapper.java

@@ -32,24 +32,24 @@ public interface ZongzhiScreenSaftyMapper {
     /**
      * 等保系统
      */
-    public ZongzhiDengbaoSystemResponse getDengbaoSystem();
+    public List<ZongzhiDengbaoSystemResponse> getDengbaoSystem();
 
 
     /**
      * 等保单位
      */
-    public ZongzhiDengbaoUnitResponse getDengbaoUnit();
+    public List<ZongzhiDengbaoUnitResponse> getDengbaoUnit();
 
 
     /**
      * 政府网站
      */
-    public ZongzhiZhengfuResponse getZhengfu();
+    public List<ZongzhiZhengfuResponse> getZhengfu();
 
     /**
      * idc
      */
-    public ZongzhiIdcResponse getIdc();
+    public List<ZongzhiIdcResponse> getIdc();
 
     /**
      * 各地区攻击次数

ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenSaftyService.java

@@ -30,7 +30,7 @@ public interface ZongzhiScreenSaftyService {
     /**
      * 安全检测监管对象
      */
-    public ZongzhiSuperviseResponse getsupervise();
+    public List<ZongzhiSuperviseResponse> getsupervise();
 
 
     /**

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<ZongzhiSuperviseResponse> getsupervise() {
+        List list = new ArrayList<>();
         //等保系统
-        ZongzhiDengbaoSystemResponse zongzhiDengbaoSystemResponse = zongzhiScreenSaftyMapper.getDengbaoSystem();
+        List<ZongzhiDengbaoSystemResponse> zongzhiDengbaoSystemResponse = zongzhiScreenSaftyMapper.getDengbaoSystem();
         //等保单位
-        ZongzhiDengbaoUnitResponse zongzhiDengbaoUnitResponse=zongzhiScreenSaftyMapper.getDengbaoUnit();
+        List<ZongzhiDengbaoUnitResponse> zongzhiDengbaoUnitResponse = zongzhiScreenSaftyMapper.getDengbaoUnit();
         //政府网站
-        ZongzhiZhengfuResponse zongzhiZhengfuResponse=zongzhiScreenSaftyMapper.getZhengfu();
+        List<ZongzhiZhengfuResponse> zongzhiZhengfuResponse = zongzhiScreenSaftyMapper.getZhengfu();
         //idc单位
-        ZongzhiIdcResponse zongzhiIdcResponse=zongzhiScreenSaftyMapper.getIdc();
-        zongzhiSuperviseResponse.setZongzhiDengbaoSystemResponse(zongzhiDengbaoSystemResponse);
-        zongzhiSuperviseResponse.setZongzhiDengbaoUnitResponse(zongzhiDengbaoUnitResponse);
-        zongzhiSuperviseResponse.setZongzhiZhengfuResponse(zongzhiZhengfuResponse);
-        zongzhiSuperviseResponse.setZongzhiIdcResponse(zongzhiIdcResponse);
-        return zongzhiSuperviseResponse;
+        List<ZongzhiIdcResponse> zongzhiIdcResponse = zongzhiScreenSaftyMapper.getIdc();
+        list.addAll(zongzhiDengbaoSystemResponse);
+        list.addAll(zongzhiDengbaoUnitResponse);
+        list.addAll(zongzhiZhengfuResponse);
+        list.addAll(zongzhiIdcResponse);
+        return list;
     }
 
     @Override

ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml

@@ -43,7 +43,7 @@
     </select>
     <select id="getSentimentReportbyReportType"
             resultType="com.ruoyi.screen.domain.response.ZongzhiReportResponse">
-        select count(sentiment_report_type) as sentimentReportType, sentiment_report_type
+        select count(sentiment_report_type) as count, sentiment_report_type as sentimentReportType
         from tc_network_sentiment
         GROUP BY sentiment_report_type
     </select>