[update] xml优化

signal-datacenter-service/src/main/java/net/wanji/datacenter/pojo/convert/LanePeriodicDataEventListConvert.java

@@ -21,7 +21,7 @@ public class LanePeriodicDataEventListConvert {
         int trafficFlow = eventList.getTrafficFlow();
         double meanV = eventList.getMeanV();
         double staticQueueLengthMax = eventList.getStaticQueueLengthMax();
-        int stopTimes = eventList.getMeanStopsNumber();
+        double stopTimes = eventList.getMeanStopsNumber();
         double meanDelay = eventList.getMeanDelay();
         Integer meanDelayInt = Double.valueOf(meanDelay).intValue();
         double laneSaturation = eventList.getLaneSaturation();
@@ -51,7 +51,7 @@ public class LanePeriodicDataEventListConvert {
         crossDataRealTimePO.setFlowRate(Double.valueOf(trafficFlow / 5 * 60));
         crossDataRealTimePO.setSpeed(meanV);
         crossDataRealTimePO.setQueueLength(staticQueueLengthMax);
-        crossDataRealTimePO.setStopTimes((double)stopTimes);
+        crossDataRealTimePO.setStopTimes(stopTimes);
         crossDataRealTimePO.setDelayTime(meanDelayInt);
         crossDataRealTimePO.setSturation(laneSaturation);
         crossDataRealTimePO.setBatchTime(batchTime);
@@ -66,7 +66,7 @@ public class LanePeriodicDataEventListConvert {
         int trafficFlow = eventList.getTrafficFlow();
         double meanV = eventList.getMeanV();
         double staticQueueLengthMax = eventList.getStaticQueueLengthMax();
-        int stopTimes = eventList.getMeanStopsNumber();
+        double stopTimes = eventList.getMeanStopsNumber();
         double meanDelay = eventList.getMeanDelay();
         Integer meanDelayInt = Double.valueOf(meanDelay).intValue();
         double laneSaturation = eventList.getLaneSaturation();
@@ -90,7 +90,7 @@ public class LanePeriodicDataEventListConvert {
         crossDirDataRealTimePO.setFlow(trafficFlow);
         crossDirDataRealTimePO.setSpeed(meanV);
         crossDirDataRealTimePO.setQueueLength(staticQueueLengthMax);
-        crossDirDataRealTimePO.setStopTimes((double)stopTimes);
+        crossDirDataRealTimePO.setStopTimes(stopTimes);
         crossDirDataRealTimePO.setDelayTime(meanDelayInt);
         crossDirDataRealTimePO.setSturation(laneSaturation);
         crossDirDataRealTimePO.setBatchTime(batchTime);
@@ -106,7 +106,7 @@ public class LanePeriodicDataEventListConvert {
         int trafficFlow = eventList.getTrafficFlow();
         double meanV = eventList.getMeanV();
         double staticQueueLengthMax = eventList.getStaticQueueLengthMax();
-        int stopTimes = eventList.getMeanStopsNumber();
+        double stopTimes = eventList.getMeanStopsNumber();
         double meanDelay = eventList.getMeanDelay();
         Integer meanDelayInt = Double.valueOf(meanDelay).intValue();
         double laneSaturation = eventList.getLaneSaturation();
@@ -129,7 +129,7 @@ public class LanePeriodicDataEventListConvert {
         crossTurnDataRealtimePO.setInSpeed(0000.0);
         crossTurnDataRealtimePO.setOutSpeed(0000.0);
         crossTurnDataRealtimePO.setQueueLength(staticQueueLengthMax);
-        crossTurnDataRealtimePO.setStopTimes((double)stopTimes);
+        crossTurnDataRealtimePO.setStopTimes(stopTimes);
         crossTurnDataRealtimePO.setDelayTime(meanDelayInt);
         crossTurnDataRealtimePO.setSturation(laneSaturation);
         crossTurnDataRealtimePO.setVehheadDist(0000.0);
@@ -147,7 +147,7 @@ public class LanePeriodicDataEventListConvert {
         int trafficFlow = eventList.getTrafficFlow();
         double meanV = eventList.getMeanV();
         double staticQueueLengthMax = eventList.getStaticQueueLengthMax();
-        int stopTimes = eventList.getMeanStopsNumber();
+        double stopTimes = eventList.getMeanStopsNumber();
         double meanDelay = eventList.getMeanDelay();
         Integer meanDelayInt = Double.valueOf(meanDelay).intValue();
         double laneSaturation = eventList.getLaneSaturation();

signal-datacenter-service/src/main/java/net/wanji/datacenter/service/impl/LanePeriodicDataProcessServiceImpl.java

@@ -149,7 +149,7 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
             insertCrossDataRealtimePO.setDelayTime(delayTime / value.size());
             insertCrossDataRealtimePOS.add(insertCrossDataRealtimePO);
         }
-//        crossDataRealTimeMapper.insertBatch(insertCrossDataRealtimePOS);
+        crossDataRealTimeMapper.insertBatch(insertCrossDataRealtimePOS);
 
         // 方向数据
         List<CrossDirDataRealtimePO> insertCrossDirDataRealtimePOS = new ArrayList<>();

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

@@ -30,7 +30,7 @@ public class CrossLaneDataRealTimePO {
     @ApiModelProperty(name = "排队长度（米）",notes = "")
     private Double queueLength;
     @ApiModelProperty(name = "停车次数",notes = "")
-    private Integer stopTimes;
+    private Double stopTimes;
     @ApiModelProperty(name = "延误时间",notes = "")
     private Integer delayTime;
     @ApiModelProperty(name = "通行能力（辆/某一时段内最大过车数）,通行能力=自然流量",notes = "")

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

@@ -41,7 +41,7 @@
              (<include refid="Base_Column_List"></include>)
         values
         <foreach collection="list" item="entity" separator=",">
-            (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{entity.duration},#{entity.unbalanceStatus},#{entity.spilloverStatus},#{entity.congestionIndex},
+            (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{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})
         </foreach>

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

@@ -41,7 +41,7 @@
              (<include refid="Base_Column_List"></include>)
         values
         <foreach collection="list" item="entity" separator=",">
-            (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{entity.duration},#{entity.unbalanceStatus},#{entity.spilloverStatus},#{entity.congestionIndex},
+            (#{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})
         </foreach>