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

@@ -86,4 +86,29 @@ public class ScreenController extends BaseController {
         screenQinglangResponse.setScreenQinglangWeiguiResponse(list1);
         return AjaxResult.success(screenQinglangResponse);
     }
+
+
+
+    /**
+     * 属地通报
+     */
+
+    @ApiOperation(value = "属地通报", response = ScreenTerritorialResponse.class)
+    @GetMapping("/screenterritorial")
+    public AjaxResult screenTerritorial() {
+        return AjaxResult.success(screenService.getScreenTerritorial());
+    }
+
+
+
+
+    /**
+     * 部门通报
+     */
+
+    @ApiOperation(value = "部门通报", response = ScreenDeptResponse.class)
+    @GetMapping("/screendept")
+    public AjaxResult screeDept() {
+        return AjaxResult.success(screenService.getScreenDept());
+    }
 }

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

@@ -0,0 +1,28 @@
+package com.ruoyi.tcZz.domain.reponse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 部门通报
+ */
+@Data
+@ApiModel("部门通报")
+public class ScreenDeptResponse {
+
+    /**
+     * 统计数据
+     */
+    @ApiModelProperty("统计数据")
+    private Integer count;
+
+
+    /**
+     * 部门
+     */
+    @ApiModelProperty("部门")
+    private String depName;
+
+
+}

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

@@ -0,0 +1,34 @@
+package com.ruoyi.tcZz.domain.reponse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 属地通报
+ */
+@ApiModel("属地通报")
+@Data
+public class ScreenTerritorialResponse {
+
+
+    /**
+     * 统计数据
+     */
+    @ApiModelProperty("统计数据")
+    private Integer count;
+
+
+    /**
+     * 地区
+     */
+    @ApiModelProperty("地区")
+    private Integer area;
+
+
+    /**
+     * 百分比
+     */
+    @ApiModelProperty("百分比")
+    private double percentage;
+}

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

@@ -54,4 +54,20 @@ public interface ScreenMapper {
      * @return
      */
     List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui();
+
+
+    /**
+     * 属地通报
+     */
+
+    List<ScreenTerritorialResponse> getScreenTerritorial();
+
+
+
+    /**
+     * 部门通报
+     *
+     * @return
+     */
+    List<ScreenDeptResponse> getScreenDept();
 }

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

@@ -52,7 +52,24 @@ public interface ScreenService {
 
     /**
      * 清郎专项行动违规
+     *
      * @return
      */
     List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui();
+
+
+    /**
+     * 属地通报
+     *
+     * @return
+     */
+
+    List<ScreenTerritorialResponse> getScreenTerritorial();
+
+    /**
+     * 部门通报
+     *
+     * @return
+     */
+    List<ScreenDeptResponse> getScreenDept();
 }

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

@@ -49,4 +49,14 @@ public class ScreenServiceImpl implements ScreenService {
     public List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui() {
         return screenMapper.getScreenQinglangWeigui();
     }
+
+    @Override
+    public List<ScreenTerritorialResponse> getScreenTerritorial() {
+        return screenMapper.getScreenTerritorial();
+    }
+
+    @Override
+    public List<ScreenDeptResponse> getScreenDept() {
+        return screenMapper.getScreenDept();
+    }
 }

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

@@ -41,4 +41,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangWeiguiResponse">
         select count2,date_time as dateTime from tc_qlzxxdsjtj  order by date_time desc  limit 12
     </select>
+    <select id="getScreenTerritorial" resultType="com.ruoyi.tcZz.domain.reponse.ScreenTerritorialResponse">
+        SELECT
+            COUNT(*) AS count,
+  area,
+  COUNT(*) * 100.0 / SUM(COUNT(*)) OVER() AS percentage
+        FROM
+            tc_sdtb  where isStatus =1
+        GROUP BY
+            area;
+    </select>
+    <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>
 </mapper>