Skip to content

H
hzjtpushdateService
Commit 3fe59c5a authored by 高飞's avatar 高飞
Browse files
Options

自动规则匹配

parent 4c71a3da
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 43 deletions
src/main/java/com/hzjt/config/ScheduleTaskConfig.java
View file @ 3fe59c5a
......@@ -29,7 +29,7 @@ public class ScheduleTaskConfig {
@Scheduled(cron = "0 0 2 * * ? ")//每天凌晨2点执行
private void statis() {
log.info("每天凌晨2点执行前一天数据整合");
// log.info("每天凌晨2点执行前一天数据整合");
// String date = DateUtils.getYesterday(-1);
//抽取前一天的车流量和事件统计数据入表
Integer result = traffFlowService.statisVehiclesByDay();
......@@ -46,7 +46,7 @@ public class ScheduleTaskConfig {
final Calendar c = Calendar.getInstance();
if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)) {
log.info("每个月最后一天执行删除前2个月车流量数据操作start");
// log.info("每个月最后一天执行删除前2个月车流量数据操作start");
//删除2个月之前车流量详情的数据
traffFlowService.deleteBeforeTwoMonthVehicles();
}
......
src/main/java/com/hzjt/controller/TraffController.java
View file @ 3fe59c5a
......@@ -104,7 +104,7 @@ public class TraffController {
@PostMapping("/alarmevent")
public ResultObj rece(@RequestBody Alarm trffClientMessage) {
log.info("alarmevent--------------");
// log.info("alarmevent--------------");
if (!TYPE.equals(trffClientMessage.getType())) {
return ResultObj.error(ResponseEnum.E_1002.getCode(), "type类型不正确");
}
......@@ -114,18 +114,18 @@ public class TraffController {
return ResultObj.error(ResponseEnum.E_1004.getCode(), "img_urls值不能为空");
}
if (StringUtils.isBlank(trffClientMessage.getIncident_type())) {
log.info("incident_type值不能为空" + trffClientMessage.toString());
// log.info("incident_type值不能为空" + trffClientMessage.toString());
return ResultObj.error(ResponseEnum.E_1004.getCode(), "incident_type值不能为空");
}
String videoId = trffClientMessage.getVideo_id();
if (StringUtils.isBlank(videoId) || !videoId.contains("_") || videoId.split("_").length != 2) {
log.info("video_id值异常 值为:" + videoId);
// log.info("video_id值异常 值为:" + videoId);
return ResultObj.error(ResponseEnum.E_1002.getCode(), "video_id值异常 值为:" + videoId);
}
/* 限流 */
if (!getRateLimiter(videoId).tryAcquire()) {
log.info("[事件推送]->设备" + videoId + "-推送已达到限流限制");
// log.info("[事件推送]->设备" + videoId + "-推送已达到限流限制");
return ResultObj.error(ResponseEnum.E_9999.getCode(), "设备" + videoId + "请求过于频繁");
}
......@@ -135,12 +135,12 @@ public class TraffController {
List<Sbtdspsr> sbtdspsrs = sbtdspsrMapper.selectBySbbh(sbbh, tdbh);
if (sbtdspsrs.isEmpty()) {
log.info("设备为:" + sbbh + ",通道为:" + tdbh + "未录入(备案)");
// log.info("设备为:" + sbbh + ",通道为:" + tdbh + "未录入(备案)");
return ResultObj.error(ResponseEnum.E_1002.getCode(), "设备为:" + sbbh + ",通道为:" + tdbh + "未录入(备案)");
}
String xzbh = sbtdspsrs.get(0).getXzbh();
if (xzbh.length() != 12) {
log.info("设备为:" + sbbh + ",通道为:" + tdbh + "配置的行政区划" + xzbh + "不合规");
// log.info("设备为:" + sbbh + ",通道为:" + tdbh + "配置的行政区划" + xzbh + "不合规");
return ResultObj.error(ResponseEnum.E_1002.getCode(), "设备为:" + sbbh + ",通道为:" + tdbh + "配置的行政区划不合规");
}
//ts 時間轉成正常時間
......@@ -171,7 +171,7 @@ public class TraffController {
//判断是否在正检时间内
int exists = traffAlarmRecordMapper.selectInChecktimeTraffAlarm(traffAlarmRecord);
log.info("selectInChecktimeTraffAlarm" + exists);
// log.info("selectInChecktimeTraffAlarm" + exists);
if (exists > 0) {
return;
}
......@@ -181,7 +181,7 @@ public class TraffController {
traffAlarmRecord.setObjlable(trffClientMessage.getObjLabel());
traffAlarmRecord.setPushstatus(9);//设置为未推送
log.info("selectInworkRectifytimeTraffAlarm" + exists);
// log.info("selectInworkRectifytimeTraffAlarm" + exists);
if ((traffAlarmRecord.getRecordtype().equalsIgnoreCase("roadworks_out_of_line") || traffAlarmRecord.getRecordtype().equalsIgnoreCase("roadworks"))) {
//支持对某一个点位报施工事件后 倒推RECTIFYTIME 查看是否是施工事件 一段时间（时间可以配置）之前的停车事件和行人闯入事件矫正为施工事件
......@@ -230,7 +230,7 @@ public class TraffController {
Map<String, Object> transferRecordMap = new HashMap<>();
FileTransferManager.fetchUrlsFromRecord(traffAlarmRecord, transferRecordMap);
List<TransferResult> results = FileTransferManager.transferFile(transferRecordMap, ftp, basepath);
log.info("缓存数据上传结果：" + results.toString());
// log.info("缓存数据上传结果：" + results.toString());
Traffalarmrecord recordBak = FileTransferManager.traffAlarmRecordUrlUpdate(results);
traffAlarmRecord.setImg2path(recordBak.getImg2path());
traffAlarmRecord.setImg3path(recordBak.getImg3path());
......@@ -260,7 +260,7 @@ public class TraffController {
String ftputl = FTPUtil.getFtpUrl(ftp) + basepath + "/" + fileName;
if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
InputStream inputStream = connection.getInputStream();
log.info("url:", url, " --- " + "key:", key);
// log.info("url:", url, " --- " + "key:", key);
boolean r = FTPUtil.uploadFile(ftp, basepath, fileName, inputStream);
if (r) traffAlarmRecord.setVideopath(ftputl);
//只更新监控
......@@ -269,11 +269,11 @@ public class TraffController {
//推送给第三方
ResultObj obj = eventWriteService.updateAndAutoSendEvent(traffAlarmRecord);
log.info("send to guangda:HTTP_OK" + obj.toString());
// log.info("send to guangda:HTTP_OK" + obj.toString());
}
} else {
ResultObj obj = eventWriteService.updateAndAutoSendEvent(traffAlarmRecord);
log.info("send to guangda HttpURLConnection.HTTP_Fail--->response message:" + obj.toString());
// log.info("send to guangda HttpURLConnection.HTTP_Fail--->response message:" + obj.toString());
}
} catch (IOException e) {
System.out.println(e.toString());
......@@ -290,7 +290,7 @@ public class TraffController {
} else {
//推送给第三方
ResultObj obj = eventWriteService.updateAndAutoSendEvent(traffAlarmRecord);
log.info("send to guangda novideopath --->response message" + obj.toString());
// log.info("send to guangda novideopath --->response message" + obj.toString());
}
......@@ -341,7 +341,7 @@ public class TraffController {
}
//查询近五分钟的车流量，当天车流量websocket 直接推送过去
log.info("fivevehivle");
// log.info("fivevehivle");
//根据连接的name ，群发根据videoid 查询的结果
webSocket.GroupSendingByVideoid(vehicles.getVideo_id());
}
......@@ -370,10 +370,10 @@ public class TraffController {
if (null != rtsp) {
if (null == stringRedisTemplate.opsForValue().get(videoid)) {
log.info("flv-----");
// log.info("flv-----");
flvCacheService.getvalue(videoid, rtsp);
}
log.info(stringRedisTemplate.opsForValue().get(videoid));
// log.info(stringRedisTemplate.opsForValue().get(videoid));
JSONObject jsonObject = JSONObject.parseObject(stringRedisTemplate.opsForValue().get(videoid));
if (null != jsonObject.getJSONArray("play_list") && jsonObject.getJSONArray("play_list").size() > 0) {
......@@ -390,7 +390,7 @@ public class TraffController {
@PostMapping("/autotraffflow")
public ResultObj autotraffflow(@RequestBody AutoVehicles vehicles) {
log.info("autotraffflow"+vehicles.toString());
// log.info("autotraffflow"+vehicles.toString());
if ("TRAFFIC_STATISTICS_VEHICLES".equalsIgnoreCase(vehicles.getType())) {
String[] sbAndTd = vehicles.getVideo_id().split("_");
String sbbh = sbAndTd[0];
......
src/main/java/com/hzjt/handler/FileTransferManager.java
View file @ 3fe59c5a
......@@ -51,7 +51,7 @@ public class FileTransferManager {
/// System.out.println("connection.getResponseCode:" + connection.getResponseCode() );
if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
InputStream inputStream = connection.getInputStream();
log.info("url:"+url+" ---key:"+key);
// log.info("url:"+url+" ---key:"+key);
String pname = DateUtils.formatCurrDayNoSign() + "_"+recordid+"_0000_"+key.replace("path","");
String fileName = pname +filesuff;
String ftputl = FTPUtil.getFtpUrl(ftp) + basePath + "/" + fileName;
......@@ -60,7 +60,7 @@ public class FileTransferManager {
if(r){
result.setImgpath(ftputl);
}
log.info("callable thread:" +result.toString());
// log.info("callable thread:" +result.toString());
}else{
log.error("connection code: "+connection.getResponseCode() +" ," +result.toString());
}
......@@ -139,7 +139,7 @@ public class FileTransferManager {
record.setVideopath(result.getImgpath());
break;
default :
log.info("unknow pathvalue"+ result.getPathvalue());
// log.info("unknow pathvalue"+ result.getPathvalue());
break;
}
}
......
src/main/java/com/hzjt/handler/WebSocket.java
View file @ 3fe59c5a
......@@ -106,19 +106,19 @@ public class WebSocket {
* 根据videoid 群发
*/
public void GroupSendingByVideoid(String name) {
log.info("name" + name);
// log.info("name" + name);
if (null == traffFlowService) return;
try {
List<Map> map = new ArrayList<>();
if (null != webSocketSet.get(name) && null != webSocketSet.get(name).session && null != webSocketSet.get(name).session.getBasicRemote()) {
log.info("name" + name);
// log.info("name" + name);
List<Map> dDayFlowmap = traffFlowService.selectFiveAndDayFlow(name);
if (null != dDayFlowmap)
map.addAll(dDayFlowmap);
List<Map> TypeDayFlow = traffFlowService.selectFiveAndTypeDayFlow(name);
if (null != dDayFlowmap)
map.addAll(TypeDayFlow);
log.info("JSONUtil.toJsonStr(map)" + JSONUtil.toJsonStr(map));
// log.info("JSONUtil.toJsonStr(map)" + JSONUtil.toJsonStr(map));
if (!map.isEmpty() && null!=webSocketSet.get(name) && null!=webSocketSet.get(name).session) {
synchronized (webSocketSet.get(name).session) {
webSocketSet.get(name).session.getBasicRemote().sendText(JSONUtil.toJsonStr(map));
......
src/main/java/com/hzjt/redis/Receiver.java
View file @ 3fe59c5a
......@@ -113,7 +113,7 @@ public class Receiver {
Map<String, Object> transferRecordMap = new HashMap<>();
FileTransferManager.fetchUrlsFromRecord(traffAlarmRecord, transferRecordMap);
List<TransferResult> results = FileTransferManager.transferFile(transferRecordMap, ftp, basepath);
log.info("缓存数据上传结果：" + results.toString());
// log.info("缓存数据上传结果：" + results.toString());
Traffalarmrecord recordBak = FileTransferManager.traffAlarmRecordUrlUpdate(results);
traffAlarmRecord.setImg2path(recordBak.getImg2path());
traffAlarmRecord.setImg3path(recordBak.getImg3path());
......@@ -142,7 +142,7 @@ public class Receiver {
String ftputl = FTPUtil.getFtpUrl(ftp) + basepath + "/" + fileName;
if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
InputStream inputStream = connection.getInputStream();
log.info("url:", url, " --- " + "key:", key);
// log.info("url:", url, " --- " + "key:", key);
boolean r = FTPUtil.uploadFile(ftp, basepath, fileName, inputStream);
if (r) traffAlarmRecord.setVideopath(ftputl);
//只更新监控
......@@ -151,7 +151,7 @@ public class Receiver {
//推送给第三方
ResultObj obj = eventWriteService.updateAndAutoSendEvent(traffAlarmRecord);
log.info("调用接口推送给广达返回信息：" + obj.toString());
// log.info("调用接口推送给广达返回信息：" + obj.toString());
}
}
......@@ -168,7 +168,7 @@ public class Receiver {
}else {
//推送给第三方
ResultObj obj = eventWriteService.updateAndAutoSendEvent(traffAlarmRecord);
log.info("调用接口推送给广达返回信息：" + obj.toString());
// log.info("调用接口推送给广达返回信息：" + obj.toString());
}
......
src/main/java/com/hzjt/service/AlarmRecordStatisticsService.java
View file @ 3fe59c5a
......@@ -65,7 +65,7 @@ public class AlarmRecordStatisticsService {
traffalarmrecordstatMapper.updateByPrimaryKeySelective(dbTraffalarmrecordstat);
} while (iterator.hasNext());
}
log.info("traffalarmrecordstat");
// log.info("traffalarmrecordstat�������");
}
......
src/main/java/com/hzjt/service/EventWriteService.java
View file @ 3fe59c5a
......@@ -160,7 +160,7 @@ public class EventWriteService {
"nt 请求异常:"+"事件="+traffalarmrecord.toString()+",错误原因=" + e.toString()+",请求总消耗时长"+(endtime-starttime)+"毫秒，"+writeInfoStr(eventWriteParam));
return ResultObj.error(ResponseEnum.E_9999.getCode(), e.toString());
}
log.info("事件推送eventwrite - sendEvent 请求成功:"+"事件="+traffalarmrecord.toString()+",请求总消耗时长"+(endtime-starttime)+"毫秒，"+writeInfoStr(eventWriteParam));
// log.info("事件推送eventwrite - sendEvent 请求成功:"+"事件="+traffalarmrecord.toString()+",请求总消耗时长"+(endtime-starttime)+"毫秒，"+writeInfoStr(eventWriteParam));
dealResult(writeResultObj, traffalarmrecord);
return ResultObj.error(writeResultObj.getStatus(), writeResultObj.getMessage(), writeResultObj.getData());
}
......
src/main/java/com/hzjt/service/FLVCacheService.java
View file @ 3fe59c5a
......@@ -33,14 +33,14 @@ public class FLVCacheService {
HttpHeaders headers = new HttpHeaders();
RestTemplate client = new RestTemplate();
String jsonString = "{\"video_id\":\""+videoid+"\",\"url\":\""+rtsp+"\"}";
log.info("jsonString"+jsonString);
// log.info("jsonString"+jsonString);
headers.setContentType(MediaType.valueOf("application/json;UTF-8"));
HttpEntity<String> strEntity = new HttpEntity<>(jsonString,headers);
ResponseEntity<String> response = client.postForEntity(url, strEntity, String.class);
//解析返回结果
log.info("response"+response.getBody());
// log.info("response"+response.getBody());
if (response.getBody() != null) {
log.info("flv response success" );
// log.info("flv response success" );
stringRedisTemplate.opsForValue().set(videoid,response.getBody(), 10, TimeUnit.MINUTES);
} else {
log.error("flv response " + "empty...");
......
src/main/java/com/hzjt/service/QingZhiLoginCacheService.java
View file @ 3fe59c5a
......@@ -70,7 +70,7 @@ public class QingZhiLoginCacheService {
ResponseEntity<String> request = client.exchange((keepaliveurl+"?token="+token), HttpMethod.GET, requestEntity, String.class);
String newToken = getTokenData(request);
if (newToken != null) {
log.info("doKeepAlive response " + request.getBody());
// log.info("doKeepAlive response " + request.getBody());
stringRedisTemplate.opsForValue().set(qztoken, newToken, 2, TimeUnit.MINUTES);
} else {
log.error("doKeepAlive response " + "empty...");
......
src/main/java/com/hzjt/service/TraffdevicewriteresultService.java
View file @ 3fe59c5a
......@@ -63,7 +63,7 @@ public class TraffdevicewriteresultService {
for (SbtdspsrParams val : sbtdspsrs) {
threadService.submit(() -> {
log.info("sendtoguangda"+val.toString());
// log.info("sendtoguangda"+val.toString());
ResultObj obj = sendToGuangda(val, param);
obj.setData(val.getSbbh() + "_" + val.getTdbh());
return obj;
......@@ -246,12 +246,12 @@ public class TraffdevicewriteresultService {
// String token = stringRedisTemplate.opsForValue().get(qztoken);
// if (token == null) {
//登录
log.info("login", qztoken);
// log.info("login", qztoken);
String token= qingZhiLoginCacheService.keepAlive();
log.error("deviceWritePost {} : redis token empty..", qztoken);
// return null;
// }
log.info("qztoken send guangda without keepalive", qztoken);
// log.info("qztoken send guangda without keepalive", qztoken);
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
headers.add("token", token);//
List<DeviceWriteParam> list = new ArrayList<>();
......@@ -283,7 +283,7 @@ public class TraffdevicewriteresultService {
//判断成功还是失败
if (writeResultObj.getStatus() == 200) {
res = ResultObj.ok(writeResultObj.getMessage());
log.info("deviceWritePost {} : regist remsg...Data=" + param.toString(), writeResultObj.toString());
// log.info("deviceWritePost {} : regist remsg...Data=" + param.toString(), writeResultObj.toString());
} else {
res = ResultObj.error(writeResultObj.getStatus(), writeResultObj.getMessage());
log.error("deviceWritePost {} : regist remsg...Data=" + param.toString(), writeResultObj.toString());
......
src/main/java/com/hzjt/util/FTPUtil.java
View file @ 3fe59c5a
......@@ -107,7 +107,7 @@ public class FTPUtil {
changeWorkingDirectory(ftpClient, path);
flag = ftpClient.storeFile(filename, input);
if (flag) {
log.info("FTP上传文件成功！");
// log.info("FTP上传文件成功！");
} else {
flag = false;
log.info("FTP上传文件失败！");
......@@ -132,14 +132,13 @@ public class FTPUtil {
changeWorkingDirectory(ftpClient, path);
flag = ftpClient.storeFile(filename, input);
if (flag) {
log.info("FTP upload success！");
// log.info("FTP upload success！");
} else {
log.info("FTP upload fail！");
}
} else {
flag = false;
log.info("FTP server refused connection ！");
log.info("FTP server refused connection ！");
// log.info("FTP server refused connection ！");
}
} catch (IOException e) {
flag = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment