潘钊 / bsth_control · Commits

Commit 95564ca50efbeb466581f787e9fa0886a55f0632

Authored by 游瑞烽
2 parents 471e093b 045b9d0b
build: skipped

Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

Inline Side-by-side
Showing 15 changed files with 696 additions and 688 deletions
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
  View file @95564ca
... ... @@ -45,7 +45,10 @@ public class DirectivesPstThread extends Thread {
45 45 for (int i = 0; i < 1000; i++) {
46 46 try {
47 47 directive = list.poll();
48   -
  48 + if(null == directive)
  49 + break;
  50 + //日期
  51 + directive.setRq(fmtyyyyMMdd.print(directive.getTimestamp()));
49 52 if (directive instanceof D60) {
50 53 D60 d60 = (D60) directive;
51 54 if(d60.isDispatch()){
... ... @@ -56,8 +59,6 @@ public class DirectivesPstThread extends Thread {
56 59 continue;
57 60 }
58 61 }
59   - //日期
60   - d60.setRq(fmtyyyyMMdd.print(d60.getTimestamp()));
61 62 d60Repository.save(d60);
62 63 }
63 64  
... ...
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
  View file @95564ca
... ... @@ -12,61 +12,51 @@ import org.apache.http.util.EntityUtils;
12 12 import org.slf4j.Logger;
13 13 import org.slf4j.LoggerFactory;
14 14  
15   -import java.io.IOException;
16   -
17 15 /**
18   - *
19   - * @ClassName: GatewayHttpUtils
20   - * @Description: TODO(和网关HTTP通讯工具类)
21 16 * @author PanZhao
22   - * @date 2016年8月14日 下午9:50:46
23   - *
  17 + * @ClassName: GatewayHttpUtils
  18 + * @Description: TODO(和网关HTTP通讯工具类)
  19 + * @date 2016年8月14日 下午9:50:46
24 20 */
25 21 public class GatewayHttpUtils {
26   - static Logger logger = LoggerFactory.getLogger(GatewayHttpUtils.class);
27   -
28   - static String url;
29   -
30   - static{
31   - url = ConfigUtil.get("http.send.directive");
32   - }
33   -
34   - public static int postJson(String jsonStr){
35   - logger.info("send : " + jsonStr);
36   -
37   - CloseableHttpClient httpClient = null;
38   - int code = -1;
39   - try{
40   - httpClient = HttpClients.createDefault();
41   -
42   - //超时时间
43   - RequestConfig requestConfig = RequestConfig.custom()
44   - .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
45   - .setSocketTimeout(1500).build();
46   -
47   - HttpPost post = new HttpPost(url);
48   -
49   - post.setConfig(requestConfig);
50   -
51   - post.setEntity(new StringEntity(jsonStr, "utf-8"));
52   -
53   - CloseableHttpResponse response = httpClient.execute(post);
  22 + static Logger logger = LoggerFactory.getLogger(GatewayHttpUtils.class);
  23 +
  24 + static String url;
  25 + static CloseableHttpClient httpClient = null;
  26 + static HttpPost post;
  27 + static RequestConfig requestConfig;
  28 + static CloseableHttpResponse response;
  29 +
  30 + static {
  31 + url = ConfigUtil.get("http.send.directive");
  32 + httpClient = HttpClients.createDefault();
  33 + post = new HttpPost(url);
  34 + requestConfig = RequestConfig.custom()
  35 + .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
  36 + .setSocketTimeout(2000).build();
  37 + post.setConfig(requestConfig);
  38 + }
  39 +
  40 + public static int postJson(String jsonStr) {
  41 + logger.info("send : " + jsonStr);
  42 +
  43 + int code = -1;
  44 + try {
  45 + post.setEntity(new StringEntity(jsonStr, "utf-8"));
  46 +
  47 + response = httpClient.execute(post);
  48 +
  49 + JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
  50 + if (null != json && json.getInteger("errCode") == 0)
  51 + code = 0;
  52 + else
  53 + logger.error("和网关http通讯失败，rs: " + json);
54 54  
55   - JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
56   - if(null != json && json.getInteger("errCode") == 0)
57   - code = 0;
58   - else
59   - logger.error("和网关http通讯失败，rs: " + json);
60   - }catch(Exception e){
61   - logger.error("", e);
62   - }finally {
63   - try {
64   - if(httpClient != null)
65   - httpClient.close();
66   - } catch (IOException e) {
67   - logger.error("", e);
68   - }
69   - }
70   - return code;
71   - }
  55 + if (null != response)
  56 + response.close();
  57 + } catch (Exception e) {
  58 + logger.error("", e);
  59 + }
  60 + return code;
  61 + }
72 62 }
... ...
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
  View file @95564ca
... ... @@ -123,7 +123,7 @@ public class DataHandleProcess {
123 123 if (Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
124 124 continue;
125 125  
126   - //gpsStateProcess.process(gps);//状态处理
  126 + gpsStateProcess.process(gps);//状态处理
127 127 stationInsideProcess.process(gps);//场站内外判定
128 128 reverseRouteProcess.process(gps);//反向路由处理
129 129 abnormalStateProcess.process(gps);//超速越界
... ...
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
  View file @95564ca
... ... @@ -148,8 +148,6 @@ public class GpsRealData {
148 148 gps.setRemark("执行 " + sch.getXlName() + " " + sch.getDfsj() + " 班次");
149 149 gps.setPlanCode(sch.getXlBm());
150 150 }
151   - else
152   - gps.setRemark(null);
153 151 }else
154 152 gps.setRemark(null);
155 153  
... ...
src/main/java/com/bsth/data/gpsdata_v2/handlers/GpsStateProcess.java
  View file @95564ca
... ... @@ -28,15 +28,15 @@ public class GpsStateProcess {
28 28 return;
29 29  
30 30 byte upDown = Byte.parseByte(sch.getXlDir());
  31 + int schState = dayOfSchedule.emptyService(sch)?1:0;
31 32  
32   - if (gps.getUpDown() != upDown) {
33   - gps.setUpDown(upDown);//修正走向
  33 + if(gps.getState() != schState || gps.getUpDown() != upDown){
  34 + //下发指令纠正车载的 营运状态 和 走向
  35 + gpsStatusManager.changeServiceState(gps.getNbbm(), upDown, schState, "同步@系统");
34 36 }
35 37  
36   - if ((!gps.isService() || gps.getUpDown() != upDown) &&
37   - !dayOfSchedule.emptyService(sch)) {
38   - //下发指令纠正车载的 营运状态 和 走向
39   - gpsStatusManager.changeServiceState(gps.getNbbm(), upDown, 0, "同步@系统");
  38 + if (gps.getUpDown() != upDown) {
  39 + gps.setUpDown(upDown);//修正走向
40 40 }
41 41  
42 42 if (!sch.getXlBm().equals(gps.getLineId())) {
... ...
src/main/java/com/bsth/data/gpsdata_v2/status_manager/gps_service_state/ServiceStateHandle.java
  View file @95564ca
... ... @@ -42,7 +42,11 @@ public class ServiceStateHandle {
42 42  
43 43 public void changeState(String nbbm, int upDown ,int state, String sender){
44 44 if(map.containsKey(nbbm)){
45   - return;
  45 + StateBean sb = map.get(nbbm);
  46 + if(sb.getUpDown()==upDown && sb.getState()==state)
  47 + return;
  48 + else
  49 + map.remove(nbbm);
46 50 }
47 51 StateBean sb = StateBean.getInstance(nbbm, upDown, state, sender);
48 52 map.put(nbbm, sb);
... ...
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
  View file @95564ca
... ... @@ -29,7 +29,7 @@ public class DirectivePushQueue implements ApplicationContextAware {
29 29 /**
30 30 * 下发运营指令6003的最小间隔时间
31 31 */
32   - static final int MIN_SEND6003_SPACE = 1000 * 60;
  32 + static final int MIN_SEND6003_SPACE = 1000 * 30;
33 33  
34 34 /**
35 35 * 车辆 ——> 上次下发6003的时间
... ... @@ -105,11 +105,6 @@ public class DirectivePushQueue implements ApplicationContextAware {
105 105 return linkedList.size();
106 106 }
107 107  
108   -/* @Override
109   - public void run(String... strings) throws Exception {
110   - start();
111   - }*/
112   -
113 108 @Override
114 109 public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
115 110 directiveService = applicationContext.getBean(DirectiveService.class);
... ...
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
  View file @95564ca
... ... @@ -66,22 +66,11 @@ public class SchedulePstThread extends Thread {
66 66 }
67 67 }
68 68  
69   -/* PropertyFilter filter = new PropertyFilter() {
70   - //过滤不需要的字段
71   - public boolean apply(Object source, String name, Object value) {
72   - if("cTasks".equals(name)||"createBy".equals(name)||"updateBy".equals(name)){
73   - return false;
74   - }
75   - return true;
76   - }
77   - };*/
78   -
79 69 private void save(){
80 70 if(saveList.size() == 0)
81 71 return;
82 72 //记录同步数据
83 73 logger.info("real schedule update size: " + saveList.size());
84   - //logger.info(JSON.toJSONString(saveList, filter));
85 74  
86 75 //批量入库
87 76 update2Db();
... ...
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
  View file @95564ca
... ... @@ -323,13 +323,13 @@ public class GpsServiceImpl implements GpsService {
323 323 return map.containsKey(key)?Float.parseFloat(map.get(key).toString()):-1;
324 324 }
325 325  
326   - private List<DeviceChange> findDeviceChangeLogs(String nbbm, long t, long st){
  326 + private List<DeviceChange> findDeviceChangeLogs(String nbbm, long et, long st){
327 327 List<DeviceChange> dcs = null;
328 328 List<DeviceChange> rs = new ArrayList<>();
329 329 try{
330 330  
331 331 //JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
332   - dcs = jdbcTemplate.query("select cl_zbh as nbbm,new_device_no as device,UNIX_TIMESTAMP(qyrq) * 1000 as st from bsth_c_car_device where cl_zbh='"+nbbm+"' and UNIX_TIMESTAMP(qyrq)<" + (t / 1000)
  332 + dcs = jdbcTemplate.query("select cl_zbh as nbbm,new_device_no as device,old_device_no as old_device,UNIX_TIMESTAMP(qyrq) * 1000 as st from bsth_c_car_device where cl_zbh='"+nbbm+"'"
333 333 , BeanPropertyRowMapper.newInstance(DeviceChange.class));
334 334  
335 335  
... ... @@ -340,13 +340,30 @@ public class GpsServiceImpl implements GpsService {
340 340 }
341 341 });
342 342  
  343 + //生成一条初始记录
  344 + if(dcs.size() > 0){
  345 + DeviceChange first = dcs.get(0);
  346 +
  347 + DeviceChange initDv = new DeviceChange();
  348 + initDv.setDevice(first.getOldDevice());
  349 + if(StringUtils.isNotEmpty(initDv.getDevice())){
  350 + initDv.setNbbm(first.getNbbm());
  351 + initDv.setSt(0);
  352 + initDv.setEt(first.getSt());
  353 + dcs.add(0, initDv);
  354 + }
  355 + }
343 356 for(int i = 0,len=dcs.size(); i < len - 1; i++){
344 357 dcs.get(i).setEt(dcs.get(i + 1).getSt());
345 358 }
346 359  
347 360 for(DeviceChange dc : dcs){
348   - if(dc.getEt() > st || dc.getEt()==0)
349   - rs.add(dc);
  361 + if(dc.getEt() < st && dc.getEt() != 0)
  362 + continue;
  363 + if(dc.getSt() > et)
  364 + continue;
  365 +
  366 + rs.add(dc);
350 367 }
351 368 }catch (Exception e){
352 369 logger.error("", e);
... ...
src/main/java/com/bsth/service/gps/entity/DeviceChange.java
  View file @95564ca
... ... @@ -7,6 +7,7 @@ package com.bsth.service.gps.entity;
7 7 public class DeviceChange {
8 8  
9 9 private String nbbm;
  10 + private String oldDevice;
10 11 private String device;
11 12 private long st;
12 13 private long et;
... ... @@ -53,4 +54,12 @@ public class DeviceChange {
53 54 public void setType(int type) {
54 55 this.type = type;
55 56 }
  57 +
  58 + public String getOldDevice() {
  59 + return oldDevice;
  60 + }
  61 +
  62 + public void setOldDevice(String oldDevice) {
  63 + this.oldDevice = oldDevice;
  64 + }
56 65 }
... ...
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
  View file @95564ca
... ... @@ -20,6 +20,7 @@ import java.util.Map;
20 20 import javax.transaction.Transactional;
21 21  
22 22 import org.apache.commons.lang3.StringEscapeUtils;
  23 +import org.apache.commons.lang3.StringUtils;
23 24 import org.slf4j.Logger;
24 25 import org.slf4j.LoggerFactory;
25 26 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -1032,7 +1033,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
1032 1033 for (int j = 0; j < dlbList.size(); j++) {
1033 1034 Dlb t=dlbList.get(j);
1034 1035 boolean fage=true;
1035   - if(t.getLp().isEmpty()){
  1036 + if(StringUtils.isEmpty(t.getLp())){
1036 1037 fage=false;
1037 1038 }else{
1038 1039 for (int i = 0; i < listpbDc.size(); i++) {
... ...
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @95564ca
... ... @@ -16,6 +16,7 @@ import java.util.Map;
16 16 import javax.transaction.Transactional;
17 17  
18 18 import org.apache.commons.lang3.StringEscapeUtils;
  19 +import org.apache.commons.lang3.StringUtils;
19 20 import org.slf4j.Logger;
20 21 import org.slf4j.LoggerFactory;
21 22 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -1717,7 +1718,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1717 1718 for (int j = 0; j < ylbList.size(); j++) {
1718 1719 Ylb t=ylbList.get(j);
1719 1720 boolean fage=true;
1720   - if(t.getLp().isEmpty()){
  1721 + if(StringUtils.isEmpty(t.getLp())){
1721 1722 fage=false;
1722 1723 }else{
1723 1724 for (int i = 0; i < listpbYc.size(); i++) {
... ...
src/main/java/com/bsth/websocket/dto/WsScheduleRealInfo.java
  View file @95564ca
1   -package com.bsth.websocket.dto;
2   -
3   -import com.bsth.entity.realcontrol.ChildTaskPlan;
4   -import com.bsth.entity.realcontrol.ScheduleRealInfo;
5   -
6   -import javax.persistence.FetchType;
7   -import javax.persistence.OneToMany;
8   -import javax.persistence.Transient;
9   -import java.util.ArrayList;
10   -import java.util.HashSet;
11   -import java.util.List;
12   -import java.util.Set;
13   -
14   -/**
15   - * 精简字段的实际排班 entity
16   - * webSocket 传输用，去掉了页面不需要的一些字段
17   - * Created by panzhao on 2017/11/14.
18   - */
19   -public class WsScheduleRealInfo {
20   -
21   - public static WsScheduleRealInfo getInstance(ScheduleRealInfo sch){
22   - if(null == sch)
23   - return null;
24   - WsScheduleRealInfo wss = new WsScheduleRealInfo();
25   - wss.id = sch.getId();
26   - wss.scheduleDateStr = sch.getScheduleDateStr();
27   - wss.realExecDate = sch.getRealExecDate();
28   - wss.xlName = sch.getXlName();
29   - wss.xlBm = sch.getXlBm();
30   - wss.lpName = sch.getLpName();
31   - wss.clZbh = sch.getClZbh();
32   - wss.jGh = sch.getjGh();
33   - wss.jName = sch.getjName();
34   - wss.sGh = sch.getsGh();
35   - wss.sName = sch.getsName();
36   - wss.xlDir = sch.getXlDir();
37   - wss.qdzCode = sch.getQdzCode();
38   - wss.qdzName = sch.getQdzName();
39   - wss.zdzCode = sch.getZdzCode();
40   - wss.zdzName = sch.getZdzName();
41   - wss.fcsj = sch.getFcsj();
42   - wss.fcsjT = sch.getFcsjT();
43   - wss.zdsj = sch.getZdsj();
44   - wss.zdsjT = sch.getZdsjT();
45   - wss.jhlc = sch.getJhlc();
46   - wss.jhlcOrig = sch.getJhlcOrig();
47   - wss.bcsj = sch.getBcsj();
48   - wss.bcType = sch.getBcType();
49   - wss.majorStationName = sch.getMajorStationName();
50   - wss.fcsjActual = sch.getFcsjActual();
51   - wss.fcsjActualTime = sch.getFcsjActualTime();
52   - wss.zdsjActual = sch.getZdsjActual();
53   - wss.zdsjActualTime = sch.getZdsjActualTime();
54   - wss.status = sch.getStatus();
55   - wss.adjustExps = sch.getAdjustExps();
56   - wss.sflj = sch.isSflj();
57   - wss.late = sch.isLate();
58   - wss.late2 = sch.isLate2();
59   - wss.lateMinute = sch.getLateMinute();
60   - wss.remarks = sch.getRemarks();
61   - wss.dfsj = sch.getDfsj();
62   - wss.dfsjT = sch.getDfsjT();
63   - wss.directiveState = sch.getDirectiveState();
64   - wss.qdzArrDatejh = sch.getQdzArrDatejh();
65   - wss.qdzArrDatesj = sch.getQdzArrDatesj();
66   - wss.cTasks = sch.getcTasks();
67   - wss.gsName = sch.getGsName();
68   - wss.gsBm = sch.getGsBm();
69   - wss.fgsName = sch.getFgsName();
70   - wss.fgsBm = sch.getFgsBm();
71   - wss.ccService = sch.isCcService();
72   - return wss;
73   - }
74   -
75   -
76   - public static List<WsScheduleRealInfo> getMultiInstance(List<ScheduleRealInfo> list){
77   - List<WsScheduleRealInfo> rs = new ArrayList<>();
78   - for(ScheduleRealInfo sch : list){
79   - rs.add(getInstance(sch));
80   - }
81   - return rs;
82   - }
83   -
84   - /** 主键Id */
85   - private Long id;
86   -
87   - /** 排班日期字符串 YYYY-MM-DD */
88   - private String scheduleDateStr;
89   -
90   - /** 真实执行时间 yyyy-MM-dd */
91   - private String realExecDate;
92   -
93   - /** 线路名称 */
94   - private String xlName;
95   - /** 线路编码 */
96   - private String xlBm;
97   -
98   - /** 路牌名称 */
99   - private String lpName;
100   -
101   - /** 车辆自编号 */
102   - private String clZbh;
103   -
104   - /** 驾驶员工号 */
105   - private String jGh;
106   - /** 驾驶员名字 */
107   - private String jName;
108   - /** 售票员工号 */
109   - private String sGh;
110   - /** 售票员名字 */
111   - private String sName;
112   -
113   - /** 线路方向 */
114   - private String xlDir;
115   - /** 起点站code*/
116   - private String qdzCode;
117   - /** 起点站名字 */
118   - private String qdzName;
119   -
120   - /** 终点站code*/
121   - private String zdzCode;
122   - /** 终点站名字 */
123   - private String zdzName;
124   -
125   - /** 计划发车时间（格式 HH:mm） */
126   - private String fcsj;
127   - /** 计划发车时间戳*/
128   - @Transient
129   - private Long fcsjT;
130   -
131   - /** 计划终点时间（格式 HH:mm） */
132   - private String zdsj;
133   - /** 计划终点时间戳*/
134   - @Transient
135   - private Long zdsjT;
136   -
137   - /** 计划里程 */
138   - private Double jhlc;
139   -
140   - /** 原始计划里程 （原计调的数据） */
141   - private Double jhlcOrig;
142   - /** 班次历时 */
143   - private Integer bcsj;
144   -
145   - /**
146   - * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
147   - */
148   - private String bcType;
149   -
150   - //放站班次 站点名称
151   - private String majorStationName;
152   -
153   - /** 实际发车时间*/
154   - private String fcsjActual;
155   - /** 实际发车时间戳*/
156   - @Transient
157   - private Long fcsjActualTime;
158   - /**实际终点时间 */
159   - private String zdsjActual;
160   - /** 实际终点时间戳*/
161   - @Transient
162   - private Long zdsjActualTime;
163   -
164   - /**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
165   - private int status;
166   -
167   - private String adjustExps;
168   -
169   - /** 是否是临加班次 */
170   - private boolean sflj;
171   -
172   - /** 是否误点 （应发未发）*/
173   - @Transient
174   - private boolean late;
175   -
176   - /** 是否误点 （应发未到） */
177   - @Transient
178   - private boolean late2;
179   - /** 误点停靠时间 */
180   - @Transient
181   - private float lateMinute;
182   -
183   - /** 备注*/
184   - private String remarks;
185   -
186   - /**待发时间（格式 HH:mm） */
187   - private String dfsj;
188   -
189   - /**待发时间戳 */
190   - @Transient
191   - private Long dfsjT;
192   -
193   - /** 指令下发状态 60: 已发送， 100： 设备确认收到， 200：驾驶员确认 0：失败 */
194   - private Integer directiveState = -1;
195   -
196   - /** 起点站计划到达时间 */
197   - @Transient
198   - private String qdzArrDatejh;
199   -
200   - /** 起点站实际到达时间 */
201   - @Transient
202   - private String qdzArrDatesj;
203   -
204   - /** 子任务 */
205   - @OneToMany(fetch = FetchType.LAZY, mappedBy = "schedule")
206   - private Set<ChildTaskPlan> cTasks = new HashSet<>();
207   -
208   - /** 关联的公司名称 */
209   - private String gsName;
210   - /** 关联的公司编码 */
211   - private String gsBm;
212   - /** 关联的分公司名称 */
213   - private String fgsName;
214   - /** 关联的分公司编码 */
215   - private String fgsBm;
216   -
217   - /**
218   - * 换车营运标记 true 表示该主任务由 【中途换车子任务】 级联生成
219   - */
220   - private boolean ccService;
221   -
222   - public Long getId() {
223   - return id;
224   - }
225   -
226   - public void setId(Long id) {
227   - this.id = id;
228   - }
229   -
230   - public String getScheduleDateStr() {
231   - return scheduleDateStr;
232   - }
233   -
234   - public void setScheduleDateStr(String scheduleDateStr) {
235   - this.scheduleDateStr = scheduleDateStr;
236   - }
237   -
238   - public String getRealExecDate() {
239   - return realExecDate;
240   - }
241   -
242   - public void setRealExecDate(String realExecDate) {
243   - this.realExecDate = realExecDate;
244   - }
245   -
246   - public String getXlName() {
247   - return xlName;
248   - }
249   -
250   - public void setXlName(String xlName) {
251   - this.xlName = xlName;
252   - }
253   -
254   - public String getXlBm() {
255   - return xlBm;
256   - }
257   -
258   - public void setXlBm(String xlBm) {
259   - this.xlBm = xlBm;
260   - }
261   -
262   - public String getLpName() {
263   - return lpName;
264   - }
265   -
266   - public void setLpName(String lpName) {
267   - this.lpName = lpName;
268   - }
269   -
270   - public String getClZbh() {
271   - return clZbh;
272   - }
273   -
274   - public void setClZbh(String clZbh) {
275   - this.clZbh = clZbh;
276   - }
277   -
278   - public String getjGh() {
279   - return jGh;
280   - }
281   -
282   - public void setjGh(String jGh) {
283   - this.jGh = jGh;
284   - }
285   -
286   - public String getjName() {
287   - return jName;
288   - }
289   -
290   - public void setjName(String jName) {
291   - this.jName = jName;
292   - }
293   -
294   - public String getsGh() {
295   - return sGh;
296   - }
297   -
298   - public void setsGh(String sGh) {
299   - this.sGh = sGh;
300   - }
301   -
302   - public String getsName() {
303   - return sName;
304   - }
305   -
306   - public void setsName(String sName) {
307   - this.sName = sName;
308   - }
309   -
310   - public String getXlDir() {
311   - return xlDir;
312   - }
313   -
314   - public void setXlDir(String xlDir) {
315   - this.xlDir = xlDir;
316   - }
317   -
318   - public String getQdzCode() {
319   - return qdzCode;
320   - }
321   -
322   - public void setQdzCode(String qdzCode) {
323   - this.qdzCode = qdzCode;
324   - }
325   -
326   - public String getQdzName() {
327   - return qdzName;
328   - }
329   -
330   - public void setQdzName(String qdzName) {
331   - this.qdzName = qdzName;
332   - }
333   -
334   - public String getZdzCode() {
335   - return zdzCode;
336   - }
337   -
338   - public void setZdzCode(String zdzCode) {
339   - this.zdzCode = zdzCode;
340   - }
341   -
342   - public String getZdzName() {
343   - return zdzName;
344   - }
345   -
346   - public void setZdzName(String zdzName) {
347   - this.zdzName = zdzName;
348   - }
349   -
350   - public String getFcsj() {
351   - return fcsj;
352   - }
353   -
354   - public void setFcsj(String fcsj) {
355   - this.fcsj = fcsj;
356   - }
357   -
358   - public Long getFcsjT() {
359   - return fcsjT;
360   - }
361   -
362   - public void setFcsjT(Long fcsjT) {
363   - this.fcsjT = fcsjT;
364   - }
365   -
366   - public String getZdsj() {
367   - return zdsj;
368   - }
369   -
370   - public void setZdsj(String zdsj) {
371   - this.zdsj = zdsj;
372   - }
373   -
374   - public Long getZdsjT() {
375   - return zdsjT;
376   - }
377   -
378   - public void setZdsjT(Long zdsjT) {
379   - this.zdsjT = zdsjT;
380   - }
381   -
382   - public Double getJhlc() {
383   - return jhlc;
384   - }
385   -
386   - public void setJhlc(Double jhlc) {
387   - this.jhlc = jhlc;
388   - }
389   -
390   - public Double getJhlcOrig() {
391   - return jhlcOrig;
392   - }
393   -
394   - public void setJhlcOrig(Double jhlcOrig) {
395   - this.jhlcOrig = jhlcOrig;
396   - }
397   -
398   - public Integer getBcsj() {
399   - return bcsj;
400   - }
401   -
402   - public void setBcsj(Integer bcsj) {
403   - this.bcsj = bcsj;
404   - }
405   -
406   - public String getBcType() {
407   - return bcType;
408   - }
409   -
410   - public void setBcType(String bcType) {
411   - this.bcType = bcType;
412   - }
413   -
414   - public String getMajorStationName() {
415   - return majorStationName;
416   - }
417   -
418   - public void setMajorStationName(String majorStationName) {
419   - this.majorStationName = majorStationName;
420   - }
421   -
422   - public String getFcsjActual() {
423   - return fcsjActual;
424   - }
425   -
426   - public void setFcsjActual(String fcsjActual) {
427   - this.fcsjActual = fcsjActual;
428   - }
429   -
430   - public Long getFcsjActualTime() {
431   - return fcsjActualTime;
432   - }
433   -
434   - public void setFcsjActualTime(Long fcsjActualTime) {
435   - this.fcsjActualTime = fcsjActualTime;
436   - }
437   -
438   - public String getZdsjActual() {
439   - return zdsjActual;
440   - }
441   -
442   - public void setZdsjActual(String zdsjActual) {
443   - this.zdsjActual = zdsjActual;
444   - }
445   -
446   - public Long getZdsjActualTime() {
447   - return zdsjActualTime;
448   - }
449   -
450   - public void setZdsjActualTime(Long zdsjActualTime) {
451   - this.zdsjActualTime = zdsjActualTime;
452   - }
453   -
454   - public int getStatus() {
455   - return status;
456   - }
457   -
458   - public void setStatus(int status) {
459   - this.status = status;
460   - }
461   -
462   - public String getAdjustExps() {
463   - return adjustExps;
464   - }
465   -
466   - public void setAdjustExps(String adjustExps) {
467   - this.adjustExps = adjustExps;
468   - }
469   -
470   - public boolean isSflj() {
471   - return sflj;
472   - }
473   -
474   - public void setSflj(boolean sflj) {
475   - this.sflj = sflj;
476   - }
477   -
478   - public boolean isLate() {
479   - return late;
480   - }
481   -
482   - public void setLate(boolean late) {
483   - this.late = late;
484   - }
485   -
486   - public boolean isLate2() {
487   - return late2;
488   - }
489   -
490   - public void setLate2(boolean late2) {
491   - this.late2 = late2;
492   - }
493   -
494   - public float getLateMinute() {
495   - return lateMinute;
496   - }
497   -
498   - public void setLateMinute(float lateMinute) {
499   - this.lateMinute = lateMinute;
500   - }
501   -
502   - public String getRemarks() {
503   - return remarks;
504   - }
505   -
506   - public void setRemarks(String remarks) {
507   - this.remarks = remarks;
508   - }
509   -
510   - public String getDfsj() {
511   - return dfsj;
512   - }
513   -
514   - public void setDfsj(String dfsj) {
515   - this.dfsj = dfsj;
516   - }
517   -
518   - public Long getDfsjT() {
519   - return dfsjT;
520   - }
521   -
522   - public void setDfsjT(Long dfsjT) {
523   - this.dfsjT = dfsjT;
524   - }
525   -
526   - public Integer getDirectiveState() {
527   - return directiveState;
528   - }
529   -
530   - public void setDirectiveState(Integer directiveState) {
531   - this.directiveState = directiveState;
532   - }
533   -
534   - public String getQdzArrDatejh() {
535   - return qdzArrDatejh;
536   - }
537   -
538   - public void setQdzArrDatejh(String qdzArrDatejh) {
539   - this.qdzArrDatejh = qdzArrDatejh;
540   - }
541   -
542   - public String getQdzArrDatesj() {
543   - return qdzArrDatesj;
544   - }
545   -
546   - public void setQdzArrDatesj(String qdzArrDatesj) {
547   - this.qdzArrDatesj = qdzArrDatesj;
548   - }
549   -
550   - public Set<ChildTaskPlan> getcTasks() {
551   - return cTasks;
552   - }
553   -
554   - public void setcTasks(Set<ChildTaskPlan> cTasks) {
555   - this.cTasks = cTasks;
556   - }
557   -
558   - public String getGsName() {
559   - return gsName;
560   - }
561   -
562   - public void setGsName(String gsName) {
563   - this.gsName = gsName;
564   - }
565   -
566   - public String getGsBm() {
567   - return gsBm;
568   - }
569   -
570   - public void setGsBm(String gsBm) {
571   - this.gsBm = gsBm;
572   - }
573   -
574   - public String getFgsName() {
575   - return fgsName;
576   - }
577   -
578   - public void setFgsName(String fgsName) {
579   - this.fgsName = fgsName;
580   - }
581   -
582   - public String getFgsBm() {
583   - return fgsBm;
584   - }
585   -
586   - public void setFgsBm(String fgsBm) {
587   - this.fgsBm = fgsBm;
588   - }
589   -
590   - public boolean isCcService() {
591   - return ccService;
592   - }
593   -
594   - public void setCcService(boolean ccService) {
595   - this.ccService = ccService;
596   - }
597   -}
  1 +package com.bsth.websocket.dto;
  2 +
  3 +import com.bsth.entity.realcontrol.ChildTaskPlan;
  4 +import com.bsth.entity.realcontrol.ScheduleRealInfo;
  5 +
  6 +import javax.persistence.FetchType;
  7 +import javax.persistence.OneToMany;
  8 +import javax.persistence.Transient;
  9 +import java.util.ArrayList;
  10 +import java.util.HashSet;
  11 +import java.util.List;
  12 +import java.util.Set;
  13 +
  14 +/**
  15 + * 精简字段的实际排班 entity
  16 + * webSocket 传输用，去掉了页面不需要的一些字段
  17 + * Created by panzhao on 2017/11/14.
  18 + */
  19 +public class WsScheduleRealInfo {
  20 +
  21 + public static WsScheduleRealInfo getInstance(ScheduleRealInfo sch){
  22 + if(null == sch)
  23 + return null;
  24 + WsScheduleRealInfo wss = new WsScheduleRealInfo();
  25 + wss.id = sch.getId();
  26 + wss.scheduleDateStr = sch.getScheduleDateStr();
  27 + wss.realExecDate = sch.getRealExecDate();
  28 + wss.xlName = sch.getXlName();
  29 + wss.xlBm = sch.getXlBm();
  30 + wss.lpName = sch.getLpName();
  31 + wss.clZbh = sch.getClZbh();
  32 + wss.jGh = sch.getjGh();
  33 + wss.jName = sch.getjName();
  34 + wss.sGh = sch.getsGh();
  35 + wss.sName = sch.getsName();
  36 + wss.xlDir = sch.getXlDir();
  37 + wss.qdzCode = sch.getQdzCode();
  38 + wss.qdzName = sch.getQdzName();
  39 + wss.zdzCode = sch.getZdzCode();
  40 + wss.zdzName = sch.getZdzName();
  41 + wss.fcsj = sch.getFcsj();
  42 + wss.fcsjT = sch.getFcsjT();
  43 + wss.zdsj = sch.getZdsj();
  44 + wss.zdsjT = sch.getZdsjT();
  45 + wss.jhlc = sch.getJhlc();
  46 + wss.jhlcOrig = sch.getJhlcOrig();
  47 + wss.bcsj = sch.getBcsj();
  48 + wss.bcType = sch.getBcType();
  49 + wss.majorStationName = sch.getMajorStationName();
  50 + wss.fcsjActual = sch.getFcsjActual();
  51 + wss.fcsjActualTime = sch.getFcsjActualTime();
  52 + wss.zdsjActual = sch.getZdsjActual();
  53 + wss.zdsjActualTime = sch.getZdsjActualTime();
  54 + wss.status = sch.getStatus();
  55 + wss.adjustExps = sch.getAdjustExps();
  56 + wss.sflj = sch.isSflj();
  57 + wss.late = sch.isLate();
  58 + wss.late2 = sch.isLate2();
  59 + wss.lateMinute = sch.getLateMinute();
  60 + wss.remarks = sch.getRemarks();
  61 + wss.dfsj = sch.getDfsj();
  62 + wss.dfsjT = sch.getDfsjT();
  63 + wss.directiveState = sch.getDirectiveState();
  64 + wss.qdzArrDatejh = sch.getQdzArrDatejh();
  65 + wss.qdzArrDatesj = sch.getQdzArrDatesj();
  66 + wss.cTasks = sch.getcTasks();
  67 + wss.gsName = sch.getGsName();
  68 + wss.gsBm = sch.getGsBm();
  69 + wss.fgsName = sch.getFgsName();
  70 + wss.fgsBm = sch.getFgsBm();
  71 + wss.ccService = sch.isCcService();
  72 + return wss;
  73 + }
  74 +
  75 +
  76 + public static List<WsScheduleRealInfo> getMultiInstance(List<ScheduleRealInfo> list){
  77 + List<WsScheduleRealInfo> rs = new ArrayList<>();
  78 + for(ScheduleRealInfo sch : list){
  79 + rs.add(getInstance(sch));
  80 + }
  81 + return rs;
  82 + }
  83 +
  84 + /** 主键Id */
  85 + private Long id;
  86 +
  87 + /** 排班日期字符串 YYYY-MM-DD */
  88 + private String scheduleDateStr;
  89 +
  90 + /** 真实执行时间 yyyy-MM-dd */
  91 + private String realExecDate;
  92 +
  93 + /** 线路名称 */
  94 + private String xlName;
  95 + /** 线路编码 */
  96 + private String xlBm;
  97 +
  98 + /** 路牌名称 */
  99 + private String lpName;
  100 +
  101 + /** 车辆自编号 */
  102 + private String clZbh;
  103 +
  104 + /** 驾驶员工号 */
  105 + private String jGh;
  106 + /** 驾驶员名字 */
  107 + private String jName;
  108 + /** 售票员工号 */
  109 + private String sGh;
  110 + /** 售票员名字 */
  111 + private String sName;
  112 +
  113 + /** 线路方向 */
  114 + private String xlDir;
  115 + /** 起点站code*/
  116 + private String qdzCode;
  117 + /** 起点站名字 */
  118 + private String qdzName;
  119 +
  120 + /** 终点站code*/
  121 + private String zdzCode;
  122 + /** 终点站名字 */
  123 + private String zdzName;
  124 +
  125 + /** 计划发车时间（格式 HH:mm） */
  126 + private String fcsj;
  127 + /** 计划发车时间戳*/
  128 + @Transient
  129 + private Long fcsjT;
  130 +
  131 + /** 计划终点时间（格式 HH:mm） */
  132 + private String zdsj;
  133 + /** 计划终点时间戳*/
  134 + @Transient
  135 + private Long zdsjT;
  136 +
  137 + /** 计划里程 */
  138 + private Double jhlc;
  139 +
  140 + /** 原始计划里程 （原计调的数据） */
  141 + private Double jhlcOrig;
  142 + /** 班次历时 */
  143 + private Integer bcsj;
  144 +
  145 + /**
  146 + * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
  147 + */
  148 + private String bcType;
  149 +
  150 + //放站班次 站点名称
  151 + private String majorStationName;
  152 +
  153 + /** 实际发车时间*/
  154 + private String fcsjActual;
  155 + /** 实际发车时间戳*/
  156 + @Transient
  157 + private Long fcsjActualTime;
  158 + /**实际终点时间 */
  159 + private String zdsjActual;
  160 + /** 实际终点时间戳*/
  161 + @Transient
  162 + private Long zdsjActualTime;
  163 +
  164 + /**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
  165 + private int status;
  166 +
  167 + private String adjustExps;
  168 +
  169 + /** 是否是临加班次 */
  170 + private boolean sflj;
  171 +
  172 + /** 是否误点 （应发未发）*/
  173 + @Transient
  174 + private boolean late;
  175 +
  176 + /** 是否误点 （应发未到） */
  177 + @Transient
  178 + private boolean late2;
  179 + /** 误点停靠时间 */
  180 + @Transient
  181 + private float lateMinute;
  182 +
  183 + /** 备注*/
  184 + private String remarks;
  185 +
  186 + /**待发时间（格式 HH:mm） */
  187 + private String dfsj;
  188 +
  189 + /**待发时间戳 */
  190 + @Transient
  191 + private Long dfsjT;
  192 +
  193 + /** 指令下发状态 60: 已发送， 100： 设备确认收到， 200：驾驶员确认 0：失败 */
  194 + private Integer directiveState = -1;
  195 +
  196 + /** 起点站计划到达时间 */
  197 + @Transient
  198 + private String qdzArrDatejh;
  199 +
  200 + /** 起点站实际到达时间 */
  201 + @Transient
  202 + private String qdzArrDatesj;
  203 +
  204 + /** 子任务 */
  205 + @OneToMany(fetch = FetchType.LAZY, mappedBy = "schedule")
  206 + private Set<ChildTaskPlan> cTasks = new HashSet<>();
  207 +
  208 + /** 关联的公司名称 */
  209 + private String gsName;
  210 + /** 关联的公司编码 */
  211 + private String gsBm;
  212 + /** 关联的分公司名称 */
  213 + private String fgsName;
  214 + /** 关联的分公司编码 */
  215 + private String fgsBm;
  216 +
  217 + /**
  218 + * 换车营运标记 true 表示该主任务由 【中途换车子任务】 级联生成
  219 + */
  220 + private boolean ccService;
  221 +
  222 + public Long getId() {
  223 + return id;
  224 + }
  225 +
  226 + public void setId(Long id) {
  227 + this.id = id;
  228 + }
  229 +
  230 + public String getScheduleDateStr() {
  231 + return scheduleDateStr;
  232 + }
  233 +
  234 + public void setScheduleDateStr(String scheduleDateStr) {
  235 + this.scheduleDateStr = scheduleDateStr;
  236 + }
  237 +
  238 + public String getRealExecDate() {
  239 + return realExecDate;
  240 + }
  241 +
  242 + public void setRealExecDate(String realExecDate) {
  243 + this.realExecDate = realExecDate;
  244 + }
  245 +
  246 + public String getXlName() {
  247 + return xlName;
  248 + }
  249 +
  250 + public void setXlName(String xlName) {
  251 + this.xlName = xlName;
  252 + }
  253 +
  254 + public String getXlBm() {
  255 + return xlBm;
  256 + }
  257 +
  258 + public void setXlBm(String xlBm) {
  259 + this.xlBm = xlBm;
  260 + }
  261 +
  262 + public String getLpName() {
  263 + return lpName;
  264 + }
  265 +
  266 + public void setLpName(String lpName) {
  267 + this.lpName = lpName;
  268 + }
  269 +
  270 + public String getClZbh() {
  271 + return clZbh;
  272 + }
  273 +
  274 + public void setClZbh(String clZbh) {
  275 + this.clZbh = clZbh;
  276 + }
  277 +
  278 + public String getjGh() {
  279 + return jGh;
  280 + }
  281 +
  282 + public void setjGh(String jGh) {
  283 + this.jGh = jGh;
  284 + }
  285 +
  286 + public String getjName() {
  287 + return jName;
  288 + }
  289 +
  290 + public void setjName(String jName) {
  291 + this.jName = jName;
  292 + }
  293 +
  294 + public String getsGh() {
  295 + return sGh;
  296 + }
  297 +
  298 + public void setsGh(String sGh) {
  299 + this.sGh = sGh;
  300 + }
  301 +
  302 + public String getsName() {
  303 + return sName;
  304 + }
  305 +
  306 + public void setsName(String sName) {
  307 + this.sName = sName;
  308 + }
  309 +
  310 + public String getXlDir() {
  311 + return xlDir;
  312 + }
  313 +
  314 + public void setXlDir(String xlDir) {
  315 + this.xlDir = xlDir;
  316 + }
  317 +
  318 + public String getQdzCode() {
  319 + return qdzCode;
  320 + }
  321 +
  322 + public void setQdzCode(String qdzCode) {
  323 + this.qdzCode = qdzCode;
  324 + }
  325 +
  326 + public String getQdzName() {
  327 + return qdzName;
  328 + }
  329 +
  330 + public void setQdzName(String qdzName) {
  331 + this.qdzName = qdzName;
  332 + }
  333 +
  334 + public String getZdzCode() {
  335 + return zdzCode;
  336 + }
  337 +
  338 + public void setZdzCode(String zdzCode) {
  339 + this.zdzCode = zdzCode;
  340 + }
  341 +
  342 + public String getZdzName() {
  343 + return zdzName;
  344 + }
  345 +
  346 + public void setZdzName(String zdzName) {
  347 + this.zdzName = zdzName;
  348 + }
  349 +
  350 + public String getFcsj() {
  351 + return fcsj;
  352 + }
  353 +
  354 + public void setFcsj(String fcsj) {
  355 + this.fcsj = fcsj;
  356 + }
  357 +
  358 + public Long getFcsjT() {
  359 + return fcsjT;
  360 + }
  361 +
  362 + public void setFcsjT(Long fcsjT) {
  363 + this.fcsjT = fcsjT;
  364 + }
  365 +
  366 + public String getZdsj() {
  367 + return zdsj;
  368 + }
  369 +
  370 + public void setZdsj(String zdsj) {
  371 + this.zdsj = zdsj;
  372 + }
  373 +
  374 + public Long getZdsjT() {
  375 + return zdsjT;
  376 + }
  377 +
  378 + public void setZdsjT(Long zdsjT) {
  379 + this.zdsjT = zdsjT;
  380 + }
  381 +
  382 + public Double getJhlc() {
  383 + return jhlc;
  384 + }
  385 +
  386 + public void setJhlc(Double jhlc) {
  387 + this.jhlc = jhlc;
  388 + }
  389 +
  390 + public Double getJhlcOrig() {
  391 + return jhlcOrig;
  392 + }
  393 +
  394 + public void setJhlcOrig(Double jhlcOrig) {
  395 + this.jhlcOrig = jhlcOrig;
  396 + }
  397 +
  398 + public Integer getBcsj() {
  399 + return bcsj;
  400 + }
  401 +
  402 + public void setBcsj(Integer bcsj) {
  403 + this.bcsj = bcsj;
  404 + }
  405 +
  406 + public String getBcType() {
  407 + return bcType;
  408 + }
  409 +
  410 + public void setBcType(String bcType) {
  411 + this.bcType = bcType;
  412 + }
  413 +
  414 + public String getMajorStationName() {
  415 + return majorStationName;
  416 + }
  417 +
  418 + public void setMajorStationName(String majorStationName) {
  419 + this.majorStationName = majorStationName;
  420 + }
  421 +
  422 + public String getFcsjActual() {
  423 + return fcsjActual;
  424 + }
  425 +
  426 + public void setFcsjActual(String fcsjActual) {
  427 + this.fcsjActual = fcsjActual;
  428 + }
  429 +
  430 + public Long getFcsjActualTime() {
  431 + return fcsjActualTime;
  432 + }
  433 +
  434 + public void setFcsjActualTime(Long fcsjActualTime) {
  435 + this.fcsjActualTime = fcsjActualTime;
  436 + }
  437 +
  438 + public String getZdsjActual() {
  439 + return zdsjActual;
  440 + }
  441 +
  442 + public void setZdsjActual(String zdsjActual) {
  443 + this.zdsjActual = zdsjActual;
  444 + }
  445 +
  446 + public Long getZdsjActualTime() {
  447 + return zdsjActualTime;
  448 + }
  449 +
  450 + public void setZdsjActualTime(Long zdsjActualTime) {
  451 + this.zdsjActualTime = zdsjActualTime;
  452 + }
  453 +
  454 + public int getStatus() {
  455 + return status;
  456 + }
  457 +
  458 + public void setStatus(int status) {
  459 + this.status = status;
  460 + }
  461 +
  462 + public String getAdjustExps() {
  463 + return adjustExps;
  464 + }
  465 +
  466 + public void setAdjustExps(String adjustExps) {
  467 + this.adjustExps = adjustExps;
  468 + }
  469 +
  470 + public boolean isSflj() {
  471 + return sflj;
  472 + }
  473 +
  474 + public void setSflj(boolean sflj) {
  475 + this.sflj = sflj;
  476 + }
  477 +
  478 + public boolean isLate() {
  479 + return late;
  480 + }
  481 +
  482 + public void setLate(boolean late) {
  483 + this.late = late;
  484 + }
  485 +
  486 + public boolean isLate2() {
  487 + return late2;
  488 + }
  489 +
  490 + public void setLate2(boolean late2) {
  491 + this.late2 = late2;
  492 + }
  493 +
  494 + public float getLateMinute() {
  495 + return lateMinute;
  496 + }
  497 +
  498 + public void setLateMinute(float lateMinute) {
  499 + this.lateMinute = lateMinute;
  500 + }
  501 +
  502 + public String getRemarks() {
  503 + return remarks;
  504 + }
  505 +
  506 + public void setRemarks(String remarks) {
  507 + this.remarks = remarks;
  508 + }
  509 +
  510 + public String getDfsj() {
  511 + return dfsj;
  512 + }
  513 +
  514 + public void setDfsj(String dfsj) {
  515 + this.dfsj = dfsj;
  516 + }
  517 +
  518 + public Long getDfsjT() {
  519 + return dfsjT;
  520 + }
  521 +
  522 + public void setDfsjT(Long dfsjT) {
  523 + this.dfsjT = dfsjT;
  524 + }
  525 +
  526 + public Integer getDirectiveState() {
  527 + return directiveState;
  528 + }
  529 +
  530 + public void setDirectiveState(Integer directiveState) {
  531 + this.directiveState = directiveState;
  532 + }
  533 +
  534 + public String getQdzArrDatejh() {
  535 + return qdzArrDatejh;
  536 + }
  537 +
  538 + public void setQdzArrDatejh(String qdzArrDatejh) {
  539 + this.qdzArrDatejh = qdzArrDatejh;
  540 + }
  541 +
  542 + public String getQdzArrDatesj() {
  543 + return qdzArrDatesj;
  544 + }
  545 +
  546 + public void setQdzArrDatesj(String qdzArrDatesj) {
  547 + this.qdzArrDatesj = qdzArrDatesj;
  548 + }
  549 +
  550 + public Set<ChildTaskPlan> getcTasks() {
  551 + return cTasks;
  552 + }
  553 +
  554 + public void setcTasks(Set<ChildTaskPlan> cTasks) {
  555 + this.cTasks = cTasks;
  556 + }
  557 +
  558 + public String getGsName() {
  559 + return gsName;
  560 + }
  561 +
  562 + public void setGsName(String gsName) {
  563 + this.gsName = gsName;
  564 + }
  565 +
  566 + public String getGsBm() {
  567 + return gsBm;
  568 + }
  569 +
  570 + public void setGsBm(String gsBm) {
  571 + this.gsBm = gsBm;
  572 + }
  573 +
  574 + public String getFgsName() {
  575 + return fgsName;
  576 + }
  577 +
  578 + public void setFgsName(String fgsName) {
  579 + this.fgsName = fgsName;
  580 + }
  581 +
  582 + public String getFgsBm() {
  583 + return fgsBm;
  584 + }
  585 +
  586 + public void setFgsBm(String fgsBm) {
  587 + this.fgsBm = fgsBm;
  588 + }
  589 +
  590 + public boolean isCcService() {
  591 + return ccService;
  592 + }
  593 +
  594 + public void setCcService(boolean ccService) {
  595 + this.ccService = ccService;
  596 + }
  597 +}
... ...
src/main/resources/static/pages/permission/authorize_all/user_auth.html
  View file @95564ca
... ... @@ -148,7 +148,7 @@
148 148 var fgs_name_mapp={
149 149 '55_3': '上南公司（六分公司）', '55_1': '上南公司（二分公司）', '55_2': '上南公司（三分公司）', '55_4': '上南公司（一分公司）', '55_5': '上南公司（培训部）',
150 150 '22_2': '金高公司（二分公司）', '22_1': '金高公司（四分公司）', '22_3': '金高公司（三分公司）', '22_5': '金高公司（一分公司）',
151   - '26_3': '南汇公司（三分公司）', '26_2': '南汇公司（南汇二分）', '26_1': '南汇公司（南汇一分）', '26_4': '南汇公司（南汇维修公司）', '26_6': '南汇公司（航头枢纽站）',
  151 + '26_3': '南汇公司（三分公司）', '26_2': '南汇公司（南汇二分）', '26_1': '南汇公司（南汇一分）', '26_4': '南汇公司（南汇维修公司）', '26_5': '南汇公司（南汇公司）', '26_6': '南汇公司（航头枢纽站）',
152 152 '05_5': '杨高公司（杨高分公司）', '05_6': '杨高公司（周浦分公司）', '05_3': '杨高公司（芦潮港分公司）', '05_1': '杨高公司（川沙分公司）', '05_2': '杨高公司（金桥分公司）',
153 153 '77_78': '闵行公司', '99_100': '青浦公交','24_1': '一车队', '24_2': '二车队', '24_3': '三车队'
154 154 };
... ... @@ -206,7 +206,10 @@
206 206 code: code,
207 207 fgsName: fgs_name_mapp[code],
208 208 list: gd[code]
209   - })
  209 + });
  210 + if(!fgs_name_mapp[code]){
  211 + alert('出现异常的公司归属 ：' + code);
  212 + }
210 213 }
211 214  
212 215 data.sort(function (a, b) {
... ...
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/left.html
  View file @95564ca
... ... @@ -231,7 +231,7 @@
231 231 var deviceStr='', fs='YYYY-MM-DD HH:mm';
232 232 for(var i=0,dc;dc=rs.dcs[i++];){
233 233 deviceStr+=dc.device + ',';
234   - dc.stStr = moment(dc.st).format(fs);
  234 + dc.stStr = dc.st>0?moment(dc.st).format(fs):'';
235 235 dc.etStr = dc.et>0?moment(dc.et).format(fs):'';
236 236 }
237 237 deviceStr=deviceStr.substr(0, deviceStr.length-1);
... ...