From 9031f5a3bc27a99b845063e095f233ebb7386a9b Mon Sep 17 00:00:00 2001 From: ASxx <2075995406@qq.com> Date: Tue, 22 Aug 2023 09:17:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BD=91=E7=BB=9C=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZongzhiScreenManageController.java | 19 ++++++++----- .../ZongzhiActionDynamicstResponse.java | 24 +++++++++++++++++ .../response/ZongzhiReportByYearResponse.java | 27 +++++++++++-------- .../mapper/ZongzhiScreenManageMapper.java | 14 +++++----- .../service/ZongzhiScreenManageService.java | 12 ++++++--- .../impl/ZongzhiScreenManageServiceImpl.java | 10 ++++--- .../screen/ZongzhiScreenManageMapper.xml | 11 +++++++- 7 files changed, 84 insertions(+), 33 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionDynamicstResponse.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenManageController.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenManageController.java index fc14c19..ac73721 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenManageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenManageController.java @@ -1,10 +1,7 @@ package com.ruoyi.screen.controller; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.screen.domain.response.ZongzhiActionResponse; -import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse; -import com.ruoyi.screen.domain.response.ZongzhiReportByYearResponse; -import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse; +import com.ruoyi.screen.domain.response.*; import com.ruoyi.screen.service.ZongzhiScreenManageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -38,7 +35,6 @@ public class ZongzhiScreenManageController { } - /** * 举报总数 处置率 */ @@ -61,7 +57,6 @@ public class ZongzhiScreenManageController { } - /** * 举报时间年度分类统计 */ @@ -72,4 +67,16 @@ public class ZongzhiScreenManageController { return AjaxResult.success(zongzhiScreenManageService.getReportByYear()); } + + /** + * 清朗专项行动动态 + */ + @ApiOperation(value = "清朗专项行动动态", response = ZongzhiActionDynamicstResponse.class) + @GetMapping("/actiondynamicst") + private AjaxResult getActionDynamicst() { + + return AjaxResult.success(zongzhiScreenManageService.getActionDynamicst()); + } + + } 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 new file mode 100644 index 0000000..f154270 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionDynamicstResponse.java @@ -0,0 +1,24 @@ +package com.ruoyi.screen.domain.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 清朗专项行动动态响应类 + */ +@Data +@ApiModel("大屏数据清朗专项行动动态响应类") +public class ZongzhiActionDynamicstResponse { + + + @ApiModelProperty(value = "专项图片") + private String zhuanxiangImg; + + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiReportByYearResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiReportByYearResponse.java index e9a4255..013af9d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiReportByYearResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiReportByYearResponse.java @@ -8,24 +8,29 @@ import lombok.Data; import java.util.Date; /** - * 大屏数据请朗专项行动数据统计响应类 + * 大屏数据举报时间年度分类统计响应类 */ @Data -@ApiModel("大屏数据请朗专项行动数据统计响应类") +@ApiModel("大屏数据举报时间年度分类统计响应类") public class ZongzhiReportByYearResponse { - + /** + * 数量 + */ @ApiModelProperty(value = "数量") private Integer count; - - @ApiModelProperty(value = "发布时间") - @JsonFormat(pattern = "MM") - private Date zhuanxiangTime; - - - @ApiModelProperty(value = "百分比") - private double pt; + /** + * 1.上级下发 2.部门转发 3.小程序 4无效 + */ + @ApiModelProperty(value = "1.上级下发 2.部门转发 3.小程序 4无效") + private String source; + + /** + * 年份 + */ + @ApiModelProperty(value = "年份") + private String year; 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 5a87a88..43d7780 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 @@ -1,9 +1,6 @@ package com.ruoyi.screen.mapper; -import com.ruoyi.screen.domain.response.ZongzhiActionResponse; -import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse; -import com.ruoyi.screen.domain.response.ZongzhiReportByYearResponse; -import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse; +import com.ruoyi.screen.domain.response.*; import java.util.List; @@ -18,15 +15,12 @@ public interface ZongzhiScreenManageMapper { public List getWorkDynamics(); - - /** * 举报总数和处置率 */ public ZongzhiNetworkReportResponse getNetworkReport(); - /** * 请朗专项行动数据统计 */ @@ -38,4 +32,10 @@ public interface ZongzhiScreenManageMapper { */ public List getReportByYear(); + + /** + * 清朗专项行动动态 + */ + public List getActionDynamicst(); + } 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 63fc005..6f739ec 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 @@ -1,9 +1,6 @@ package com.ruoyi.screen.service; -import com.ruoyi.screen.domain.response.ZongzhiActionResponse; -import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse; -import com.ruoyi.screen.domain.response.ZongzhiReportByYearResponse; -import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse; +import com.ruoyi.screen.domain.response.*; import java.util.List; @@ -41,4 +38,11 @@ public interface ZongzhiScreenManageService { */ public List getReportByYear(); + + /** + * 清朗专项行动动态 + */ + public List getActionDynamicst(); + + } 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 581948f..f4de639 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 @@ -1,9 +1,6 @@ package com.ruoyi.screen.service.impl; -import com.ruoyi.screen.domain.response.ZongzhiActionResponse; -import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse; -import com.ruoyi.screen.domain.response.ZongzhiReportByYearResponse; -import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse; +import com.ruoyi.screen.domain.response.*; import com.ruoyi.screen.mapper.ZongzhiScreenManageMapper; import com.ruoyi.screen.service.ZongzhiScreenManageService; import org.springframework.stereotype.Service; @@ -40,5 +37,10 @@ public class ZongzhiScreenManageServiceImpl implements ZongzhiScreenManageServi return zongzhiScreenManageMapper.getReportByYear(); } + @Override + public List getActionDynamicst() { + return zongzhiScreenManageMapper.getActionDynamicst(); + } + } diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml index b035438..cc2a9ea 100644 --- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml @@ -21,6 +21,15 @@ GROUP BY zhuanxiang_type, zhuanxiang_time - + + \ No newline at end of file