|
|
|
|
@ -146,6 +146,7 @@ public class DataVSupervisionNotifyController {
|
|
|
|
|
|
|
|
|
|
public Result<JSONObject> getSupervisionNotifyMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, |
|
|
|
|
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
|
|
|
|
endTime = DateUtil.endOfDay(endTime); |
|
|
|
|
//地图数据
|
|
|
|
|
List<SuperviseMapIconVo> superviseTempMapVoList = negativeMapper.getSupervisionMapIconInfo(beginTime, endTime); |
|
|
|
|
JSONObject data = new JSONObject().fluentPut("superviseTempMapVoList", superviseTempMapVoList); |
|
|
|
|
@ -181,6 +182,7 @@ public class DataVSupervisionNotifyController {
|
|
|
|
|
public Result<JSONObject> getYellowBetDrug(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, |
|
|
|
|
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, |
|
|
|
|
String dictValue) { |
|
|
|
|
endTime = DateUtil.endOfDay(endTime); |
|
|
|
|
// 分县市局
|
|
|
|
|
DayTimeSuperviseVo countyOverview = negativeMapper.getYellowBetOverview(beginTime, endTime, 3, dictValue); |
|
|
|
|
List<OrganizeProblemRankVo> countyRankList = negativeMapper.getYellowBetRankList(beginTime, endTime, 3, dictValue); |
|
|
|
|
@ -207,6 +209,7 @@ public class DataVSupervisionNotifyController {
|
|
|
|
|
@GetMapping("/getWorkDynamics") |
|
|
|
|
public Result<List<News>> getWorkDynamics(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, |
|
|
|
|
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
|
|
|
|
endTime = DateUtil.endOfDay(endTime); |
|
|
|
|
List<News> newsList = newsService.getWorkDynamics(beginTime, endTime, DCGZDT, null); |
|
|
|
|
return Result.success(newsList); |
|
|
|
|
} |
|
|
|
|
|