From 253bd3c655e04b14052dd5f32502c77b0605aaf4 Mon Sep 17 00:00:00 2001 From: ASxx <2075995406@qq.com> Date: Tue, 22 Aug 2023 13:56:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=94=BB=E5=87=BB=E8=A1=A8?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90=EF=BC=8C=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E7=94=9F=E6=80=81=E6=8E=A5=E5=8F=A3=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ZongzhiScreenNetworkEcologyController.java | 61 +++++++++++++++++++ .../ZongzhiActionDynamicstResponse.java | 22 +++++++ .../response/ZongzhiActionResponse.java | 5 ++ .../ZongzhiAppraiserCompleteResponse.java | 28 +++++++++ .../response/ZongzhiAppraiserResponse.java | 28 +++++++++ .../response/ZongzhiArticlesResponse.java | 32 ++++++++++ .../ZongzhiWorkDynamicsCountResponse.java | 25 ++++++++ .../response/ZongzhiWorkDynamicsResponse.java | 9 ++- .../mapper/ZongzhiScreenManageMapper.java | 6 ++ .../ZongzhiScreenNetworkEcologyMapper.java | 32 ++++++++++ .../service/ZongzhiScreenManageService.java | 2 +- .../ZongzhiScreenNetworkEcologyService.java | 31 ++++++++++ .../impl/ZongzhiScreenManageServiceImpl.java | 10 ++- ...ongzhiScreenNetworkEcologyServiceImpl.java | 36 +++++++++++ .../controller/TcAttackController.java | 17 +++--- .../screen/ZongzhiScreenManageMapper.xml | 12 +++- .../ZongzhiScreenNetworkEcologyMapper.xml | 25 ++++++++ 17 files changed, 362 insertions(+), 19 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenNetworkEcologyController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiAppraiserCompleteResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiAppraiserResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiArticlesResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiWorkDynamicsCountResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenNetworkEcologyMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenNetworkEcologyService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenNetworkEcologyServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenNetworkEcologyMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenNetworkEcologyController.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenNetworkEcologyController.java new file mode 100644 index 0000000..d79071e --- /dev/null +++ b/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()); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionDynamicstResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionDynamicstResponse.java index f154270..80f1ac5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionDynamicstResponse.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionResponse.java index ef2aadb..31cc447 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionResponse.java +++ b/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; + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiAppraiserCompleteResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiAppraiserCompleteResponse.java new file mode 100644 index 0000000..404f48c --- /dev/null +++ b/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; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiAppraiserResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiAppraiserResponse.java new file mode 100644 index 0000000..8d442f7 --- /dev/null +++ b/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; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiArticlesResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiArticlesResponse.java new file mode 100644 index 0000000..b86605d --- /dev/null +++ b/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 ; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiWorkDynamicsCountResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiWorkDynamicsCountResponse.java new file mode 100644 index 0000000..c856fbc --- /dev/null +++ b/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 list; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiWorkDynamicsResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiWorkDynamicsResponse.java index 0e79324..db2dd12 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiWorkDynamicsResponse.java +++ b/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; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenManageMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenManageMapper.java index 43d7780..e1984bc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenManageMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenManageMapper.java @@ -15,6 +15,12 @@ public interface ZongzhiScreenManageMapper { public List getWorkDynamics(); + /** + * 工作动态数量统计 + */ + public int getWorkDynamicsCount(); + + /** * 举报总数和处置率 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenNetworkEcologyMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenNetworkEcologyMapper.java new file mode 100644 index 0000000..15d2d3c --- /dev/null +++ b/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 getArticles(); + + + /** + * 本级上级评指令比们 + */ + public List getAppraiser(); + + + /** + * 网评员任务完成率 + */ + public List getAppraiserComplete(); + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenManageService.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenManageService.java index 6f739ec..39ac4c7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenManageService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenManageService.java @@ -12,7 +12,7 @@ public interface ZongzhiScreenManageService { /** * 工作动态 */ - public List getWorkDynamics(); + public ZongzhiWorkDynamicsCountResponse getWorkDynamics(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenNetworkEcologyService.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenNetworkEcologyService.java new file mode 100644 index 0000000..0ccc036 --- /dev/null +++ b/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 getArticles(); + + + /** + * 本级上级评指令比们 + */ + public List getAppraiser(); + + + + /** + * 网评员任务完成率 + */ + public List getAppraiserComplete(); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenManageServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenManageServiceImpl.java index f4de639..e076076 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenManageServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenManageServiceImpl.java @@ -6,20 +6,24 @@ import com.ruoyi.screen.service.ZongzhiScreenManageService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** * 太仓综治网络管理实现层 */ @Service -public class ZongzhiScreenManageServiceImpl implements ZongzhiScreenManageService { +public class ZongzhiScreenManageServiceImpl implements ZongzhiScreenManageService { @Resource ZongzhiScreenManageMapper zongzhiScreenManageMapper; @Override - public List getWorkDynamics() { - return zongzhiScreenManageMapper.getWorkDynamics(); + public ZongzhiWorkDynamicsCountResponse getWorkDynamics() { + ZongzhiWorkDynamicsCountResponse zongzhiWorkDynamicsCountResponse =new ZongzhiWorkDynamicsCountResponse(); + zongzhiWorkDynamicsCountResponse.setList(zongzhiScreenManageMapper.getWorkDynamics()); + zongzhiWorkDynamicsCountResponse.setCount(zongzhiScreenManageMapper.getWorkDynamicsCount()); + return zongzhiWorkDynamicsCountResponse; } @Override diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenNetworkEcologyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenNetworkEcologyServiceImpl.java new file mode 100644 index 0000000..9d465c4 --- /dev/null +++ b/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 getArticles() { + return zongzhiScreenNetworkEcologyMapper.getArticles(); + } + + @Override + public List getAppraiser() { + return zongzhiScreenNetworkEcologyMapper.getAppraiser(); + } + + @Override + public List getAppraiserComplete() { + return zongzhiScreenNetworkEcologyMapper.getAppraiserComplete(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcAttackController.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcAttackController.java index 970cfb2..c12899b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcAttackController.java +++ b/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) { diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml index cc2a9ea..17a0bb5 100644 --- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml @@ -7,7 +7,7 @@ + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenNetworkEcologyMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenNetworkEcologyMapper.xml new file mode 100644 index 0000000..8e5e963 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenNetworkEcologyMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file