Skip to content

H
hzjtpushdateService
Commit 26e5f214 authored by yzm's avatar yzm
Browse files
Options

修复时区相差8小时问题

parent 33ecd994
Show whitespace changes
Inline Side-by-side
Showing with 120 additions and 163 deletions
pom.xml
View file @ 26e5f214
......@@ -9,7 +9,6 @@
<packaging>jar</packaging>
<name>hzjt</name>
<description>Demo project for Spring Boot</description>
<parent>
<groupId>org.springframework.boot</groupId>
......@@ -29,6 +28,8 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
......@@ -148,12 +149,26 @@
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
<!--<dependency>-->
<!--<groupId>com.fasterxml.jackson.datatype</groupId>-->
<!--<artifactId>jackson-datatype-joda</artifactId>-->
<!--<version>2.9.6</version>-->
<!--</dependency>-->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>2.9.6</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
......
src/main/java/com/hzjt/controller/TraffController.java
View file @ 26e5f214
......@@ -95,6 +95,7 @@ public class TraffController {
@Autowired
FLVCacheService flvCacheService;
Long eightHour=25200000L;
// @Autowired
// private SimpMessagingTemplate template;
......@@ -127,11 +128,9 @@ public class TraffController {
*/
@PostConstruct
public void init() {
System.out.println(DateUtils.formatDate(new Date(Long.valueOf("1624331555000"))));
//查询素有videowbbh
List<String> sbbhlist= sbtdspsrMapper.selectAllWbbh();
mQTTSubsribe.subscribe(sbbhlist);
}
@PostMapping("/alarmevent")
......@@ -148,6 +147,19 @@ public class TraffController {
log.info("incident_type值不能为空" + trffClientMessage.toString());
return ResultObj.error(ResponseEnum.E_1004.getCode(), "incident_type值不能为空");
}
//加8个小时兼容算法
log.info("trffClientMessage ts===="+trffClientMessage.getTs());
log.info("trffClientMessage nowtime======="+new Date().getTime());
Long current=new Date().getTime()-Long.valueOf(trffClientMessage.getTs());
log.info("current.longValue()>=eightHour.longValue()======"+(current.longValue()>=eightHour.longValue()));
if(current.longValue()>=eightHour.longValue())
{
//系统时间小于8小时
Long lontime=Long.valueOf(trffClientMessage.getTs())+28800000L;
log.info("trffClientMessage lontime====="+lontime);
trffClientMessage.setTs(String.valueOf(lontime));
}
String videoId = trffClientMessage.getVideo_id();
if (StringUtils.isBlank(videoId)) {
......@@ -205,44 +217,20 @@ public class TraffController {
Traffalarmrecord traffAlarmRecord = new Traffalarmrecord();
traffAlarmRecord.setAreaid(Long.valueOf(trffClientMessage.getDept()));
traffAlarmRecord.setRecordtype(trffClientMessage.getIncident_type().toLowerCase());
traffAlarmRecord.setRecordtime(new Date(Long.valueOf(trffClientMessage.getTs())));
traffAlarmRecord.setRecordtime(DateUtils.getDateString(new Date(Long.valueOf(trffClientMessage.getTs()))));
Integer channelid=Integer.valueOf(0);
// if(trffClientMessage.getVideo_id().contains("_")&& trffClientMessage.getVideo_id().split("_").length == 2) {
// String[] videoIdArr = trffClientMessage.getVideo_id().split("_");
// traffAlarmRecord.setFdid(videoIdArr[0]);
// channelid = Integer.valueOf(videoIdArr[1]) + 1;
// }
// else{
traffAlarmRecord.setFdid(trffClientMessage.getVideo_id());
channelid=0;
// }
traffAlarmRecord.setChannelid(channelid);
//判断是否在正检时间内
//int exists = traffAlarmRecordMapper.selectInChecktimeTraffAlarm(traffAlarmRecord);
// log.info("selectInChecktimeTraffAlarm" + exists);
//if (exists > 0) {
// return;
// }
traffAlarmRecord.setVideourlfrom(trffClientMessage.getVideo_record_url());
traffAlarmRecord.setCreatetime(new Date());
traffAlarmRecord.setCreatetime(DateUtils.getDateString(new Date()));
traffAlarmRecord.setObjlable(trffClientMessage.getObjLabel());
traffAlarmRecord.setPushstatus(9);//设置为未推送
//// log.info("selectInworkRectifytimeTraffAlarm" + exists);
// if ((traffAlarmRecord.getRecordtype().equalsIgnoreCase("roadworks_out_of_line") || traffAlarmRecord.getRecordtype().equalsIgnoreCase("roadworks"))) {
//
// //支持对某一个点位报施工事件后 倒推RECTIFYTIME 查看是否是施工事件 一段时间（时间可以配置）之前的停车事件和行人闯入事件矫正为施工事件
// exists = traffAlarmRecordMapper.updateInworkRectifytimeTraffAlarm(traffAlarmRecord);
// //这个事件如果为停车事件或者行人闯入事件时，设置纠偏状态为1
// if (exists > 0) {
// log.info("setRectificationtype=1");
// }
//
// }
List<String> imgBase64List = trffClientMessage.getImg_base64();
String imgEnumHead = "IMG";
Ftp ftp = ftpService.reloadFtp();
......@@ -283,6 +271,9 @@ public class TraffController {
webSocket.GroupSending(JsonUtil.beanToString(map));
traffAlarmRecord.setProcessstatus("0");
log.info(traffAlarmRecord.getRecordtime());
log.info("JSONUtil.toJsonStr 告警记录数据插入：{}",JSONUtil.toJsonStr(traffAlarmRecord));
log.info("JSON.toJSONString 告警记录数据插入：{}",JSON.toJSONString(traffAlarmRecord));
traffAlarmRecordMapper.inserTraffAlarmRecord(traffAlarmRecord);
try {
......@@ -344,6 +335,7 @@ public class TraffController {
} catch (IOException e) {
System.out.println(e.toString());
log.error(e.toString());
sendtomqtt(trffClientMessage, wbbh, traffAlarmRecord);
return 0;
}
}
......@@ -372,6 +364,18 @@ public class TraffController {
}
}
public static void main(String args[]) {
long a =1624377806000l;
Date date =new Date(a);
System.out.println(date);
}
private void sendtomqtt(Alarm trffClientMessage, String wbbh, Traffalarmrecord traffAlarmRecord) {
if(null==wbbh || "".equals(wbbh))
{
......@@ -381,7 +385,7 @@ public class TraffController {
MqttAlarm mqttalarm = new MqttAlarm();
//查询事件类型mqtt 对应的编号
String mqttbh = traffAlarmRecordMapper.seletmqttbh(trffClientMessage.getIncident_type());
mqttalarm.setAlarmTime(DateUtils.formatDate(new Date(Long.valueOf(trffClientMessage.getTs()))));
mqttalarm.setAlarmTime(traffAlarmRecord.getRecordtime());
mqttalarm.setCompanyId("66211");
//设置图片
mqttalarm.setImagePath(traffAlarmRecord.getImg1path()==null?"":ftpServiceUrl+"?location="+traffAlarmRecord.getImg1path().replace("ftp://"+ftppath+"/",""));
......@@ -394,8 +398,9 @@ public class TraffController {
mqttalarm.setHeight(trffClientMessage.getObj_location().get("height") == null ? null : trffClientMessage.getObj_location().get("height").toString());
}
mqttalarm.setEventTypeId(mqttbh);
log.info("mqtt data========"+ JSONUtil.toJsonStr(mqttalarm));
mQTTSubsribe.publishMessage("event/" + wbbh + "/videoEvent", JsonUtil.beanToString(mqttalarm));
log.info("JSONUtil mqtt data：{}", JSON.toJSONString(mqttalarm));
log.info("mqtt data：{}"+ JSON.toJSONString(mqttalarm));
mQTTSubsribe.publishMessage("event/" + wbbh + "/videoEvent", JSON.toJSONString(mqttalarm));
}
}
......@@ -535,7 +540,7 @@ public class TraffController {
if(traffalarmrecord==null) return 0;
Alarm alarm=new Alarm();
Base64Encoder base64Encoder=new Base64Encoder();
alarm.setTs(Long.toString(traffalarmrecord.getRecordtime()==null?new Date().getTime():traffalarmrecord.getRecordtime().getTime()));
alarm.setTs(Long.toString(traffalarmrecord.getRecordtime()==null?new Date().getTime():DateUtils.Parsedate(traffalarmrecord.getRecordtime()).getTime()));
alarm.setDept(traffalarmrecord.getAreaid()==null?null:Long.toString(traffalarmrecord.getAreaid()));
alarm.setVideo_id(traffalarmrecord.getFdid()+"_"+traffalarmrecord.getChannelid());
alarm.setIncident_type(traffalarmrecord.getRecordtype());
......
src/main/java/com/hzjt/domain/Traffalarmrecord.java
View file @ 26e5f214
package com.hzjt.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.persistence.Id;
......@@ -16,7 +17,7 @@ public class Traffalarmrecord implements java.io.Serializable {
private Integer channelid ;//--ͨ�����
private Integer channeletype;//ͨ������ �ɺ���
private String channelname ;//ͨ������
private Date recordtime ;//�¼���¼ʱ��
private String recordtime ;//�¼���¼ʱ��
private String recordtype ;//�¼���¼����
private String location ;//Ŀ�궨λ��Ϣ
private String img1urlfrom ;//ͼƬԴ��ַ
......@@ -36,7 +37,7 @@ public class Traffalarmrecord implements java.io.Serializable {
private Integer recordlevel;//�¼����� --Ĭ��Ϊ0 ����������ʱδ֪
private Integer checkstatus ;//0:����� 1:���ͨ�� 2:��˲�ͨ�� 9:����
private String creator;//������
private Date createtime ;//����ʱ��
private String createtime ;//����ʱ��
private String updator ;//������
private Date updatetime ;//����ʱ��
private String remark ;
......
src/main/java/com/hzjt/redis/Receiver.java
View file @ 26e5f214
......@@ -101,8 +101,8 @@ public class Receiver {
traffAlarmRecord.setAreaid(Long.valueOf(trffClientMessage.getDept()));
traffAlarmRecord.setRecordtype(trffClientMessage.getIncident_type().toLowerCase());
traffAlarmRecord.setVideourlfrom(trffClientMessage.getVideo_record_url());
traffAlarmRecord.setRecordtime(new Date(Long.valueOf(trffClientMessage.getTs())));
traffAlarmRecord.setCreatetime(new Date());
traffAlarmRecord.setRecordtime(DateUtils.getDateString(new Date(Long.valueOf(trffClientMessage.getTs()))));
traffAlarmRecord.setCreatetime(DateUtils.getDateString(new Date()));
traffAlarmRecord.setObjlable(trffClientMessage.getObjLabel());
traffAlarmRecord.setPushstatus(9);//设置为未推送
......
src/main/java/com/hzjt/service/EventWriteService.java
View file @ 26e5f214
......@@ -99,7 +99,7 @@ public class EventWriteService {
alarm.setDept(record.getAreaid().toString());
alarm.setIncident_type(record.getRecordtype());
alarm.setType("TRAFFIC_INCIDENT_ALARM");
alarm.setTs(String.valueOf(record.getRecordtime().getTime()));
alarm.setTs(record.getRecordtime());
alarm.setVideo_id(record.getFdid());
List<String> img_urls=new ArrayList<>();
img_urls.add(record.getImg1urlfrom());
......@@ -187,7 +187,7 @@ public class EventWriteService {
eventWriteParam.setEventSource(EVENT_SOURCE);
eventWriteParam.setRegionID(traffalarmrecord.getAreaid());
eventWriteParam.setEventType(traffalarmrecord.getRecordtype());
eventWriteParam.setOccurTime(DateUtils.formatDateToNoSign(traffalarmrecord.getRecordtime()));
eventWriteParam.setOccurTime(traffalarmrecord.getRecordtime());
//获得外部编号
List<Sbtdspsr> sbtdspsr = sbtdspsrMapper.selectBySbbh(traffalarmrecord.getFdid(),traffalarmrecord.getChannelid());
......
src/main/java/com/hzjt/util/DateUtils.java
View file @ 26e5f214
package com.hzjt.util;
import org.joda.time.DateTime;
import org.joda.time.Days;
import org.joda.time.Months;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import lombok.extern.slf4j.Slf4j;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
/**
* ʱ���ʽת���� 2019.10.23
* @author cp
*/
@Slf4j
public class DateUtils {
private static final DateTimeFormatter YMD_HMS = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
private static final DateTimeFormatter YMDHMS = DateTimeFormat.forPattern("yyyyMMddHHmmss");
private static final DateTimeFormatter YMD = DateTimeFormat.forPattern("yyyyMMdd");
private static final DateTimeFormatter Y_M_D = DateTimeFormat.forPattern("yyyy-MM-dd");
public static String formatCurrDate(){
return formatCurrDateByType(YMD_HMS);
}
public static String formatCurrDateNoSign(){
return formatCurrDateByType(YMDHMS);
}
public static String formatCurrDateYMD(){
return formatCurrDateByType(Y_M_D);
}
public static String formatCurrDayNoSign(){
return formatCurrDateByType(YMD);
}
public static Date parseDate(String date){
return DateTime.parse(date,YMD_HMS).toDate();
}
public static Date parseDateNoSign(String date){
return DateTime.parse(date,YMDHMS).toDate();
}
public static String getYesterday(int day){
Date date= addDay(new Date(),day);
return new DateTime(date).toString(YMD_HMS);
}
public static String getlastMonth(int month){
Date date= addMonth(new Date(),month);
return new DateTime(date).toString(YMD_HMS);
}
public static String formatDate(Date date){
return new DateTime(date).toString(YMD_HMS);
}
public static String formatDateToNoSign(Date date){
return new DateTime(date).toString(YMDHMS);
}
public static String formatDateToNoSign(String date){
return DateTime.parse(date,YMD_HMS).toString(YMDHMS);
}
private static String formatCurrDateByType(DateTimeFormatter dateTimeFormatter){
return DateTime.now().toString(dateTimeFormatter);
}
public static Date addMinutes(Date date, int minutes) {
return new DateTime(date).plusMinutes(minutes).toDate();
}
public static Date addDay(Date date, int day) {
if(day == 0){
return date;
}
return new DateTime(date).plusDays(day).toDate();
}
public static Date addMonth(Date date, int month) {
if(month == 0){
return date;
public static String getDateString(Date date) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
log.info("date timezone:{}",formatter.getTimeZone()) ;
formatter.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
log.info("date timezone:{}",formatter.getTimeZone()) ;
String dateString = formatter.format(date);
return dateString ;
}
public static String getDateStringNoSign(Date date) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
log.info("date timezone:{}",formatter.getTimeZone()) ;
formatter.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
log.info("date timezone:{}",formatter.getTimeZone()) ;
String dateString = formatter.format(date);
return dateString ;
}
public static String formatCurrDayNoSign() {
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
log.info("date timezone:{}",formatter.getTimeZone()) ;
formatter.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
log.info("date timezone:{}",formatter.getTimeZone()) ;
String dateString = formatter.format(new Date());
return dateString ;
}
public static Date Parsedate(String datestr) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
log.info("date timezone:{}",formatter.getTimeZone()) ;
formatter.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
log.info("date timezone:{}",formatter.getTimeZone()) ;
try {
Date dateString = formatter.parse(datestr);
return dateString ;
}catch (Exception ex){
return null;
}
return new DateTime(date).plusMonths(month).toDate();
}
/**
* ����ʱ����������
* @param date1 ʱ��1
* @param date2 ʱ��2
* @return ����
*/
public static int diffMonth(Date date1, Date date2) {
if (date1 == null || date2 == null) {
return 0;
}
DateTime dt1 = new DateTime(date1);
DateTime dt2 = new DateTime(date2);
return Months.monthsBetween(dt1, dt2).getMonths();
}
/**
* ����ʱ����������
* @param date1 ʱ��1
* @param date2 ʱ��2
* @return ����
*/
public static int diffDay(Date date1, Date date2) {
if (date1 == null || date2 == null) {
return 0;
}
DateTime dt1 = new DateTime(date1);
DateTime dt2 = new DateTime(date2);
return Days.daysBetween(dt1, dt2).getDays();
}
}
src/main/resources/application.properties
View file @ 26e5f214
......@@ -7,6 +7,7 @@ spring.thymeleaf.content-type=text/html
spring.thymeleaf.enabled=true
spring.thymeleaf.encoding=UTF-8
spring.thymeleaf.mode=HTML5
# mybatis
mybatis.type-aliases-package=com.hzjt.domain
mybatis.configuration.map-underscore-to-camel-case=true
......@@ -14,15 +15,13 @@ mybatis.configuration.default-fetch-size=100
mybatis.configuration.default-statement-timeout=3000
#mybatis.mapperLocations = classpath:xxx.xml
logging.level.com.hzjt=debug
# Mysql���ݿ�-����Դ����
spring.datasource.username=hzjt
spring.datasource.password=hzjt
spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1521:helowin
#spring.datasource.username=hzjt
#spring.datasource.password=hzjt
#spring.datasource.url=jdbc:oracle:thin:@33.65.219.103:1521:helowin
#spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1521:helowin
spring.datasource.username=hzjt
spring.datasource.password=hzjt
spring.datasource.url=jdbc:oracle:thin:@33.65.250.179:1521:helowin
spring.datasource.driverClassName=oracle.jdbc.OracleDriver
# druid
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
......@@ -43,8 +42,8 @@ spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowS
spring.datasource.useGlobalDataSourceStat=true
#redis
#spring.redis.host=33.65.219.103
spring.redis.host=127.0.0.1
spring.redis.host=33.65.250.179
#spring.redis.host=127.0.0.1
spring.redis.port=6379
#spring.redis.password=123456
spring.redis.database=0
......@@ -54,17 +53,18 @@ spring.redis.pool.max-idle=8
spring.redis.pool.min-idle=0
spring.redis.timeout=2000
spring.session.store-type=none
ip.host=33.65.219.103
ip.host=33.65.250.179
port=21
message.dept=33030
message.rate=10
ftp.host=33.65.219.40:21:hzjt:1qaz2wsx
ftppath=hzjt:1qaz2wsx@33.65.219.40:21
ftpServiceUrl=http://33.65.219.103:8089/api/alg/files
ftpServiceUrl=http://33.65.250.179:8089/api/alg/files
alarm.subscribe.data.key=gs:traff:alarmlist
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
# 免审标记 0需审核 1免审
alarmrecord.check.enable=1
......@@ -105,3 +105,5 @@ spring.mqtt.completionTimeout=3000
spring.mqtt.qos=2
#mqtt配置 - end
src/main/resources/mapper/Traffalarmrecord.xml
View file @ 26e5f214
......@@ -67,7 +67,6 @@
<if test="manualstatus != null">manualstatus ,</if>
</trim>
<trim prefix="select" suffix="from dual" suffixOverrides=",">
<if test="recordid != null">#{recordid},</if>
<if test="algotype != null">#{algotype},</if>
<if test="areaid != null">#{areaid},</if>
......@@ -75,7 +74,7 @@
<if test="channelid != null">#{ channelid},</if>
<if test="channeletype != null">#{channeletype},</if>
<if test="channelname != null">#{ channelname },</if>
<if test="recordtime != null">#{ recordtime},</if>
<if test="recordtime != null">to_date(#{recordtime},'yyyy-mm-dd hh24:mi:ss'),</if>
<if test="recordtype != null">#{ recordtype},</if>
<if test="location != null">#{ location},</if>
<if test="img1urlfrom != null">#{img1urlfrom},</if>
......@@ -95,7 +94,7 @@
<if test="recordlevel != null">#{recordlevel,jdbcType=INTEGER},</if>
<if test="checkstatus != null">#{checkstatus,jdbcType=INTEGER},</if>
<if test="creator != null">#{creator},</if>
<if test="createtime != null">#{createtime},</if>
<if test="createtime != null">to_date(#{createtime},'yyyy-mm-dd hh24:mi:ss'),</if>
<if test="updator != null">#{updator},</if>
<if test="updatetime != null">#{updatetime},</if>
<if test="remark != null">#{remark},</if>
......
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