diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenOpinionController.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenOpinionController.java index 216fc6e..aaf0d5f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenOpinionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenOpinionController.java @@ -63,16 +63,6 @@ public class ZongzhiScreenOpinionController { } - /** - * 动态筛选 - */ - @ApiOperation(value = "动态筛选", response = ZongzhiSentimenFilteringResponse.class) - @GetMapping("/sentimenfiltering") - private AjaxResult getSentimenFiltering() { - return null; - // return AjaxResult.success(zongzhiScreenOpinionService.getSentimenFiltering()); - } - /** * 词云 @@ -109,4 +99,16 @@ public class ZongzhiScreenOpinionController { } + + /** + * 动态筛选 + */ + @ApiOperation(value = "动态筛选", response = ZongzhiSentimentfilterResponse.class) + @GetMapping("/sentimentfilter") + private AjaxResult getSentimentFiltering() { + ; + return AjaxResult.success(zongzhiScreenOpinionService.getSentimentFiltering()); + } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSentimentfilterResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSentimentfilterResponse.java new file mode 100644 index 0000000..15e1c06 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSentimentfilterResponse.java @@ -0,0 +1,43 @@ +package com.ruoyi.screen.domain.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 清朗专项行动动态响应类 + */ +@Data +@ApiModel("大屏数据清朗专项行动动态响应类") +public class ZongzhiSentimentfilterResponse { + + + /** + * 监测信息总量 + */ + @ApiModelProperty(value = "监测信息总量") + private Integer count1; + + /** + * 排除信息量 + */ + @ApiModelProperty(value = "排除信息量") + private Integer count2; + + /** + * 舆情预警 + */ + @ApiModelProperty(value = "舆情预警") + private Integer count3; + + + + /** + * 舆情预警百分比 + */ + @ApiModelProperty(value = "舆情预警百分比") + private double pt; + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java index 4a36634..8956025 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java @@ -25,6 +25,12 @@ public class ZongzhiTbAreaResponse { private String locationName; + /** + * 统计数量 + */ + @ApiModelProperty(value = "统计数量") + private Integer count; + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenOpinionMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenOpinionMapper.java index a542b66..d4e597b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenOpinionMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenOpinionMapper.java @@ -64,4 +64,11 @@ public interface ZongzhiScreenOpinionMapper { * 部门专办情况 */ public List getSentimentDept(); + + + + /** + * 动态筛选 + */ + public List getSentimentFiltering(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenOpinionService.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenOpinionService.java index 164b943..e1000d5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenOpinionService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenOpinionService.java @@ -64,4 +64,10 @@ public interface ZongzhiScreenOpinionService { + + /** + * 动态筛选 + */ + public List getSentimentFiltering(); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenOpinionServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenOpinionServiceImpl.java index 4540de8..b4e492a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenOpinionServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenOpinionServiceImpl.java @@ -55,4 +55,9 @@ public class ZongzhiScreenOpinionServiceImpl implements ZongzhiScreenOpinionServ public List getSentimentDept() { return zongzhiScreenOpinionMapper.getSentimentDept(); } + + @Override + public List getSentimentFiltering() { + return zongzhiScreenOpinionMapper.getSentimentFiltering(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSentiment.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSentiment.java index c2acb07..5eafead 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSentiment.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSentiment.java @@ -84,10 +84,10 @@ public class TcNetworkSentiment extends BaseEntity { /** * 舆情类型1.敏感 2.非敏感 3.本地相关信息 - * 4.推送预警信息 5.聚焦本地媒体信息 + * 4.推送预警信息 5.聚焦本地媒体信息 6.监测信息总量 7.排除信息量 8.舆情预警 */ @Excel(name = "舆情类型") - @ApiModelProperty(value = "舆情类型1.敏感 2.非敏感 3.本地相关信息 4.推送预警信息 5.聚焦本地媒体信息 ") + @ApiModelProperty(value = "舆情类型1.敏感 2.非敏感 3.本地相关信息 4.推送预警信息 5.聚焦本地媒体信息 6.监测信息总量 7.排除信息量 8.舆情预警 ") private Long sentimentType; /** diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml index 38f9e67..f5eb572 100644 --- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml @@ -54,4 +54,13 @@ where isturn ='1' GROUP BY dep_name + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml index ab9370c..83fa048 100644 --- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from tc_idc_unit