8 changed files with 456 additions and 120 deletions
@ -0,0 +1,247 @@
|
||||
package com.biutag.supervision.controller.subdatav; |
||||
|
||||
import com.alibaba.fastjson.JSONObject; |
||||
import com.biutag.supervision.pojo.Result; |
||||
import com.biutag.supervision.pojo.vo.*; |
||||
import com.biutag.supervision.service.DataSupervisionNotifyServiceImpl; |
||||
import com.biutag.supervision.service.SubOneSupervisionNotifyService; |
||||
import com.biutag.supervision.service.SubOneVideoSuperviseService; |
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
import lombok.RequiredArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springframework.cache.annotation.Cacheable; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
import java.util.Date; |
||||
import java.util.List; |
||||
|
||||
import static com.biutag.supervision.constants.enums.ProblemSourcesEnum.XCDC; |
||||
import static com.biutag.supervision.constants.enums.ProblemSourcesEnum.ZXDC; |
||||
|
||||
/** |
||||
* @Auther: sh |
||||
* @Date: 2024/12/17 10:58 |
||||
* @Description: 二级现场督察大屏相关 |
||||
*/ |
||||
@Slf4j |
||||
@RestController |
||||
@RequiredArgsConstructor |
||||
@RequestMapping("datav/sub1/supervisonNotify") |
||||
@Tag(name = "现场督察相关") |
||||
public class SubOneSupervisionNotifyController { |
||||
|
||||
|
||||
private final SubOneSupervisionNotifyService subOneSupervisionNotifyService; |
||||
|
||||
// region 左边
|
||||
|
||||
/** |
||||
* 获取日常督察情况 |
||||
* |
||||
* @param beginTime 开始时间 |
||||
* @param endTime 结束时间 |
||||
* @return |
||||
*/ |
||||
@Operation(summary = "获取日常督察数量概览和整改率排名") |
||||
@GetMapping("/getSubOneChangedRank") |
||||
public Result<JSONObject> getSubOneChangedRank(@RequestParam Integer departId, |
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, |
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
||||
DayTimeSuperviseVo policeRankOverview = subOneSupervisionNotifyService.getChangedRankOverView(10, departId, beginTime, endTime); |
||||
DayTimeSuperviseVo teamRankOverview = subOneSupervisionNotifyService.getChangedRankOverView(-1, departId, beginTime, endTime); |
||||
List<RankVo> policeChangedRankList = subOneSupervisionNotifyService.getSubOneChangedRateRank(10, departId, beginTime, endTime); |
||||
List<RankVo> teamChangedRankList = subOneSupervisionNotifyService.getSubOneChangedRateRank(-1, departId, beginTime, endTime); |
||||
JSONObject data = new JSONObject() |
||||
.fluentPut("fxsjRankOverview", policeRankOverview) |
||||
.fluentPut("jsdwRankOverview", teamRankOverview) |
||||
.fluentPut("fxsjChangedRankList", policeChangedRankList) |
||||
.fluentPut("jsdwChangedRankList", teamChangedRankList); |
||||
return Result.success(data); |
||||
} |
||||
|
||||
/** |
||||
* 问题类型占比 |
||||
* |
||||
* @param beginTime 开始时间 |
||||
* @param endTime 结束时间 |
||||
* @return |
||||
*/ |
||||
@GetMapping("/getSubOneProblemTypeRate") |
||||
public Result<JSONObject> getSubOneProblemTypeRate(@RequestParam Integer departId, |
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, |
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
||||
List<EchartsVo> wtlxList = subOneSupervisionNotifyService.getSubOneProblemTypeRatio(departId, beginTime, endTime); |
||||
JSONObject data = new JSONObject().fluentPut("wtlxList", wtlxList); |
||||
return Result.success(data); |
||||
} |
||||
|
||||
// endregion
|
||||
|
||||
// region 中间
|
||||
|
||||
/** |
||||
* 大屏中央数据 |
||||
* |
||||
* @param beginTime 开始时间 |
||||
* @param endTime 结束时间 |
||||
* @return |
||||
*/ |
||||
@Operation(summary = "大屏中央数据") |
||||
@GetMapping("/getAllSubOneSupervisionNotifyCount") |
||||
public Result<JSONObject> getAllSubOneSupervisionNotifyCount(@RequestParam Integer departId, |
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, |
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
||||
SupervisionNotifyOverView overview = subOneSupervisionNotifyService.getAllSubOneSupervisionNotifyCount(departId, beginTime, endTime); |
||||
JSONObject data = new JSONObject().fluentPut("overview", overview); |
||||
return Result.success(data); |
||||
} |
||||
// /**
|
||||
// * 地图数据
|
||||
// *
|
||||
// * @param beginTime 开始时间
|
||||
// * @param endTime 结束时间
|
||||
// * @return List<SuperviseMapIconVo>
|
||||
// */
|
||||
// @GetMapping("/getMap")
|
||||
// @Cacheable(cacheNames = "superviseMap", key = "'p_'+ #endTime")
|
||||
// public Result<JSONObject> getMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
|
||||
// @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
|
||||
// //地图数据
|
||||
// List<SuperviseMapIconVo> superviseTempMapVoList = dataSupervisionNotifyService.getSupervisionMapIconInfo(beginTime, endTime);
|
||||
// JSONObject data = new JSONObject().fluentPut("superviseTempMapVoList", superviseTempMapVoList);
|
||||
// return Result.success(data);
|
||||
// }
|
||||
|
||||
/** |
||||
* 获取现场督察问题趋势 |
||||
* |
||||
* @param year 年份 |
||||
* @return List<EchartsVo> |
||||
*/ |
||||
@GetMapping("/getSubOneSupervisionTrend") |
||||
public Result<JSONObject> getSubOneSupervisionTrend(@RequestParam Integer departId, |
||||
@RequestParam String year) { |
||||
List<EchartsVo> supervisionTrend = subOneSupervisionNotifyService.getSubOneSupervisionTrend(departId, year); |
||||
JSONObject data = new JSONObject().fluentPut("supervisionTrend", supervisionTrend); |
||||
return Result.success(data); |
||||
} |
||||
|
||||
// endregion
|
||||
|
||||
// region 右边
|
||||
|
||||
/** |
||||
* 黄赌毒数据 |
||||
* |
||||
* @param beginTime 开始时间 |
||||
* @param endTime 结束时间 |
||||
* @return JSONObject |
||||
*/ |
||||
@GetMapping("/getYellowBetDrug") |
||||
public Result<JSONObject> getYellowBetDrug(@RequestParam Integer departId, |
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, |
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
||||
// // 黄赌毒总览
|
||||
// DayTimeSuperviseVo fxsjYellowBetOverview = subOneSupervisionNotifyService.getSubOneYellowBetOverview(beginTime, endTime, departId, 1);
|
||||
// DayTimeSuperviseVo jsdwYellowBetOverview = subOneSupervisionNotifyService.getSubOneYellowBetOverview(beginTime, endTime, departId, 1);
|
||||
// // 黄毒赌列表
|
||||
// List<OrganizeProblemRankVo> fxsjYellowBetRankList = subOneSupervisionNotifyService.getSubOneYellowBetRankList(beginTime, endTime, departId, 1);
|
||||
// List<OrganizeProblemRankVo> jsdwYellowBetRankList = subOneSupervisionNotifyService.getSubOneYellowBetRankList(beginTime, endTime, departId, 1);
|
||||
//
|
||||
// JSONObject data = new JSONObject()
|
||||
// .fluentPut("fxsjYellowBetOverview", fxsjYellowBetOverview)
|
||||
// .fluentPut("jsdwYellowBetOverview", jsdwYellowBetOverview)
|
||||
// .fluentPut("fxsjYellowBetRankList", fxsjYellowBetRankList)
|
||||
// .fluentPut("jsdwYellowBetRankList", jsdwYellowBetRankList);
|
||||
return Result.success(null); |
||||
} |
||||
//
|
||||
//
|
||||
// // 枪支管理数据
|
||||
// @GetMapping("/getGunController")
|
||||
// public Result<JSONObject> getGunController(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
|
||||
// @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
|
||||
// // 枪支管理总览
|
||||
// DayTimeSuperviseVo fxsjGunControllerOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 3, 2);
|
||||
// DayTimeSuperviseVo jsdwGunControllerOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 4, 2);
|
||||
// // 枪支管理列表
|
||||
// List<OrganizeProblemRankVo> fxsjGunControllerRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 3, 2);
|
||||
// List<OrganizeProblemRankVo> jsdwGunControllerRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 4, 2);
|
||||
//
|
||||
// JSONObject data = new JSONObject()
|
||||
// .fluentPut("fxsjGunControllerOverview", fxsjGunControllerOverview)
|
||||
// .fluentPut("jsdwGunControllerOverview", jsdwGunControllerOverview)
|
||||
// .fluentPut("fxsjGunControllerRankList", fxsjGunControllerRankList)
|
||||
// .fluentPut("jsdwGunControllerRankList", jsdwGunControllerRankList);
|
||||
// return Result.success(data);
|
||||
// }
|
||||
//
|
||||
// // 涉企问题数据
|
||||
// @GetMapping("/getCompanyProblem")
|
||||
// public Result<JSONObject> getCompanyProblem(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
|
||||
// @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
|
||||
// // 涉企问题总览
|
||||
// DayTimeSuperviseVo fxsjCompanyProblemOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 3, 3);
|
||||
// DayTimeSuperviseVo jsdwCompanyProblemOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 4, 3);
|
||||
// // 涉企问题列表
|
||||
// List<OrganizeProblemRankVo> fxsjCompanyProblemRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 3, 3);
|
||||
// List<OrganizeProblemRankVo> jsdwCompanyProblemRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 4, 3);
|
||||
//
|
||||
// JSONObject data = new JSONObject()
|
||||
// .fluentPut("fxsjCompanyProblemOverview", fxsjCompanyProblemOverview)
|
||||
// .fluentPut("jsdwCompanyProblemOverview", jsdwCompanyProblemOverview)
|
||||
// .fluentPut("fxsjCompanyProblemRankList", fxsjCompanyProblemRankList)
|
||||
// .fluentPut("jsdwCompanyProblemRankList", jsdwCompanyProblemRankList);
|
||||
// return Result.success(data);
|
||||
// }
|
||||
//
|
||||
// // 执法办案数据
|
||||
// @GetMapping("/getHandleCase")
|
||||
// public Result<JSONObject> getHandleCase(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
|
||||
// @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
|
||||
// // 执法办案总览
|
||||
// DayTimeSuperviseVo fxsjHandleCaseOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 3, 4);
|
||||
// DayTimeSuperviseVo jsdwHandleCaseOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 4, 4);
|
||||
// // 执法办案列表
|
||||
// List<OrganizeProblemRankVo> fxsjHandleCaseRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 3, 4);
|
||||
// List<OrganizeProblemRankVo> jsdwHandleCaseRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 4, 4);
|
||||
//
|
||||
// JSONObject data = new JSONObject()
|
||||
// .fluentPut("fxsjHandleCaseOverview", fxsjHandleCaseOverview)
|
||||
// .fluentPut("jsdwHandleCaseOverview", jsdwHandleCaseOverview)
|
||||
// .fluentPut("fxsjHandleCaseRankList", fxsjHandleCaseRankList)
|
||||
// .fluentPut("jsdwHandleCaseRankList", jsdwHandleCaseRankList);
|
||||
// return Result.success(data);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// // 工作日测酒数据
|
||||
// @GetMapping("/getCheckBeer")
|
||||
// public Result<JSONObject> getCheckBeer(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
|
||||
// @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
|
||||
// // 工作日测酒总览
|
||||
// DayTimeSuperviseVo fxsjCheckBeerOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 3, 5);
|
||||
// DayTimeSuperviseVo jsdwCheckBeerOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 4, 5);
|
||||
// // 工作日测酒列表
|
||||
// List<OrganizeProblemRankVo> fxsjCheckBeerRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 3, 5);
|
||||
// List<OrganizeProblemRankVo> jsdwCheckBeerRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 4, 5);
|
||||
//
|
||||
// JSONObject data = new JSONObject()
|
||||
// .fluentPut("fxsjCheckBeerOverview", fxsjCheckBeerOverview)
|
||||
// .fluentPut("jsdwCheckBeerOverview", jsdwCheckBeerOverview)
|
||||
// .fluentPut("fxsjCheckBeerRankList", fxsjCheckBeerRankList)
|
||||
// .fluentPut("jsdwCheckBeerRankList", jsdwCheckBeerRankList);
|
||||
// return Result.success(data);
|
||||
// }
|
||||
|
||||
// endregion
|
||||
|
||||
|
||||
} |
||||
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
package com.biutag.supervision.pojo.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* @Auther: sh |
||||
* @Date: 2024/12/17 16:44 |
||||
* @Description: |
||||
*/ |
||||
@Data |
||||
public class SupervisionNotifyOverView { |
||||
private String problemNumber; |
||||
private String rectifingNumber; |
||||
private String rectifedNumber; |
||||
private String departNumber; |
||||
private String personNumber; |
||||
private String rectifyRate; |
||||
} |
||||
|
||||
@ -0,0 +1,64 @@
|
||||
package com.biutag.supervision.service; |
||||
|
||||
import com.biutag.supervision.mapper.NegativeMapper; |
||||
import com.biutag.supervision.pojo.vo.DayTimeSuperviseVo; |
||||
import com.biutag.supervision.pojo.vo.EchartsVo; |
||||
import com.biutag.supervision.pojo.vo.RankVo; |
||||
import com.biutag.supervision.pojo.vo.SupervisionNotifyOverView; |
||||
import lombok.RequiredArgsConstructor; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.Date; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* @Auther: sh |
||||
* @Date: 2024/12/17 16:27 |
||||
* @Description: 现场督察二级大屏服务 |
||||
*/ |
||||
@RequiredArgsConstructor |
||||
@Service |
||||
public class SubOneSupervisionNotifyService { |
||||
|
||||
private final NegativeMapper negativeMapper; |
||||
|
||||
public DayTimeSuperviseVo getChangedRankOverView(Integer groupId, Integer departId, Date beginTime, Date endTime) { |
||||
DayTimeSuperviseVo res; |
||||
if (groupId != null && groupId == 10) { |
||||
res = negativeMapper.getPoliceChangedRankOverView(departId, beginTime, endTime); |
||||
} else { |
||||
res = negativeMapper.getTeamChangedRankOverView(departId, beginTime, endTime); |
||||
} |
||||
return res; |
||||
} |
||||
|
||||
public List<RankVo> getSubOneChangedRateRank(Integer groupId, Integer departId, Date beginTime, Date endTime) { |
||||
List<RankVo> res; |
||||
if (groupId != null && groupId == 10) { |
||||
res = negativeMapper.getSubOnePoliceChangedRateRank(departId, beginTime, endTime); |
||||
} else { |
||||
res = negativeMapper.getSubOneTeamChangedRateRank(departId, beginTime, endTime); |
||||
} |
||||
return res; |
||||
} |
||||
|
||||
public List<EchartsVo> getSubOneProblemTypeRatio(Integer departId, Date beginTime, Date endTime) { |
||||
List<EchartsVo> res = negativeMapper.getSubOneProblemTypeRatio(departId, beginTime, endTime); |
||||
return res; |
||||
} |
||||
|
||||
public SupervisionNotifyOverView getAllSubOneSupervisionNotifyCount(Integer departId, Date beginTime, Date endTime) { |
||||
SupervisionNotifyOverView res = negativeMapper.getAllSubOneSupervisionNotifyCount(departId, beginTime, endTime); |
||||
return res; |
||||
} |
||||
|
||||
public List<EchartsVo> getSubOneSupervisionTrend(Integer departId, String year) { |
||||
List<EchartsVo> res = negativeMapper.getSubOneSupervisionTrend(departId, year); |
||||
return res; |
||||
} |
||||
|
||||
public DayTimeSuperviseVo getSubOneYellowBetOverview(Date beginTime, Date endTime, Integer departId, Integer groupId) { |
||||
return null; |
||||
} |
||||
} |
||||
|
||||
Loading…
Reference in new issue