update...

潘钊
1 parent 668bce79
Showing 8 changed files with 147 additions and 53 deletions
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config_entity.html
@@ -220,12 +220,12 @@ public class InStationProcess {
     private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next) {
         LineConfig config = lineConfigData.get(sch.getXlBm());
         //限定出站既出场的停车场
-        String park = config.getTwinsPark();
-        boolean limitPark = StringUtils.isNotEmpty(park);
+        List<String> parks = config.findTwinsParkList();
+        boolean limitPark = null != parks && parks.size() > 0;
  
  
         if (next.getBcType().equals("in") && config.getOutConfig() == 2 && isEmptyMileage(next)
-                && (!limitPark || park.equals(next.getZdzCode()))) {
+                && (!limitPark || parks.contains(next.getZdzCode()))) {
  
             endSch(next, sch.getZdsjActualTime());
  
@@ -16,6 +16,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
+import java.util.List;
+
 /**
  * 车辆出站处理程序
  * Created by panzhao on 2017/11/16.
@@ -159,14 +161,14 @@ public class OutStationProcess {
         try {
             LineConfig config = lineConfigData.get(sch.getXlBm());
             //限定出站既出场的停车场
-            String park = config.getTwinsPark();
-            boolean limitPark = StringUtils.isNotEmpty(park);
+            List<String> parks = config.findTwinsParkList();
+            boolean limitPark = null != parks && parks.size() > 0;
  
             if (config != null && config.getOutConfig() == 2) {
                 //出站既出场
                 ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
                 if (isOut(schPrev) && isEmptyMileage(schPrev)
-                        && (!limitPark || park.equals(schPrev.getQdzCode()))) {
+                        && (!limitPark || parks.contains(schPrev.getQdzCode()))) {
  
                     endSch(schPrev, sch.getFcsjActualTime());
  
@@ -610,8 +610,8 @@ public class DayOfSchedule {
             outConfig = config.getOutConfig();
  
         //限定出站既出场的停车场
-        String park = config.getTwinsPark();
-        boolean limitPark = StringUtils.isNotEmpty(park);
+        List<String> parks = config.findTwinsParkList();
+        boolean limitPark = null != parks && parks.size() > 0;
         boolean flag = false;
         ScheduleRealInfo next = null;
         for (ScheduleRealInfo temp : list) {
@@ -625,7 +625,7 @@ public class DayOfSchedule {
  
             //出站既出场，忽略出场班次
             if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
-                    && (!limitPark || park.equals(temp.getQdzCode())))
+                    && (!limitPark || parks.contains(temp.getQdzCode())))
                 continue;
  
             if (flag) {
@@ -672,8 +672,8 @@ public class DayOfSchedule {
             outConfig = config.getOutConfig();
  
         //限定出站既出场的停车场
-        String park = config.getTwinsPark();
-        boolean limitPark = StringUtils.isNotEmpty(park);
+        List<String> parks = config.findTwinsParkList();
+        boolean limitPark = null != parks && parks.size() > 0;
         boolean flag = false;
         ScheduleRealInfo next = null;
         for (ScheduleRealInfo temp : list) {
@@ -684,7 +684,7 @@ public class DayOfSchedule {
  
             //出站既出场，忽略出场班次
             if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
-                    && (!limitPark || park.equals(temp.getQdzCode())))
+                    && (!limitPark || parks.contains(temp.getQdzCode())))
                 continue;
  
             if (flag) {
@@ -213,12 +213,12 @@ public class SchAttrCalculator {
  
         int outConfig = -1;
         //限定出站既出场的停车场
-        String park = null;
+        List<String> parks = null;
         if (conf != null) {
             outConfig = conf.getOutConfig();
-            park = conf.getTwinsPark();
+            parks = conf.findTwinsParkList();
         }
-        boolean limitPark = StringUtils.isNotEmpty(park);
+        boolean limitPark = null != parks && parks.size() > 0;
  
         ScheduleRealInfo sch, prev = null;
         for(int i = list.size() - 1; i >= 0; i --){
@@ -226,7 +226,7 @@ public class SchAttrCalculator {
  
             //如果是出站既出场，忽略出场班次
             if (outConfig == 2 && sch.getBcType().equals("out")
-                    && (!limitPark || park.equals(sch.getQdzCode()))
+                    && (!limitPark || parks.contains(sch.getQdzCode()))
                     && (sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0))
                 continue;
  
 package com.bsth.entity.realcontrol;
  
 import com.bsth.entity.Line;
+import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
  
 import javax.persistence.*;
+import java.util.List;
  
 /**
  * 
@@ -34,11 +39,11 @@ public class LineConfig {
 	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 2：出站即出场 */
 	private int outConfig;
  
-	/** 出站既出场 对应的停车场 */
-	private String twinsPark;
+	/** 出站既出场 对应的停车场  , 号分割多个*/
+	private String twinsParks;
  
 	/** 出站既出场 对应的起点站 */
-	private String twinsStation;
+	private String twinsStations;
  
 	/** 调度指令模板 */
 	private String schDirectiveTemp;
@@ -169,13 +174,6 @@ public class LineConfig {
 		this.downOutDiff = downOutDiff;
 	}
  
-	public String getTwinsPark() {
-		return twinsPark;
-	}
-
-	public void setTwinsPark(String twinsPark) {
-		this.twinsPark = twinsPark;
-	}
  
 	public String getYjtkStart() {
 		return yjtkStart;
@@ -217,13 +215,6 @@ public class LineConfig {
 		this.enableYjtk = enableYjtk;
 	}
  
-	public String getTwinsStation() {
-		return twinsStation;
-	}
-
-	public void setTwinsStation(String twinsStation) {
-		this.twinsStation = twinsStation;
-	}
  
 	public boolean isLockFirstOutTime() {
 		return lockFirstOutTime;
@@ -240,4 +231,36 @@ public class LineConfig {
 	public void setAutoExec(boolean autoExec) {
 		this.autoExec = autoExec;
 	}
+
+	public String getTwinsParks() {
+		return twinsParks;
+	}
+
+	public void setTwinsParks(String twinsParks) {
+		this.twinsParks = twinsParks;
+	}
+
+	public String getTwinsStations() {
+		return twinsStations;
+	}
+
+	public void setTwinsStations(String twinsStations) {
+		this.twinsStations = twinsStations;
+	}
+
+
+	@Transient
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+
+	public List<String> findTwinsParkList() {
+		try{
+			if(StringUtils.isEmpty(this.twinsParks))
+				return null;
+			return Splitter.on(",").splitToList(this.twinsParks);
+		}catch (Exception e){
+			logger.error("", e);
+			return null;
+		}
+	}
 }
@@ -83,8 +83,8 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
  
             conf.setOutConfig(type);
             if(type == 2){
-                conf.setTwinsPark(parkCode);
-                conf.setTwinsStation(stationCode);
+                conf.setTwinsParks(parkCode);
+                conf.setTwinsStations(stationCode);
             }
             lineConfigData.set(conf);
  
@@ -190,8 +190,8 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         Map<String, Object> rs = new HashMap<>();
         try {
             LineConfig conf = lineConfigData.get(lineCode);
-            conf.setTwinsPark(twinsPark);
-            conf.setTwinsStation(twinsStation);
+            conf.setTwinsParks(twinsPark);
+            conf.setTwinsStations(twinsStation);
  
             lineConfigData.set(conf);
  
@@ -541,4 +541,29 @@ span.sm-grey{
 #line_config_entity_wrap .uk-list{
     display: block;
     margin-top: 25px;
+}
+
+.park-and-station-wrap>.c_2_s_list{
+    border-bottom: 1px solid #dbdbdb;
+    padding-bottom: 15px;
+}
+
+.park-and-station-wrap .add_btn_span{
+    border: 1px solid #b4b4b4;
+    padding: 5px 16px;
+    border-radius: 5px;
+    cursor: pointer;
+}
+
+.park-and-station-wrap .add_btn_span:hover{
+    background: #ededed;
+}
+
+.park-and-station-wrap .add_btn_span i.uk-icon-plus{
+    margin-right: 7px;
+}
+
+
+.park-and-station-wrap .c_2_s_list>.item{
+    margin-top: 12px;
 }
 \ No newline at end of file
@@ -68,7 +68,9 @@
                     <option {{if outConfig==2}}selected{{/if}} value=2>出站既出场</option>
                 </select>
                 时间作为进出场班次的实际时间
-                <div class="park-and-station-wrap">
+                <div class="park-and-station-wrap" style="display: {{outConfig==2?'block':'none'}}">
+                    <div class="c_2_s_list"></div>
+                    <span class="add_btn_span"><i class="uk-icon-plus"></i>添加</span>
                 </div>
                 <ul class="uk-list">
                     <li>
@@ -108,19 +110,41 @@
     </script>
  
     <script id="park-and-station-temp" type="text/html">
-        <span>停车场</span>
-        <select class="z-depth-input" name="twinsPark">
-            {{each parks as p i}}
-            <option value="{{p.code}}" {{if p.code==conf.twinsPark}}selected{{/if}}>{{p.name}}</option>
-            {{/each}}
-        </select>
-        <span>&nbsp;既是站点</span>
-        <select class="z-depth-input" name="twinsStation">
-            {{each routes as r i}}
-            <option value="{{r.stationCode}}" {{if r.stationCode==conf.twinsStation}}selected{{/if}}>{{r.stationName}}
-            </option>
-            {{/each}}
-        </select>
+        <div class="item">
+            <span>停车场</span>
+            <select class="z-depth-input" name="twinsPark">
+                {{each parks as p i}}
+                <option value="{{p.code}}" {{if p.code==conf.twinsPark}}selected{{/if}}>{{p.name}}</option>
+                {{/each}}
+            </select>
+            <span>&nbsp;既是站点</span>
+            <select class="z-depth-input" name="twinsStation">
+                {{each routes as r i}}
+                <option value="{{r.stationCode}}" {{if r.stationCode==conf.twinsStation}}selected{{/if}}>{{r.stationName}}
+                </option>
+                {{/each}}
+            </select>
+
+
+        </div>
+    </script>
+
+    <script id="park-and-station-2-temp" type="text/html">
+        <div class="item">
+            <span>停车场</span>
+            <select class="z-depth-input" name="twinsPark">
+                {{each parks as p i}}
+                <option value="{{p.code}}" {{if p.code==conf.twinsPark}}selected{{/if}}>{{p.name}}</option>
+                {{/each}}
+            </select>
+            <span>&nbsp;既是站点</span>
+            <select class="z-depth-input" name="twinsStation">
+                {{each routes as r i}}
+                <option value="{{r.stationCode}}" {{if r.stationCode==conf.twinsStation}}selected{{/if}}>{{r.stationName}}
+                </option>
+                {{/each}}
+            </select>
+        </div>
     </script>
     <script>
         (function () {
@@ -276,10 +300,10 @@
                         conf: conf,
                         routes: [upStationRoutes[0], upStationRoutes[upStationRoutes.length - 1]]
                     });
-                    $panel.html(htmlStr).show();
+                    $panel.show().find('.c_2_s_list').html(htmlStr);
                 }
                 else
-                    $panel.html('').hide();
+                    $panel.hide().find('.c_2_s_list').empty();
  
                 //切换场既是站的，停车场和站点
                 $('select[name=twinsPark]', wrap).on('change', changeTwinsParkAndStation);
@@ -322,6 +346,26 @@
                     }, '我确定要禁用【' + conf.line.name + '】的自动执行', true);
                 }
             }
+
+            /**
+             * 添加新的 场既是站
+             */
+            $(wrap).on('click', '.add_btn_span', function () {
+                var htmlStr = '',
+                        $panel = $('.park-and-station-2-wrap', wrap);
+                if (conf['outConfig'] == 2) {
+                    htmlStr = template('park-and-station-temp', {
+                        parks: parks,
+                        conf: conf,
+                        routes: [upStationRoutes[0], upStationRoutes[upStationRoutes.length - 1]]
+                    });
+                    $('.c_2_s_list', $panel).append(htmlStr);
+                }
+
+                //切换场既是站的，停车场和站点
+                //$('select[name=twinsPark]', wrap).on('change', changeTwinsParkAndStation);
+                //$('select[name=twinsStation]', wrap).on('change', changeTwinsParkAndStation);
+            });
         })();
     </script>
 </div>
 \ No newline at end of file