大屏安全监管检测对象接口修改，大屏请朗专项行动数据统计新增

ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenManageController.java

@@ -1,6 +1,8 @@
 package com.ruoyi.screen.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.screen.domain.response.ZongzhiActionResponse;
+import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse;
 import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse;
 import com.ruoyi.screen.service.ZongzhiScreenManageService;
 import io.swagger.annotations.Api;
@@ -36,4 +38,25 @@ public class ZongzhiScreenManageController {
 
 
 
+    /**
+     * 举报总数 处置率
+     */
+    @ApiOperation(value = "举报总数和处置率", response = ZongzhiNetworkReportResponse.class)
+    @GetMapping("/networkreport")
+    private AjaxResult getNetworkReport() {
+
+        return AjaxResult.success(zongzhiScreenManageService.getNetworkReport());
+    }
+
+
+    /**
+     * 请朗专项行动数据统计
+     */
+    @ApiOperation(value = "请朗专项行动数据统计", response = ZongzhiActionResponse.class)
+    @GetMapping("/action")
+    private AjaxResult getaction() {
+
+        return AjaxResult.success(zongzhiScreenManageService.getaction());
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionResponse.java

@@ -0,0 +1,23 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 大屏数据请朗专项行动数据统计响应类
+ */
+@Data
+@ApiModel("大屏数据请朗专项行动数据统计响应类")
+public class ZongzhiActionResponse {
+
+
+    @ApiModelProperty(value = "数量")
+    private Integer count;
+
+
+    @ApiModelProperty(value = "攻击源IP地址区域")
+    private String attackIpRegion;
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoSystemResponse.java

@@ -0,0 +1,24 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 等保系统响应类
+ */
+@Data
+@ApiModel("等保系统响应类")
+public class ZongzhiDengbaoSystemResponse {
+    /**
+     * 等保系统名称
+     */
+    @ApiModelProperty(value = "等保系统名称")
+    private String name;
+
+    /**
+     * 等保系统数量
+     */
+    @ApiModelProperty(value = "等保系统数量")
+    private int count;
+}

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoUnitResponse.java

@@ -0,0 +1,27 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 等保单位响应类
+ */
+@Data
+@ApiModel("等保单位响应类")
+public class ZongzhiDengbaoUnitResponse {
+
+
+    /**
+     * 等保单位名称
+     */
+    @ApiModelProperty(value = "等保单位名称")
+    private String name1;
+
+    /**
+     * 等保单位数量
+     */
+    @ApiModelProperty(value = "等保单位数量")
+    private int count1;
+
+}

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiIdcResponse.java

@@ -0,0 +1,27 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * IDC响应类
+ */
+@Data
+@ApiModel("IDC响应类")
+public class ZongzhiIdcResponse {
+
+
+    /**
+     * IDC单位名称
+     */
+    @ApiModelProperty(value = "IDC单位名称")
+    private String name3;
+
+    /**
+     * IDC单位数量
+     */
+    @ApiModelProperty(value = "IDC单位数量")
+    private int count3;
+
+}

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiNetworkReportResponse.java

@@ -0,0 +1,23 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 大屏数据举报总数和处置率响应类
+ */
+@Data
+@ApiModel("大屏数据举报总数和处置率响应类")
+public class ZongzhiNetworkReportResponse {
+
+
+    @ApiModelProperty(value = "举报总数")
+    private Integer count;
+
+
+    @ApiModelProperty(value = "处置率")
+    private Double handle;
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSuperviseResponse.java

@@ -11,55 +11,32 @@ import lombok.Data;
 @ApiModel("安全检测监管对象响应类")
 public class ZongzhiSuperviseResponse {
 
-    /**
-     * 等保系统名称
-     */
-    @ApiModelProperty(value = "等保系统名称")
-    private String name;
-
-    /**
-     * 等保系统数量
-     */
-    @ApiModelProperty(value = "等保系统数量")
-    private int count;
-
 
     /**
-     * 等保单位名称
+     * 等保系统响应类
      */
-    @ApiModelProperty(value = "等保单位名称")
+    @ApiModelProperty(value = "等保系统响应类")
-    private String name1;
+    private ZongzhiDengbaoSystemResponse zongzhiDengbaoSystemResponse;
 
     /**
-     * 等保单位数量
+     * 等保单位响应类
      */
-    @ApiModelProperty(value = "等保单位数量")
+    @ApiModelProperty(value = "等保单位响应类")
-    private int count1;
+    private ZongzhiDengbaoUnitResponse zongzhiDengbaoUnitResponse;
 
 
 
     /**
-     * 政府网站名称
+     * 政府网站响应类
      */
-    @ApiModelProperty(value = "政府网站名称")
+    @ApiModelProperty(value = "政府网站响应类")
-    private String name2;
+    private ZongzhiZhengfuResponse zongzhiZhengfuResponse;
-
-    /**
-     * 政府网站数量
-     */
-    @ApiModelProperty(value = "政府网站数量")
-    private int count2;
 
 
-    /**
-     * IDC单位名称
-     */
-    @ApiModelProperty(value = "IDC单位名称")
-    private String name3;
 
     /**
-     * IDC单位数量
+     * IDC响应类
      */
-    @ApiModelProperty(value = "IDC单位数量")
+    @ApiModelProperty(value = "IDC响应类")
-    private int count3;
+    private  ZongzhiIdcResponse zongzhiIdcResponse;
 }

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiZhengfuResponse.java

@@ -0,0 +1,26 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 政府网站响应类
+ */
+@Data
+@ApiModel("政府网站响应类")
+public class ZongzhiZhengfuResponse {
+
+    /**
+     * 政府网站名称
+     */
+    @ApiModelProperty(value = "政府网站名称")
+    private String name2;
+
+    /**
+     * 政府网站数量
+     */
+    @ApiModelProperty(value = "政府网站数量")
+    private int count2;
+
+}

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

@@ -1,5 +1,7 @@
 package com.ruoyi.screen.mapper;
 
+import com.ruoyi.screen.domain.response.ZongzhiActionResponse;
+import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse;
 import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse;
 
 import java.util.List;
@@ -17,4 +19,16 @@ public interface ZongzhiScreenManageMapper {
 
 
 
+    /**
+     * 举报总数和处置率
+     */
+    public ZongzhiNetworkReportResponse getNetworkReport();
+
+
+
+    /**
+     * 请朗专项行动数据统计
+     */
+    public List<ZongzhiActionResponse> getaction();
+
 }

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

@@ -29,12 +29,27 @@ public interface ZongzhiScreenSaftyMapper {
      */
     public List<ZongzhiSafetyListResponse> getSafetyList();
 
+    /**
+     * 等保系统
+     */
+    public ZongzhiDengbaoSystemResponse getDengbaoSystem();
+
+
+    /**
+     * 等保单位
+     */
+    public ZongzhiDengbaoUnitResponse getDengbaoUnit();
+
 
     /**
-     * 安全检测监管对象
+     * 政府网站
      */
-    public ZongzhiSuperviseResponse getsupervise();
+    public ZongzhiZhengfuResponse getZhengfu();
 
+    /**
+     * idc
+     */
+    public ZongzhiIdcResponse getIdc();
 
     /**
      * 各地区攻击次数
@@ -60,7 +75,6 @@ public interface ZongzhiScreenSaftyMapper {
     public List<ZongzhiHazardDisposalResponse> getHazardDisposal();
 
 
-
     /**
      * 隐患处置最新隐患
      */

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

@@ -1,5 +1,7 @@
 package com.ruoyi.screen.service;
 
+import com.ruoyi.screen.domain.response.ZongzhiActionResponse;
+import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse;
 import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse;
 
 import java.util.List;
@@ -17,4 +19,16 @@ public interface ZongzhiScreenManageService {
 
 
 
+    /**
+     * 举报总数和处置率
+     */
+    public ZongzhiNetworkReportResponse getNetworkReport();
+
+
+
+
+    /**
+     * 请朗专项行动数据统计
+     */
+    public List<ZongzhiActionResponse> getaction();
 }

ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenManageServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ruoyi.screen.service.impl;
 
+import com.ruoyi.screen.domain.response.ZongzhiActionResponse;
+import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse;
 import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse;
 import com.ruoyi.screen.mapper.ZongzhiScreenManageMapper;
 import com.ruoyi.screen.service.ZongzhiScreenManageService;
@@ -22,5 +24,15 @@ public class ZongzhiScreenManageServiceImpl  implements ZongzhiScreenManageServi
         return zongzhiScreenManageMapper.getWorkDynamics();
     }
 
+    @Override
+    public ZongzhiNetworkReportResponse getNetworkReport() {
+        return zongzhiScreenManageMapper.getNetworkReport();
+    }
+
+    @Override
+    public List<ZongzhiActionResponse> getaction() {
+        return zongzhiScreenManageMapper.getaction();
+    }
+
 
 }

ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenSaftyServiceImpl.java

@@ -15,6 +15,7 @@ import java.util.List;
 public class ZongzhiScreenSaftyServiceImpl implements ZongzhiScreenSaftyService {
     @Autowired
     private ZongzhiScreenSaftyMapper zongzhiScreenSaftyMapper;
+
     @Override
     public List<ZongzhiSourceResponse> getSource() {
         return zongzhiScreenSaftyMapper.getSource();
@@ -32,7 +33,20 @@ public class ZongzhiScreenSaftyServiceImpl implements ZongzhiScreenSaftyService
 
     @Override
     public ZongzhiSuperviseResponse getsupervise() {
-        return zongzhiScreenSaftyMapper.getsupervise();
+        ZongzhiSuperviseResponse zongzhiSuperviseResponse = new ZongzhiSuperviseResponse();
+        //等保系统
+        ZongzhiDengbaoSystemResponse zongzhiDengbaoSystemResponse = zongzhiScreenSaftyMapper.getDengbaoSystem();
+        //等保单位
+        ZongzhiDengbaoUnitResponse zongzhiDengbaoUnitResponse=zongzhiScreenSaftyMapper.getDengbaoUnit();
+        //政府网站
+        ZongzhiZhengfuResponse zongzhiZhengfuResponse=zongzhiScreenSaftyMapper.getZhengfu();
+        //idc单位
+        ZongzhiIdcResponse zongzhiIdcResponse=zongzhiScreenSaftyMapper.getIdc();
+        zongzhiSuperviseResponse.setZongzhiDengbaoSystemResponse(zongzhiDengbaoSystemResponse);
+        zongzhiSuperviseResponse.setZongzhiDengbaoUnitResponse(zongzhiDengbaoUnitResponse);
+        zongzhiSuperviseResponse.setZongzhiZhengfuResponse(zongzhiZhengfuResponse);
+        zongzhiSuperviseResponse.setZongzhiIdcResponse(zongzhiIdcResponse);
+        return zongzhiSuperviseResponse;
     }
 
     @Override

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

@@ -10,5 +10,13 @@
         FROM `tc_work_dongtai`
         GROUP BY type, materialsName
     </select>
+    <select id="getNetworkReport" resultType="com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse">
+        select count(*) as count, ROUND(count(case when state=2 THEN 1 ELSE NULL END ) * 100.0/ sum(count(*)) OVER (), 1 )as handle
+        FROM tc_network_report
+
+    </select>
+    <select id="getaction" resultType="com.ruoyi.screen.domain.response.ZongzhiActionResponse">
+
+    </select>
 
 </mapper>

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

@@ -12,7 +12,7 @@
         GROUP BY sentiment_type
     </select>
     <select id="getSentimenCount" resultType="com.ruoyi.screen.domain.response.ZongzhiSentimentCountResponse">
-        select count(*) as count ,sentiment_type as type
+        select count(*) as count ,sentiment_type as type,ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt
         from tc_network_sentiment
         where sentiment_type !='2'
         GROUP BY sentiment_type

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

@@ -19,21 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select source_ip, attack_time AS attackTime , attack_type as attackType
         from tc_safety_detection
     </select>
-    <select id="getsupervise" resultType="com.ruoyi.screen.domain.response.ZongzhiSuperviseResponse">
-        select a.count,
-               a.name,
-               b.count1,
-               b.name1,
-               c.count2,
-               c.name2,
-               d.count3,
-               d.name3
-        from (select count(*) as count,'等保系统' as name from tc_dengbao_system) a,
-             (select count(*) as count1, '等保单位' as name1 from tc_dengbao_unit) b,
-             (select count(*) as count2, '政府网站' as name2 from tc_government_web) c,
-             (select count(*) as count3, 'IDC单位' as name3 from tc_idc_unit) d
 
-    </select>
     <select id="getAttack" resultType="com.ruoyi.screen.domain.response.ZongzhiAttackResponse">
         SELECT COUNT(*) AS count, attack_ip_region as attackIpRegion
         FROM tc_safety_detection
@@ -55,4 +41,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getNotification" resultType="com.ruoyi.screen.domain.response.ZongzhiNotificationResponse">
         select unit_name as unitName , ip_dns as ipDns, state from tc_safety_danger
     </select>
+    <select id="getDengbaoSystem" resultType="com.ruoyi.screen.domain.response.ZongzhiDengbaoSystemResponse">
+        select count(*) as count,'等保系统' as name from tc_dengbao_system
+    </select>
+    <select id="getDengbaoUnit" resultType="com.ruoyi.screen.domain.response.ZongzhiDengbaoUnitResponse">
+        select count(*) as count1, '等保单位' as name1
+        from tc_dengbao_unit
+    </select>
+    <select id="getZhengfu" resultType="com.ruoyi.screen.domain.response.ZongzhiZhengfuResponse">
+        select count(*) as count2, '政府网站' as name2
+        from tc_government_web
+    </select>
+    <select id="getIdc" resultType="com.ruoyi.screen.domain.response.ZongzhiIdcResponse">
+        select count(*) as count3, 'IDC单位' as name3
+        from tc_idc_unit
+    </select>
 </mapper>