supervision
/
supervision-boot
6
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix--视频督察一二级大屏对齐

master
buaixuexideshitongxue 1 month ago
parent
b5f58412eb
commit
a42c1fc3b6
5 changed files with 25 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java
  2. 28
      src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
  3. 52
      src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java
  4. 1
      src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
  5. 1
      src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java

11
src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java
Unescape View File

@ -1,10 +1,11 @@
package com.biutag.supervision.controller.subdatav;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.biutag.supervision.mapper.NegativeMapper;
import com.biutag.supervision.pojo.Result;
import com.biutag.supervision.pojo.request.subdatav.SubDataVRequest;
import com.biutag.supervision.pojo.vo.EchartsVo;
import com.biutag.supervision.service.SubOneVideoSuperviseService;
import com.biutag.supervision.service.subDatav.SubDatavService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -28,8 +29,8 @@ import static com.biutag.supervision.constants.enums.ProblemSourcesEnum.SPDC;
@RequestMapping("datav/sub1/videoSupervise")
public class SubOneVideoSuperviseController {
private final SubOneVideoSuperviseService subOneVideoSuperviseService;
private final SubDatavService subDatavService;
private final NegativeMapper negativeMapper;
@Operation(summary = "问题数排名")
@ -59,7 +60,8 @@ public class SubOneVideoSuperviseController {
@Operation(summary = "问题趋势统计")
@GetMapping("/getSubOneVideoSuperviseTrend")
public Result<JSONObject> getSubOneVideoSuperviseTrend(@RequestParam Integer departId, @RequestParam Integer year) {
List<EchartsVo> videoSuperviseTrendList = subOneVideoSuperviseService.getSubOneVideoSuperviseTrend(String.valueOf(year), SPDC.getValue(), departId.toString());
List<String> proCode = List.of(SPDC.getValue());
List<EchartsVo> videoSuperviseTrendList = negativeMapper.selectMonthStatByYear(year, String.valueOf(departId), proCode);
JSONObject jsonObject = new JSONObject().fluentPut("videoSuperviseTrendList", videoSuperviseTrendList);
return Result.success(jsonObject);
}
@ -73,7 +75,8 @@ public class SubOneVideoSuperviseController {
public Result<JSONObject> getSubOneVideoSuperviseProblemTypeRate(@RequestParam Integer departId,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
List<EchartsVo> subOneVideoSuperviseProblemTypeRate = subOneVideoSuperviseService.getSubOneVideoSuperviseProblemTypeRate(departId, beginTime, endTime);
endTime =DateUtil.endOfDay(endTime);
List<EchartsVo> subOneVideoSuperviseProblemTypeRate = negativeMapper.getSubOneVideoSuperviseProblemTypeRate(departId, beginTime, endTime);
JSONObject jsonObject = new JSONObject().fluentPut("subOneVideoSuperviseProblemTypeRate", subOneVideoSuperviseProblemTypeRate);
return Result.success(jsonObject);
}

28
src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
Unescape View File

@ -130,12 +130,27 @@ public interface NegativeMapper extends BaseMapper<Negative> {
"INNER JOIN negative_problem_relation npr " +
"on ng.id=npr.negativeId " +
"WHERE ng.problemSourcesCode=16 " +
"AND checkStatus <> 3 " +
"and ng.check_status_code in (1, 2, 3) " +
"AND crtTime BETWEEN #{beginTime} AND #{endTime} " +
"GROUP BY npr.threeLevelContent ")
List<EchartsVo> getVideoSuperviseProblemTypeRate(Date beginTime, Date endTime);
@Select("SELECT npr.threeLevelContent AS `name`, " +
"COUNT(*) AS `value` " +
"FROM negative ng " +
"LEFT JOIN negative_problem_relation npr on ng.id=npr.negativeId " +
"LEFT JOIN sup_depart sd on ng.involveDepartId = sd.id " +
"LEFT JOIN sup_depart sdd on sd.pid = sdd.id " +
"LEFT JOIN sup_depart sddd on sdd.pid = sddd.id " +
"WHERE ng.problemSourcesCode=16 " +
"AND ng.check_status_code in (1, 2, 3) " +
"AND ng.crtTime BETWEEN #{beginTime} AND #{endTime} " +
"AND (sd.id =#{departId} OR sdd.id=#{departId} or sddd.id=#{departId}) " +
"GROUP BY npr.threeLevelContent ")
List<EchartsVo> getSubOneVideoSuperviseProblemTypeRate(Integer departId, Date beginTime, Date endTime);
@Select("select * from negative ng " +
@ -335,17 +350,6 @@ public interface NegativeMapper extends BaseMapper<Negative> {
"AND ng.crtTime BETWEEN #{beginTime} AND #{endTime} ")
VideoSuperviseCountVo getSubOneAllVideoSuperviseCount(Date beginTime, Date endTime, Integer departId);
@Select("SELECT npr.threeLevelContent AS `name`, " +
"COUNT(*) AS `value` " +
"FROM negative ng " +
"INNER JOIN sup_depart sd ON ng.involveDepartId=sd.id AND sd.pid=#{departId} " +
"INNER JOIN negative_problem_relation npr " +
"on ng.id=npr.negativeId " +
"WHERE ng.problemSourcesCode=16 " +
"AND checkStatus <> 3 " +
"AND crtTime BETWEEN #{beginTime} AND #{endTime} " +
"GROUP BY npr.threeLevelContent ")
List<EchartsVo> getSubOneVideoSuperviseProblemTypeRate(Integer departId, Date beginTime, Date endTime);

52
src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java
Unescape View File

@ -1,52 +0,0 @@
package com.biutag.supervision.service;
import com.biutag.supervision.mapper.NegativeMapper;
import com.biutag.supervision.pojo.vo.EchartsVo;
import com.biutag.supervision.pojo.vo.OrganizeProblemRankVo;
import com.biutag.supervision.pojo.vo.VideoSuperviseCountVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @Auther: sh
* @Date: 2024/12/16 17:18
* @Description:
*/
@RequiredArgsConstructor
@Service
public class SubOneVideoSuperviseService {
private final NegativeMapper negativeMapper;
private final SupDepartService departService;
public VideoSuperviseCountVo getSubOneAllVideoSuperviseCount(Date beginTime, Date endTime, Integer departId) {
VideoSuperviseCountVo res = negativeMapper.getSubOneAllVideoSuperviseCount(beginTime, endTime, departId);
return res;
}
public List<OrganizeProblemRankVo> getSuboOneVideoSuperviseProblemRank(Date beginTime, Date endTime, Integer groupId, Integer departId) {
List<OrganizeProblemRankVo> res ;
if (groupId == 10) {
res = negativeMapper.getSuboOneVideoSupervisePoliceProblemRank(beginTime, endTime, groupId, departId);
} else {
res = negativeMapper.getSuboOneVideoSuperviseTeamProblemRank(beginTime, endTime, groupId, departId);
}
return res;
}
public List<EchartsVo> getSubOneVideoSuperviseTrend(String year, String problemCode, String departId) {
List<String> departIds = departService.getAllNodeIds(departId);
List<EchartsVo> res = negativeMapper.getSubOneVideoSuperviseTrend(year, problemCode, departIds);
return res;
}
public List<EchartsVo> getSubOneVideoSuperviseProblemTypeRate(Integer departId, Date beginTime, Date endTime) {
List<EchartsVo> res = negativeMapper.getSubOneVideoSuperviseProblemTypeRate(departId, beginTime, endTime);
return res;
}
}

1
src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
Unescape View File

@ -500,6 +500,7 @@ public class DatavServiceImpl implements DatavService {
// 4. 领导问责（按 negativeId + 领导姓名 + 领导处理结果 去重）
Set<String> seenLead = new HashSet<>();
List<NegativeBlame> leadBlames = negativeBlames.stream()
.filter(one -> BlameType.personal.name().equals(one.getType()))
.filter(one -> StrUtil.isNotBlank(one.getLeadHandleResultName()))
.filter(one -> !"不予追责".equals(one.getLeadHandleResultName()))
.filter(one -> seenLead.add(

1
src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java
Unescape View File

@ -388,6 +388,7 @@ public class SubDatavServiceImpl implements SubDatavService {
// 4. 领导问责（按 negativeId + 领导姓名 + 领导处理结果 去重）
Set<String> seenLead = new HashSet<>();
List<NegativeBlame> leadBlames = negativeBlames.stream()
.filter(one -> BlameType.personal.name().equals(one.getType()))
.filter(one -> StrUtil.isNotBlank(one.getLeadHandleResultName()))
.filter(one -> !"不予追责".equals(one.getLeadHandleResultName()))
.filter(one -> seenLead.add(

Write Preview
Loading…
Cancel
Save