Merge branch 'minhang' into pudong

潘钊
2 parents b11a3aff 35b37b97
Showing 3 changed files with 25 additions and 1 deletions
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTable.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
  
 /**
- * 对外的营运数据接口，主要输出当日的数据
+ * 对外的营运数据接口
  * Created by panzhao on 2017/3/15.
  */
 @RestController
@@ -78,4 +78,24 @@ public class ServiceDataInterface {
         }
         return rs;
     }
+
+    /**
+     * 获取全量的进出场数据， 仅供接口项目调用。 由接口项目负责对外所有场站输出
+     * @return
+     */
+    @RequestMapping("/findCurrInAndOut")
+    public List<ScheduleRealInfo> findCurrInAndOut(@RequestParam String secretKey){
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getBcType().equals("in")
+                    || sch.getBcType().equals("out")) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
 }
@@ -189,6 +189,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     formobj.fcno = cellinfo.fcno;
                     formobj.bcs = cellinfo.bcs;
                     formobj.isFB = cellinfo.isfb;
+                    formobj.isTS = 0;
  
                     formobj.bcType = colinfo.bc_type;
                     formobj.xlDir = colinfo.xldir;
@@ -490,6 +490,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     self.ttid,
                     self.ttname
                 );
+
+                self.TimeTableDetailForSave.isTS = 0;
                 self.title2 =
                     self.xlname + "（" + self.ttname + "）" + "时刻表明细信息" +
                     "->路牌" + self.TimeTableDetailForSave.lp.lpName +
@@ -515,6 +517,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     detailInfo.qdzCode = value.qdzCode || undefined;
                     detailInfo.zdzCode = value.zdzCode || undefined;
                     detailInfo.isfb = value.isFB;
+                    detailInfo.ists = value.isTS;
  
                     detailInfo.validInfo();