From 4ada644e965453cdac85632418fa985422bcf34e Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 11 Oct 2024 17:12:24 +0800
Subject: [PATCH] bugfix

---
 .../tcZz/controller/ScreenController.java     | 22 ++++++---
 .../main/java/com/ruoyi/tcZz/domain/TcVx.java |  2 +-
 .../reponse/ScreenQinglangResponse.java       | 30 ++++++++++--
 .../com/ruoyi/tcZz/mapper/ScreenMapper.java   | 39 +++++++++------
 .../com/ruoyi/tcZz/service/ScreenService.java | 38 ++++++++++-----
 .../tcZz/service/impl/ScreenServiceImpl.java  | 35 ++++++++++----
 .../mapper/tcZz/netManage/ScreenMapper.xml    | 47 +++++++++++++++----
 .../tcZz/netManage/TcQlzxxdsjtjMapper.xml     |  2 +-
 8 files changed, 159 insertions(+), 56 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/ScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/ScreenController.java
index fbfb5de1..3293d84f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/ScreenController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/ScreenController.java
@@ -2,6 +2,7 @@ package com.ruoyi.tcZz.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.tcZz.domain.TcCy;
 import com.ruoyi.tcZz.domain.reponse.*;
 import com.ruoyi.tcZz.service.ScreenService;
 import io.swagger.annotations.Api;
@@ -36,6 +37,15 @@ public class ScreenController extends BaseController {
         return AjaxResult.success(screenService.getScreenSupervision());
     }
 
+    /**
+     * 大屏词云
+     */
+    @ApiOperation(value = "大屏词云", response = TcCy.class)
+    @GetMapping("/getAllCy")
+    public AjaxResult getAllCy() {
+        return AjaxResult.success(screenService.getAllCy());
+    }
+
 
     /**
      * 大屏数据来源
@@ -76,12 +86,12 @@ public class ScreenController extends BaseController {
     @ApiOperation(value = "清郎专项行动数据统计", response = ScreenQinglangResponse.class)
     @GetMapping("/screenqinglang")
     public AjaxResult screenQinglang() {
-        ScreenQinglangResponse screenQinglangResponse = new ScreenQinglangResponse();
-        List<ScreenQinglangWeifanResponse> list = screenService.getScreenQinglang();
-        List<ScreenQinglangWeiguiResponse> list1 = screenService.getScreenQinglangWeigui();
-        screenQinglangResponse.setScreenQinglangWeifanResponse(list);
-        screenQinglangResponse.setScreenQinglangWeiguiResponse(list1);
-        return AjaxResult.success(screenQinglangResponse);
+//        ScreenQinglangResponse screenQinglangResponse = new ScreenQinglangResponse();
+//        List<ScreenQinglangWeifanResponse> list = screenService.getScreenQinglang();
+//        List<ScreenQinglangWeiguiResponse> list1 = screenService.getScreenQinglangWeigui();
+//        screenQinglangResponse.setScreenQinglangWeifanResponse(list);
+//        screenQinglangResponse.setScreenQinglangWeiguiResponse(list1);
+        return AjaxResult.success(screenService.screenQinglang());
     }
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcVx.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcVx.java
index 6941b839..73b63a33 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcVx.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcVx.java
@@ -37,7 +37,7 @@ public class TcVx extends BaseEntity
     /** 账号ID */
     @Excel(name = "账号ID")
     @ApiModelProperty(value = "账号ID")
-    private Long zhId;
+    private String zhId;
 
     /** 行业属性 */
     @Excel(name = "行业属性")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/reponse/ScreenQinglangResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/reponse/ScreenQinglangResponse.java
index 03f22456..4bffd91f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/reponse/ScreenQinglangResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/reponse/ScreenQinglangResponse.java
@@ -1,9 +1,12 @@
 package com.ruoyi.tcZz.domain.reponse;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -12,16 +15,35 @@ import java.util.List;
 @Data
 @ApiModel("清郎专项行动")
 public class ScreenQinglangResponse {
+//    /**
+//     * 清郎专项行动处理有害信息数据统计
+//     */
+//    @ApiModelProperty("清郎专项行动处理有害信息数据统计")
+//    List<ScreenQinglangWeifanResponse> screenQinglangWeifanResponse;
+//
+//
+//    /**
+//     * 关闭直播平台违规账号
+//     */
+//    @ApiModelProperty("关闭直播平台违规账号")
+//    List<ScreenQinglangWeiguiResponse> screenQinglangWeiguiResponse;
+
     /**
-     * 清郎专项行动处理有害信息数据统计
+     * 处理有害信息数量
      */
-    @ApiModelProperty("清郎专项行动处理有害信息数据统计")
-    List<ScreenQinglangWeifanResponse> screenQinglangWeifanResponse;
+    @ApiModelProperty("处理有害信息数量")
+    private Integer count1;
 
+    /**
+     * 日期
+     */
+    @ApiModelProperty("日期")
+    private String dateTime;
 
     /**
      * 关闭直播平台违规账号
      */
     @ApiModelProperty("关闭直播平台违规账号")
-    List<ScreenQinglangWeiguiResponse> screenQinglangWeiguiResponse;
+    private Integer count2;
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/ScreenMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/ScreenMapper.java
index 98dffafe..116b9ce9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/ScreenMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/ScreenMapper.java
@@ -1,5 +1,6 @@
 package com.ruoyi.tcZz.mapper;
 
+import com.ruoyi.tcZz.domain.TcCy;
 import com.ruoyi.tcZz.domain.reponse.*;
 
 import java.util.List;
@@ -43,20 +44,20 @@ public interface ScreenMapper {
     ScreenArticlesResponse getScreenArticles();
 
 
-    /**
-     * 清郎专项行动数据统计
-     *
-     * @return
-     */
-    List<ScreenQinglangWeifanResponse> getScreenQinglang();
-
-
-    /**
-     * 清郎专项行动违规
-     *
-     * @return
-     */
-    List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui();
+//    /**
+//     * 清郎专项行动数据统计
+//     *
+//     * @return
+//     */
+//    List<ScreenQinglangWeifanResponse> getScreenQinglang();
+//
+//
+//    /**
+//     * 清郎专项行动违规
+//     *
+//     * @return
+//     */
+//    List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui();
 
 
     /**
@@ -92,4 +93,14 @@ public interface ScreenMapper {
      * @return
      */
     List<ScreenDepartmentResponse> getScreenDepartment();
+
+    /**
+     * 清郎专项行动数据统计
+     */
+    List<ScreenQinglangResponse> screenQinglang();
+
+    /**
+     * 大屏词云
+     */
+    List<TcCy> getAllCy();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java
index f3f65766..143f7347 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java
@@ -1,5 +1,6 @@
 package com.ruoyi.tcZz.service;
 
+import com.ruoyi.tcZz.domain.TcCy;
 import com.ruoyi.tcZz.domain.reponse.*;
 
 import java.util.List;
@@ -43,19 +44,19 @@ public interface ScreenService {
      */
     ScreenArticlesResponse getScreenArticles();
 
-    /**
-     * 清郎专项行动处理有害数据统计
-     *
-     * @return
-     */
-    List<ScreenQinglangWeifanResponse> getScreenQinglang();
-
-    /**
-     * 清郎专项行动违规
-     *
-     * @return
-     */
-    List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui();
+//    /**
+//     * 清郎专项行动处理有害数据统计
+//     *
+//     * @return
+//     */
+//    List<ScreenQinglangWeifanResponse> getScreenQinglang();
+//
+//    /**
+//     * 清郎专项行动违规
+//     *
+//     * @return
+//     */
+//    List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui();
 
 
     /**
@@ -88,4 +89,15 @@ public interface ScreenService {
      * @return
      */
     List<ScreenDepartmentResponse> getScreenDepartment();
+
+    /**
+     * 清郎专项行动数据统计
+     */
+    List<ScreenQinglangResponse> screenQinglang();
+
+
+    /**
+     * 大屏词云
+     */
+    List<TcCy> getAllCy();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java
index 9ac0e3e1..a26e36ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.tcZz.service.impl;
 
+import com.ruoyi.tcZz.domain.TcCy;
 import com.ruoyi.tcZz.domain.reponse.*;
 import com.ruoyi.tcZz.mapper.ScreenMapper;
 import com.ruoyi.tcZz.service.ScreenService;
@@ -40,15 +41,15 @@ public class ScreenServiceImpl implements ScreenService {
         return screenMapper.getScreenArticles();
     }
 
-    @Override
-    public List<ScreenQinglangWeifanResponse> getScreenQinglang() {
-        return screenMapper.getScreenQinglang();
-    }
-
-    @Override
-    public List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui() {
-        return screenMapper.getScreenQinglangWeigui();
-    }
+//    @Override
+//    public List<ScreenQinglangWeifanResponse> getScreenQinglang() {
+//        return screenMapper.getScreenQinglang();
+//    }
+//
+//    @Override
+//    public List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui() {
+//        return screenMapper.getScreenQinglangWeigui();
+//    }
 
     @Override
     public List<ScreenTerritorialResponse> getScreenTerritorial() {
@@ -69,4 +70,20 @@ public class ScreenServiceImpl implements ScreenService {
     public  List<ScreenDepartmentResponse> getScreenDepartment() {
         return screenMapper.getScreenDepartment();
     }
+
+    /**
+     * 清郎专项行动数据统计
+     */
+    @Override
+    public List<ScreenQinglangResponse> screenQinglang() {
+        return screenMapper.screenQinglang();
+    }
+
+    /**
+     * 大屏词云
+     */
+    @Override
+    public List<TcCy> getAllCy() {
+        return screenMapper.getAllCy();
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
index f05b1bad..5993d971 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
@@ -3,7 +3,17 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.tcZz.mapper.ScreenMapper">
-
+    <resultMap type="TcCy" id="TcCyResult">
+        <result property="id"    column="id"    />
+        <result property="cyName"    column="cy_name"    />
+        <result property="cyCount"    column="cy_count"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="areaId"    column="area_id"    />
+    </resultMap>
     <select id="getScreenSupervision" resultType="com.ruoyi.tcZz.domain.reponse.ScreenSupervisionResponse">
         SELECT *
         FROM (SELECT COUNT(*) AS count FROM tc_dbxt WHERE isStatus=1) count,
@@ -34,13 +44,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   (SELECT COUNT(*) AS count2 FROM tc_wpwzlyqk where type=3 and isStatus=1 ) count2;
 
     </select>
-    <select id="getScreenQinglang" resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangWeifanResponse">
-        select count1,date_time as dateTime from tc_qlzxxdsjtj  order by date_time desc
-    </select>
-    <select id="getScreenQinglangWeigui"
-            resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangWeiguiResponse">
-        select count2,date_time as dateTime from tc_qlzxxdsjtj  order by date_time desc  limit 12
-    </select>
+<!--    <select id="getScreenQinglang" resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangWeifanResponse">-->
+<!--        select count1,date_time as dateTime from tc_qlzxxdsjtj-->
+<!--                       where date_time  >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)-->
+<!--                         AND date_time &lt; DATE_FORMAT(CURDATE(), '%Y-%m-01') order by date_time desc-->
+<!--    </select>-->
+<!--    <select id="getScreenQinglangWeigui"-->
+<!--            resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangWeiguiResponse">-->
+<!--        select count2,date_time as dateTime from tc_qlzxxdsjtj   order by date_time desc  limit 12-->
+<!--    </select>-->
     <select id="getScreenTerritorial" resultType="com.ruoyi.tcZz.domain.reponse.ScreenTerritorialResponse">
         SELECT
             COUNT(*) AS count,
@@ -63,4 +75,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getScreenDepartment" resultType="com.ruoyi.tcZz.domain.reponse.ScreenDepartmentResponse">
         select count(*)as count ,dep_name as depName from tc_zbxq group by dep_name
     </select>
+    <select id="screenQinglang" resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangResponse">
+        SELECT
+        SUM( count1 ) AS count1,
+        SUM( count2 ) AS count2,
+        DATE_FORMAT( date_time, '%Y-%m' ) AS dateTime
+        FROM
+        tc_qlzxxdsjtj
+        WHERE
+        date_time >= DATE_SUB( CURDATE(), INTERVAL 6 MONTH )
+        AND date_time &lt; DATE_FORMAT( CURDATE(), '%Y-%m-01' )
+        GROUP BY
+        dateTime
+        ORDER BY
+        dateTime desc
+    </select>
+    <select id="getAllCy" resultMap="TcCyResult">
+        select * from tc_cy
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/TcQlzxxdsjtjMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/TcQlzxxdsjtjMapper.xml
index 3c86887c..0de724ac 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/TcQlzxxdsjtjMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/TcQlzxxdsjtjMapper.xml
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTcQlzxxdsjtjList" parameterType="TcQlzxxdsjtj" resultMap="TcQlzxxdsjtjResult">
         <include refid="selectTcQlzxxdsjtjVo"/>
-        <where>  
+        <where>
             <if test="id != null "> and id = #{id}</if>
             <if test="params.beginDateTime != null and params.beginDateTime != '' and params.endDateTime != null and params.endDateTime != ''"> and date_time between #{params.beginDateTime} and #{params.endDateTime}</if>
             <if test="count1 != null "> and count1 = #{count1}</if>