地区攻击表删除权限，大屏网络生态接口新增

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

@@ -0,0 +1,61 @@
+package com.ruoyi.screen.controller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.screen.domain.response.ZongzhiAppraiserCompleteResponse;
+import com.ruoyi.screen.domain.response.ZongzhiAppraiserResponse;
+import com.ruoyi.screen.domain.response.ZongzhiArticlesResponse;
+import com.ruoyi.screen.service.ZongzhiScreenNetworkEcologyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 太仓综治网络生态大屏接口
+ */
+@RestController
+@RequestMapping("/zongzhi/network")
+@Api(tags = " 太仓综治网络生态大屏接口")
+public class ZongzhiScreenNetworkEcologyController {
+
+
+    @Resource
+    private ZongzhiScreenNetworkEcologyService zongzhiScreenNetworkEcologyService;
+
+    /**
+     * 网评文章录用情况
+     */
+    @ApiOperation(value = "网评文章录用情况", response = ZongzhiArticlesResponse.class)
+    @GetMapping("/articles")
+    private AjaxResult getArticles() {
+
+        return AjaxResult.success(zongzhiScreenNetworkEcologyService.getArticles());
+    }
+
+
+    /**
+     * 本级上级评指令比们(月)
+     */
+    @ApiOperation(value = "本级上级评指令比们(月)", response = ZongzhiAppraiserResponse.class)
+    @GetMapping("/appraiser")
+    private AjaxResult getAppraiser() {
+
+        return AjaxResult.success(zongzhiScreenNetworkEcologyService.getAppraiser());
+    }
+
+
+
+    /**
+     * 网评员任务完成率
+     */
+    @ApiOperation(value = "网评员任务完成率(月)", response = ZongzhiAppraiserCompleteResponse.class)
+    @GetMapping("/appraisercomplete")
+    private AjaxResult getAppraiserComplete() {
+
+        return AjaxResult.success(zongzhiScreenNetworkEcologyService.getAppraiserComplete());
+    }
+}
+

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

@@ -15,9 +15,31 @@ import java.util.Date;
 public class ZongzhiActionDynamicstResponse {
 
 
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    /**
+     * 专项图片
+     */
     @ApiModelProperty(value = "专项图片")
     private String zhuanxiangImg;
 
+    /**
+     * 专项内容
+     */
+    @ApiModelProperty(value = "专项内容")
+    private String content;
+
+
+
+    /**
+     * 专项标题
+     */
+    @ApiModelProperty(value = "专项标题")
+    private String title;
 
 
 

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

@@ -28,6 +28,11 @@ public class ZongzhiActionResponse {
     private double pt;
 
 
+    @ApiModelProperty(value = "处理类型 1.处理有害信息 2.关闭直播平台违规账号")
+    private Integer type;
+
+
+
 
 
 }

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiAppraiserCompleteResponse.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 ZongzhiAppraiserCompleteResponse {
+
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "城乡名称")
+    private String name;
+
+    /**
+     * 百分比
+     */
+    @ApiModelProperty(value = "百分比")
+    private double pt;
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiAppraiserResponse.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 ZongzhiAppraiserResponse {
+
+
+    /**
+     * 网评类型 1:本级网评 2:上级网评
+     */
+    @ApiModelProperty(value = "网评类型 1:本级网评 2:上级网评")
+    private Integer type;
+
+    /**
+     * 百分比
+     */
+    @ApiModelProperty(value = "百分比")
+    private double pt;
+
+
+}

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

@@ -0,0 +1,32 @@
+package com.ruoyi.screen.domain.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 网评文章录用情况响应类
+ */
+@Data
+@ApiModel("网评文章录用情况响应类")
+public class ZongzhiArticlesResponse {
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "数量")
+    private Integer count ;
+
+
+    /**
+     * 文章类型 1.	本地录用
+     * 2.	苏州级录用
+     * 3.	省级级以上录用
+     * 4.	上级媒体
+     * 5.	本地发布
+     */
+    @ApiModelProperty(value = "文章类型 1.本地录用 2.苏州级录用 3.省级级以上录用 4.上级媒体 5.本地发布")
+    private Integer type ;
+
+
+}

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

@@ -0,0 +1,25 @@
+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 ZongzhiWorkDynamicsCountResponse {
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "数量")
+    private Integer count;
+
+
+    @ApiModelProperty(value = "大屏数据工作动态响应类")
+    List<ZongzhiWorkDynamicsResponse>  list;
+}

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

@@ -11,13 +11,18 @@ import lombok.Data;
 @ApiModel("大屏数据工作动态响应类")
 public class ZongzhiWorkDynamicsResponse {
 
-
+    /**
+     * 类型
+     */
     @ApiModelProperty(value = "类型")
     private String type;
 
-
+    /**
+     * 材料文件名称
+     */
     @ApiModelProperty(value = "材料文件名称")
     private String name;
 
 
+
 }

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

@@ -15,6 +15,12 @@ public interface ZongzhiScreenManageMapper {
     public List<ZongzhiWorkDynamicsResponse> getWorkDynamics();
 
 
+    /**
+     * 工作动态数量统计
+     */
+    public int getWorkDynamicsCount();
+
+
     /**
      * 举报总数和处置率
      */

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

@@ -0,0 +1,32 @@
+package com.ruoyi.screen.mapper;
+
+import com.ruoyi.screen.domain.response.ZongzhiAppraiserCompleteResponse;
+import com.ruoyi.screen.domain.response.ZongzhiAppraiserResponse;
+import com.ruoyi.screen.domain.response.ZongzhiArticlesResponse;
+
+import java.util.List;
+
+/**
+ * 太仓综治网络生态数据层
+ */
+public interface ZongzhiScreenNetworkEcologyMapper {
+
+
+    /**
+     * 网评文章录用情况
+     */
+    public List<ZongzhiArticlesResponse> getArticles();
+
+
+    /**
+     * 本级上级评指令比们
+     */
+    public List<ZongzhiAppraiserResponse> getAppraiser();
+
+
+    /**
+     * 网评员任务完成率
+     */
+    public List<ZongzhiAppraiserCompleteResponse> getAppraiserComplete();
+
+}

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

@@ -12,7 +12,7 @@ public interface ZongzhiScreenManageService {
     /**
      * 工作动态
      */
-    public List<ZongzhiWorkDynamicsResponse> getWorkDynamics();
+    public ZongzhiWorkDynamicsCountResponse getWorkDynamics();
 
 
 

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

@@ -0,0 +1,31 @@
+package com.ruoyi.screen.service;
+
+import com.ruoyi.screen.domain.response.ZongzhiAppraiserCompleteResponse;
+import com.ruoyi.screen.domain.response.ZongzhiAppraiserResponse;
+import com.ruoyi.screen.domain.response.ZongzhiArticlesResponse;
+
+import java.util.List;
+
+/**
+ * 太仓综治网络生态业务层
+ */
+public interface ZongzhiScreenNetworkEcologyService {
+
+    /**
+     * 网评文章录用情况
+     */
+    public List<ZongzhiArticlesResponse> getArticles();
+
+
+    /**
+     * 本级上级评指令比们
+     */
+    public List<ZongzhiAppraiserResponse> getAppraiser();
+
+
+
+    /**
+     * 网评员任务完成率
+     */
+    public List<ZongzhiAppraiserCompleteResponse> getAppraiserComplete();
+}

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

@@ -6,6 +6,7 @@ import com.ruoyi.screen.service.ZongzhiScreenManageService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -18,8 +19,11 @@ public class ZongzhiScreenManageServiceImpl  implements ZongzhiScreenManageServi
     ZongzhiScreenManageMapper zongzhiScreenManageMapper;
 
     @Override
-    public List<ZongzhiWorkDynamicsResponse> getWorkDynamics() {
+    public ZongzhiWorkDynamicsCountResponse getWorkDynamics() {
-        return zongzhiScreenManageMapper.getWorkDynamics();
+        ZongzhiWorkDynamicsCountResponse zongzhiWorkDynamicsCountResponse =new ZongzhiWorkDynamicsCountResponse();
+        zongzhiWorkDynamicsCountResponse.setList(zongzhiScreenManageMapper.getWorkDynamics());
+        zongzhiWorkDynamicsCountResponse.setCount(zongzhiScreenManageMapper.getWorkDynamicsCount());
+        return zongzhiWorkDynamicsCountResponse;
     }
 
     @Override

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

@@ -0,0 +1,36 @@
+package com.ruoyi.screen.service.impl;
+
+import com.ruoyi.screen.domain.response.ZongzhiAppraiserCompleteResponse;
+import com.ruoyi.screen.domain.response.ZongzhiAppraiserResponse;
+import com.ruoyi.screen.domain.response.ZongzhiArticlesResponse;
+import com.ruoyi.screen.mapper.ZongzhiScreenNetworkEcologyMapper;
+import com.ruoyi.screen.service.ZongzhiScreenNetworkEcologyService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 太仓综治网络生态实现层
+ */
+@Service
+public class ZongzhiScreenNetworkEcologyServiceImpl implements ZongzhiScreenNetworkEcologyService {
+
+    @Resource
+    private ZongzhiScreenNetworkEcologyMapper zongzhiScreenNetworkEcologyMapper;
+
+    @Override
+    public List<ZongzhiArticlesResponse> getArticles() {
+        return zongzhiScreenNetworkEcologyMapper.getArticles();
+    }
+
+    @Override
+    public List<ZongzhiAppraiserResponse> getAppraiser() {
+        return zongzhiScreenNetworkEcologyMapper.getAppraiser();
+    }
+
+    @Override
+    public List<ZongzhiAppraiserCompleteResponse> getAppraiserComplete() {
+        return zongzhiScreenNetworkEcologyMapper.getAppraiserComplete();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcAttackController.java

@@ -39,7 +39,7 @@ public class TcAttackController extends BaseController
     /**
      * 查询地区受攻击列表
      */
-    @PreAuthorize("@ss.hasPermi('zongzhi:attack:list')")
+
     @GetMapping("/list")
     public TableDataInfo list(TcAttack tcAttack)
     {
@@ -51,8 +51,7 @@ public class TcAttackController extends BaseController
     /**
      * 导出地区受攻击列表
      */
-    @PreAuthorize("@ss.hasPermi('zongzhi:attack:export')")
+
-    @Log(title = "地区受攻击", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TcAttack tcAttack)
     {
@@ -64,7 +63,7 @@ public class TcAttackController extends BaseController
     /**
      * 获取地区受攻击详细信息
      */
-    @PreAuthorize("@ss.hasPermi('zongzhi:attack:query')")
+
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -74,8 +73,8 @@ public class TcAttackController extends BaseController
     /**
      * 新增地区受攻击
      */
-    @PreAuthorize("@ss.hasPermi('zongzhi:attack:add')")
+
-    @Log(title = "地区受攻击", businessType = BusinessType.INSERT)
+
     @PostMapping
     public AjaxResult add(@RequestBody TcAttack tcAttack)
     {
@@ -85,8 +84,7 @@ public class TcAttackController extends BaseController
     /**
      * 修改地区受攻击
      */
-    @PreAuthorize("@ss.hasPermi('zongzhi:attack:edit')")
+
-    @Log(title = "地区受攻击", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TcAttack tcAttack)
     {
@@ -96,8 +94,7 @@ public class TcAttackController extends BaseController
     /**
      * 删除地区受攻击
      */
-    @PreAuthorize("@ss.hasPermi('zongzhi:attack:remove')")
+
-    @Log(title = "地区受攻击", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

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

@@ -7,7 +7,7 @@
 
     <select id="getWorkDynamics" resultType="com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse">
         SELECT type, name
-        FROM `tc_work_dongtai`
+        FROM `tc_work_dongtai` where name is not null
         GROUP BY type, name
     </select>
     <select id="getNetworkReport" resultType="com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse">
@@ -16,7 +16,7 @@
 
     </select>
     <select id="getaction" resultType="com.ruoyi.screen.domain.response.ZongzhiActionResponse">
-        select count(*) as count, zhuanxiang_time as zhuanxiangTime ,ROUND(count(*) * 100.0/ sum(count(*)) OVER (), 1 ) as pt
+        select count(*) as count, zhuanxiang_time as zhuanxiangTime ,ROUND(count(*) * 100.0/ sum(count(*)) OVER (), 1 ) as pt,zhuanxiang_type as type
         from tc_qinglang_zhuanxiang
         GROUP BY zhuanxiang_type, zhuanxiang_time
 
@@ -28,8 +28,14 @@
     </select>
     <select id="getActionDynamicst"
             resultType="com.ruoyi.screen.domain.response.ZongzhiActionDynamicstResponse">
-        select zhuanxiang_img as zhuanxiangImg
+        select zhuanxiang_img as zhuanxiangImg,zhuanxiang_content as content,zhuanxiang_title as title,id
         from tc_qinglang_zhuanxiang
     </select>
+    <select id="getWorkDynamicsCount" resultType="java.lang.Integer">
+        SELECT count(*) as count
+        FROM `tc_work_dongtai`
+        where name is not null
+    </select>
+
 
 </mapper>

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.screen.mapper.ZongzhiScreenNetworkEcologyMapper">
+
+
+    <select id="getArticles" resultType="com.ruoyi.screen.domain.response.ZongzhiArticlesResponse">
+        select type, count(*) as count
+        from tc_network_article
+    </select>
+    <select id="getAppraiser" resultType="com.ruoyi.screen.domain.response.ZongzhiAppraiserResponse">
+        select appraiser_type as type, ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt
+        from tc_network_evaluate
+        WHERE MONTH (create_time) = MONTH (CURDATE())
+        GROUP BY type
+    </select>
+    <select id="getAppraiserComplete"
+            resultType="com.ruoyi.screen.domain.response.ZongzhiAppraiserCompleteResponse">
+        SELECT ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt, b.name
+        FROM `tc_network_evaluate` a
+                 left join tc_town b on a.area_id = b.id
+        GROUP BY a.area_id
+    </select>
+</mapper>