suzhou-jichuang-lanhai
/
tcZz-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
main
杜函宇 3 months ago
parent deb78033f3
commit 4ada644e96
8 changed files with 159 additions and 56 deletions
Show Stats Download Patch File Download Diff File

22
ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/ScreenController.java
Unescape View File

@ -2,6 +2,7 @@ package com.ruoyi.tcZz.controller;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.tcZz.domain.TcCy;
import com.ruoyi.tcZz.domain.reponse.*; import com.ruoyi.tcZz.domain.reponse.*;
import com.ruoyi.tcZz.service.ScreenService; import com.ruoyi.tcZz.service.ScreenService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -36,6 +37,15 @@ public class ScreenController extends BaseController {
return AjaxResult.success(screenService.getScreenSupervision()); 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) @ApiOperation(value = "清郎专项行动数据统计", response = ScreenQinglangResponse.class)
@GetMapping("/screenqinglang") @GetMapping("/screenqinglang")
public AjaxResult screenQinglang() { public AjaxResult screenQinglang() {
ScreenQinglangResponse screenQinglangResponse = new ScreenQinglangResponse(); // ScreenQinglangResponse screenQinglangResponse = new ScreenQinglangResponse();
List<ScreenQinglangWeifanResponse> list = screenService.getScreenQinglang(); // List<ScreenQinglangWeifanResponse> list = screenService.getScreenQinglang();
List<ScreenQinglangWeiguiResponse> list1 = screenService.getScreenQinglangWeigui(); // List<ScreenQinglangWeiguiResponse> list1 = screenService.getScreenQinglangWeigui();
screenQinglangResponse.setScreenQinglangWeifanResponse(list); // screenQinglangResponse.setScreenQinglangWeifanResponse(list);
screenQinglangResponse.setScreenQinglangWeiguiResponse(list1); // screenQinglangResponse.setScreenQinglangWeiguiResponse(list1);
return AjaxResult.success(screenQinglangResponse); return AjaxResult.success(screenService.screenQinglang());
} }

2
ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcVx.java
Unescape View File

@ -37,7 +37,7 @@ public class TcVx extends BaseEntity
/** 账号ID */ /** 账号ID */
@Excel(name = "账号ID") @Excel(name = "账号ID")
@ApiModelProperty(value = "账号ID") @ApiModelProperty(value = "账号ID")
private Long zhId; private String zhId;
/** 行业属性 */ /** 行业属性 */
@Excel(name = "行业属性") @Excel(name = "行业属性")

30
ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/reponse/ScreenQinglangResponse.java
Unescape View File

@ -1,9 +1,12 @@
package com.ruoyi.tcZz.domain.reponse; package com.ruoyi.tcZz.domain.reponse;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -12,16 +15,35 @@ import java.util.List;
@Data @Data
@ApiModel("清郎专项行动") @ApiModel("清郎专项行动")
public class ScreenQinglangResponse { public class ScreenQinglangResponse {
// /**
// * 清郎专项行动处理有害信息数据统计
// */
// @ApiModelProperty("清郎专项行动处理有害信息数据统计")
// List<ScreenQinglangWeifanResponse> screenQinglangWeifanResponse;
//
//
// /**
// * 关闭直播平台违规账号
// */
// @ApiModelProperty("关闭直播平台违规账号")
// List<ScreenQinglangWeiguiResponse> screenQinglangWeiguiResponse;
/** /**
* 清郎专项行动处理有害信息数据统计 * 处理有害信息数量
*/ */
@ApiModelProperty("清郎专项行动处理有害信息数据统计") @ApiModelProperty("处理有害信息数量")
List<ScreenQinglangWeifanResponse> screenQinglangWeifanResponse; private Integer count1;
/**
* 日期
*/
@ApiModelProperty("日期")
private String dateTime;
/** /**
* 关闭直播平台违规账号 * 关闭直播平台违规账号
*/ */
@ApiModelProperty("关闭直播平台违规账号") @ApiModelProperty("关闭直播平台违规账号")
List<ScreenQinglangWeiguiResponse> screenQinglangWeiguiResponse; private Integer count2;
} }

39
ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/ScreenMapper.java
Unescape View File

@ -1,5 +1,6 @@
package com.ruoyi.tcZz.mapper; package com.ruoyi.tcZz.mapper;
import com.ruoyi.tcZz.domain.TcCy;
import com.ruoyi.tcZz.domain.reponse.*; import com.ruoyi.tcZz.domain.reponse.*;
import java.util.List; import java.util.List;
@ -43,20 +44,20 @@ public interface ScreenMapper {
ScreenArticlesResponse getScreenArticles(); ScreenArticlesResponse getScreenArticles();
/** // /**
* 清郎专项行动数据统计 // * 清郎专项行动数据统计
* // *
* @return // * @return
*/ // */
List<ScreenQinglangWeifanResponse> getScreenQinglang(); // List<ScreenQinglangWeifanResponse> getScreenQinglang();
//
//
/** // /**
* 清郎专项行动违规 // * 清郎专项行动违规
* // *
* @return // * @return
*/ // */
List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui(); // List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui();
/** /**
@ -92,4 +93,14 @@ public interface ScreenMapper {
* @return * @return
*/ */
List<ScreenDepartmentResponse> getScreenDepartment(); List<ScreenDepartmentResponse> getScreenDepartment();
/**
* 清郎专项行动数据统计
*/
List<ScreenQinglangResponse> screenQinglang();
/**
* 大屏词云
*/
List<TcCy> getAllCy();
} }

38
ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java
Unescape View File

@ -1,5 +1,6 @@
package com.ruoyi.tcZz.service; package com.ruoyi.tcZz.service;
import com.ruoyi.tcZz.domain.TcCy;
import com.ruoyi.tcZz.domain.reponse.*; import com.ruoyi.tcZz.domain.reponse.*;
import java.util.List; import java.util.List;
@ -43,19 +44,19 @@ public interface ScreenService {
*/ */
ScreenArticlesResponse getScreenArticles(); ScreenArticlesResponse getScreenArticles();
/** // /**
* 清郎专项行动处理有害数据统计 // * 清郎专项行动处理有害数据统计
* // *
* @return // * @return
*/ // */
List<ScreenQinglangWeifanResponse> getScreenQinglang(); // List<ScreenQinglangWeifanResponse> getScreenQinglang();
//
/** // /**
* 清郎专项行动违规 // * 清郎专项行动违规
* // *
* @return // * @return
*/ // */
List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui(); // List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui();
/** /**
@ -88,4 +89,15 @@ public interface ScreenService {
* @return * @return
*/ */
List<ScreenDepartmentResponse> getScreenDepartment(); List<ScreenDepartmentResponse> getScreenDepartment();
/**
* 清郎专项行动数据统计
*/
List<ScreenQinglangResponse> screenQinglang();
/**
* 大屏词云
*/
List<TcCy> getAllCy();
} }

35
ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package com.ruoyi.tcZz.service.impl; package com.ruoyi.tcZz.service.impl;
import com.ruoyi.tcZz.domain.TcCy;
import com.ruoyi.tcZz.domain.reponse.*; import com.ruoyi.tcZz.domain.reponse.*;
import com.ruoyi.tcZz.mapper.ScreenMapper; import com.ruoyi.tcZz.mapper.ScreenMapper;
import com.ruoyi.tcZz.service.ScreenService; import com.ruoyi.tcZz.service.ScreenService;
@ -40,15 +41,15 @@ public class ScreenServiceImpl implements ScreenService {
return screenMapper.getScreenArticles(); return screenMapper.getScreenArticles();
} }
@Override // @Override
public List<ScreenQinglangWeifanResponse> getScreenQinglang() { // public List<ScreenQinglangWeifanResponse> getScreenQinglang() {
return screenMapper.getScreenQinglang(); // return screenMapper.getScreenQinglang();
} // }
//
@Override // @Override
public List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui() { // public List<ScreenQinglangWeiguiResponse> getScreenQinglangWeigui() {
return screenMapper.getScreenQinglangWeigui(); // return screenMapper.getScreenQinglangWeigui();
} // }
@Override @Override
public List<ScreenTerritorialResponse> getScreenTerritorial() { public List<ScreenTerritorialResponse> getScreenTerritorial() {
@ -69,4 +70,20 @@ public class ScreenServiceImpl implements ScreenService {
public List<ScreenDepartmentResponse> getScreenDepartment() { public List<ScreenDepartmentResponse> getScreenDepartment() {
return screenMapper.getScreenDepartment(); return screenMapper.getScreenDepartment();
} }
/**
* 清郎专项行动数据统计
*/
@Override
public List<ScreenQinglangResponse> screenQinglang() {
return screenMapper.screenQinglang();
}
/**
* 大屏词云
*/
@Override
public List<TcCy> getAllCy() {
return screenMapper.getAllCy();
}
} }

47
ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
Unescape View File

@ -3,7 +3,17 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tcZz.mapper.ScreenMapper"> <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 id="getScreenSupervision" resultType="com.ruoyi.tcZz.domain.reponse.ScreenSupervisionResponse">
SELECT * SELECT *
FROM (SELECT COUNT(*) AS count FROM tc_dbxt WHERE isStatus=1) count, 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 COUNT(*) AS count2 FROM tc_wpwzlyqk where type=3 and isStatus=1 ) count2;
</select> </select>
<select id="getScreenQinglang" resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangWeifanResponse"> <!-- <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 count1,date_time as dateTime from tc_qlzxxdsjtj-->
</select> <!-- where date_time >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)-->
<select id="getScreenQinglangWeigui" <!-- AND date_time &lt; DATE_FORMAT(CURDATE(), '%Y-%m-01') order by date_time desc-->
resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangWeiguiResponse"> <!-- </select>-->
select count2,date_time as dateTime from tc_qlzxxdsjtj order by date_time desc limit 12 <!-- <select id="getScreenQinglangWeigui"-->
</select> <!-- 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 id="getScreenTerritorial" resultType="com.ruoyi.tcZz.domain.reponse.ScreenTerritorialResponse">
SELECT SELECT
COUNT(*) AS count, 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 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 count(*)as count ,dep_name as depName from tc_zbxq group by dep_name
</select> </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> </mapper>
Write Preview
Loading…
Cancel
Save