From 89d152df69aa38130a1dd627c63fc051c00ab27f Mon Sep 17 00:00:00 2001 From: ASxx <2075995406@qq.com> Date: Mon, 21 Aug 2023 19:15:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E6=8A=A5list=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=A4=A7=E5=B1=8F=E7=AE=A1=E7=90=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZongzhiScreenManageController.java | 13 ++++++++ .../response/ZongzhiActionResponse.java | 14 ++++++-- .../response/ZongzhiReportByYearResponse.java | 33 +++++++++++++++++++ .../mapper/ZongzhiScreenManageMapper.java | 7 ++++ .../service/ZongzhiScreenManageService.java | 10 ++++++ .../impl/ZongzhiScreenManageServiceImpl.java | 6 ++++ .../java/com/ruoyi/zongzhi/domain/TcTb.java | 4 +-- .../screen/ZongzhiScreenManageMapper.xml | 4 +++ .../resources/mapper/zongzhi/TcTbMapper.xml | 28 ++++++++-------- 9 files changed, 101 insertions(+), 18 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiReportByYearResponse.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 82c31ec..fc14c19 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 @@ -3,6 +3,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.service.ZongzhiScreenManageService; import io.swagger.annotations.Api; @@ -59,4 +60,16 @@ public class ZongzhiScreenManageController { return AjaxResult.success(zongzhiScreenManageService.getaction()); } + + + /** + * 举报时间年度分类统计 + */ + @ApiOperation(value = "举报时间年度分类统计", response = ZongzhiReportByYearResponse.class) + @GetMapping("/reportbyyear") + private AjaxResult getReportByYear() { + + return AjaxResult.success(zongzhiScreenManageService.getReportByYear()); + } + } 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 41c3a50..ef2aadb 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 @@ -1,9 +1,12 @@ 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; + /** * 大屏数据请朗专项行动数据统计响应类 */ @@ -16,8 +19,15 @@ public class ZongzhiActionResponse { private Integer count; - @ApiModelProperty(value = "攻击源IP地址区域") - private String attackIpRegion; + @ApiModelProperty(value = "发布时间") + @JsonFormat(pattern = "MM") + private Date zhuanxiangTime; + + + @ApiModelProperty(value = "百分比") + private double pt; + + } 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 new file mode 100644 index 0000000..e9a4255 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiReportByYearResponse.java @@ -0,0 +1,33 @@ +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 ZongzhiReportByYearResponse { + + + @ApiModelProperty(value = "数量") + private Integer count; + + + @ApiModelProperty(value = "发布时间") + @JsonFormat(pattern = "MM") + private Date zhuanxiangTime; + + + @ApiModelProperty(value = "百分比") + private double pt; + + + + +} 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 e764e27..5a87a88 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 @@ -2,6 +2,7 @@ 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 java.util.List; @@ -31,4 +32,10 @@ public interface ZongzhiScreenManageMapper { */ public List getaction(); + + /** + * 举报时间年度分类统计 + */ + public List getReportByYear(); + } 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 376c34f..63fc005 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 @@ -2,6 +2,7 @@ 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 java.util.List; @@ -31,4 +32,13 @@ public interface ZongzhiScreenManageService { * 请朗专项行动数据统计 */ public List getaction(); + + + + + /** + * 举报时间年度分类统计 + */ + public List getReportByYear(); + } 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 591db8e..581948f 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 @@ -2,6 +2,7 @@ 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.mapper.ZongzhiScreenManageMapper; import com.ruoyi.screen.service.ZongzhiScreenManageService; @@ -34,5 +35,10 @@ public class ZongzhiScreenManageServiceImpl implements ZongzhiScreenManageServi return zongzhiScreenManageMapper.getaction(); } + @Override + public List getReportByYear() { + return zongzhiScreenManageMapper.getReportByYear(); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java index 0710a5c..ea36755 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java @@ -53,7 +53,7 @@ public class TcTb extends BaseEntity { */ @Excel(name = "处置状态 1:已处置 2:为处置") @ApiModelProperty(value = "处置状态 1:已处置 2:为处置") - private int state; + private Integer state; @@ -83,7 +83,7 @@ public class TcTb extends BaseEntity { */ @Excel(name = "通报类型:1.属地通报 2.部门通报") @ApiModelProperty(value = "通报类型:1.属地通报 2.部门通报") - private int tbType; + private Integer tbType; /** * 通报时间 diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml index d35fbb7..b035438 100644 --- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml @@ -16,7 +16,11 @@ + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/zongzhi/TcTbMapper.xml b/ruoyi-system/src/main/resources/mapper/zongzhi/TcTbMapper.xml index 5ca83c2..9c26e9e 100644 --- a/ruoyi-system/src/main/resources/mapper/zongzhi/TcTbMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/zongzhi/TcTbMapper.xml @@ -25,23 +25,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, area_id, dep_name, location_name,ip,state,file_url,tb_type,file_name,tb_time, create_id, create_by, create_time, update_id, update_by, update_time, remark from tc_tb + select id, area_id, dep_name, location_name,tb_type,tb_time, create_id, create_by, create_time, update_id, update_by, update_time, remark,ip,state,file_url,file_name from tc_tb @@ -55,11 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" area_id, dep_name, - ip, - state, - file_url, tb_type, - file_name, location_name, tb_time, create_id, @@ -69,6 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, + ip, + state, + file_url, + file_name, #{areaId}, @@ -76,10 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{locationName}, #{tbType}, #{tbTime}, - #{ip}, - #{state}, - #{fileUrl}, - #{fileName}, #{createId}, #{createBy}, #{createTime}, @@ -87,6 +83,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{ip}, + #{state}, + #{fileUrl}, + #{fileName},