fix

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

@@ -16,8 +16,8 @@ public class ZongzhiSafetyHazardResponse {
     private Integer count;
 
 
-    @ApiModelProperty(value = "攻击源IP地址区域")
-    private String attackIpRegion;
+    @ApiModelProperty(value = "隐患类型1.敏感信息泄露漏洞 2.权限许可和访问控制 3.未加密登录请求 4.应用程序测试脚本漏洞 5.文件上传漏洞 6.其他")
+    private Integer type;
 
 
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.screen.domain.response;
 
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,4 +18,8 @@ public class ZongzhiSentimenWordCloudResponse {
      */
     @ApiModelProperty(value = "词云类别1.开门红 2.城乡文明融合")
     private Integer type;
+
+
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSentimentTypeResponse.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;
+
 /**
  * 舆情走势图响应类
  */
@@ -28,4 +31,15 @@ public class ZongzhiSentimentTypeResponse {
     private Integer type;
 
 
+
+
+    /**
+     * 发布时间
+     */
+    @ApiModelProperty(value = "发布时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date publishTime;
+
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSentiment.java

@@ -125,6 +125,24 @@ public class TcNetworkSentiment extends BaseEntity {
     @ApiModelProperty(value = "文件地址")
     private String fileUrl;
 
+
+    /**
+     * 是否提示 1是 2否
+     */
+    @Excel(name = "是否提示 1是 2否")
+    @ApiModelProperty(value = "是否提示 1是 2否")
+    private Long reminder;
+
+
+    /**
+     * 舆情报告类型1:专报 2:月报3：深度报告
+     */
+    @Excel(name = "舆情报告类型1:专报 2:月报3：深度报告")
+    @ApiModelProperty(value = "舆情报告类型1:专报 2:月报3：深度报告")
+    private String sentimentReportType;
+
+
+
     /**
      * 创建人ID
      */

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

@@ -8,7 +8,7 @@
     <select id="getWorkDynamics" resultType="com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse">
         SELECT type, name
         FROM `tc_work_dongtai`
-        GROUP BY type, materialsName
+        GROUP BY type, name
     </select>
     <select id="getNetworkReport" resultType="com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse">
         select count(*) as count, ROUND(count(case when state=2 THEN 1 ELSE NULL END ) * 100.0/ sum(count(*)) OVER (), 1 )as handle

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

@@ -6,10 +6,11 @@
 
 
     <select id="getSentimentType" resultType="com.ruoyi.screen.domain.response.ZongzhiSentimentTypeResponse">
-        select count(*) as count ,sentiment_type as type
+        select count(*) as count ,sentiment_type as type,publish_time as publishTime
+
         from tc_network_sentiment
         where sentiment_type in ("1", "2")
-        GROUP BY sentiment_type
+        GROUP BY sentiment_type,publish_time
     </select>
     <select id="getSentimenCount" resultType="com.ruoyi.screen.domain.response.ZongzhiSentimentCountResponse">
         select count(*) as count ,sentiment_type as type,ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt

ruoyi-system/src/main/resources/mapper/zongzhi/TcNetworkSentimentMapper.xml

@@ -27,16 +27,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="sentimentReportType"    column="sentiment_report_type"    />
+        <result property="reminder" column="reminder"/>
+
     </resultMap>
 
     <sql id="selectTcNetworkSentimentVo">
-        select id, area_id, sentiment_name, sentiment_content, dep_name, publish_time, sentiment_state, media_type, event_type, sentiment_type, yuci_type, source, isturn, file_name, file_url, create_id, create_by, create_time, update_id, update_by, update_time, remark from tc_network_sentiment
+        select id, area_id, sentiment_name, reminder,sentiment_report_type,sentiment_content, dep_name, publish_time, sentiment_state, media_type, event_type, sentiment_type, yuci_type, source, isturn, file_name, file_url, create_id, create_by, create_time, update_id, update_by, update_time, remark from tc_network_sentiment
     </sql>
 
     <select id="selectTcNetworkSentimentList" parameterType="TcNetworkSentiment" resultMap="TcNetworkSentimentResult">
         <include refid="selectTcNetworkSentimentVo"/>
         <where>  
             <if test="areaId != null "> and area_id = #{areaId}</if>
+            <if test="reminder != null "> and reminder = #{reminder}</if>
+            <if test="sentimentReportType != null "> and sentiment_report_type = #{sentimentReportType}</if>
             <if test="sentimentName != null  and sentimentName != ''"> and sentiment_name like concat('%', #{sentimentName}, '%')</if>
             <if test="sentimentContent != null  and sentimentContent != ''"> and sentiment_content = #{sentimentContent}</if>
             <if test="depName != null  and depName != ''"> and dep_name like concat('%', #{depName}, '%')</if>
@@ -64,7 +69,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into tc_network_sentiment
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaId != null">area_id,</if>
+
             <if test="sentimentName != null">sentiment_name,</if>
+            <if test="reminder != null">reminder,</if>
+            <if test="sentimentReportType != null">sentiment_report_type,</if>
             <if test="sentimentContent != null">sentiment_content,</if>
             <if test="depName != null">dep_name,</if>
             <if test="publishTime != null">publish_time,</if>
@@ -88,7 +96,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="areaId != null">#{areaId},</if>
             <if test="sentimentName != null">#{sentimentName},</if>
+            <if test="reminder != null">#{reminder},</if>
             <if test="sentimentContent != null">#{sentimentContent},</if>
+            <if test="sentimentReportType != null">#{sentimentReportType},</if>
             <if test="depName != null">#{depName},</if>
             <if test="publishTime != null">#{publishTime},</if>
             <if test="sentimentState != null">#{sentimentState},</if>
@@ -115,7 +125,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaId != null">area_id = #{areaId},</if>
             <if test="sentimentName != null">sentiment_name = #{sentimentName},</if>
+            <if test="reminder != null">reminder = #{reminder},</if>
             <if test="sentimentContent != null">sentiment_content = #{sentimentContent},</if>
+            <if test="sentimentReportType != null">sentiment_report_type = #{sentimentReportType},</if>
             <if test="depName != null">dep_name = #{depName},</if>
             <if test="publishTime != null">publish_time = #{publishTime},</if>
             <if test="sentimentState != null">sentiment_state = #{sentimentState},</if>