[add] 周期数据插入时间和修改时间优化

wj-databus/src/main/java/net/wanji/databus/po/CrossDataRealtimePO.java

@@ -50,6 +50,8 @@ public class CrossDataRealtimePO {
     private Date startTime;
 
     @ApiModelProperty(value = "结束时间：yyyy-MM-dd HH:mm:ss", notes = "")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
     @ApiModelProperty(value = "持续时间（单位：分钟）", notes = "")
     private Integer duration;
@@ -149,11 +151,15 @@ public class CrossDataRealtimePO {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间", notes = "")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtCreate;
     /**
      * 修改时间
      */
     @ApiModelProperty(value = "修改时间", notes = "")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified;
     /**
      * 红灯清空率

wj-databus/src/main/java/net/wanji/databus/po/CrossDirDataRealtimePO.java

@@ -65,8 +65,12 @@ public class CrossDirDataRealtimePO {
     @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
     public Integer batchTime;
     @ApiModelProperty(name = "创建时间",notes = "")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date gmtCreate ;
     @ApiModelProperty(name = "修改时间",notes = "")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date gmtModified ;
     @ApiModelProperty(name = "溢流率：交叉口间路段车辆排队长度超出可容纳空间的时长与观测总时长的百分比",notes = "")
     public Double effusionRate;

wj-databus/src/main/java/net/wanji/databus/po/CrossLaneDataRealTimePO.java

 package net.wanji.databus.po;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -61,8 +63,12 @@ public class CrossLaneDataRealTimePO {
     @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
     private Integer batchTime;
     @ApiModelProperty(name = "创建时间",notes = "")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtCreate ;
     @ApiModelProperty(name = "修改时间",notes = "")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified ;
     @ApiModelProperty(value = "溢流率", notes = "")
     private Double effusionRate;

wj-databus/src/main/java/net/wanji/databus/po/CrossTurnDataRealtimePO.java

@@ -92,9 +92,13 @@ public class CrossTurnDataRealtimePO {
     public Integer batchTime ;
     /** 创建时间 */
     @ApiModelProperty(name = "创建时间",notes = "")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date gmtCreate ;
     /** 修改时间 */
     @ApiModelProperty(name = "修改时间",notes = "")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date gmtModified ;
 
     @ApiModelProperty(value = "绿灯有效利用率", notes = "")

wj-databus/src/main/resources/mapper/CrossDataHistMapper.xml

@@ -75,7 +75,8 @@
         <foreach collection="list" item="entity" separator=",">
             (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{entity.endTime},#{entity.duration},#{entity.isUnbalance},#{entity.isSpillover},#{entity.isCongestion},
             #{entity.unbalanceIndex},#{entity.spilloverIndex},#{entity.congestionIndex},#{entity.unbalanceDirs},#{entity.spilloverDirs},#{entity.congestionDirs},
-            #{entity.flow},#{entity.flowRate},#{entity.speed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
+            #{entity.flow},#{entity.flowRate},#{entity.speed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.batchTime},
+            now(),now(),
              #{entity.clearRate},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate},
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},
             #{entity.nonMotorFlow},#{entity.v85},#{entity.trafficFlowA},#{entity.trafficFlowB},

wj-databus/src/main/resources/mapper/CrossDataRealtimeMapper.xml

@@ -75,7 +75,8 @@
         <foreach collection="list" item="entity" separator=",">
             (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{entity.duration},#{entity.isSpillover},#{entity.isSpillover},#{entity.isCongestion},
             #{entity.unbalanceIndex},#{entity.spilloverIndex},#{entity.congestionIndex},#{entity.unbalanceDirs},#{entity.spilloverDirs},#{entity.congestionDirs},
-            #{entity.flow},#{entity.flowRate},#{entity.speed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
+            #{entity.flow},#{entity.flowRate},#{entity.speed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.batchTime},
+            now(), now(),
              #{entity.clearRate},#{entity.endTime},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate},
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},
             #{entity.nonMotorFlow},#{entity.v85},#{entity.trafficFlowA},#{entity.trafficFlowB},#{entity.trafficFlowC},

wj-databus/src/main/resources/mapper/CrossDirDataRealtimeMapper.xml

@@ -44,7 +44,7 @@
             ( #{entity.id}, #{entity.dirType}, #{entity.inOutType}, #{entity.crossId}, #{entity.length}, #{entity.status}, #{entity.trafficIndex}, #{entity.startTime}, #{entity.capacity}, #{entity.duration}, #{entity.flow},
             #{entity.speed}, #{entity.queueLength}, #{entity.stopTimes}, #{entity.delayTime}, #{entity.sturation},
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.batchTime},
-             #{entity.gmtCreate}, #{entity.gmtModified},#{entity.effusionRate}, #{entity.greenLightEfficiency} )
+            now(), now(),#{entity.effusionRate}, #{entity.greenLightEfficiency} )
         </foreach>
     </insert>
 

wj-databus/src/main/resources/mapper/CrossLaneDataHistMapper.xml

@@ -51,7 +51,8 @@
         values
         <foreach collection="list" item="entity" separator=",">
             (#{entity.id},#{entity.crossId},#{entity.flow},#{entity.speed},#{entity.inSpeed},#{entity.outSpeed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.capacity},#{entity.sturation},
-            #{entity.vehheadDist},#{entity.vehheadTime},#{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
+            #{entity.vehheadDist},#{entity.vehheadTime},#{entity.quality},#{entity.batchTime},
+            now(),now(),
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime},
             #{entity.effusionRate},#{entity.greenLightEfficiency},#{entity.vehicleNumsRatioMean},#{entity.vehicleLengthRatioMean},#{entity.timeOccupancy},
             #{entity.nonMotorFlow},#{entity.v85},#{entity.trafficFlowA},#{entity.trafficFlowB},#{entity.trafficFlowC}, DATE_FORMAT(#{entity.startTime}, '%Y%m%d')

wj-databus/src/main/resources/mapper/CrossLaneDataRealTimeMapper.xml

@@ -49,7 +49,8 @@
         values
         <foreach collection="list" item="entity" separator=",">
             (#{entity.id},#{entity.crossId},#{entity.flow},#{entity.speed},#{entity.inSpeed},#{entity.outSpeed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.capacity},#{entity.sturation},
-            #{entity.vehheadDist},#{entity.vehheadTime},#{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
+            #{entity.vehheadDist},#{entity.vehheadTime},#{entity.quality},#{entity.batchTime},
+            now(), now(),
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime},
             #{entity.effusionRate},#{entity.greenLightEfficiency},#{entity.vehicleNumsRatioMean},#{entity.vehicleLengthRatioMean},#{entity.timeOccupancy},
             #{entity.nonMotorFlow},#{entity.v85},#{entity.trafficFlowA},#{entity.trafficFlowB},#{entity.trafficFlowC})

wj-databus/src/main/resources/mapper/CrossTurnDataHistMapper.xml

@@ -48,7 +48,7 @@
             (#{entity.id},#{entity.turnType},#{entity.inDir},#{entity.outDir},#{entity.crossId},#{entity.flow},
             #{entity.status},#{entity.trafficIndex},#{entity.speed},#{entity.inSpeed},#{entity.outSpeed},
             #{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.vehheadDist},#{entity.vehheadTime},
-            #{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
+            #{entity.quality},#{entity.batchTime},now(),now(),
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime},
             #{entity.greenLightEfficiency},#{entity.effusionRate}, DATE_FORMAT(#{entity.startTime}, '%Y%m%d')
             )

wj-databus/src/main/resources/mapper/CrossTurnDataRealtimeMapper.xml

@@ -49,7 +49,7 @@
             (#{entity.id},#{entity.turnType},#{entity.inDir},#{entity.outDir},#{entity.crossId},#{entity.flow},
              #{entity.status},#{entity.trafficIndex},#{entity.speed},#{entity.inSpeed},#{entity.outSpeed},
              #{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.vehheadDist},#{entity.vehheadTime},
-             #{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
+             #{entity.quality},#{entity.batchTime},now(),now(),
              #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime},
             #{entity.greenLightEfficiency},#{entity.effusionRate})
         </foreach>