Merge branch 'dongdingding' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-java

ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/ScreenController.java

@@ -111,4 +111,15 @@ public class ScreenController extends BaseController {
     public AjaxResult screeDept() {
         return AjaxResult.success(screenService.getScreenDept());
     }
+
+
+    /**
+     * 举报地图
+     */
+
+    @ApiOperation(value = "举报地图", response = ScreenReportMapResponse.class)
+    @GetMapping("/screenreportmap")
+    public AjaxResult screenReportMap() {
+        return AjaxResult.success(screenService.getScreenReportMap());
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/reponse/ScreenReportMapResponse.java

@@ -0,0 +1,27 @@
+package com.ruoyi.tcZz.domain.reponse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 举报地图
+ */
+@Data
+@ApiModel("举报地图")
+public class ScreenReportMapResponse {
+
+
+    /**
+     * 举报总数
+     */
+    @ApiModelProperty("举报总数")
+    private Integer count;
+
+
+    /**
+     * 处置率
+     */
+    @ApiModelProperty("处置率")
+    private double rate;
+}

ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/ScreenMapper.java

@@ -12,6 +12,8 @@ public interface ScreenMapper {
 
     /**
      * 大屏监管对象
+     *
+     * @return
      */
 
     ScreenSupervisionResponse getScreenSupervision();
@@ -19,6 +21,8 @@ public interface ScreenMapper {
 
     /**
      * 大屏数据来源
+     *
+     * @return
      */
 
     ScreenSourceResponse getScreenSource();
@@ -31,7 +35,6 @@ public interface ScreenMapper {
     ScreenOpinionReportResponse getScreenOpinionReport();
 
 
-
     /**
      * 网评文章
      *
@@ -40,7 +43,6 @@ public interface ScreenMapper {
     ScreenArticlesResponse getScreenArticles();
 
 
-
     /**
      * 清郎专项行动数据统计
      *
@@ -51,6 +53,7 @@ public interface ScreenMapper {
 
     /**
      * 清郎专项行动违规
+     *
      * @return
      */
     List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui();
@@ -58,16 +61,25 @@ public interface ScreenMapper {
 
     /**
      * 属地通报
+     *
+     * @return
      */
 
     List<ScreenTerritorialResponse> getScreenTerritorial();
 
 
-
     /**
      * 部门通报
      *
      * @return
      */
     List<ScreenDeptResponse> getScreenDept();
+
+
+    /**
+     * 举报地图
+     *
+     * @return
+     */
+    ScreenReportMapResponse getScreenReportMap();
 }

ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java

@@ -72,4 +72,12 @@ public interface ScreenService {
      * @return
      */
     List<ScreenDeptResponse> getScreenDept();
+
+
+    /**
+     * 举报地图
+     *
+     * @return
+     */
+    ScreenReportMapResponse getScreenReportMap();
 }

ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java

@@ -59,4 +59,9 @@ public class ScreenServiceImpl implements ScreenService {
     public List<ScreenDeptResponse> getScreenDept() {
         return screenMapper.getScreenDept();
     }
+
+    @Override
+    public ScreenReportMapResponse getScreenReportMap() {
+        return screenMapper.getScreenReportMap();
+    }
 }

ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml

@@ -54,4 +54,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getScreenDept" resultType="com.ruoyi.tcZz.domain.reponse.ScreenDeptResponse">
         select  COUNT(*) AS count,dep_name as depName from tc_bmtb  where isStatus =1 GROUP BY  dep_name
     </select>
+    <select id="getScreenReportMap" resultType="com.ruoyi.tcZz.domain.reponse.ScreenReportMapResponse">
+        SELECT COUNT(*) AS count,
+  SUM(CASE WHEN state = 2 THEN 1 ELSE 0 END) * 100.0 / COUNT(*) AS rate
+        FROM
+            tc_jbmap;
+    </select>
 </mapper>