This commit is contained in:
parent
b0d7f9dc09
commit
7e1a9195a0
|
|
@ -76,6 +76,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询所有工地最新列表
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectAllBuilding")
|
||||
|
|
@ -91,6 +92,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 根据建筑编号查询近7天工地噪声和扬尘的信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectWeekPmAndNoice")
|
||||
|
|
@ -110,6 +112,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 根据建筑编号查询近30天工地噪声和扬尘的信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectMonthPmAndNoice")
|
||||
|
|
@ -129,6 +132,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询工地扬尘事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectRaise")
|
||||
|
|
@ -151,6 +155,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询工地噪声事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectNoiceEvent")
|
||||
|
|
@ -171,6 +176,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询工地视频感知事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByAllEvent")
|
||||
|
|
@ -194,6 +200,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 根据工地名称搜索工地
|
||||
*
|
||||
* @param projectName
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -208,6 +215,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 根据经纬度查询半径内所有的工地
|
||||
*
|
||||
* @param jd
|
||||
* @param wd
|
||||
* @param radius
|
||||
|
|
@ -232,6 +240,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询当天工地视频感知事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByEvent")
|
||||
|
|
@ -250,6 +259,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询当天扬尘事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByDayRaise")
|
||||
|
|
@ -265,6 +275,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询当天噪声事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByDayNoice")
|
||||
|
|
@ -280,6 +291,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询当天道路污染事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByDayRoadData")
|
||||
|
|
@ -303,6 +315,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询近7天噪声事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByWeekNoice")
|
||||
|
|
@ -318,6 +331,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询近30天噪声事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByMonthNoice")
|
||||
|
|
@ -333,6 +347,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询近7天扬尘事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByWeekNaise")
|
||||
|
|
@ -348,6 +363,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询近30天扬尘事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByMonthNaise")
|
||||
|
|
@ -363,6 +379,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询近7天工地视频感知事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByWeekEvent")
|
||||
|
|
@ -381,6 +398,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询近30天工地视频感知事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByMonthEvent")
|
||||
|
|
@ -399,6 +417,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询近30天物联感知事件时间趋势
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectMonthCurrentByBuilding")
|
||||
|
|
@ -416,6 +435,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询近30天工地视频感知事件时间趋势
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectMonthCurrentByEvent")
|
||||
|
|
@ -433,6 +453,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询走航监测top5全部道路污染事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectRoadDataCountEvent")
|
||||
|
|
@ -449,6 +470,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询走航监测top5近7天道路污染事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectRoadDataWeekEvent")
|
||||
|
|
@ -465,6 +487,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询走航监测top5近30天道路污染事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectRoadDataMonthEvent")
|
||||
|
|
@ -481,6 +504,7 @@ public class BuildingController {
|
|||
|
||||
/**
|
||||
* 查询近30天走航监测事件时间趋势
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectMonthCurrentByRoadData")
|
||||
|
|
@ -497,5 +521,4 @@ public class BuildingController {
|
|||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
|
|
@ -57,6 +58,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 推送给城管接口用的
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("cameras")
|
||||
|
|
@ -68,7 +70,6 @@ public class Controller {
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("camera")
|
||||
|
|
@ -80,6 +81,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 景区人流识别
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("scenicCamera")
|
||||
|
|
@ -114,6 +116,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 查询所有摄像头
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -125,6 +128,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 根据channelCode查询摄像头详细信息
|
||||
*
|
||||
* @param channelCode
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -144,6 +148,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 根据摄像头名字模糊查询摄像头
|
||||
*
|
||||
* @param channelName
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -161,6 +166,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 根据parentId和checkStatus查询摄像头
|
||||
*
|
||||
* @param parentId
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -182,6 +188,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 根据标签查询对应摄像头
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectLabel")
|
||||
|
|
@ -204,6 +211,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 根据经纬度查询半径内所有的摄像头
|
||||
*
|
||||
* @param gpsX
|
||||
* @param gpsY
|
||||
* @param radius
|
||||
|
|
@ -225,6 +233,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 查询所有标签
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectAllLabel")
|
||||
|
|
@ -240,6 +249,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 查询city为1的标签
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByLabelCity")
|
||||
|
|
@ -255,6 +265,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 根据标签名字模糊查询标签
|
||||
*
|
||||
* @param labelName
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -272,6 +283,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 根据parentId查询组织
|
||||
*
|
||||
* @param parentId
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -292,6 +304,7 @@ public class Controller {
|
|||
|
||||
/**
|
||||
* 提供给其他项目分页查询摄像头接口
|
||||
*
|
||||
* @param page
|
||||
* @param pageSize
|
||||
* @return
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ public class EventController {
|
|||
|
||||
/**
|
||||
* 订阅任务下发接口
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("subscribe")
|
||||
|
|
@ -47,6 +48,7 @@ public class EventController {
|
|||
|
||||
/**
|
||||
* 订阅任务下发接口
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
* @throws IOException
|
||||
|
|
@ -123,6 +125,7 @@ public class EventController {
|
|||
|
||||
/**
|
||||
* 事件模板分页查询接口
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("tamplate")
|
||||
|
|
@ -134,6 +137,7 @@ public class EventController {
|
|||
|
||||
/**
|
||||
* 查询所有事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectEvent")
|
||||
|
|
@ -171,6 +175,7 @@ public class EventController {
|
|||
|
||||
/**
|
||||
* 查询当天事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByTime")
|
||||
|
|
@ -201,6 +206,7 @@ public class EventController {
|
|||
|
||||
/**
|
||||
* 根据事件名称查询事件
|
||||
*
|
||||
* @param eventNewName
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -274,6 +280,7 @@ public class EventController {
|
|||
|
||||
/**
|
||||
* 查询当天根据事件名称查询事件
|
||||
*
|
||||
* @param eventNewName
|
||||
* @return
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ public class FileController {
|
|||
|
||||
/**
|
||||
* 根据摄像头标识获取视频流
|
||||
*
|
||||
* @param channelCode
|
||||
* @return
|
||||
* @throws IOException
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 根据区域类型查询全部区域列表的最新时间的人数
|
||||
*
|
||||
* @param type1
|
||||
* @param type2
|
||||
* @param type3
|
||||
|
|
@ -60,6 +61,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 根据区域类型查询区域的最新时间的人数
|
||||
*
|
||||
* @param type
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -78,6 +80,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 根据名称查询商圈范围
|
||||
*
|
||||
* @param areaName
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -91,6 +94,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 根据名称查询重点区域名称
|
||||
*
|
||||
* @param areaName
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -105,6 +109,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 重点区域场景查询所有事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByAreaEvent")
|
||||
|
|
@ -141,6 +146,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 重点区域场景查询当天事件
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByDayAreaEvent")
|
||||
|
|
@ -172,6 +178,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 重点区域场景根据事件名称查询事件
|
||||
*
|
||||
* @param eventNewName
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -223,6 +230,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 查询近30天重点区域视频感知事件时间趋势
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectMonthAreaEvent")
|
||||
|
|
@ -240,6 +248,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 统计事件类型
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectEventType")
|
||||
|
|
@ -267,6 +276,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 查询近7天重点区域本地外地人流峰值按每一天输出
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectLocalWeekArea")
|
||||
|
|
@ -285,6 +295,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 查询近30天重点区域本地外地人流峰值按每一天输出
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectLocalMonthArea")
|
||||
|
|
@ -303,6 +314,7 @@ public class KeyAreaController {
|
|||
|
||||
/**
|
||||
* 查询重点区域抓图照片
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectByAreaImage")
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ public class PassengerTestController {
|
|||
|
||||
/**
|
||||
* 查询全部人流测试点
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectPassengerTest")
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ public class PeopleRecognizeController {
|
|||
|
||||
/**
|
||||
* 查询全部安保区域人流
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectPeopleRecognize")
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ public class QidiController {
|
|||
public List<Map> resCatalogApplyHJWSBase() {
|
||||
return qidiService.resCatalogApplyHJWSBase();
|
||||
}
|
||||
|
||||
//环卫车辆数据1，作业
|
||||
@GetMapping("resCatalogApplyHJWSZY")
|
||||
@ApiOperation("环卫车辆数据1，作业--根据后台ZYRQ调用接口")
|
||||
|
|
@ -150,7 +151,6 @@ public class QidiController {
|
|||
}
|
||||
|
||||
|
||||
|
||||
//测试获取最新的客流列表，从接口获取
|
||||
@GetMapping("passengerFlow")
|
||||
@ApiOperation("获取最新的客流列表，测试接口，调用接口获取")
|
||||
|
|
@ -167,6 +167,7 @@ public class QidiController {
|
|||
List<PassengerFlow> list = passengerFlowService.listPassengerFlow(timeId);
|
||||
return list;
|
||||
}
|
||||
|
||||
//从表中获取最新的客流列表，并筛选出all_nums >=5000的
|
||||
@GetMapping("listPassengerFlowByAllNums")
|
||||
@ApiOperation("从表中获取最新的客流列表，并筛选出all_nums >=5000的")
|
||||
|
|
@ -208,6 +209,7 @@ public class QidiController {
|
|||
|
||||
/**
|
||||
* 查询半径范围内格栅
|
||||
*
|
||||
* @param longitude
|
||||
* @param latitude
|
||||
* @param radius
|
||||
|
|
@ -264,6 +266,7 @@ public class QidiController {
|
|||
|
||||
/**
|
||||
* 查询全部环卫车轨迹信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectAllTrailSanitation")
|
||||
|
|
@ -276,6 +279,7 @@ public class QidiController {
|
|||
|
||||
/**
|
||||
* 查询全部渣土车轨迹信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectAllSedimentTrail")
|
||||
|
|
@ -299,6 +303,7 @@ public class QidiController {
|
|||
});
|
||||
return Result.success(roadData);
|
||||
}
|
||||
|
||||
//根据输入的日期间隔查询道路污染数据(例如：2022-05-10 00:00:00至2022-05-11 00:00:00）
|
||||
@GetMapping(value = "listRoadDataByTimeRegion")
|
||||
@ApiOperation("根据输入的日期间隔查询道路污染数据(例如：2022-05-10 00:00:00至2022-05-11 00:00:00）")
|
||||
|
|
@ -316,6 +321,7 @@ public class QidiController {
|
|||
|
||||
/**
|
||||
* 查询全部道路污染累计事件数量
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectRoadData")
|
||||
|
|
@ -350,6 +356,7 @@ public class QidiController {
|
|||
|
||||
/**
|
||||
* 查询全部工地信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectBuildSite")
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ public class WaterPointController {
|
|||
|
||||
/**
|
||||
* 查询积水点列表
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectWaterPoint")
|
||||
|
|
@ -41,6 +42,7 @@ public class WaterPointController {
|
|||
|
||||
/**
|
||||
* 查询积水点等级
|
||||
*
|
||||
* @param reportOrigin
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -55,6 +57,7 @@ public class WaterPointController {
|
|||
|
||||
/**
|
||||
* 根据名称查询积水点详细信息
|
||||
*
|
||||
* @param waterPointName
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -69,6 +72,7 @@ public class WaterPointController {
|
|||
|
||||
/**
|
||||
* 统计分析积水点市区分布
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectCountWater")
|
||||
|
|
@ -81,6 +85,7 @@ public class WaterPointController {
|
|||
|
||||
/**
|
||||
* 统计分析积水点来源
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectCountWaters")
|
||||
|
|
@ -93,6 +98,7 @@ public class WaterPointController {
|
|||
|
||||
/**
|
||||
* 统计分析积水点等级
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectCountLevel")
|
||||
|
|
@ -105,6 +111,7 @@ public class WaterPointController {
|
|||
|
||||
/**
|
||||
* 根据经纬度查询积水点周边监控
|
||||
*
|
||||
* @param longitude
|
||||
* @param latitude
|
||||
* @param radius
|
||||
|
|
@ -126,6 +133,7 @@ public class WaterPointController {
|
|||
|
||||
/**
|
||||
* 查询交警提供积水点列表
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectWaterPoliceList")
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ public interface BuildingRecordsMapper extends BaseMapper<BuildingRecords> {
|
|||
@Param("jd1") Double jd1,
|
||||
@Param("wd") Double wd,
|
||||
@Param("wd1") Double wd1);
|
||||
|
||||
@Select("select * from t_building_records br JOIN t_building_site bs ON br.project_name = bs.gdmc where TO_DAYS(push_time) = TO_DAYS(NOW()) AND br.pm10 > 80")
|
||||
List<BuildingRecordsDto> selectByDayRaise();
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Select;
|
|||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Repository
|
||||
public interface ChannelPictureMapper extends BaseMapper<ChannelPicture> {
|
||||
|
||||
|
|
|
|||
|
|
@ -555,8 +555,7 @@ public class MonitorService{
|
|||
|
||||
|
||||
}
|
||||
}
|
||||
catch (Exception e){
|
||||
} catch (Exception e) {
|
||||
|
||||
log.info("[monitor-capture] " + cameraCode + " 人流识别失败 " + e.getMessage());
|
||||
}
|
||||
|
|
@ -567,6 +566,7 @@ public class MonitorService{
|
|||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
private BufferedImage capturecreenshot(String code) throws IOException {
|
||||
String url = monitorDomain + "/videoService/realmonitor/uri?scheme=HLS&channelId=" + code;
|
||||
|
||||
|
|
@ -612,6 +612,7 @@ public class MonitorService{
|
|||
|
||||
/**
|
||||
* 获取路径返回给前端
|
||||
*
|
||||
* @param code
|
||||
* @return
|
||||
* @throws IOException
|
||||
|
|
@ -639,6 +640,7 @@ public class MonitorService{
|
|||
|
||||
/**
|
||||
* 调用接口获取摄像头和组织
|
||||
*
|
||||
* @param parentId
|
||||
* @param path
|
||||
* @throws IOException
|
||||
|
|
@ -807,6 +809,7 @@ public class MonitorService{
|
|||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 特定摊点8:50抓图
|
||||
*/
|
||||
|
|
@ -849,6 +852,7 @@ public class MonitorService{
|
|||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 特定摊点9:50抓图
|
||||
*/
|
||||
|
|
@ -891,6 +895,7 @@ public class MonitorService{
|
|||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 特定摊点9:20抓图
|
||||
*/
|
||||
|
|
@ -933,6 +938,7 @@ public class MonitorService{
|
|||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 特定摊点11:20抓图
|
||||
*/
|
||||
|
|
@ -975,6 +981,7 @@ public class MonitorService{
|
|||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 特定摊点12:20抓图
|
||||
*/
|
||||
|
|
@ -1017,6 +1024,7 @@ public class MonitorService{
|
|||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 特定摊点19:20抓图
|
||||
*/
|
||||
|
|
@ -1059,6 +1067,7 @@ public class MonitorService{
|
|||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 特定摊点20:20抓图
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ public class PassengerFlowService {
|
|||
|
||||
/**
|
||||
* 最新的实时客流
|
||||
*
|
||||
* @param
|
||||
* @return List
|
||||
*/
|
||||
|
|
@ -100,6 +101,7 @@ public class PassengerFlowService {
|
|||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
//从表中获取最新的实时客流
|
||||
public List<PassengerFlow> listPassengerFlow(String timeId) {
|
||||
List<PassengerFlow> lists = new ArrayList<>();
|
||||
|
|
@ -114,6 +116,7 @@ public class PassengerFlowService {
|
|||
|
||||
return lists;
|
||||
}
|
||||
|
||||
//从表中获取获取最新的实时客流，并筛选出all_nums>=5000,并desc排序
|
||||
public List<PassengerFlow> listPassengerFlowByAllNums() {
|
||||
List<PassengerFlow> lists = new ArrayList<>();
|
||||
|
|
@ -124,6 +127,7 @@ public class PassengerFlowService {
|
|||
return lists;
|
||||
|
||||
}
|
||||
|
||||
@Scheduled(cron = "0 31 10-22/1 * * ? ")
|
||||
//提供的接口能查到当前时间2个小时之前的数据，每隔15分钟一次，我们只取整点从早8点到晚8点的整点数据
|
||||
//10:31 到晚上10：31，每小时的31分执行一次
|
||||
|
|
@ -172,6 +176,7 @@ public class PassengerFlowService {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
//保存实时客流
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean savePassengerFlow(List<Map> maps) {
|
||||
|
|
@ -258,7 +263,8 @@ public class PassengerFlowService {
|
|||
}
|
||||
|
||||
|
||||
/** @param vertX polygon coordinates latitudes
|
||||
/**
|
||||
* @param vertX polygon coordinates latitudes
|
||||
* @param vertY polygon coordinates longitudes
|
||||
* @return true indicate inside of the polygon， false indicate outside of the polygon
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -205,6 +205,7 @@ public class QidiService {
|
|||
|
||||
return maps;
|
||||
}
|
||||
|
||||
//环卫道路明细数据
|
||||
public List<Map> resCatalogApplyHJWSRoad() {
|
||||
String token = this.qidiToken();
|
||||
|
|
@ -226,6 +227,7 @@ public class QidiService {
|
|||
return new ArrayList<>();
|
||||
}
|
||||
}
|
||||
|
||||
//获取当前日期的时间串，2022-05-08 00:00:00
|
||||
private String dateTimeStr() {
|
||||
LocalDate localDate = LocalDate.now();
|
||||
|
|
@ -234,6 +236,7 @@ public class QidiService {
|
|||
LocalDateTime dateTime = LocalDateTime.of(yestDay.getYear(), yestDay.getMonth(), yestDay.getDayOfMonth(), 0, 0, 0);
|
||||
return dateTime.format(formatter);
|
||||
}
|
||||
|
||||
//获取当前日期的时间串，2022-05-08
|
||||
private String dateStr() {
|
||||
LocalDate localDate = LocalDate.now();
|
||||
|
|
|
|||
|
|
@ -207,6 +207,7 @@ public class SJZTService {
|
|||
LocalDateTime dateTime = LocalDateTime.of(yestDay.getYear(), yestDay.getMonth(), yestDay.getDayOfMonth(), 0, 0, 0);
|
||||
return dateTime.format(formatter);
|
||||
}
|
||||
|
||||
//获取当前日期的时间串，2022-05-08
|
||||
private String dateStr() {
|
||||
LocalDate localDate = LocalDate.now();
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@ public class SedimentTrailService {
|
|||
|
||||
/**
|
||||
* 根据输入的经纬度和查询的半径（米）查询范围内的渣土车轨迹信息
|
||||
* @param longitude（经度） latitude（纬度） radius(米) start(时间) end(时间)
|
||||
*
|
||||
* @param longitude（经度） latitude（纬度） radius(米) start(时间) end(时间)
|
||||
*/
|
||||
public List<SedimentTrail> listSedimentTrailByPoints(double longitude, double latitude, Integer radius, String start, String end) {
|
||||
double[] points = LongLatUtil.getAround(longitude, latitude, radius);
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ public class TrailSanitationService {
|
|||
|
||||
/**
|
||||
* 根据输入的经纬度和查询的半径（米）查询范围内的环卫车轨迹信息
|
||||
* @param longitude（经度） latitude（纬度） raidus(米) start(时间) end(时间)
|
||||
*
|
||||
* @param longitude（经度） latitude（纬度） raidus(米) start(时间) end(时间)
|
||||
*/
|
||||
public List<TrailSanitation> listSedimentTrailByPoints(double longitude, double latitude, Integer radius, String start, String end) {
|
||||
double[] points = LongLatUtil.getAround(longitude, latitude, radius);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
package com.hisense.monitormanage.utils;
|
||||
|
||||
import net.sf.ehcache.CacheManager;
|
||||
|
||||
import java.net.URL;
|
||||
|
||||
import net.sf.ehcache.Cache;
|
||||
import net.sf.ehcache.Element;
|
||||
|
||||
|
|
@ -17,6 +19,7 @@ public class EhcacheUtil {
|
|||
private URL url;
|
||||
private CacheManager manager;
|
||||
private static EhcacheUtil ehCache;
|
||||
|
||||
private EhcacheUtil(String path) {
|
||||
url = getClass().getResource(path);
|
||||
manager = CacheManager.create(url);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ package com.hisense.monitormanage.utils;
|
|||
*/
|
||||
public class LongLatUtil {
|
||||
private static final double PI = 3.1415926;
|
||||
|
||||
/**
|
||||
* 计算地球上任意两点(经纬度)距离
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
# 应用名称
|
||||
spring.application.name=monitor-manage
|
||||
|
||||
logging.level.com.hisense.monitormanage=INFO
|
||||
|
||||
# 应用服务 WEB 访问端口
|
||||
server.port=7009
|
||||
# 数据库驱动：
|
||||
|
|
@ -14,7 +12,6 @@ spring.datasource.url=jdbc:mysql://15.72.183.91:3306/monitor_manage?useUnicode=t
|
|||
# 数据库用户名&密码：
|
||||
spring.datasource.username=root
|
||||
spring.datasource.password=w@CmM1mBVQkPhdrc
|
||||
|
||||
hwx.file.work-path=/data/services/monitor/
|
||||
#用于生成图片地址
|
||||
hwx.file.pic-host=http://15.72.183.90:7009
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
# 应用名称
|
||||
spring.application.name=monitor-manage
|
||||
|
||||
logging.level.com.hisense.monitormanage=DEBUG
|
||||
|
||||
# 应用服务 WEB 访问端口
|
||||
server.port=7009
|
||||
# 数据库驱动：
|
||||
|
|
@ -16,14 +14,12 @@ spring.datasource.url=jdbc:mysql://15.72.183.91:3306/monitor_manage?useUnicode=t
|
|||
spring.datasource.username=root
|
||||
spring.datasource.password=w@CmM1mBVQkPhdrc
|
||||
#spring.datasource.password=123456
|
||||
|
||||
hwx.file.work-path=D:/tupian/
|
||||
hwx.file.pic-host=http://127.0.0.1:7009
|
||||
spring.resources.static-locations=classpath:/static,classpath:/public,file:${hwx.file.work-path}
|
||||
mybatis-plus.mapper-locations=classpath*:/mapper/*.xml
|
||||
#??????swagger,true???false??
|
||||
swagger.enable=true
|
||||
|
||||
scheduled.enable=false
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -47,11 +47,15 @@
|
|||
<select id="selectNoiceEvent" resultType="com.hisense.monitormanage.dto.BuildingRecordsDto">
|
||||
SELECT * FROM
|
||||
(SELECT a.* FROM
|
||||
(SELECT br.noice,br.push_time,br.project_name,br.pm10,br.build_license,bs.jd,bs.wd,bs.channel_name,bs.sgwz,bs.ssdq,bs.channel_code FROM
|
||||
(SELECT
|
||||
br.noice,br.push_time,br.project_name,br.pm10,br.build_license,bs.jd,bs.wd,bs.channel_name,bs.sgwz,bs.ssdq,bs.channel_code
|
||||
FROM
|
||||
t_building_records br JOIN t_building_site bs ON br.project_name = bs.gdmc
|
||||
WHERE (HOUR(br.push_time)>=22 OR 6 > HOUR(br.push_time)) AND br.noice > 55
|
||||
UNION
|
||||
SELECT br.noice,br.push_time,br.project_name,br.pm10,br.build_license,bs.jd,bs.wd,bs.channel_name,bs.sgwz,bs.ssdq,bs.channel_code FROM
|
||||
SELECT
|
||||
br.noice,br.push_time,br.project_name,br.pm10,br.build_license,bs.jd,bs.wd,bs.channel_name,bs.sgwz,bs.ssdq,bs.channel_code
|
||||
FROM
|
||||
t_building_records br JOIN t_building_site bs ON br.project_name = bs.gdmc
|
||||
WHERE DATE_FORMAT(br.push_time,'%H')>=6 AND DATE_FORMAT(br.push_time,'%H') < 22 AND br.noice > 70) a ) b
|
||||
LEFT JOIN t_channel_picture cp ON b.channel_code = cp.channel_code
|
||||
|
|
@ -441,12 +445,10 @@
|
|||
SELECT date_sub(curdate(), INTERVAL 30 DAY) AS pushTime
|
||||
) b LEFT JOIN (
|
||||
SELECT DATE_FORMAT(rd.dt,'%Y%-%m-%d') AS pushTime,COUNT(1) AS number
|
||||
from t_road_data rd where pm10 > 150 AND DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= DATE(rd.dt) GROUP BY pushTime) a
|
||||
from t_road_data rd where pm10 > 150 AND DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= DATE(rd.dt) GROUP BY
|
||||
pushTime) a
|
||||
ON a.pushTime = b.pushTime ORDER BY b.pushTime
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</mapper>
|
||||
|
|
@ -10,7 +10,8 @@
|
|||
</select>
|
||||
|
||||
<select id="selectByName" resultType="com.hisense.monitormanage.dto.EventDto">
|
||||
SELECT * FROM t_event WHERE track_event = 'START' AND event_cn_name IN (${eventNewName}) ORDER BY capture_time DESC
|
||||
SELECT * FROM t_event WHERE track_event = 'START' AND event_cn_name IN (${eventNewName}) ORDER BY capture_time
|
||||
DESC
|
||||
<if test="page!=null and '' != page and pageSize != null and '' != pageSize">
|
||||
<bind name="page" value="(page-1)*pageSize"/>
|
||||
limit #{page},#{pageSize}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@
|
|||
ORDER BY waterPointDepth DESC
|
||||
</select>
|
||||
<select id="selectCountWaters" resultType="com.hisense.monitormanage.dto.WaterPointDtos">
|
||||
SELECT c.report_origin,COUNT(*) as count,MAX(waterPointDepth) AS waterPointDepth FROM (SELECT a.*,b.updated_date AS waterPointDepth
|
||||
SELECT c.report_origin,COUNT(*) as count,MAX(waterPointDepth) AS waterPointDepth FROM (SELECT a.*,b.updated_date
|
||||
AS waterPointDepth
|
||||
FROM
|
||||
(SELECT wp.*,wpr.point_level
|
||||
FROM water_point wp
|
||||
|
|
|
|||
Loading…
Reference in New Issue