大屏接口修改

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

@@ -97,4 +97,16 @@ public class ZongzhiScreenOpinionController {
     }
 
 
+
+    /**
+     * 部门专办情况
+     */
+    @ApiOperation(value = "部门专办情况", response = ZongzhiSentimentDeptResponse.class)
+    @GetMapping("/sentimentdept")
+    private AjaxResult getSentimentDept() {
+        ;
+        return AjaxResult.success(zongzhiScreenOpinionService.getSentimentDept());
+    }
+
+
 }

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

@@ -125,4 +125,33 @@ public class ZongzhiScreenSaftyController {
 
 
 
+    /**
+     * 通报统计属地通报
+     */
+    @ApiOperation(value = "通报统计属地通报", response = ZongzhiTbAreaResponse.class)
+    @GetMapping("/tbarea")
+    private AjaxResult getTbArea() {
+        return AjaxResult.success(zongzhiScreenSaftyService.getTbArea());
+    }
+
+    /**
+     * 通报统计部门通报
+     */
+    @ApiOperation(value = "通报统计部门通报", response = ZongzhiTbDeptResponse.class)
+    @GetMapping("/tbdept")
+    private AjaxResult getTbDept() {
+        return AjaxResult.success(zongzhiScreenSaftyService.getTbDept());
+    }
+
+
+
+
+    /**
+     * 通报完成情况
+     */
+    @ApiOperation(value = "通报完成情况", response = ZongzhiTbDeptCompleteResponse.class)
+    @GetMapping("/tbcomplete")
+    private AjaxResult getTbCompletet() {
+        return AjaxResult.success(zongzhiScreenSaftyService.getTbDeptComplet());
+    }
 }

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

@@ -12,12 +12,12 @@ import lombok.Data;
 public class ZongzhiAttackResponse {
 
 
-    @ApiModelProperty(value = "数量")
+    @ApiModelProperty(value = "名称")
-    private Integer count;
+    private String name;
 
 
-    @ApiModelProperty(value = "攻击源IP地址区域")
+    @ApiModelProperty(value = "受攻击次数")
-    private String attackIpRegion;
+    private Integer attackCount;
 
 
 }

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

@@ -18,4 +18,6 @@ public class ZongzhiSafetyResponse {
 
     @ApiModelProperty(value = "攻击类型 1.入侵攻击 2.恶意扫描 3僵木蠕病毒 4．挖矿 5．网络爬虫")
     private int attackType;
+
+
 }

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

@@ -0,0 +1,28 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 部门专办情况响应类
+ */
+@Data
+@ApiModel("部门专办情况响应类")
+public class ZongzhiSentimentDeptResponse {
+
+
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门名称")
+    private String dep_name;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "数量")
+    private Integer count;
+
+
+}

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

@@ -24,5 +24,5 @@ public class ZongzhiSourceResponse {
      * 7.系统监测
      */
     @ApiModelProperty(value = "类型 1.云断监管  2：APT（M） 3.硬探针 4.软探针 5.监管单位 6.网站监测 7.系统监测")
-    private int type;
+    private Integer type;
 }

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

@@ -0,0 +1,33 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 通报统计属地通报响应类
+ */
+@Data
+@ApiModel("通报统计属地通报响应类")
+public class ZongzhiTbAreaResponse {
+
+
+    /**
+     * 百分比
+     */
+    @ApiModelProperty(value = " 百分比")
+    private double pt;
+
+    /**
+     * 属地
+     */
+    @ApiModelProperty(value = "属地")
+    private String locationName;
+
+
+
+
+
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 近一个月通报完成响应类
+ */
+@Data
+@ApiModel("近一个月通报完成响应类")
+public class ZongzhiTbDeptCompleteMonthResponse {
+
+    /**
+     * 通报数量
+     */
+    @ApiModelProperty(value = "通报数量")
+    private int count;
+
+
+
+    /**
+     * 通报数量
+     */
+    @ApiModelProperty(value = "完成期数")
+    private int complete;
+
+
+
+    /**
+     * 百分比
+     */
+    @ApiModelProperty(value = "百分比")
+    private double pt;
+
+
+}

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

@@ -0,0 +1,19 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 通报完成情况响应类
+ */
+@Data
+@ApiModel("通报完成情况响应类")
+public class ZongzhiTbDeptCompleteResponse {
+
+    @ApiModelProperty(value = "近一个月完成情况")
+    List<ZongzhiTbDeptCompleteMonthResponse> getmonthList;
+
+}

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

@@ -0,0 +1,37 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 近一个月通报完成响应类
+ */
+@Data
+@ApiModel("近六个月通报完成响应类")
+public class ZongzhiTbDeptCompleteSixResponse {
+
+    /**
+     * 通报数量
+     */
+    @ApiModelProperty(value = "通报数量")
+    private int count;
+
+
+
+    /**
+     * 通报数量
+     */
+    @ApiModelProperty(value = "完成期数")
+    private int complete;
+
+
+
+    /**
+     * 百分比
+     */
+    @ApiModelProperty(value = "百分比")
+    private double pt;
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 近一个月通报完成响应类
+ */
+@Data
+@ApiModel("近三个月通报完成响应类")
+public class ZongzhiTbDeptCompleteThirdMonthResponse {
+
+    /**
+     * 通报数量
+     */
+    @ApiModelProperty(value = "通报数量")
+    private int count;
+
+
+
+    /**
+     * 通报数量
+     */
+    @ApiModelProperty(value = "完成期数")
+    private int complete;
+
+
+
+    /**
+     * 百分比
+     */
+    @ApiModelProperty(value = "百分比")
+    private double pt;
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 近一个月通报完成响应类
+ */
+@Data
+@ApiModel("近一年通报完成响应类")
+public class ZongzhiTbDeptCompleteYearResponse {
+
+    /**
+     * 通报数量
+     */
+    @ApiModelProperty(value = "通报数量")
+    private int count;
+
+
+
+    /**
+     * 通报数量
+     */
+    @ApiModelProperty(value = "完成期数")
+    private int complete;
+
+
+
+    /**
+     * 百分比
+     */
+    @ApiModelProperty(value = "百分比")
+    private double pt;
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbDeptResponse.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 ZongzhiTbDeptResponse {
+
+
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门名称")
+    private String dep_name;
+
+    /**
+     * 百分比
+     */
+    @ApiModelProperty(value = "通报次数")
+    private Integer count;
+
+}

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

@@ -11,6 +11,13 @@ import lombok.Data;
 @ApiModel("大屏数据工作动态响应类")
 public class ZongzhiWorkDynamicsResponse {
 
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private int id;
+
     /**
      * 类型
      */

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

@@ -58,4 +58,10 @@ public interface ZongzhiScreenOpinionMapper {
      * 舆情报告分类
      */
     public List<ZongzhiReportResponse> getSentimentReportbyReportType();
+
+
+    /**
+     * 部门专办情况
+     */
+    public List<ZongzhiSentimentDeptResponse> getSentimentDept();
 }

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

@@ -79,4 +79,46 @@ public interface ZongzhiScreenSaftyMapper {
      * 隐患处置最新隐患
      */
     public List<ZongzhiNotificationResponse> getNotification();
+
+
+
+
+    /**
+     * 通报统计属地通报
+     */
+    public List<ZongzhiTbAreaResponse> getTbArea();
+
+
+
+
+    /**
+     * 通报统计属地通报
+     */
+    public List<ZongzhiTbDeptResponse> getTbDept();
+
+
+    /**
+     * 近一个月通报
+     */
+    public List<ZongzhiTbDeptCompleteMonthResponse> getmonthList();
+
+
+    /**
+     * 近三个月通报
+     */
+    public List<ZongzhiTbDeptCompleteThirdMonthResponse> getthirdList();
+
+
+    /**
+     * 近六个月通报
+     */
+    public List<ZongzhiTbDeptCompleteSixResponse> getsixList();
+
+
+    /**
+     * 近三个月通报
+     */
+    public List<ZongzhiTbDeptCompleteYearResponse> getyearList();
+
+
 }

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

@@ -56,4 +56,12 @@ public interface ZongzhiScreenOpinionService {
 
 
 
+
+    /**
+     * 部门专办情况
+     */
+    public List<ZongzhiSentimentDeptResponse> getSentimentDept();
+
+
+
 }

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

@@ -68,4 +68,24 @@ public interface ZongzhiScreenSaftyService {
 
 
 
+    /**
+     * 通报统计属地通报
+     */
+    public List<ZongzhiTbAreaResponse> getTbArea();
+
+
+
+    /**
+     * 通报统计属地通报
+     */
+    public List<ZongzhiTbDeptResponse> getTbDept();
+
+
+
+    /**
+     * 通报完成
+     */
+    public List<ZongzhiTbDeptCompleteResponse> getTbDeptComplet();
+
+
 }

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

@@ -50,4 +50,9 @@ public class ZongzhiScreenOpinionServiceImpl implements ZongzhiScreenOpinionServ
     public List<ZongzhiReportResponse> getSentimentReportbyReportType() {
         return zongzhiScreenOpinionMapper.getSentimentReportbyReportType();
     }
+
+    @Override
+    public List<ZongzhiSentimentDeptResponse> getSentimentDept() {
+        return zongzhiScreenOpinionMapper.getSentimentDept();
+    }
 }

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

@@ -74,4 +74,32 @@ public class ZongzhiScreenSaftyServiceImpl implements ZongzhiScreenSaftyService
     public List<ZongzhiNotificationResponse> getNotification() {
         return zongzhiScreenSaftyMapper.getNotification();
     }
+
+    @Override
+    public List<ZongzhiTbAreaResponse> getTbArea() {
+        return zongzhiScreenSaftyMapper.getTbArea();
+    }
+
+    @Override
+    public List<ZongzhiTbDeptResponse> getTbDept() {
+        return zongzhiScreenSaftyMapper.getTbDept();
+    }
+
+    @Override
+    public List<ZongzhiTbDeptCompleteResponse> getTbDeptComplet() {
+        List list =new ArrayList<>();
+        //近一个月
+        List<ZongzhiTbDeptCompleteMonthResponse> monthList=zongzhiScreenSaftyMapper.getmonthList();
+        //近三个月
+        List<ZongzhiTbDeptCompleteThirdMonthResponse> thirdList=zongzhiScreenSaftyMapper.getthirdList();
+        //近六个月
+        List<ZongzhiTbDeptCompleteSixResponse> sixList=zongzhiScreenSaftyMapper.getsixList();
+        //近一年
+        List<ZongzhiTbDeptCompleteYearResponse> yearList=zongzhiScreenSaftyMapper.getyearList();
+        list.addAll(monthList);
+        list.addAll(thirdList);
+        list.addAll(sixList);
+        list.addAll(yearList);
+        return list;
+    }
 }

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

@@ -6,9 +6,9 @@
 
 
     <select id="getWorkDynamics" resultType="com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse">
-        SELECT type, name
+        SELECT type, materials_name as name,id
-        FROM `tc_work_dongtai` where name is not null
+        FROM `tc_work_dongtai` where materials_name is not null
-        GROUP BY type, name
+        GROUP BY type, materials_name
     </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
@@ -34,7 +34,7 @@
     <select id="getWorkDynamicsCount" resultType="java.lang.Integer">
         SELECT count(*) as count
         FROM `tc_work_dongtai`
-        where name is not null
+        where materials_name is not null
     </select>
 
 

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

@@ -45,7 +45,13 @@
     <select id="getSentimentReportbyReportType"
             resultType="com.ruoyi.screen.domain.response.ZongzhiReportResponse">
         select count(sentiment_report_type) as count, sentiment_report_type as sentimentReportType
-        from tc_network_sentiment
+        from tc_network_sentiment where sentiment_report_type is not null
         GROUP BY sentiment_report_type
     </select>
+    <select id="getSentimentDept" resultType="com.ruoyi.screen.domain.response.ZongzhiSentimentDeptResponse">
+        select dep_name, count(*) as count
+        from tc_network_sentiment
+        where isturn ='1'
+        GROUP BY dep_name
+    </select>
 </mapper>

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

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getSource" resultType="com.ruoyi.screen.domain.response.ZongzhiSourceResponse">
         select count(*) as count ,type
-        from tc_data_source
+        from tc_data_source where type is not null
         GROUP BY type
     </select>
     <select id="getsafety" resultType="com.ruoyi.screen.domain.response.ZongzhiSafetyResponse">
@@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getAttack" resultType="com.ruoyi.screen.domain.response.ZongzhiAttackResponse">
-        SELECT COUNT(*) AS count, attack_ip_region as attackIpRegion
+        SELECT name, attack_count as attackCount
-        FROM tc_safety_detection
+        FROM tc_attack
-        GROUP BY attack_ip_region;
+
     </select>
     <select id="getUnAttackTop" resultType="com.ruoyi.screen.domain.response.ZongzhiUnAttackResponse">
         select attacked_ip as attackedIp, attacked_ip_region as attackIpRegion, count(*)as count, ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt
@@ -56,4 +56,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(*) as count, 'IDC单位' as name
         from tc_idc_unit
     </select>
+    <select id="getTbArea" resultType="com.ruoyi.screen.domain.response.ZongzhiTbAreaResponse">
+        SELECT ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt, location_name as locationName
+        from tc_tb where tb_type='1'
+        group by location_name
+    </select>
+    <select id="getTbDept" resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptResponse">
+        SELECT COUNT(*) AS count, dep_name
+        from tc_tb
+        where tb_type = '2'
+        group by dep_name
+
+    </select>
+    <select id="getmonthList" resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptCompleteMonthResponse">
+        SELECT COUNT(*) AS count,
+		count(case when state=1 then state else null end) as complete,
+    count(case when state=1 then state else null end) / COUNT(*)  AS pt
+        FROM`tc_tb`WHERE DATE_FORMAT( tb_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+    </select>
+    <select id="getthirdList"
+            resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptCompleteThirdMonthResponse">
+        SELECT COUNT(*) AS count,
+		count(case when state=1 then state else null end) as complete,
+    count(case when state=1 then state else null end) / COUNT(*)  AS pt
+        FROM `tc_tb` WHERE QUARTER(tb_time)=QUARTER(now());
+
+    </select>
+
+    <select id="getsixList"
+            resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptCompleteSixResponse">
+        SELECT COUNT(*) AS count,
+        count(case when state=1 then state else null end) as complete,
+        count(case when state=1 then state else null end) / COUNT(*)  AS pt
+        FROM `tc_tb` WHERE DATE(tb_time) >= DATE_SUB(CURRENT_DATE(), INTERVAL 6 MONTH) and tb_time &lt;= CURRENT_DATE();;
+
+    </select>
+
+
+
+    <select id="getyearList"
+            resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptCompleteSixResponse">
+        SELECT COUNT(*) AS count,
+        count(case when state=1 then state else null end) as complete,
+        count(case when state=1 then state else null end) / COUNT(*)  AS pt
+        FROM `tc_tb` WHERE DATE(tb_time) >= DATE_SUB(CURRENT_DATE(), INTERVAL 1 YEAR) and tb_time &lt;= CURRENT_DATE();;
+
+    </select>
 </mapper>