Commit 0bcad6d2eacfabfe9ef50cfb0afe410495846aee

Authored by 潘钊
2 parents 5b45cb54 933fcbe6

Merge branch 'minhang' into pudong

Showing 41 changed files with 2140 additions and 633 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
@@ -529,8 +529,8 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, @@ -529,8 +529,8 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
529 } 529 }
530 530
531 @RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST) 531 @RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
532 - public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks){  
533 - return scheduleRealInfoService.changeBcType(id, bcType, remarks); 532 + public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
  533 + return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
534 } 534 }
535 535
536 @RequestMapping(value="/history", method=RequestMethod.POST) 536 @RequestMapping(value="/history", method=RequestMethod.POST)
src/main/java/com/bsth/controller/realcontrol/summary/DestroySituationController.java
@@ -2,13 +2,28 @@ package com.bsth.controller.realcontrol.summary; @@ -2,13 +2,28 @@ package com.bsth.controller.realcontrol.summary;
2 2
3 import com.bsth.controller.BaseController; 3 import com.bsth.controller.BaseController;
4 import com.bsth.data.summary.entity.DestroySituation; 4 import com.bsth.data.summary.entity.DestroySituation;
  5 +import com.bsth.data.summary.service.DestroySituationService;
  6 +import org.springframework.beans.factory.annotation.Autowired;
5 import org.springframework.web.bind.annotation.RequestMapping; 7 import org.springframework.web.bind.annotation.RequestMapping;
  8 +import org.springframework.web.bind.annotation.RequestParam;
6 import org.springframework.web.bind.annotation.RestController; 9 import org.springframework.web.bind.annotation.RestController;
7 10
  11 +import javax.servlet.http.HttpServletRequest;
  12 +import javax.servlet.http.HttpServletResponse;
  13 +import java.util.Map;
  14 +
8 /** 15 /**
9 * Created by panzhao on 2017/11/1. 16 * Created by panzhao on 2017/11/1.
10 */ 17 */
11 @RestController 18 @RestController
12 @RequestMapping("/summary/destroy_detail") 19 @RequestMapping("/summary/destroy_detail")
13 public class DestroySituationController extends BaseController<DestroySituation, Long> { 20 public class DestroySituationController extends BaseController<DestroySituation, Long> {
  21 +
  22 + @Autowired
  23 + DestroySituationService destroySituationService;
  24 +
  25 + @RequestMapping("excel")
  26 + public void excel(@RequestParam Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
  27 + destroySituationService.excel(map, request, response);
  28 + }
14 } 29 }
src/main/java/com/bsth/data/schedule/auto_exec/AutoExecScanThread.java
1 -package com.bsth.data.schedule.auto_exec;  
2 -  
3 -import com.bsth.data.LineConfigData;  
4 -import com.bsth.data.schedule.DayOfSchedule;  
5 -import com.bsth.entity.realcontrol.LineConfig;  
6 -import com.bsth.entity.realcontrol.ScheduleRealInfo;  
7 -import org.slf4j.Logger;  
8 -import org.slf4j.LoggerFactory;  
9 -import org.springframework.beans.factory.annotation.Autowired;  
10 -import org.springframework.stereotype.Component;  
11 -  
12 -import java.util.ArrayList;  
13 -import java.util.Collection;  
14 -import java.util.List;  
15 -  
16 -/**  
17 - * 班次自动执行扫描线程  
18 - * Created by panzhao on 2017/10/31.  
19 - */  
20 -@Component  
21 -public class AutoExecScanThread extends Thread{  
22 -  
23 -  
24 - @Autowired  
25 - LineConfigData lineConfigData;  
26 -  
27 - @Autowired  
28 - DayOfSchedule dayOfSchedule;  
29 -  
30 - @Autowired  
31 - RealScheduleAutoExecHandler realScheduleAutoExecHandler;  
32 -  
33 - Logger logger = LoggerFactory.getLogger(this.getClass());  
34 -  
35 - @Override  
36 - public void run() {  
37 - try{  
38 - //要自动执行的线路  
39 - List<String> autos = new ArrayList<>();  
40 - Collection<LineConfig> lcs = lineConfigData.getAll();  
41 -  
42 - for(LineConfig config : lcs){  
43 - if(config.isAutoExec()){  
44 - autos.add(config.getLine().getLineCode());  
45 - }  
46 - }  
47 -  
48 - if(autos.size()==0)  
49 - return;  
50 - List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());  
51 - for(ScheduleRealInfo sch : all){  
52 - if(autos.contains(sch.getXlBm())){  
53 - realScheduleAutoExecHandler.exec(sch);  
54 - }  
55 - }  
56 - }catch (Exception e){  
57 - logger.error("", e);  
58 - }  
59 - }  
60 -} 1 +package com.bsth.data.schedule.auto_exec;
  2 +
  3 +import com.bsth.data.LineConfigData;
  4 +import com.bsth.data.schedule.DayOfSchedule;
  5 +import com.bsth.entity.realcontrol.LineConfig;
  6 +import com.bsth.entity.realcontrol.ScheduleRealInfo;
  7 +import org.slf4j.Logger;
  8 +import org.slf4j.LoggerFactory;
  9 +import org.springframework.beans.factory.annotation.Autowired;
  10 +import org.springframework.stereotype.Component;
  11 +
  12 +import java.util.ArrayList;
  13 +import java.util.Collection;
  14 +import java.util.List;
  15 +
  16 +/**
  17 + * 班次自动执行扫描线程
  18 + * Created by panzhao on 2017/10/31.
  19 + */
  20 +@Component
  21 +public class AutoExecScanThread extends Thread{
  22 +
  23 +
  24 + @Autowired
  25 + LineConfigData lineConfigData;
  26 +
  27 + @Autowired
  28 + DayOfSchedule dayOfSchedule;
  29 +
  30 + @Autowired
  31 + RealScheduleAutoExecHandler realScheduleAutoExecHandler;
  32 +
  33 + Logger logger = LoggerFactory.getLogger(this.getClass());
  34 +
  35 + @Override
  36 + public void run() {
  37 + try{
  38 + //要自动执行的线路
  39 + List<String> autos = new ArrayList<>();
  40 + Collection<LineConfig> lcs = lineConfigData.getAll();
  41 +
  42 + for(LineConfig config : lcs){
  43 + if(config.isAutoExec()){
  44 + autos.add(config.getLine().getLineCode());
  45 + }
  46 + }
  47 +
  48 + if(autos.size()==0)
  49 + return;
  50 + List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
  51 + for(ScheduleRealInfo sch : all){
  52 + if(autos.contains(sch.getXlBm())){
  53 + realScheduleAutoExecHandler.exec(sch);
  54 + }
  55 + }
  56 + }catch (Exception e){
  57 + logger.error("", e);
  58 + }
  59 + }
  60 +}
src/main/java/com/bsth/data/schedule/auto_exec/RealScheduleAutoExecHandler.java
1 -package com.bsth.data.schedule.auto_exec;  
2 -  
3 -import com.bsth.data.schedule.DayOfSchedule;  
4 -import com.bsth.entity.realcontrol.ScheduleRealInfo;  
5 -import com.bsth.websocket.handler.SendUtils;  
6 -import org.springframework.beans.factory.annotation.Autowired;  
7 -import org.springframework.stereotype.Component;  
8 -  
9 -import java.util.ArrayList;  
10 -import java.util.List;  
11 -  
12 -/**  
13 - * 实际班次自动执行  
14 - * Created by panzhao on 2017/10/31.  
15 - */  
16 -@Component  
17 -public class RealScheduleAutoExecHandler {  
18 -  
19 - @Autowired  
20 - SendUtils sendUtils;  
21 - @Autowired  
22 - DayOfSchedule dayOfSchedule;  
23 -  
24 -  
25 - public void exec(ScheduleRealInfo sch) {  
26 - boolean flag = false;  
27 - long t = System.currentTimeMillis();  
28 -  
29 - if (sch.getDfsjT() < t) {  
30 - sch.setFcsjActualAll(sch.getDfsjT());  
31 - flag = true;  
32 - }  
33 -  
34 - if (sch.getZdsjT() < t) {  
35 - sch.setZdsjActualAll(sch.getZdsjT());  
36 - ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);  
37 - if (null != next) {  
38 - next.setQdzArrDatesj(sch.getZdsjActual());  
39 -  
40 - List<ScheduleRealInfo> refs = new ArrayList<>();  
41 - refs.add(sch);  
42 - refs.add(next);  
43 - sendUtils.refreshSch(refs);  
44 - return;  
45 - }  
46 - }  
47 -  
48 - if (flag) {  
49 - sendUtils.refreshSch(sch);  
50 - }  
51 - }  
52 -} 1 +package com.bsth.data.schedule.auto_exec;
  2 +
  3 +import com.bsth.data.schedule.DayOfSchedule;
  4 +import com.bsth.entity.realcontrol.ScheduleRealInfo;
  5 +import com.bsth.websocket.handler.SendUtils;
  6 +import org.springframework.beans.factory.annotation.Autowired;
  7 +import org.springframework.stereotype.Component;
  8 +
  9 +import java.util.ArrayList;
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * 实际班次自动执行
  14 + * Created by panzhao on 2017/10/31.
  15 + */
  16 +@Component
  17 +public class RealScheduleAutoExecHandler {
  18 +
  19 + @Autowired
  20 + SendUtils sendUtils;
  21 + @Autowired
  22 + DayOfSchedule dayOfSchedule;
  23 +
  24 +
  25 + public void exec(ScheduleRealInfo sch) {
  26 + boolean flag = false;
  27 + long t = System.currentTimeMillis();
  28 +
  29 + if (sch.getDfsjT() < t) {
  30 + sch.setFcsjActualAll(sch.getDfsjT());
  31 + flag = true;
  32 + }
  33 +
  34 + if (sch.getZdsjT() < t) {
  35 + sch.setZdsjActualAll(sch.getZdsjT());
  36 + ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
  37 + if (null != next) {
  38 + next.setQdzArrDatesj(sch.getZdsjActual());
  39 +
  40 + List<ScheduleRealInfo> refs = new ArrayList<>();
  41 + refs.add(sch);
  42 + refs.add(next);
  43 + sendUtils.refreshSch(refs);
  44 + return;
  45 + }
  46 + }
  47 +
  48 + if (flag) {
  49 + sendUtils.refreshSch(sch);
  50 + }
  51 + }
  52 +}
src/main/java/com/bsth/data/summary/entity/DestroySituation.java
1 -package com.bsth.data.summary.entity;  
2 -  
3 -import javax.persistence.Entity;  
4 -import javax.persistence.Id;  
5 -import javax.persistence.Table;  
6 -  
7 -/**  
8 - * 烂班情况  
9 - * Created by panzhao on 2017/10/31.  
10 - */  
11 -@Entity  
12 -@Table(name = "z_calc_destroy_detail")  
13 -public class DestroySituation {  
14 -  
15 - @Id  
16 - private Long id;  
17 -  
18 - private String rq;  
19 -  
20 - private String gsBm;  
21 -  
22 - private String fgsBm;  
23 -  
24 - private String lineCode;  
25 -  
26 - private String lineName;  
27 -  
28 - private String nbbm;  
29 -  
30 - private String jGh;  
31 -  
32 - private String sGh;  
33 -  
34 - private String reason;  
35 -  
36 - private int size;  
37 -  
38 - private Double mileage;  
39 -  
40 - private Long t;  
41 -  
42 - private String remark;  
43 -  
44 - private String idsStr;  
45 -  
46 - public Long getId() {  
47 - return id;  
48 - }  
49 -  
50 - public void setId(Long id) {  
51 - this.id = id;  
52 - }  
53 -  
54 - public String getRq() {  
55 - return rq;  
56 - }  
57 -  
58 - public void setRq(String rq) {  
59 - this.rq = rq;  
60 - }  
61 -  
62 - public String getLineCode() {  
63 - return lineCode;  
64 - }  
65 -  
66 - public void setLineCode(String lineCode) {  
67 - this.lineCode = lineCode;  
68 - }  
69 -  
70 - public String getLineName() {  
71 - return lineName;  
72 - }  
73 -  
74 - public void setLineName(String lineName) {  
75 - this.lineName = lineName;  
76 - }  
77 -  
78 - public String getNbbm() {  
79 - return nbbm;  
80 - }  
81 -  
82 - public void setNbbm(String nbbm) {  
83 - this.nbbm = nbbm;  
84 - }  
85 -  
86 - public String getjGh() {  
87 - return jGh;  
88 - }  
89 -  
90 - public void setjGh(String jGh) {  
91 - this.jGh = jGh;  
92 - }  
93 -  
94 - public String getsGh() {  
95 - return sGh;  
96 - }  
97 -  
98 - public void setsGh(String sGh) {  
99 - this.sGh = sGh;  
100 - }  
101 -  
102 - public String getReason() {  
103 - return reason;  
104 - }  
105 -  
106 - public void setReason(String reason) {  
107 - this.reason = reason;  
108 - }  
109 -  
110 - public int getSize() {  
111 - return size;  
112 - }  
113 -  
114 - public void setSize(int size) {  
115 - this.size = size;  
116 - }  
117 -  
118 - public Double getMileage() {  
119 - return mileage;  
120 - }  
121 -  
122 - public void setMileage(Double mileage) {  
123 - this.mileage = mileage;  
124 - }  
125 -  
126 - public Long getT() {  
127 - return t;  
128 - }  
129 -  
130 - public void setT(Long t) {  
131 - this.t = t;  
132 - }  
133 -  
134 - public String getRemark() {  
135 - return remark;  
136 - }  
137 -  
138 - public void setRemark(String remark) {  
139 - this.remark = remark;  
140 - }  
141 -  
142 - public String getIdsStr() {  
143 - return idsStr;  
144 - }  
145 -  
146 - public void setIdsStr(String idsStr) {  
147 - this.idsStr = idsStr;  
148 - }  
149 -  
150 - public String getGsBm() {  
151 - return gsBm;  
152 - }  
153 -  
154 - public void setGsBm(String gsBm) {  
155 - this.gsBm = gsBm;  
156 - }  
157 -  
158 - public String getFgsBm() {  
159 - return fgsBm;  
160 - }  
161 -  
162 - public void setFgsBm(String fgsBm) {  
163 - this.fgsBm = fgsBm;  
164 - }  
165 -} 1 +package com.bsth.data.summary.entity;
  2 +
  3 +import javax.persistence.Entity;
  4 +import javax.persistence.Id;
  5 +import javax.persistence.Table;
  6 +
  7 +/**
  8 + * 烂班情况
  9 + * Created by panzhao on 2017/10/31.
  10 + */
  11 +@Entity
  12 +@Table(name = "z_calc_destroy_detail")
  13 +public class DestroySituation {
  14 +
  15 + @Id
  16 + private Long id;
  17 +
  18 + private String rq;
  19 +
  20 + private String gsBm;
  21 +
  22 + private String fgsBm;
  23 +
  24 + private String lineCode;
  25 +
  26 + private String lineName;
  27 +
  28 + private String nbbm;
  29 +
  30 + private String jGh;
  31 +
  32 + private String sGh;
  33 +
  34 + private String reason;
  35 +
  36 + private int size;
  37 +
  38 + private Double mileage;
  39 +
  40 + private Long t;
  41 +
  42 + private String remark;
  43 +
  44 + private String idsStr;
  45 +
  46 + public Long getId() {
  47 + return id;
  48 + }
  49 +
  50 + public void setId(Long id) {
  51 + this.id = id;
  52 + }
  53 +
  54 + public String getRq() {
  55 + return rq;
  56 + }
  57 +
  58 + public void setRq(String rq) {
  59 + this.rq = rq;
  60 + }
  61 +
  62 + public String getLineCode() {
  63 + return lineCode;
  64 + }
  65 +
  66 + public void setLineCode(String lineCode) {
  67 + this.lineCode = lineCode;
  68 + }
  69 +
  70 + public String getLineName() {
  71 + return lineName;
  72 + }
  73 +
  74 + public void setLineName(String lineName) {
  75 + this.lineName = lineName;
  76 + }
  77 +
  78 + public String getNbbm() {
  79 + return nbbm;
  80 + }
  81 +
  82 + public void setNbbm(String nbbm) {
  83 + this.nbbm = nbbm;
  84 + }
  85 +
  86 + public String getjGh() {
  87 + return jGh;
  88 + }
  89 +
  90 + public void setjGh(String jGh) {
  91 + this.jGh = jGh;
  92 + }
  93 +
  94 + public String getsGh() {
  95 + return sGh;
  96 + }
  97 +
  98 + public void setsGh(String sGh) {
  99 + this.sGh = sGh;
  100 + }
  101 +
  102 + public String getReason() {
  103 + return reason;
  104 + }
  105 +
  106 + public void setReason(String reason) {
  107 + this.reason = reason;
  108 + }
  109 +
  110 + public int getSize() {
  111 + return size;
  112 + }
  113 +
  114 + public void setSize(int size) {
  115 + this.size = size;
  116 + }
  117 +
  118 + public Double getMileage() {
  119 + return mileage;
  120 + }
  121 +
  122 + public void setMileage(Double mileage) {
  123 + this.mileage = mileage;
  124 + }
  125 +
  126 + public Long getT() {
  127 + return t;
  128 + }
  129 +
  130 + public void setT(Long t) {
  131 + this.t = t;
  132 + }
  133 +
  134 + public String getRemark() {
  135 + return remark;
  136 + }
  137 +
  138 + public void setRemark(String remark) {
  139 + this.remark = remark;
  140 + }
  141 +
  142 + public String getIdsStr() {
  143 + return idsStr;
  144 + }
  145 +
  146 + public void setIdsStr(String idsStr) {
  147 + this.idsStr = idsStr;
  148 + }
  149 +
  150 + public String getGsBm() {
  151 + return gsBm;
  152 + }
  153 +
  154 + public void setGsBm(String gsBm) {
  155 + this.gsBm = gsBm;
  156 + }
  157 +
  158 + public String getFgsBm() {
  159 + return fgsBm;
  160 + }
  161 +
  162 + public void setFgsBm(String fgsBm) {
  163 + this.fgsBm = fgsBm;
  164 + }
  165 +}
src/main/java/com/bsth/data/summary/repository/DestroySituationRepository.java
1 -package com.bsth.data.summary.repository;  
2 -  
3 -import com.bsth.data.summary.entity.DestroySituation;  
4 -import com.bsth.repository.BaseRepository;  
5 -import org.springframework.stereotype.Repository;  
6 -  
7 -/**  
8 - * Created by panzhao on 2017/11/1.  
9 - */  
10 -@Repository  
11 -public interface DestroySituationRepository extends BaseRepository<DestroySituation, Long> {  
12 -} 1 +package com.bsth.data.summary.repository;
  2 +
  3 +import com.bsth.data.summary.entity.DestroySituation;
  4 +import com.bsth.repository.BaseRepository;
  5 +import org.springframework.stereotype.Repository;
  6 +
  7 +/**
  8 + * Created by panzhao on 2017/11/1.
  9 + */
  10 +@Repository
  11 +public interface DestroySituationRepository extends BaseRepository<DestroySituation, Long> {
  12 +}
src/main/java/com/bsth/data/summary/service/DestroySituationService.java
@@ -3,8 +3,13 @@ package com.bsth.data.summary.service; @@ -3,8 +3,13 @@ package com.bsth.data.summary.service;
3 import com.bsth.data.summary.entity.DestroySituation; 3 import com.bsth.data.summary.entity.DestroySituation;
4 import com.bsth.service.BaseService; 4 import com.bsth.service.BaseService;
5 5
  6 +import javax.servlet.http.HttpServletRequest;
  7 +import javax.servlet.http.HttpServletResponse;
  8 +import java.util.Map;
  9 +
6 /** 10 /**
7 * Created by panzhao on 2017/11/1. 11 * Created by panzhao on 2017/11/1.
8 */ 12 */
9 public interface DestroySituationService extends BaseService<DestroySituation, Long> { 13 public interface DestroySituationService extends BaseService<DestroySituation, Long> {
10 -} 14 + void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response);
  15 +}
11 \ No newline at end of file 16 \ No newline at end of file
src/main/java/com/bsth/data/summary/service/impl/DestroySituationServiceImpl.java
@@ -2,12 +2,94 @@ package com.bsth.data.summary.service.impl; @@ -2,12 +2,94 @@ package com.bsth.data.summary.service.impl;
2 2
3 import com.bsth.data.summary.entity.DestroySituation; 3 import com.bsth.data.summary.entity.DestroySituation;
4 import com.bsth.data.summary.service.DestroySituationService; 4 import com.bsth.data.summary.service.DestroySituationService;
  5 +import com.bsth.data.utils.CustomStringUtils;
5 import com.bsth.service.impl.BaseServiceImpl; 6 import com.bsth.service.impl.BaseServiceImpl;
  7 +import org.apache.poi.hssf.usermodel.HSSFWorkbook;
  8 +import org.apache.poi.poifs.filesystem.POIFSFileSystem;
  9 +import org.apache.poi.ss.usermodel.Row;
  10 +import org.apache.poi.ss.usermodel.Sheet;
  11 +import org.slf4j.Logger;
  12 +import org.slf4j.LoggerFactory;
6 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
7 14
  15 +import javax.servlet.http.HttpServletRequest;
  16 +import javax.servlet.http.HttpServletResponse;
  17 +import java.io.FileInputStream;
  18 +import java.io.OutputStream;
  19 +import java.net.URLEncoder;
  20 +import java.text.SimpleDateFormat;
  21 +import java.util.*;
  22 +
8 /** 23 /**
9 * Created by panzhao on 2017/11/1. 24 * Created by panzhao on 2017/11/1.
10 */ 25 */
11 @Service 26 @Service
12 public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituation, Long> implements DestroySituationService { 27 public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituation, Long> implements DestroySituationService {
13 -} 28 +
  29 + Logger logger = LoggerFactory.getLogger(this.getClass());
  30 +
  31 + @Override
  32 + public void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
  33 + try {
  34 + map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString()
  35 + , map.get("rq_le").toString(), 62));
  36 +
  37 + List<DestroySituation> list = (List<DestroySituation>) super.list(map);
  38 +
  39 + if(list.size() == 0){
  40 + response.setHeader("Content-type", "text/html;charset=UTF-8");
  41 + response.getWriter().print("<span style='color:red;font-size:24px;'>根据查询条件没有搜索到数据,别导了!</span>");
  42 + return ;
  43 + }
  44 +
  45 + //排序
  46 + Collections.sort(list, new Comparator<DestroySituation>() {
  47 + @Override
  48 + public int compare(DestroySituation o1, DestroySituation o2) {
  49 + return (int) (o1.getT() - o2.getT());
  50 + }
  51 + });
  52 +
  53 + //输出excel
  54 + String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
  55 + String filePath = basePath + "/static/pages/summary/excel/烂班明细情况.xls";
  56 + POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath));
  57 + HSSFWorkbook wb = new HSSFWorkbook(fs);
  58 +
  59 + //写入数据
  60 + Sheet sheet = wb.getSheetAt(0);
  61 + Row row;
  62 + DestroySituation dys;
  63 + SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
  64 + for(int i = 0; i < list.size(); i++){
  65 + dys = list.get(i);
  66 + row = sheet.createRow(i + 1);
  67 + row.createCell(0).setCellValue(dys.getRq());
  68 + row.createCell(1).setCellValue(dys.getLineName());
  69 + row.createCell(2).setCellValue(dys.getNbbm());
  70 + row.createCell(3).setCellValue(dys.getjGh());
  71 + row.createCell(4).setCellValue(dys.getsGh());
  72 + row.createCell(5).setCellValue(dys.getReason());
  73 + row.createCell(6).setCellValue(dys.getSize());
  74 + row.createCell(7).setCellValue(dys.getMileage());
  75 + row.createCell(8).setCellValue(sdf.format(new Date(dys.getT())));
  76 + row.createCell(9).setCellValue(dys.getRemark());
  77 + }
  78 +
  79 + String name = list.get(0).getLineName();
  80 + wb.setSheetName(0, name + "烂班明细");
  81 + //response 输出
  82 + String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "烂班明细情况.xls";
  83 + response.setContentType("application/x-msdownload");
  84 + response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
  85 +
  86 + OutputStream os = response.getOutputStream();
  87 + wb.write(os);
  88 + os.flush();
  89 + os.close();
  90 + } catch (Exception e) {
  91 + logger.error("", e);
  92 + }
  93 + }
  94 +
  95 +}
14 \ No newline at end of file 96 \ No newline at end of file
src/main/java/com/bsth/data/summary/service/impl/FastAndSlowServiceImpl.java
@@ -4,6 +4,7 @@ import com.bsth.data.BasicData; @@ -4,6 +4,7 @@ import com.bsth.data.BasicData;
4 import com.bsth.data.summary.entity.FastAndSlow; 4 import com.bsth.data.summary.entity.FastAndSlow;
5 import com.bsth.data.summary.service.FastAndSlowService; 5 import com.bsth.data.summary.service.FastAndSlowService;
6 import com.bsth.data.utils.ConvertUtil; 6 import com.bsth.data.utils.ConvertUtil;
  7 +import com.bsth.data.utils.CustomStringUtils;
7 import com.bsth.service.impl.BaseServiceImpl; 8 import com.bsth.service.impl.BaseServiceImpl;
8 import com.google.common.collect.ArrayListMultimap; 9 import com.google.common.collect.ArrayListMultimap;
9 import org.apache.poi.hssf.usermodel.HSSFWorkbook; 10 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -22,8 +23,6 @@ import javax.servlet.http.HttpServletResponse; @@ -22,8 +23,6 @@ import javax.servlet.http.HttpServletResponse;
22 import java.io.FileInputStream; 23 import java.io.FileInputStream;
23 import java.io.OutputStream; 24 import java.io.OutputStream;
24 import java.net.URLEncoder; 25 import java.net.URLEncoder;
25 -import java.text.ParseException;  
26 -import java.text.SimpleDateFormat;  
27 import java.util.*; 26 import java.util.*;
28 27
29 /** 28 /**
@@ -40,7 +39,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i @@ -40,7 +39,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
40 public Iterable<FastAndSlow> list(Map<String, Object> map) { 39 public Iterable<FastAndSlow> list(Map<String, Object> map) {
41 try { 40 try {
42 //最多5天 41 //最多5天
43 - map.put("rq_le", maxEndTime(map.get("rq_ge").toString() 42 + map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString()
44 , map.get("rq_le").toString(), 4)); 43 , map.get("rq_le").toString(), 4));
45 44
46 List<FastAndSlow> list = (List) super.list(map); 45 List<FastAndSlow> list = (List) super.list(map);
@@ -58,7 +57,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i @@ -58,7 +57,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
58 try { 57 try {
59 Map<String, Object> params = new HashMap(); 58 Map<String, Object> params = new HashMap();
60 //最多31天 59 //最多31天
61 - et = maxEndTime(st, et, 31); 60 + et = CustomStringUtils.maxEndTime(st, et, 31);
62 params.put("rq_ge", st); 61 params.put("rq_ge", st);
63 params.put("rq_le", et); 62 params.put("rq_le", et);
64 params.put("lineCode_eq", lineCode); 63 params.put("lineCode_eq", lineCode);
@@ -198,23 +197,6 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i @@ -198,23 +197,6 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
198 } 197 }
199 198
200 199
201 - private String maxEndTime(String sStr, String eStr, int space) throws ParseException {  
202 - try {  
203 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");  
204 - long st = sdf.parse(sStr).getTime();  
205 - long et = sdf.parse(eStr).getTime();  
206 - long dayTime = 24 * 60 * 60 * 1000;  
207 - long spaceTime = dayTime * space;  
208 -  
209 - if (et - st > spaceTime) {  
210 - eStr = sdf.format(new Date(st + spaceTime));  
211 - }  
212 - } catch (Exception e) {  
213 - throw e;  
214 - }  
215 - return eStr;  
216 - }  
217 -  
218 /** 200 /**
219 * 计划发出快误点 201 * 计划发出快误点
220 * @param list 202 * @param list
src/main/java/com/bsth/data/utils/CustomStringUtils.java
@@ -2,6 +2,10 @@ package com.bsth.data.utils; @@ -2,6 +2,10 @@ package com.bsth.data.utils;
2 2
3 import org.apache.commons.lang3.StringUtils; 3 import org.apache.commons.lang3.StringUtils;
4 4
  5 +import java.text.ParseException;
  6 +import java.text.SimpleDateFormat;
  7 +import java.util.Date;
  8 +
5 /** 9 /**
6 * Created by panzhao on 2017/7/10. 10 * Created by panzhao on 2017/7/10.
7 */ 11 */
@@ -16,4 +20,21 @@ public class CustomStringUtils { @@ -16,4 +20,21 @@ public class CustomStringUtils {
16 } 20 }
17 return s1.equals(s2); 21 return s1.equals(s2);
18 } 22 }
  23 +
  24 + public static String maxEndTime(String sStr, String eStr, int space) throws ParseException {
  25 + try {
  26 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  27 + long st = sdf.parse(sStr).getTime();
  28 + long et = sdf.parse(eStr).getTime();
  29 + long dayTime = 24 * 60 * 60 * 1000;
  30 + long spaceTime = dayTime * space;
  31 +
  32 + if (et - st > spaceTime) {
  33 + eStr = sdf.format(new Date(st + spaceTime));
  34 + }
  35 + } catch (Exception e) {
  36 + throw e;
  37 + }
  38 + return eStr;
  39 + }
19 } 40 }
src/main/java/com/bsth/entity/oil/Dlb.java
@@ -73,7 +73,7 @@ public class Dlb { @@ -73,7 +73,7 @@ public class Dlb {
73 private String fgsname; 73 private String fgsname;
74 74
75 75
76 - 76 + private String lp;
77 77
78 public Integer getId() { 78 public Integer getId() {
79 return id; 79 return id;
@@ -383,6 +383,15 @@ public class Dlb { @@ -383,6 +383,15 @@ public class Dlb {
383 public void setUpdatetime(Date updatetime) { 383 public void setUpdatetime(Date updatetime) {
384 this.updatetime = updatetime; 384 this.updatetime = updatetime;
385 } 385 }
  386 +
  387 + public String getLp() {
  388 + return lp;
  389 + }
  390 +
  391 + public void setLp(String lp) {
  392 + this.lp = lp;
  393 + }
  394 +
386 395
387 396
388 } 397 }
src/main/java/com/bsth/entity/oil/Ylb.java
@@ -56,6 +56,7 @@ public class Ylb { @@ -56,6 +56,7 @@ public class Ylb {
56 //进场顺序(根据最先出场和最后进场来关联车辆的存油量) 56 //进场顺序(根据最先出场和最后进场来关联车辆的存油量)
57 private int jcsx; 57 private int jcsx;
58 58
  59 + private String lp;
59 @Transient 60 @Transient
60 private String bglyh; 61 private String bglyh;
61 62
@@ -330,5 +331,14 @@ public class Ylb { @@ -330,5 +331,14 @@ public class Ylb {
330 public void setUpdatetime(Date updatetime) { 331 public void setUpdatetime(Date updatetime) {
331 this.updatetime = updatetime; 332 this.updatetime = updatetime;
332 } 333 }
  334 +
  335 + public String getLp() {
  336 + return lp;
  337 + }
  338 +
  339 + public void setLp(String lp) {
  340 + this.lp = lp;
  341 + }
  342 +
333 343
334 } 344 }
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
@@ -108,6 +108,9 @@ public class ScheduleRealInfo { @@ -108,6 +108,9 @@ public class ScheduleRealInfo {
108 */ 108 */
109 private String bcType; 109 private String bcType;
110 110
  111 + //放站班次 站点名称
  112 + private String majorStationName;
  113 +
111 /** 创建人 */ 114 /** 创建人 */
112 @JsonIgnore 115 @JsonIgnore
113 @ManyToOne(fetch = FetchType.LAZY) 116 @ManyToOne(fetch = FetchType.LAZY)
@@ -971,4 +974,12 @@ public class ScheduleRealInfo { @@ -971,4 +974,12 @@ public class ScheduleRealInfo {
971 public void setCcService(boolean ccService) { 974 public void setCcService(boolean ccService) {
972 this.ccService = ccService; 975 this.ccService = ccService;
973 } 976 }
  977 +
  978 + public String getMajorStationName() {
  979 + return majorStationName;
  980 + }
  981 +
  982 + public void setMajorStationName(String majorStationName) {
  983 + this.majorStationName = majorStationName;
  984 + }
974 } 985 }
src/main/java/com/bsth/repository/SectionRepository.java
1 package com.bsth.repository; 1 package com.bsth.repository;
2 2
3 -  
4 import org.springframework.data.jpa.repository.Modifying; 3 import org.springframework.data.jpa.repository.Modifying;
5 import org.springframework.data.jpa.repository.Query; 4 import org.springframework.data.jpa.repository.Query;
6 import org.springframework.stereotype.Repository; 5 import org.springframework.stereotype.Repository;
@@ -8,6 +7,8 @@ import org.springframework.transaction.annotation.Transactional; @@ -8,6 +7,8 @@ import org.springframework.transaction.annotation.Transactional;
8 7
9 import com.bsth.entity.Section; 8 import com.bsth.entity.Section;
10 9
  10 +import java.util.List;
  11 +
11 /** 12 /**
12 * 13 *
13 * @Interface: SectionRepository(路段Repository数据持久层接口) 14 * @Interface: SectionRepository(路段Repository数据持久层接口)
@@ -112,4 +113,8 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; { @@ -112,4 +113,8 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
112 Double speedLimit,String descriptions,Integer version,Integer createBy,String createDate, 113 Double speedLimit,String descriptions,Integer version,Integer createBy,String createDate,
113 114
114 Integer updateBy,String updateDate); 115 Integer updateBy,String updateDate);
  116 +
  117 + @Query(value = "SELECT AsText(s.bsection_vector) as section,r.directions as dir FROM bsth_c_section s left join bsth_c_sectionroute r on s.section_code = r.section_code " +
  118 + "where r.line = ?1 and directions = ?2 ORDER BY r.directions,r.sectionroute_code ",nativeQuery = true)
  119 + List<Object[]> getSectionDirByLineId(Integer lineId , Integer directions);
115 } 120 }
src/main/java/com/bsth/repository/oil/YlbRepository.java
@@ -125,8 +125,8 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{ @@ -125,8 +125,8 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
125 125
126 @Query(value="select s from Ylb s " 126 @Query(value="select s from Ylb s "
127 + " where to_days(?1)=to_days(s.rq) " 127 + " where to_days(?1)=to_days(s.rq) "
128 - + " and s.ssgsdm like %?2% "  
129 - + " and s.fgsdm like %?3%" 128 + + " and s.ssgsdm =?2 "
  129 + + " and s.fgsdm =?3 "
130 + " and s.xlbm like %?4% " 130 + " and s.xlbm like %?4% "
131 + " and s.nbbm in ?5 order by nbbm,jcsx") 131 + " and s.nbbm in ?5 order by nbbm,jcsx")
132 List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm); 132 List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
@@ -17,17 +17,17 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{ @@ -17,17 +17,17 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
17 * @param rq 17 * @param rq
18 * @return 18 * @return
19 */ 19 */
20 - @Query(value="SELECT * FROM bsth_c_ylxxb where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true) 20 + @Query(value="SELECT * FROM bsth_c_ylxxb where yyrq=?1 and nylx=?2 and gsdm like %?3%",nativeQuery=true)
21 List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm); 21 List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
22 22
23 - @Query(value="SELECT * FROM bsth_c_ylxxb where to_days(?1)=to_days(yyrq) and gsdm=?2",nativeQuery=true) 23 + @Query(value="SELECT * FROM bsth_c_ylxxb where yyrq=?1 and gsdm=?2",nativeQuery=true)
24 List<Ylxxb> checkYlxx(String rq,String gs); 24 List<Ylxxb> checkYlxx(String rq,String gs);
25 25
26 - @Query(value="SELECT * FROM bsth_c_ylxxb where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true) 26 + @Query(value="SELECT * FROM bsth_c_ylxxb where yyrq=?1 and nbbm =?2 and jylx=1",nativeQuery=true)
27 List<Ylxxb> obtainYlxx2(String rq,String nbbm); 27 List<Ylxxb> obtainYlxx2(String rq,String nbbm);
28 28
29 @Query(value="select * from bsth_c_ylxxb s where s.nbbm = ?1 and " 29 @Query(value="select * from bsth_c_ylxxb s where s.nbbm = ?1 and "
30 - + "to_days(s.yyrq) = to_days(?2)",nativeQuery=true) 30 + + "s.yyrq=?2",nativeQuery=true)
31 List<Ylxxb> queryListYlxxb(String clZbh,String date); 31 List<Ylxxb> queryListYlxxb(String clZbh,String date);
32 32
33 33
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
@@ -190,10 +190,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI @@ -190,10 +190,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
190 List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2); 190 List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
191 191
192 192
193 - @Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj") 193 + @Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
194 List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm); 194 List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm);
195 195
196 - @Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj") 196 + @Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
197 List<Map<String,Object>> yesterdayDataList_eq(String line,String date,String gsbm,String fgsbm,String nbbm); 197 List<Map<String,Object>> yesterdayDataList_eq(String line,String date,String gsbm,String fgsbm,String nbbm);
198 198
199 @Query(value="select s from ScheduleRealInfo s where s.scheduleDateStr = ?1 ORDER BY xlBm,lpName,clZbh,xlDir") 199 @Query(value="select s from ScheduleRealInfo s where s.scheduleDateStr = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
@@ -110,8 +110,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen @@ -110,8 +110,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
110 logger.warn("烂班不允许发送调度指令...."); 110 logger.warn("烂班不允许发送调度指令....");
111 return -1; 111 return -1;
112 } 112 }
113 - String text = "已完成" + finish + "个班次,下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + ",由"  
114 - + sch.getQdzName() + "发往" + sch.getZdzName(); 113 + String text = "您已完成" + finish + "个班次,下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + ",由"
  114 + + sch.getQdzName() + "发往" + sch.getZdzName() ;
  115 +
  116 + if(sch.getBcType().equals("venting")){
  117 + text += " (直放)";
  118 + }
  119 + else if(sch.getBcType().equals("major")){
  120 + text += " (放站到"+sch.getMajorStationName()+"带客)";
  121 + }
115 122
116 //下发0x01指令 调度指令(闹钟有效) 123 //下发0x01指令 调度指令(闹钟有效)
117 long t = System.currentTimeMillis() + 1000 * 30, 124 long t = System.currentTimeMillis() + 1000 * 30,
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
@@ -739,15 +739,29 @@ public class FormsServiceImpl implements FormsService { @@ -739,15 +739,29 @@ public class FormsServiceImpl implements FormsService {
739 ScheduleRealInfo s=listReal.get(j); 739 ScheduleRealInfo s=listReal.get(j);
740 if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh) 740 if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
741 &&s.getXlBm().equals(line)){ 741 &&s.getXlBm().equals(line)){
742 - newList.add(s);  
743 - Set<ChildTaskPlan> cts = s.getcTasks();  
744 - if(cts != null && cts.size() > 0){  
745 - newList_.add(s);  
746 - }else{  
747 - if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){ 742 + if(y.getLp()==null){
  743 + newList.add(s);
  744 + Set<ChildTaskPlan> cts = s.getcTasks();
  745 + if(cts != null && cts.size() > 0){
748 newList_.add(s); 746 newList_.add(s);
  747 + }else{
  748 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
  749 + newList_.add(s);
  750 + }
749 } 751 }
750 - } 752 + }else{
  753 + if(y.getLp().equals(s.getLpName())){
  754 + newList.add(s);
  755 + Set<ChildTaskPlan> cts = s.getcTasks();
  756 + if(cts != null && cts.size() > 0){
  757 + newList_.add(s);
  758 + }else{
  759 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
  760 + newList_.add(s);
  761 + }
  762 + }
  763 + }
  764 + }
751 } 765 }
752 } 766 }
753 double jhgl=culateMileageService.culateJhgl(newList); 767 double jhgl=culateMileageService.culateJhgl(newList);
@@ -793,8 +807,9 @@ public class FormsServiceImpl implements FormsService { @@ -793,8 +807,9 @@ public class FormsServiceImpl implements FormsService {
793 ScheduleRealInfo s=listReal.get(j); 807 ScheduleRealInfo s=listReal.get(j);
794 if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh) 808 if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
795 &&s.getXlBm().equals(line)){ 809 &&s.getXlBm().equals(line)){
796 - newList.add(s);  
797 - Set<ChildTaskPlan> cts = s.getcTasks(); 810 + if(y.getLp()==null){
  811 + newList.add(s);
  812 + Set<ChildTaskPlan> cts = s.getcTasks();
798 if(cts != null && cts.size() > 0){ 813 if(cts != null && cts.size() > 0){
799 newList_.add(s); 814 newList_.add(s);
800 }else{ 815 }else{
@@ -802,6 +817,19 @@ public class FormsServiceImpl implements FormsService { @@ -802,6 +817,19 @@ public class FormsServiceImpl implements FormsService {
802 newList_.add(s); 817 newList_.add(s);
803 } 818 }
804 } 819 }
  820 + }else{
  821 + if(y.getLp().equals(s.getLpName())){
  822 + newList.add(s);
  823 + Set<ChildTaskPlan> cts = s.getcTasks();
  824 + if(cts != null && cts.size() > 0){
  825 + newList_.add(s);
  826 + }else{
  827 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
  828 + newList_.add(s);
  829 + }
  830 + }
  831 + }
  832 + }
805 } 833 }
806 } 834 }
807 double jhgl=culateMileageService.culateJhgl(newList); 835 double jhgl=culateMileageService.culateJhgl(newList);
@@ -1604,7 +1632,7 @@ public class FormsServiceImpl implements FormsService { @@ -1604,7 +1632,7 @@ public class FormsServiceImpl implements FormsService {
1604 @Override 1632 @Override
1605 public int compare(Singledata o1, Singledata o2) { 1633 public int compare(Singledata o1, Singledata o2) {
1606 // TODO Auto-generated method stub 1634 // TODO Auto-generated method stub
1607 - return o2.getxL().compareTo(o1.getxL()); 1635 + return (o2.getxL()+o2.getClzbh()).compareTo((o1.getxL()+o1.getClzbh()));
1608 } 1636 }
1609 } 1637 }
1610 } 1638 }
src/main/java/com/bsth/service/impl/CarParkServiceImpl.java
@@ -30,6 +30,10 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem @@ -30,6 +30,10 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
30 try { 30 try {
31 // 停车场编码 31 // 停车场编码
32 String parkCode = map.get("parkCode").equals("") ? null : map.get("parkCode").toString(); 32 String parkCode = map.get("parkCode").equals("") ? null : map.get("parkCode").toString();
  33 + if (!selectTccInfoByCode(map)) {
  34 + resultMap.put("status", ResponseCode.ERROR);
  35 + return resultMap;
  36 + }
33 // 停车场名称 37 // 停车场名称
34 String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString(); 38 String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString();
35 // 地理位置(百度坐标集合) 39 // 地理位置(百度坐标集合)
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -19,7 +19,6 @@ import com.bsth.service.TrafficManageService; @@ -19,7 +19,6 @@ import com.bsth.service.TrafficManageService;
19 import com.bsth.service.traffic.YgcBasicDataService; 19 import com.bsth.service.traffic.YgcBasicDataService;
20 import com.bsth.util.TimeUtils; 20 import com.bsth.util.TimeUtils;
21 import com.bsth.util.db.DBUtils_MS; 21 import com.bsth.util.db.DBUtils_MS;
22 -import com.bsth.webService.trafficManage.geotool.services.InternalPortType;  
23 import com.bsth.webService.trafficManage.org.tempuri.Results; 22 import com.bsth.webService.trafficManage.org.tempuri.Results;
24 import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator; 23 import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
25 import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap; 24 import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
@@ -40,6 +39,7 @@ import java.sql.ResultSet; @@ -40,6 +39,7 @@ import java.sql.ResultSet;
40 import java.text.DecimalFormat; 39 import java.text.DecimalFormat;
41 import java.text.SimpleDateFormat; 40 import java.text.SimpleDateFormat;
42 import java.util.*; 41 import java.util.*;
  42 +import java.util.regex.Matcher;
43 import java.util.regex.Pattern; 43 import java.util.regex.Pattern;
44 44
45 /** 45 /**
@@ -67,10 +67,16 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -67,10 +67,16 @@ public class TrafficManageServiceImpl implements TrafficManageService{
67 @Autowired 67 @Autowired
68 private LineRepository lineRepository; 68 private LineRepository lineRepository;
69 69
  70 + @Autowired
  71 + private LineInformationRepository lineInformationRepository;
  72 +
70 // 站点路由repository 73 // 站点路由repository
71 @Autowired 74 @Autowired
72 private StationRouteRepository stationRouteRepository; 75 private StationRouteRepository stationRouteRepository;
73 76
  77 + @Autowired
  78 + private SectionRepository sectionRepository;
  79 +
74 // 车辆repository 80 // 车辆repository
75 @Autowired 81 @Autowired
76 private CarsRepository carsRepository; 82 private CarsRepository carsRepository;
@@ -104,8 +110,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -104,8 +110,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{
104 private YgcBasicDataService ygcBasicDataService; 110 private YgcBasicDataService ygcBasicDataService;
105 111
106 112
107 - // 运管处接口  
108 - private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint(); 113 + // 运管处上传接口
  114 + private com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap webServiceSoapUp;
109 private WebServiceSoap ssop ; 115 private WebServiceSoap ssop ;
110 { 116 {
111 try { 117 try {
@@ -127,6 +133,23 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -127,6 +133,23 @@ public class TrafficManageServiceImpl implements TrafficManageService{
127 private final String userNameOther = "user"; 133 private final String userNameOther = "user";
128 // 密码 134 // 密码
129 private final String passwordOther = "user"; 135 private final String passwordOther = "user";
  136 +
  137 + // 用户名
  138 + private final String userNameUp = "user";
  139 + // 密码
  140 + private final String passwordUp = "user";
  141 +
  142 + private synchronized com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoapUp(){
  143 + try {
  144 + if(webServiceSoapUp == null){
  145 + webServiceSoapUp = new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceLocator().getWebServiceSoap();
  146 + }
  147 + }catch (Exception e){
  148 + e.printStackTrace();
  149 + }finally {
  150 + return webServiceSoapUp;
  151 + }
  152 + }
130 /** 153 /**
131 * 上传线路信息 154 * 上传线路信息
132 */ 155 */
@@ -140,23 +163,38 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -140,23 +163,38 @@ public class TrafficManageServiceImpl implements TrafficManageService{
140 Map<String,Object> map = new HashMap<>(); 163 Map<String,Object> map = new HashMap<>();
141 map.put("lineCode_eq", id); 164 map.put("lineCode_eq", id);
142 Line line ; 165 Line line ;
  166 + LineInformation lineInformation;
143 line = lineRepository.findOne(new CustomerSpecs<Line>(map)); 167 line = lineRepository.findOne(new CustomerSpecs<Line>(map));
144 if(line == null){ 168 if(line == null){
145 continue; 169 continue;
146 } 170 }
147 List<StationRoute> upStationsList ;// 上行站点路由集 171 List<StationRoute> upStationsList ;// 上行站点路由集
148 - List<StationRoute> downStationsList = null;// 下行站点路由集  
149 - sBuffer.append("<Data>");  
150 - sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");  
151 - sBuffer.append("<DataList>"); 172 + List<StationRoute> downStationsList;// 下行站点路由集
  173 + List<Object[]> downPointList;// 下行站点集
  174 + List<Object[]> upPointList;// 上行站点集
  175 + sBuffer.append("<XLs>");
  176 + sBuffer.append("<XL>");
152 if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){ 177 if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){
153 return result; 178 return result;
154 } 179 }
155 - sBuffer.append("<LINE_ID>").append(line.getId()).append("</LINE_ID>");  
156 - sBuffer.append("<LINE_CODE>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</LINE_CODE>");  
157 - sBuffer.append("<LINE_NAME>").append(line.getName()).append("</LINE_NAME>"); 180 + map = new HashMap<>();
  181 + map.put("line.id_eq",line.getId());
  182 + lineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(map));
  183 + if(lineInformation == null){
  184 + continue;
  185 + }
  186 + sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
  187 + sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
  188 + sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
  189 + sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
  190 + sBuffer.append("<QZLC>").append(lineInformation.getUpMileage()).append("</QZLC>");
  191 + sBuffer.append("<ZQLC>").append(lineInformation.getDownMileage()).append("</ZQLC>");
  192 + sBuffer.append("<XLGH>").append(line.getLinePlayType()).append("</XLGH>");
  193 + sBuffer.append("<UPDATE_DATE>").append(sdfnyr.format(new Date())).append("</UPDATE_DATE>");
  194 +
158 // 循环添加站点信息 195 // 循环添加站点信息
159 - sBuffer.append("<LineStationList>"); 196 + sBuffer.append("<StationList>");
  197 +
160 // 先查上行 198 // 先查上行
161 upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0); 199 upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
162 int startId = 1; 200 int startId = 1;
@@ -167,25 +205,23 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -167,25 +205,23 @@ public class TrafficManageServiceImpl implements TrafficManageService{
167 downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1); 205 downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
168 packagStationXml(downStationsList, sBuffer, startId); 206 packagStationXml(downStationsList, sBuffer, startId);
169 } 207 }
170 - sBuffer.append("</LineStationList>"); 208 + sBuffer.append("</StationList>");
171 209
172 // 循环添加站点点位信息 210 // 循环添加站点点位信息
173 sBuffer.append("<LinePointList>"); 211 sBuffer.append("<LinePointList>");
  212 + upPointList = sectionRepository.getSectionDirByLineId(line.getId(),0);
174 startId = 1; 213 startId = 1;
175 - startId = packagStationPointXml(upStationsList, sBuffer, startId); 214 + startId = packagStationPointXml(upPointList, sBuffer, startId);
176 // 环线不查下行 215 // 环线不查下行
177 if(line.getLinePlayType() != 1){ 216 if(line.getLinePlayType() != 1){
178 - packagStationPointXml(downStationsList, sBuffer, startId); 217 + downPointList = sectionRepository.getSectionDirByLineId(line.getId(),1);
  218 + packagStationPointXml(downPointList, sBuffer, startId);
179 } 219 }
180 sBuffer.append("</LinePointList>"); 220 sBuffer.append("</LinePointList>");
181 - sBuffer.append("</DataList>");  
182 - sBuffer.append("</Data>"); 221 + sBuffer.append("</XL>");
  222 + sBuffer.append("</XLs>");
183 // 调用上传方法 223 // 调用上传方法
184 - result = ygcBasicDataService.invokeMethod("UpdateBusLineStation",sBuffer.toString());  
185 - String str = "ReturnCode";  
186 - // 解析返回值  
187 - result = result.substring(result.indexOf(str)+str.length()+1,result.lastIndexOf(str)-2);  
188 - if(result.equals("1")){ 224 + if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,sBuffer.toString()).isSuccess()){
189 result = "success"; 225 result = "success";
190 }else{ 226 }else{
191 result = "failure"; 227 result = "failure";
@@ -1162,15 +1198,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1162,15 +1198,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1162 } 1198 }
1163 paraMap = packageYgcStationNumParam(srRoute,null); 1199 paraMap = packageYgcStationNumParam(srRoute,null);
1164 sBuffer.append("<Station>"); 1200 sBuffer.append("<Station>");
1165 - sBuffer.append("<STATION_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</STATION_ID>");  
1166 - sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");  
1167 - sBuffer.append("<STATION_NO>").append(i).append("</STATION_NO>");  
1168 - sBuffer.append("<STATION_CODE>").append(srRoute.getStationCode()).append("</STATION_CODE>");  
1169 - sBuffer.append("<STATION_NAME>").append(srRoute.getStationName()).append("</STATION_NAME>");  
1170 - sBuffer.append("<STATION_LON>").append(srRoute.getStation().getgLonx()).append("</STATION_LON>");  
1171 - sBuffer.append("<STATION_LAT>").append(srRoute.getStation().getgLaty()).append("</STATION_LAT>");  
1172 - sBuffer.append("<STATION_TYPE>").append(zdlx).append("</STATION_TYPE>");  
1173 - sBuffer.append("<STATION_DISTANCE>").append(srRoute.getDistances()).append("</STATION_DISTANCE>"); 1201 + sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</ZDXH>");
  1202 + sBuffer.append("<SXX>").append(srRoute.getDirections()).append("</SXX>");
  1203 + sBuffer.append("<ZDMC>").append(srRoute.getStationName()).append("</ZDMC>");
  1204 + sBuffer.append("<ZDBM>").append(srRoute.getStationCode()).append("</ZDBM>");
  1205 + sBuffer.append("<ZDJD>").append(srRoute.getStation().getgLonx()).append("</ZDJD>");
  1206 + sBuffer.append("<ZDWD>").append(srRoute.getStation().getgLaty()).append("</ZDWD>");
  1207 + sBuffer.append("<ZZ>").append(srRoute.getStation().getAddr() == null ? "" : srRoute.getStation().getAddr()).append("</ZZ>");
  1208 + sBuffer.append("<ZDLX>").append(zdlx).append("</ZDLX>");
  1209 + sBuffer.append("<ZJLC>").append(srRoute.getDistances()).append("</ZJLC>");
1174 sBuffer.append("</Station>"); 1210 sBuffer.append("</Station>");
1175 startId++; 1211 startId++;
1176 } 1212 }
@@ -1178,35 +1214,37 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1178,35 +1214,37 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1178 } 1214 }
1179 1215
1180 /** 1216 /**
1181 - * @param stationsList 站点路由 1217 + * @param pointList 站点点位
1182 * @param sBuffer sBuffer 1218 * @param sBuffer sBuffer
1183 * @param startId 站点序号起始ID 1219 * @param startId 站点序号起始ID
1184 * 1220 *
1185 * @return 站点序号累加后的ID 1221 * @return 站点序号累加后的ID
1186 */ 1222 */
1187 - private int packagStationPointXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){  
1188 - int size = stationsList.size();  
1189 - StationRoute srRoute;  
1190 - HashMap<String,String> paraMap;  
1191 - String zdlx ;// 站点类型:0:起点站、1:终点站、2:中途站 1223 + private int packagStationPointXml(List<Object[]> pointList,StringBuffer sBuffer,int startId){
  1224 + int size = pointList.size();
  1225 + Object[] objs;
  1226 + String bsection,dir,section;
  1227 + String[] sections ;
1192 for (int i = 0; i < size; i++) { 1228 for (int i = 0; i < size; i++) {
1193 - srRoute = stationsList.get(i);  
1194 - zdlx = srRoute.getStationMark();  
1195 - if(zdlx.equals("B")){  
1196 - zdlx = "0";  
1197 - }else if(zdlx.equals("E")){  
1198 - zdlx = "1";  
1199 - }else{  
1200 - zdlx = "2"; 1229 + objs = pointList.get(i);
  1230 + bsection = objs[0]+"";
  1231 + dir = objs[1]+"";
  1232 + // 取括号内的内容
  1233 + Pattern pattern = Pattern.compile("(?<=\\()(.+?)(?=\\))");
  1234 + Matcher matcher = pattern.matcher(bsection);
  1235 + if(matcher.find()){
  1236 + sections = matcher.group().split(",");
  1237 + for (int j = 0 ; j < sections.length ; j ++){
  1238 + section = sections[j];
  1239 + sBuffer.append("<LinePoint>");
  1240 + sBuffer.append("<ZDXH>").append(startId).append("</ZDXH>");
  1241 + sBuffer.append("<SXX>").append(dir).append("</SXX>");
  1242 + sBuffer.append("<ZDJD>").append(section.split(" ")[0]).append("</ZDJD>");
  1243 + sBuffer.append("<ZDWD>").append(section.split(" ")[1]).append("</ZDWD>");
  1244 + sBuffer.append("</LinePoint>");
  1245 + startId++;
  1246 + }
1201 } 1247 }
1202 - paraMap = packageYgcStationNumParam(srRoute,null);  
1203 - sBuffer.append("<Point>");  
1204 - sBuffer.append("<POINT_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</POINT_ID>");  
1205 - sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");  
1206 - sBuffer.append("<POINTLON>").append(srRoute.getStation().getgLonx()).append("</POINTLON>");  
1207 - sBuffer.append("<POINTLAT>").append(srRoute.getStation().getgLaty()).append("</POINTLAT>");  
1208 - sBuffer.append("</Point>");  
1209 - startId++;  
1210 } 1248 }
1211 return startId; 1249 return startId;
1212 } 1250 }
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
@@ -2,6 +2,33 @@ package com.bsth.service.oil.impl; @@ -2,6 +2,33 @@ package com.bsth.service.oil.impl;
2 2
3 3
4 4
  5 +import java.sql.ResultSet;
  6 +import java.sql.SQLException;
  7 +import java.text.DecimalFormat;
  8 +import java.text.ParseException;
  9 +import java.text.SimpleDateFormat;
  10 +import java.util.ArrayList;
  11 +import java.util.Calendar;
  12 +import java.util.Collections;
  13 +import java.util.Comparator;
  14 +import java.util.Date;
  15 +import java.util.HashMap;
  16 +import java.util.Iterator;
  17 +import java.util.List;
  18 +import java.util.Map;
  19 +
  20 +import javax.transaction.Transactional;
  21 +
  22 +import org.apache.commons.lang3.StringEscapeUtils;
  23 +import org.slf4j.Logger;
  24 +import org.slf4j.LoggerFactory;
  25 +import org.springframework.beans.factory.annotation.Autowired;
  26 +import org.springframework.data.domain.Sort;
  27 +import org.springframework.data.domain.Sort.Direction;
  28 +import org.springframework.jdbc.core.JdbcTemplate;
  29 +import org.springframework.jdbc.core.RowMapper;
  30 +import org.springframework.stereotype.Service;
  31 +
5 import com.alibaba.fastjson.JSONArray; 32 import com.alibaba.fastjson.JSONArray;
6 import com.alibaba.fastjson.JSONObject; 33 import com.alibaba.fastjson.JSONObject;
7 import com.bsth.common.ResponseCode; 34 import com.bsth.common.ResponseCode;
@@ -9,34 +36,24 @@ import com.bsth.data.BasicData; @@ -9,34 +36,24 @@ import com.bsth.data.BasicData;
9 import com.bsth.entity.Cars; 36 import com.bsth.entity.Cars;
10 import com.bsth.entity.Line; 37 import com.bsth.entity.Line;
11 import com.bsth.entity.oil.Cdl; 38 import com.bsth.entity.oil.Cdl;
  39 +import com.bsth.entity.oil.Cyl;
12 import com.bsth.entity.oil.Dlb; 40 import com.bsth.entity.oil.Dlb;
13 import com.bsth.entity.oil.Jdl; 41 import com.bsth.entity.oil.Jdl;
  42 +import com.bsth.entity.oil.Ylb;
14 import com.bsth.entity.oil.Ylxxb; 43 import com.bsth.entity.oil.Ylxxb;
  44 +import com.bsth.entity.search.CustomerSpecs;
15 import com.bsth.repository.CarsRepository; 45 import com.bsth.repository.CarsRepository;
16 import com.bsth.repository.oil.CdlRepository; 46 import com.bsth.repository.oil.CdlRepository;
  47 +import com.bsth.repository.oil.CylRepository;
17 import com.bsth.repository.oil.DlbRepository; 48 import com.bsth.repository.oil.DlbRepository;
18 import com.bsth.repository.oil.JdlRepository; 49 import com.bsth.repository.oil.JdlRepository;
  50 +import com.bsth.repository.oil.YlbRepository;
19 import com.bsth.repository.oil.YlxxbRepository; 51 import com.bsth.repository.oil.YlxxbRepository;
20 import com.bsth.service.impl.BaseServiceImpl; 52 import com.bsth.service.impl.BaseServiceImpl;
21 import com.bsth.service.oil.DlbService; 53 import com.bsth.service.oil.DlbService;
22 import com.bsth.service.realcontrol.ScheduleRealInfoService; 54 import com.bsth.service.realcontrol.ScheduleRealInfoService;
23 import com.bsth.util.Arith; 55 import com.bsth.util.Arith;
24 import com.bsth.util.BatchSaveUtils; 56 import com.bsth.util.BatchSaveUtils;
25 -import org.apache.commons.lang3.StringEscapeUtils;  
26 -import org.slf4j.Logger;  
27 -import org.slf4j.LoggerFactory;  
28 -import org.springframework.beans.factory.annotation.Autowired;  
29 -import org.springframework.jdbc.core.JdbcTemplate;  
30 -import org.springframework.jdbc.core.RowMapper;  
31 -import org.springframework.stereotype.Service;  
32 -  
33 -import javax.transaction.Transactional;  
34 -import java.sql.ResultSet;  
35 -import java.sql.SQLException;  
36 -import java.text.DecimalFormat;  
37 -import java.text.ParseException;  
38 -import java.text.SimpleDateFormat;  
39 -import java.util.*;  
40 57
41 @Service 58 @Service
42 public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbService{ 59 public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbService{
@@ -410,7 +427,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -410,7 +427,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
410 // TODO Auto-generated method stub 427 // TODO Auto-generated method stub
411 // 当天YLB信息 428 // 当天YLB信息
412 List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm"); 429 List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
413 -// repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");  
414 // 当天YLXXB信息 430 // 当天YLXXB信息
415 List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm); 431 List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
416 // 从排班表中计算出行驶的总里程 432 // 从排班表中计算出行驶的总里程
@@ -467,8 +483,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -467,8 +483,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
467 Map<String, Object> newMap_=new HashMap<String,Object>(); 483 Map<String, Object> newMap_=new HashMap<String,Object>();
468 List<Dlb> addList = new ArrayList<Dlb>(); 484 List<Dlb> addList = new ArrayList<Dlb>();
469 List<Dlb> updateList = new ArrayList<Dlb>(); 485 List<Dlb> updateList = new ArrayList<Dlb>();
470 - String ins="";  
471 - Map<String, Object> ylMap=new HashMap<String, Object>(); 486 + Map<String, Object> cMap=new HashMap<String, Object>();
472 List<Map<String, Object>> listpb_=listpb; 487 List<Map<String, Object>> listpb_=listpb;
473 Collections.sort(listpb,new NbbmJcsxMap()); 488 Collections.sort(listpb,new NbbmJcsxMap());
474 for (int x = 0; x < listpb_.size(); x++) { 489 for (int x = 0; x < listpb_.size(); x++) {
@@ -514,9 +529,24 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -514,9 +529,24 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
514 if (t1.getNbbm().equals(map.get("clZbh").toString()) 529 if (t1.getNbbm().equals(map.get("clZbh").toString())
515 && t1.getJsy().equals(map.get("jGh").toString()) 530 && t1.getJsy().equals(map.get("jGh").toString())
516 && t1.getXlbm().equals(map.get("xlBm").toString())) { 531 && t1.getXlbm().equals(map.get("xlBm").toString())) {
517 - t = t1;  
518 - type = "update"; 532 + if(t1.getLp()==null){
  533 + //同人同车同线路不同路牌的过滤 (考虑到历史数据)
  534 + if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
  535 + t = t1;
  536 + type = "update";
  537 + cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
  538 + map.get("clZbh").toString());
  539 + }
  540 + }else{
  541 + if(t1.getLp().equals(map.get("lpName").toString())){
  542 + t = t1;
  543 + type = "update";
  544 + }
  545 +
  546 + }
519 } 547 }
  548 +
  549 +
520 } 550 }
521 Double lc= Double.parseDouble(map.get("totalKilometers").toString()); 551 Double lc= Double.parseDouble(map.get("totalKilometers").toString());
522 if(map.get("seqNumber").toString().equals("1")){ 552 if(map.get("seqNumber").toString().equals("1")){
@@ -576,7 +606,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -576,7 +606,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
576 t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString()); 606 t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
577 t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString()); 607 t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
578 t.setRq(sdf.parse(rq)); 608 t.setRq(sdf.parse(rq));
579 - 609 + t.setLp(map.get("lpName").toString());
580 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){ 610 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
581 if(type.equals("add")){ 611 if(type.equals("add")){
582 t.setCreatetime(date); 612 t.setCreatetime(date);
@@ -586,7 +616,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -586,7 +616,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
586 updateList.add(t); 616 updateList.add(t);
587 } 617 }
588 } 618 }
589 -// repository.save(t);  
590 newMap.put("status", ResponseCode.SUCCESS); 619 newMap.put("status", ResponseCode.SUCCESS);
591 } 620 }
592 } 621 }
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
@@ -184,6 +184,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -184,6 +184,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
184 t.setJcsx(Integer.parseInt(map.get("seqNumber").toString())); 184 t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
185 t.setSsgsdm(map.get("company")==null?"":map.get("company").toString()); 185 t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
186 t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString()); 186 t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
  187 + t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
187 t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString()); 188 t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
188 t.setRq(sdf.parse(rq)); 189 t.setRq(sdf.parse(rq));
189 t.setCreatetime(dNow); 190 t.setCreatetime(dNow);
@@ -262,13 +263,16 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -262,13 +263,16 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
262 // TODO Auto-generated method stub 263 // TODO Auto-generated method stub
263 // 当天YLB信息 264 // 当天YLB信息
264 List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm"); 265 List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
265 -// repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm"); 266 +
266 // 当天YLXXB信息 267 // 当天YLXXB信息
267 List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm); 268 List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
  269 +
268 // 前一天所有车辆最后进场班次信息 270 // 前一天所有车辆最后进场班次信息
269 // List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm); 271 // List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
270 List<Ylb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm); 272 List<Ylb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
  273 +
271 List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm); 274 List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
  275 +
272 // 从排班表中计算出行驶的总里程 276 // 从排班表中计算出行驶的总里程
273 List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>(); 277 List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
274 List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm); 278 List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
@@ -307,11 +311,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -307,11 +311,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
307 } 311 }
308 } 312 }
309 } 313 }
310 - 314 +
311 List<Ylb> addList = new ArrayList<Ylb>(); 315 List<Ylb> addList = new ArrayList<Ylb>();
312 List<Ylb> updateList = new ArrayList<Ylb>(); 316 List<Ylb> updateList = new ArrayList<Ylb>();
313 - String ins="";  
314 Map<String, Object> ylMap=new HashMap<String, Object>(); 317 Map<String, Object> ylMap=new HashMap<String, Object>();
  318 +
  319 + Map<String, Object> cMap=new HashMap<String, Object>();
315 for (int x = 0; x < listpb.size(); x++) { 320 for (int x = 0; x < listpb.size(); x++) {
316 String type = "add"; 321 String type = "add";
317 boolean sfdc = true; 322 boolean sfdc = true;
@@ -328,12 +333,25 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -328,12 +333,25 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
328 Ylb t1 = ylList.get(k); 333 Ylb t1 = ylList.get(k);
329 if (t1.getNbbm().equals(map.get("clZbh").toString()) 334 if (t1.getNbbm().equals(map.get("clZbh").toString())
330 && t1.getJsy().equals(map.get("jGh").toString()) 335 && t1.getJsy().equals(map.get("jGh").toString())
331 - && t1.getXlbm().equals(map.get("xlBm").toString())) {  
332 - t = t1;  
333 - type = "update"; 336 + && t1.getXlbm().equals(map.get("xlBm").toString()
  337 + )) {
  338 + if(t1.getLp()==null){
  339 + //同人同车同线路不同路牌的过滤 (考虑到历史数据)
  340 + if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
  341 + t = t1;
  342 + type = "update";
  343 + cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
  344 + map.get("clZbh").toString());
  345 + }
  346 + }else{
  347 + if(t1.getLp().equals(map.get("lpName").toString())){
  348 + t = t1;
  349 + type = "update";
  350 + }
  351 +
  352 + }
334 } 353 }
335 } 354 }
336 -  
337 // 当日的第一个班次,出场油量等于前一天的最后一个班次的进场油量 355 // 当日的第一个班次,出场油量等于前一天的最后一个班次的进场油量
338 if (map.get("seqNumber").toString().equals("1")) { 356 if (map.get("seqNumber").toString().equals("1")) {
339 boolean fage = true; 357 boolean fage = true;
@@ -428,7 +446,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -428,7 +446,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
428 t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString()); 446 t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
429 t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString()); 447 t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
430 t.setRq(sdf.parse(rq)); 448 t.setRq(sdf.parse(rq));
431 - 449 + t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
432 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){ 450 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
433 if(type.equals("add")){ 451 if(type.equals("add")){
434 t.setCreatetime(date); 452 t.setCreatetime(date);
@@ -436,7 +454,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -436,7 +454,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
436 }else{ 454 }else{
437 t.setUpdatetime(date); 455 t.setUpdatetime(date);
438 updateList.add(t); 456 updateList.add(t);
439 - ins += t.getId().toString()+",";  
440 } 457 }
441 } 458 }
442 // repository.save(t); 459 // repository.save(t);
@@ -456,7 +473,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -456,7 +473,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
456 } 473 }
457 474
458 } 475 }
459 -  
460 if(updateList.size()>0){ 476 if(updateList.size()>0){
461 for (int i = 0; i < updateList.size(); i++) { 477 for (int i = 0; i < updateList.size(); i++) {
462 repository.save(updateList.get(i)); 478 repository.save(updateList.get(i));
@@ -1437,23 +1453,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -1437,23 +1453,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1437 t.setYh(yh); 1453 t.setYh(yh);
1438 t.setJzyl(ylxs); 1454 t.setJzyl(ylxs);
1439 nextJzyl=ylxs; 1455 nextJzyl=ylxs;
1440 -  
1441 -  
1442 }else{ 1456 }else{
1443 t.setYh(yh); 1457 t.setYh(yh);
1444 t.setJzyl(nextJzyl); 1458 t.setJzyl(nextJzyl);
1445 } 1459 }
1446 } 1460 }
1447 repository.save(t); 1461 repository.save(t);
1448 - for (int z = 0; z < cylList.size(); z++) {  
1449 - Cyl cyl = cylList.get(z);  
1450 - if (t.getNbbm().equals(cyl.getNbbm())) {  
1451 - cyl.setCyl(t.getJzyl());  
1452 - cyl.setUpdatetime(t.getRq());  
1453 - break;  
1454 - }  
1455 - cylRepository.save(cyl);  
1456 - }  
1457 } 1462 }
1458 newMap.put("status", ResponseCode.SUCCESS); 1463 newMap.put("status", ResponseCode.SUCCESS);
1459 } 1464 }
@@ -1547,7 +1552,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -1547,7 +1552,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1547 String px) { 1552 String px) {
1548 // TODO Auto-generated method stub 1553 // TODO Auto-generated method stub
1549 String sql="SELECT * FROM bsth_c_ylb " 1554 String sql="SELECT * FROM bsth_c_ylb "
1550 - + " where to_days('"+rq+"')=to_days(rq) and ssgsdm like '%"+gsdm+"%' " 1555 + + " where rq ='"+rq+"' and ssgsdm like '%"+gsdm+"%' "
1551 + " and fgsdm like '%"+fgsdm+"%'"; 1556 + " and fgsdm like '%"+fgsdm+"%'";
1552 if(xlbm.equals("")){ 1557 if(xlbm.equals("")){
1553 sql+= " and xlbm like '%"+xlbm+"%' "; 1558 sql+= " and xlbm like '%"+xlbm+"%' ";
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
@@ -139,9 +139,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L @@ -139,9 +139,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
139 139
140 Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs); 140 Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs);
141 141
142 - Map<String,Object> changeBcType(Long id, String bcType, String remarks); 142 + Map<String, Object> changeBcType(Long id, String bcType, String remarks, String majorStationName);
143 143
144 - Map<String,Object> historySave(ScheduleRealInfo sch); 144 + Map<String,Object> historySave(ScheduleRealInfo sch);
145 145
146 Map<String, Object> MapById(Long id) ; 146 Map<String, Object> MapById(Long id) ;
147 147
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -24,7 +24,6 @@ import com.bsth.data.utils.CustomStringUtils; @@ -24,7 +24,6 @@ import com.bsth.data.utils.CustomStringUtils;
24 import com.bsth.entity.Cars; 24 import com.bsth.entity.Cars;
25 import com.bsth.entity.Line; 25 import com.bsth.entity.Line;
26 import com.bsth.entity.Personnel; 26 import com.bsth.entity.Personnel;
27 -import com.bsth.entity.mcy_forms.Waybillday;  
28 import com.bsth.entity.oil.Dlb; 27 import com.bsth.entity.oil.Dlb;
29 import com.bsth.entity.oil.Ylb; 28 import com.bsth.entity.oil.Ylb;
30 import com.bsth.entity.oil.Ylxxb; 29 import com.bsth.entity.oil.Ylxxb;
@@ -2949,21 +2948,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2949,21 +2948,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2949 }else{ 2948 }else{
2950 yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList_eq(line, date,gsbm,fgsbm,nbbm); 2949 yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList_eq(line, date,gsbm,fgsbm,nbbm);
2951 } 2950 }
2952 - System.out.println("time2:"+new Date());  
2953 -  
2954 List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm); 2951 List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
2955 for (int x = 0; x < yesterdayDataList.size(); x++) { 2952 for (int x = 0; x < yesterdayDataList.size(); x++) {
2956 String jName = yesterdayDataList.get(x).get("jGh").toString(); 2953 String jName = yesterdayDataList.get(x).get("jGh").toString();
2957 String clZbh = yesterdayDataList.get(x).get("clZbh").toString(); 2954 String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
2958 String xlbm = yesterdayDataList.get(x).get("xlBm").toString(); 2955 String xlbm = yesterdayDataList.get(x).get("xlBm").toString();
  2956 + String lp =yesterdayDataList.get(x).get("lpName").toString();
2959 Map<String, Object> map = new HashMap<String, Object>(); 2957 Map<String, Object> map = new HashMap<String, Object>();
2960 boolean fage = true; 2958 boolean fage = true;
2961 String company=""; 2959 String company="";
2962 String bCompany=""; 2960 String bCompany="";
2963 List<ScheduleRealInfo> listS=new ArrayList<ScheduleRealInfo>(); 2961 List<ScheduleRealInfo> listS=new ArrayList<ScheduleRealInfo>();
2964 for (ScheduleRealInfo scheduleRealInfo : lists) { 2962 for (ScheduleRealInfo scheduleRealInfo : lists) {
2965 - if(scheduleRealInfo.getjGh().equals(jName) && scheduleRealInfo.getClZbh().equals(clZbh)  
2966 - && scheduleRealInfo.getXlBm().equals(xlbm)){ 2963 + if(scheduleRealInfo.getjGh().equals(jName)
  2964 + && scheduleRealInfo.getClZbh().equals(clZbh)
  2965 + && scheduleRealInfo.getXlBm().equals(xlbm)
  2966 + && scheduleRealInfo.getLpName().equals(lp)){
2967 if (fage) { 2967 if (fage) {
2968 //根据线路代码获取公司 2968 //根据线路代码获取公司
2969 company=scheduleRealInfo.getGsBm(); 2969 company=scheduleRealInfo.getGsBm();
@@ -2980,7 +2980,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2980,7 +2980,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2980 } 2980 }
2981 } 2981 }
2982 } 2982 }
2983 -  
2984 yesterdayDataList.get(x).put("company", company); 2983 yesterdayDataList.get(x).put("company", company);
2985 yesterdayDataList.get(x).put("bCompany", bCompany); 2984 yesterdayDataList.get(x).put("bCompany", bCompany);
2986 Double ljgl=culateMieageService.culateLjgl(listS); 2985 Double ljgl=culateMieageService.culateLjgl(listS);
@@ -3005,6 +3004,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3005,6 +3004,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3005 } 3004 }
3006 } 3005 }
3007 } 3006 }
  3007 +
3008 return yesterdayDataList; 3008 return yesterdayDataList;
3009 } 3009 }
3010 3010
@@ -3241,7 +3241,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3241,7 +3241,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3241 * @return 3241 * @return
3242 */ 3242 */
3243 @Override 3243 @Override
3244 - public Map<String, Object> changeBcType(Long id, String bcType, String remarks) { 3244 + public Map<String, Object> changeBcType(Long id, String bcType, String remarks, String majorStationName) {
3245 Map<String, Object> rs = new HashMap<>(); 3245 Map<String, Object> rs = new HashMap<>();
3246 3246
3247 try { 3247 try {
@@ -3251,6 +3251,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3251,6 +3251,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3251 sch.addRemarks(remarks); 3251 sch.addRemarks(remarks);
3252 rs.put("status", ResponseCode.SUCCESS); 3252 rs.put("status", ResponseCode.SUCCESS);
3253 rs.put("t", sch); 3253 rs.put("t", sch);
  3254 +
  3255 + if("major".equals(bcType)){
  3256 + sch.setMajorStationName(majorStationName);
  3257 + }
3254 } 3258 }
3255 } catch (Exception e) { 3259 } catch (Exception e) {
3256 logger.error("", e); 3260 logger.error("", e);
@@ -3550,7 +3554,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3550,7 +3554,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3550 map.put("fast", ""); 3554 map.put("fast", "");
3551 map.put("slow", ""); 3555 map.put("slow", "");
3552 } 3556 }
3553 - System.out.println(map);  
3554 listMap.add(map); 3557 listMap.add(map);
3555 } catch (Exception e) { 3558 } catch (Exception e) {
3556 e.printStackTrace(); 3559 e.printStackTrace();
@@ -3741,26 +3744,46 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3741,26 +3744,46 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3741 type=0; 3744 type=0;
3742 for (int i = 0; i < listYlb.size(); i++) { 3745 for (int i = 0; i < listYlb.size(); i++) {
3743 Ylb y = listYlb.get(i); 3746 Ylb y = listYlb.get(i);
3744 - ccyl=Arith.add(ccyl, y.getCzyl());  
3745 - jcyl=Arith.add(jcyl, y.getJzyl());  
3746 - yh =Arith.add(yh ,y.getYh());  
3747 - jzl =Arith.add(jzl, y.getJzl());  
3748 - zlc =Arith.add(zlc, y.getZlc()); 3747 + if(y.getLp()==null){
  3748 + ccyl=Arith.add(ccyl, y.getCzyl());
  3749 + jcyl=Arith.add(jcyl, y.getJzyl());
  3750 + yh =Arith.add(yh ,y.getYh());
  3751 + jzl =Arith.add(jzl, y.getJzl());
  3752 + zlc =Arith.add(zlc, y.getZlc());
  3753 + }else{
  3754 + if(y.getLp().equals(s.getLpName())){
  3755 + ccyl=Arith.add(ccyl, y.getCzyl());
  3756 + jcyl=Arith.add(jcyl, y.getJzyl());
  3757 + yh =Arith.add(yh ,y.getYh());
  3758 + jzl =Arith.add(jzl, y.getJzl());
  3759 + zlc =Arith.add(zlc, y.getZlc());
  3760 + }
  3761 + }
  3762 +
3749 } 3763 }
3750 }else{ 3764 }else{
3751 type=1; 3765 type=1;
3752 for (int i = 0; i < listDlb.size(); i++) { 3766 for (int i = 0; i < listDlb.size(); i++) {
3753 Dlb d=listDlb.get(i); 3767 Dlb d=listDlb.get(i);
3754 - ccyl=Arith.add(ccyl, d.getCzcd());  
3755 - jcyl=Arith.add(jcyl, d.getJzcd());  
3756 - yh =Arith.add(yh ,d.getHd());  
3757 - jzl =Arith.add(jzl, d.getCdl());  
3758 - zlc =Arith.add(zlc, d.getZlc()); 3768 + if(d.getLp()==null){
  3769 + ccyl=Arith.add(ccyl, d.getCzcd());
  3770 + jcyl=Arith.add(jcyl, d.getJzcd());
  3771 + yh =Arith.add(yh ,d.getHd());
  3772 + jzl =Arith.add(jzl, d.getCdl());
  3773 + zlc =Arith.add(zlc, d.getZlc());
  3774 + }else{
  3775 + if(d.getLp().equals(s.getLpName())){
  3776 + ccyl=Arith.add(ccyl, d.getCzcd());
  3777 + jcyl=Arith.add(jcyl, d.getJzcd());
  3778 + yh =Arith.add(yh ,d.getHd());
  3779 + jzl =Arith.add(jzl, d.getCdl());
  3780 + zlc =Arith.add(zlc, d.getZlc());
  3781 + }
  3782 + }
  3783 +
3759 } 3784 }
3760 } 3785 }
3761 3786
3762 -  
3763 -  
3764 map.put("jzl", jzl); 3787 map.put("jzl", jzl);
3765 map.put("yh", yh); 3788 map.put("yh", yh);
3766 map.put("ccyl", ccyl); 3789 map.put("ccyl", ccyl);
src/main/java/com/bsth/service/traffic/impl/YgcBasicDataServiceImpl.java
@@ -45,6 +45,7 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{ @@ -45,6 +45,7 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
45 45
46 private static String IP = "218.242.195.76:9091"; 46 private static String IP = "218.242.195.76:9091";
47 private static String downTargetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl"; 47 private static String downTargetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl";
  48 + // 此地址作废
48 private static String upTargetEndpoint = "http://" + IP +"/ygc.TransManager.BasicUpload?wsdl"; 49 private static String upTargetEndpoint = "http://" + IP +"/ygc.TransManager.BasicUpload?wsdl";
49 private static String namespace = "http://service.shygc.com"; 50 private static String namespace = "http://service.shygc.com";
50 private static String userName = "admin"; 51 private static String userName = "admin";
src/main/java/com/bsth/webService/trafficManage/up/org/tempuri/Results.java 0 → 100644
  1 +/**
  2 + * Results.java
  3 + *
  4 + * This file was auto-generated from WSDL
  5 + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
  6 + */
  7 +
  8 +package com.bsth.webService.trafficManage.up.org.tempuri;
  9 +
  10 +public class Results implements java.io.Serializable {
  11 + private boolean success;
  12 +
  13 + private java.lang.String message;
  14 +
  15 + public Results() {
  16 + }
  17 +
  18 + public Results(
  19 + boolean success,
  20 + java.lang.String message) {
  21 + this.success = success;
  22 + this.message = message;
  23 + }
  24 +
  25 +
  26 + /**
  27 + * Gets the success value for this Results.
  28 + *
  29 + * @return success
  30 + */
  31 + public boolean isSuccess() {
  32 + return success;
  33 + }
  34 +
  35 +
  36 + /**
  37 + * Sets the success value for this Results.
  38 + *
  39 + * @param success
  40 + */
  41 + public void setSuccess(boolean success) {
  42 + this.success = success;
  43 + }
  44 +
  45 +
  46 + /**
  47 + * Gets the message value for this Results.
  48 + *
  49 + * @return message
  50 + */
  51 + public java.lang.String getMessage() {
  52 + return message;
  53 + }
  54 +
  55 +
  56 + /**
  57 + * Sets the message value for this Results.
  58 + *
  59 + * @param message
  60 + */
  61 + public void setMessage(java.lang.String message) {
  62 + this.message = message;
  63 + }
  64 +
  65 + private java.lang.Object __equalsCalc = null;
  66 + public synchronized boolean equals(java.lang.Object obj) {
  67 + if (!(obj instanceof Results)) return false;
  68 + Results other = (Results) obj;
  69 + if (obj == null) return false;
  70 + if (this == obj) return true;
  71 + if (__equalsCalc != null) {
  72 + return (__equalsCalc == obj);
  73 + }
  74 + __equalsCalc = obj;
  75 + boolean _equals;
  76 + _equals = true &&
  77 + this.success == other.isSuccess() &&
  78 + ((this.message==null && other.getMessage()==null) ||
  79 + (this.message!=null &&
  80 + this.message.equals(other.getMessage())));
  81 + __equalsCalc = null;
  82 + return _equals;
  83 + }
  84 +
  85 + private boolean __hashCodeCalc = false;
  86 + public synchronized int hashCode() {
  87 + if (__hashCodeCalc) {
  88 + return 0;
  89 + }
  90 + __hashCodeCalc = true;
  91 + int _hashCode = 1;
  92 + _hashCode += (isSuccess() ? Boolean.TRUE : Boolean.FALSE).hashCode();
  93 + if (getMessage() != null) {
  94 + _hashCode += getMessage().hashCode();
  95 + }
  96 + __hashCodeCalc = false;
  97 + return _hashCode;
  98 + }
  99 +
  100 + // Type metadata
  101 + private static org.apache.axis.description.TypeDesc typeDesc =
  102 + new org.apache.axis.description.TypeDesc(Results.class, true);
  103 +
  104 + static {
  105 + typeDesc.setXmlType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  106 + org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
  107 + elemField.setFieldName("success");
  108 + elemField.setXmlName(new javax.xml.namespace.QName("http://tempuri.org/", "success"));
  109 + elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
  110 + elemField.setNillable(false);
  111 + typeDesc.addFieldDesc(elemField);
  112 + elemField = new org.apache.axis.description.ElementDesc();
  113 + elemField.setFieldName("message");
  114 + elemField.setXmlName(new javax.xml.namespace.QName("http://tempuri.org/", "message"));
  115 + elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
  116 + elemField.setMinOccurs(0);
  117 + elemField.setNillable(false);
  118 + typeDesc.addFieldDesc(elemField);
  119 + }
  120 +
  121 + /**
  122 + * Return type metadata object
  123 + */
  124 + public static org.apache.axis.description.TypeDesc getTypeDesc() {
  125 + return typeDesc;
  126 + }
  127 +
  128 + /**
  129 + * Get Custom Serializer
  130 + */
  131 + public static org.apache.axis.encoding.Serializer getSerializer(
  132 + java.lang.String mechType,
  133 + java.lang.Class _javaType,
  134 + javax.xml.namespace.QName _xmlType) {
  135 + return
  136 + new org.apache.axis.encoding.ser.BeanSerializer(
  137 + _javaType, _xmlType, typeDesc);
  138 + }
  139 +
  140 + /**
  141 + * Get Custom Deserializer
  142 + */
  143 + public static org.apache.axis.encoding.Deserializer getDeserializer(
  144 + java.lang.String mechType,
  145 + java.lang.Class _javaType,
  146 + javax.xml.namespace.QName _xmlType) {
  147 + return
  148 + new org.apache.axis.encoding.ser.BeanDeserializer(
  149 + _javaType, _xmlType, typeDesc);
  150 + }
  151 +
  152 +}
src/main/java/com/bsth/webService/trafficManage/up/org/tempuri/WebService.java 0 → 100644
  1 +/**
  2 + * WebService.java
  3 + *
  4 + * This file was auto-generated from WSDL
  5 + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
  6 + */
  7 +
  8 +package com.bsth.webService.trafficManage.up.org.tempuri;
  9 +
  10 +public interface WebService extends javax.xml.rpc.Service {
  11 + public java.lang.String getWebServiceSoapAddress();
  12 +
  13 + public com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoap() throws javax.xml.rpc.ServiceException;
  14 +
  15 + public com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoap(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
  16 +}
src/main/java/com/bsth/webService/trafficManage/up/org/tempuri/WebServiceLocator.java 0 → 100644
  1 +/**
  2 + * WebServiceLocator.java
  3 + *
  4 + * This file was auto-generated from WSDL
  5 + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
  6 + */
  7 +
  8 +package com.bsth.webService.trafficManage.up.org.tempuri;
  9 +
  10 +public class WebServiceLocator extends org.apache.axis.client.Service implements com.bsth.webService.trafficManage.up.org.tempuri.WebService {
  11 +
  12 + public WebServiceLocator() {
  13 + }
  14 +
  15 +
  16 + public WebServiceLocator(org.apache.axis.EngineConfiguration config) {
  17 + super(config);
  18 + }
  19 +
  20 + public WebServiceLocator(java.lang.String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException {
  21 + super(wsdlLoc, sName);
  22 + }
  23 +
  24 + // Use to get a proxy class for WebServiceSoap
  25 + private java.lang.String WebServiceSoap_address = "http://218.242.195.76:8411/WebService_test/WebService.asmx";
  26 +
  27 + public java.lang.String getWebServiceSoapAddress() {
  28 + return WebServiceSoap_address;
  29 + }
  30 +
  31 + // The WSDD service name defaults to the port name.
  32 + private java.lang.String WebServiceSoapWSDDServiceName = "WebServiceSoap";
  33 +
  34 + public java.lang.String getWebServiceSoapWSDDServiceName() {
  35 + return WebServiceSoapWSDDServiceName;
  36 + }
  37 +
  38 + public void setWebServiceSoapWSDDServiceName(java.lang.String name) {
  39 + WebServiceSoapWSDDServiceName = name;
  40 + }
  41 +
  42 + public com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoap() throws javax.xml.rpc.ServiceException {
  43 + java.net.URL endpoint;
  44 + try {
  45 + endpoint = new java.net.URL(WebServiceSoap_address);
  46 + }
  47 + catch (java.net.MalformedURLException e) {
  48 + throw new javax.xml.rpc.ServiceException(e);
  49 + }
  50 + return getWebServiceSoap(endpoint);
  51 + }
  52 +
  53 + public com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoap(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {
  54 + try {
  55 + com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoapStub _stub = new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoapStub(portAddress, this);
  56 + _stub.setPortName(getWebServiceSoapWSDDServiceName());
  57 + return _stub;
  58 + }
  59 + catch (org.apache.axis.AxisFault e) {
  60 + return null;
  61 + }
  62 + }
  63 +
  64 + public void setWebServiceSoapEndpointAddress(java.lang.String address) {
  65 + WebServiceSoap_address = address;
  66 + }
  67 +
  68 + /**
  69 + * For the given interface, get the stub implementation.
  70 + * If this service has no port for the given interface,
  71 + * then ServiceException is thrown.
  72 + */
  73 + public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
  74 + try {
  75 + if (com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap.class.isAssignableFrom(serviceEndpointInterface)) {
  76 + com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoapStub _stub = new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoapStub(new java.net.URL(WebServiceSoap_address), this);
  77 + _stub.setPortName(getWebServiceSoapWSDDServiceName());
  78 + return _stub;
  79 + }
  80 + }
  81 + catch (java.lang.Throwable t) {
  82 + throw new javax.xml.rpc.ServiceException(t);
  83 + }
  84 + throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName()));
  85 + }
  86 +
  87 + /**
  88 + * For the given interface, get the stub implementation.
  89 + * If this service has no port for the given interface,
  90 + * then ServiceException is thrown.
  91 + */
  92 + public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
  93 + if (portName == null) {
  94 + return getPort(serviceEndpointInterface);
  95 + }
  96 + java.lang.String inputPortName = portName.getLocalPart();
  97 + if ("WebServiceSoap".equals(inputPortName)) {
  98 + return getWebServiceSoap();
  99 + }
  100 + else {
  101 + java.rmi.Remote _stub = getPort(serviceEndpointInterface);
  102 + ((org.apache.axis.client.Stub) _stub).setPortName(portName);
  103 + return _stub;
  104 + }
  105 + }
  106 +
  107 + public javax.xml.namespace.QName getServiceName() {
  108 + return new javax.xml.namespace.QName("http://tempuri.org/", "WebService");
  109 + }
  110 +
  111 + private java.util.HashSet ports = null;
  112 +
  113 + public java.util.Iterator getPorts() {
  114 + if (ports == null) {
  115 + ports = new java.util.HashSet();
  116 + ports.add(new javax.xml.namespace.QName("http://tempuri.org/", "WebServiceSoap"));
  117 + }
  118 + return ports.iterator();
  119 + }
  120 +
  121 + /**
  122 + * Set the endpoint address for the specified port name.
  123 + */
  124 + public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException {
  125 +
  126 +if ("WebServiceSoap".equals(portName)) {
  127 + setWebServiceSoapEndpointAddress(address);
  128 + }
  129 + else
  130 +{ // Unknown Port Name
  131 + throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName);
  132 + }
  133 + }
  134 +
  135 + /**
  136 + * Set the endpoint address for the specified port name.
  137 + */
  138 + public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) throws javax.xml.rpc.ServiceException {
  139 + setEndpointAddress(portName.getLocalPart(), address);
  140 + }
  141 +
  142 +}
src/main/java/com/bsth/webService/trafficManage/up/org/tempuri/WebServiceSoap.java 0 → 100644
  1 +/**
  2 + * WebServiceSoap.java
  3 + *
  4 + * This file was auto-generated from WSDL
  5 + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
  6 + */
  7 +
  8 +package com.bsth.webService.trafficManage.up.org.tempuri;
  9 +
  10 +public interface WebServiceSoap extends java.rmi.Remote {
  11 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setXL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  12 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setCL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  13 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setLD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  14 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setDDRB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  15 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setJHBC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  16 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setSKB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  17 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setSJ(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  18 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setLCYH(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  19 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setXLPC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  20 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setCS(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  21 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setFZCKGM(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  22 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setJJZD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
  23 +}
src/main/java/com/bsth/webService/trafficManage/up/org/tempuri/WebServiceSoapProxy.java 0 → 100644
  1 +package com.bsth.webService.trafficManage.up.org.tempuri;
  2 +
  3 +public class WebServiceSoapProxy implements com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap {
  4 + private String _endpoint = null;
  5 + private com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap webServiceSoap = null;
  6 +
  7 + public WebServiceSoapProxy() {
  8 + _initWebServiceSoapProxy();
  9 + }
  10 +
  11 + public WebServiceSoapProxy(String endpoint) {
  12 + _endpoint = endpoint;
  13 + _initWebServiceSoapProxy();
  14 + }
  15 +
  16 + private void _initWebServiceSoapProxy() {
  17 + try {
  18 + webServiceSoap = (new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceLocator()).getWebServiceSoap();
  19 + if (webServiceSoap != null) {
  20 + if (_endpoint != null)
  21 + ((javax.xml.rpc.Stub)webServiceSoap)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint);
  22 + else
  23 + _endpoint = (String)((javax.xml.rpc.Stub)webServiceSoap)._getProperty("javax.xml.rpc.service.endpoint.address");
  24 + }
  25 +
  26 + }
  27 + catch (javax.xml.rpc.ServiceException serviceException) {}
  28 + }
  29 +
  30 + public String getEndpoint() {
  31 + return _endpoint;
  32 + }
  33 +
  34 + public void setEndpoint(String endpoint) {
  35 + _endpoint = endpoint;
  36 + if (webServiceSoap != null)
  37 + ((javax.xml.rpc.Stub)webServiceSoap)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint);
  38 +
  39 + }
  40 +
  41 + public com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoap() {
  42 + if (webServiceSoap == null)
  43 + _initWebServiceSoapProxy();
  44 + return webServiceSoap;
  45 + }
  46 +
  47 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setXL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  48 + if (webServiceSoap == null)
  49 + _initWebServiceSoapProxy();
  50 + return webServiceSoap.setXL(uName, uPass, sXml);
  51 + }
  52 +
  53 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setCL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  54 + if (webServiceSoap == null)
  55 + _initWebServiceSoapProxy();
  56 + return webServiceSoap.setCL(uName, uPass, sXml);
  57 + }
  58 +
  59 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setLD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  60 + if (webServiceSoap == null)
  61 + _initWebServiceSoapProxy();
  62 + return webServiceSoap.setLD(uName, uPass, sXml);
  63 + }
  64 +
  65 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setDDRB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  66 + if (webServiceSoap == null)
  67 + _initWebServiceSoapProxy();
  68 + return webServiceSoap.setDDRB(uName, uPass, sXml);
  69 + }
  70 +
  71 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setJHBC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  72 + if (webServiceSoap == null)
  73 + _initWebServiceSoapProxy();
  74 + return webServiceSoap.setJHBC(uName, uPass, sXml);
  75 + }
  76 +
  77 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setSKB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  78 + if (webServiceSoap == null)
  79 + _initWebServiceSoapProxy();
  80 + return webServiceSoap.setSKB(uName, uPass, sXml);
  81 + }
  82 +
  83 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setSJ(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  84 + if (webServiceSoap == null)
  85 + _initWebServiceSoapProxy();
  86 + return webServiceSoap.setSJ(uName, uPass, sXml);
  87 + }
  88 +
  89 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setLCYH(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  90 + if (webServiceSoap == null)
  91 + _initWebServiceSoapProxy();
  92 + return webServiceSoap.setLCYH(uName, uPass, sXml);
  93 + }
  94 +
  95 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setXLPC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  96 + if (webServiceSoap == null)
  97 + _initWebServiceSoapProxy();
  98 + return webServiceSoap.setXLPC(uName, uPass, sXml);
  99 + }
  100 +
  101 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setCS(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  102 + if (webServiceSoap == null)
  103 + _initWebServiceSoapProxy();
  104 + return webServiceSoap.setCS(uName, uPass, sXml);
  105 + }
  106 +
  107 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setFZCKGM(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  108 + if (webServiceSoap == null)
  109 + _initWebServiceSoapProxy();
  110 + return webServiceSoap.setFZCKGM(uName, uPass, sXml);
  111 + }
  112 +
  113 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setJJZD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
  114 + if (webServiceSoap == null)
  115 + _initWebServiceSoapProxy();
  116 + return webServiceSoap.setJJZD(uName, uPass, sXml);
  117 + }
  118 +
  119 +
  120 +}
0 \ No newline at end of file 121 \ No newline at end of file
src/main/java/com/bsth/webService/trafficManage/up/org/tempuri/WebServiceSoapStub.java 0 → 100644
  1 +/**
  2 + * WebServiceSoapStub.java
  3 + *
  4 + * This file was auto-generated from WSDL
  5 + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
  6 + */
  7 +
  8 +package com.bsth.webService.trafficManage.up.org.tempuri;
  9 +
  10 +public class WebServiceSoapStub extends org.apache.axis.client.Stub implements com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap {
  11 + private java.util.Vector cachedSerClasses = new java.util.Vector();
  12 + private java.util.Vector cachedSerQNames = new java.util.Vector();
  13 + private java.util.Vector cachedSerFactories = new java.util.Vector();
  14 + private java.util.Vector cachedDeserFactories = new java.util.Vector();
  15 +
  16 + static org.apache.axis.description.OperationDesc [] _operations;
  17 +
  18 + static {
  19 + _operations = new org.apache.axis.description.OperationDesc[12];
  20 + _initOperationDesc1();
  21 + _initOperationDesc2();
  22 + }
  23 +
  24 + private static void _initOperationDesc1(){
  25 + org.apache.axis.description.OperationDesc oper;
  26 + org.apache.axis.description.ParameterDesc param;
  27 + oper = new org.apache.axis.description.OperationDesc();
  28 + oper.setName("setXL");
  29 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  30 + param.setOmittable(true);
  31 + oper.addParameter(param);
  32 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  33 + param.setOmittable(true);
  34 + oper.addParameter(param);
  35 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  36 + param.setOmittable(true);
  37 + oper.addParameter(param);
  38 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  39 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  40 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setXLResult"));
  41 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  42 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  43 + _operations[0] = oper;
  44 +
  45 + oper = new org.apache.axis.description.OperationDesc();
  46 + oper.setName("setCL");
  47 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  48 + param.setOmittable(true);
  49 + oper.addParameter(param);
  50 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  51 + param.setOmittable(true);
  52 + oper.addParameter(param);
  53 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  54 + param.setOmittable(true);
  55 + oper.addParameter(param);
  56 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  57 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  58 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setCLResult"));
  59 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  60 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  61 + _operations[1] = oper;
  62 +
  63 + oper = new org.apache.axis.description.OperationDesc();
  64 + oper.setName("setLD");
  65 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  66 + param.setOmittable(true);
  67 + oper.addParameter(param);
  68 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  69 + param.setOmittable(true);
  70 + oper.addParameter(param);
  71 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  72 + param.setOmittable(true);
  73 + oper.addParameter(param);
  74 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  75 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  76 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setLDResult"));
  77 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  78 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  79 + _operations[2] = oper;
  80 +
  81 + oper = new org.apache.axis.description.OperationDesc();
  82 + oper.setName("setDDRB");
  83 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  84 + param.setOmittable(true);
  85 + oper.addParameter(param);
  86 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  87 + param.setOmittable(true);
  88 + oper.addParameter(param);
  89 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  90 + param.setOmittable(true);
  91 + oper.addParameter(param);
  92 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  93 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  94 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setDDRBResult"));
  95 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  96 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  97 + _operations[3] = oper;
  98 +
  99 + oper = new org.apache.axis.description.OperationDesc();
  100 + oper.setName("setJHBC");
  101 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  102 + param.setOmittable(true);
  103 + oper.addParameter(param);
  104 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  105 + param.setOmittable(true);
  106 + oper.addParameter(param);
  107 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  108 + param.setOmittable(true);
  109 + oper.addParameter(param);
  110 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  111 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  112 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setJHBCResult"));
  113 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  114 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  115 + _operations[4] = oper;
  116 +
  117 + oper = new org.apache.axis.description.OperationDesc();
  118 + oper.setName("setSKB");
  119 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  120 + param.setOmittable(true);
  121 + oper.addParameter(param);
  122 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  123 + param.setOmittable(true);
  124 + oper.addParameter(param);
  125 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  126 + param.setOmittable(true);
  127 + oper.addParameter(param);
  128 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  129 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  130 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setSKBResult"));
  131 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  132 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  133 + _operations[5] = oper;
  134 +
  135 + oper = new org.apache.axis.description.OperationDesc();
  136 + oper.setName("setSJ");
  137 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  138 + param.setOmittable(true);
  139 + oper.addParameter(param);
  140 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  141 + param.setOmittable(true);
  142 + oper.addParameter(param);
  143 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  144 + param.setOmittable(true);
  145 + oper.addParameter(param);
  146 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  147 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  148 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setSJResult"));
  149 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  150 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  151 + _operations[6] = oper;
  152 +
  153 + oper = new org.apache.axis.description.OperationDesc();
  154 + oper.setName("setLCYH");
  155 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  156 + param.setOmittable(true);
  157 + oper.addParameter(param);
  158 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  159 + param.setOmittable(true);
  160 + oper.addParameter(param);
  161 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  162 + param.setOmittable(true);
  163 + oper.addParameter(param);
  164 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  165 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  166 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setLCYHResult"));
  167 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  168 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  169 + _operations[7] = oper;
  170 +
  171 + oper = new org.apache.axis.description.OperationDesc();
  172 + oper.setName("setXLPC");
  173 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  174 + param.setOmittable(true);
  175 + oper.addParameter(param);
  176 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  177 + param.setOmittable(true);
  178 + oper.addParameter(param);
  179 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  180 + param.setOmittable(true);
  181 + oper.addParameter(param);
  182 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  183 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  184 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setXLPCResult"));
  185 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  186 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  187 + _operations[8] = oper;
  188 +
  189 + oper = new org.apache.axis.description.OperationDesc();
  190 + oper.setName("setCS");
  191 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  192 + param.setOmittable(true);
  193 + oper.addParameter(param);
  194 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  195 + param.setOmittable(true);
  196 + oper.addParameter(param);
  197 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  198 + param.setOmittable(true);
  199 + oper.addParameter(param);
  200 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  201 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  202 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setCSResult"));
  203 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  204 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  205 + _operations[9] = oper;
  206 +
  207 + }
  208 +
  209 + private static void _initOperationDesc2(){
  210 + org.apache.axis.description.OperationDesc oper;
  211 + org.apache.axis.description.ParameterDesc param;
  212 + oper = new org.apache.axis.description.OperationDesc();
  213 + oper.setName("setFZCKGM");
  214 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  215 + param.setOmittable(true);
  216 + oper.addParameter(param);
  217 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  218 + param.setOmittable(true);
  219 + oper.addParameter(param);
  220 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  221 + param.setOmittable(true);
  222 + oper.addParameter(param);
  223 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  224 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  225 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setFZCKGMResult"));
  226 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  227 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  228 + _operations[10] = oper;
  229 +
  230 + oper = new org.apache.axis.description.OperationDesc();
  231 + oper.setName("setJJZD");
  232 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  233 + param.setOmittable(true);
  234 + oper.addParameter(param);
  235 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  236 + param.setOmittable(true);
  237 + oper.addParameter(param);
  238 + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
  239 + param.setOmittable(true);
  240 + oper.addParameter(param);
  241 + oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
  242 + oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  243 + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setJJZDResult"));
  244 + oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
  245 + oper.setUse(org.apache.axis.constants.Use.LITERAL);
  246 + _operations[11] = oper;
  247 +
  248 + }
  249 +
  250 + public WebServiceSoapStub() throws org.apache.axis.AxisFault {
  251 + this(null);
  252 + }
  253 +
  254 + public WebServiceSoapStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
  255 + this(service);
  256 + super.cachedEndpoint = endpointURL;
  257 + }
  258 +
  259 + public WebServiceSoapStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
  260 + if (service == null) {
  261 + super.service = new org.apache.axis.client.Service();
  262 + } else {
  263 + super.service = service;
  264 + }
  265 + ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2");
  266 + java.lang.Class cls;
  267 + javax.xml.namespace.QName qName;
  268 + javax.xml.namespace.QName qName2;
  269 + java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
  270 + java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
  271 + java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
  272 + java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
  273 + java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
  274 + java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
  275 + java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
  276 + java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
  277 + java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
  278 + java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
  279 + qName = new javax.xml.namespace.QName("http://tempuri.org/", "Results");
  280 + cachedSerQNames.add(qName);
  281 + cls = com.bsth.webService.trafficManage.up.org.tempuri.Results.class;
  282 + cachedSerClasses.add(cls);
  283 + cachedSerFactories.add(beansf);
  284 + cachedDeserFactories.add(beandf);
  285 +
  286 + }
  287 +
  288 + protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
  289 + try {
  290 + org.apache.axis.client.Call _call = super._createCall();
  291 + if (super.maintainSessionSet) {
  292 + _call.setMaintainSession(super.maintainSession);
  293 + }
  294 + if (super.cachedUsername != null) {
  295 + _call.setUsername(super.cachedUsername);
  296 + }
  297 + if (super.cachedPassword != null) {
  298 + _call.setPassword(super.cachedPassword);
  299 + }
  300 + if (super.cachedEndpoint != null) {
  301 + _call.setTargetEndpointAddress(super.cachedEndpoint);
  302 + }
  303 + if (super.cachedTimeout != null) {
  304 + _call.setTimeout(super.cachedTimeout);
  305 + }
  306 + if (super.cachedPortName != null) {
  307 + _call.setPortName(super.cachedPortName);
  308 + }
  309 + java.util.Enumeration keys = super.cachedProperties.keys();
  310 + while (keys.hasMoreElements()) {
  311 + java.lang.String key = (java.lang.String) keys.nextElement();
  312 + _call.setProperty(key, super.cachedProperties.get(key));
  313 + }
  314 + // All the type mapping information is registered
  315 + // when the first call is made.
  316 + // The type mapping information is actually registered in
  317 + // the TypeMappingRegistry of the service, which
  318 + // is the reason why registration is only needed for the first call.
  319 + synchronized (this) {
  320 + if (firstCall()) {
  321 + // must set encoding style before registering serializers
  322 + _call.setEncodingStyle(null);
  323 + for (int i = 0; i < cachedSerFactories.size(); ++i) {
  324 + java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i);
  325 + javax.xml.namespace.QName qName =
  326 + (javax.xml.namespace.QName) cachedSerQNames.get(i);
  327 + java.lang.Object x = cachedSerFactories.get(i);
  328 + if (x instanceof Class) {
  329 + java.lang.Class sf = (java.lang.Class)
  330 + cachedSerFactories.get(i);
  331 + java.lang.Class df = (java.lang.Class)
  332 + cachedDeserFactories.get(i);
  333 + _call.registerTypeMapping(cls, qName, sf, df, false);
  334 + }
  335 + else if (x instanceof javax.xml.rpc.encoding.SerializerFactory) {
  336 + org.apache.axis.encoding.SerializerFactory sf = (org.apache.axis.encoding.SerializerFactory)
  337 + cachedSerFactories.get(i);
  338 + org.apache.axis.encoding.DeserializerFactory df = (org.apache.axis.encoding.DeserializerFactory)
  339 + cachedDeserFactories.get(i);
  340 + _call.registerTypeMapping(cls, qName, sf, df, false);
  341 + }
  342 + }
  343 + }
  344 + }
  345 + return _call;
  346 + }
  347 + catch (java.lang.Throwable _t) {
  348 + throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
  349 + }
  350 + }
  351 +
  352 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setXL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  353 + if (super.cachedEndpoint == null) {
  354 + throw new org.apache.axis.NoEndPointException();
  355 + }
  356 + org.apache.axis.client.Call _call = createCall();
  357 + _call.setOperation(_operations[0]);
  358 + _call.setUseSOAPAction(true);
  359 + _call.setSOAPActionURI("http://tempuri.org/setXL");
  360 + _call.setEncodingStyle(null);
  361 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  362 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  363 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  364 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setXL"));
  365 +
  366 + setRequestHeaders(_call);
  367 + setAttachments(_call);
  368 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  369 +
  370 + if (_resp instanceof java.rmi.RemoteException) {
  371 + throw (java.rmi.RemoteException)_resp;
  372 + }
  373 + else {
  374 + extractAttachments(_call);
  375 + try {
  376 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  377 + } catch (java.lang.Exception _exception) {
  378 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  379 + }
  380 + }
  381 + } catch (org.apache.axis.AxisFault axisFaultException) {
  382 + throw axisFaultException;
  383 +}
  384 + }
  385 +
  386 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setCL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  387 + if (super.cachedEndpoint == null) {
  388 + throw new org.apache.axis.NoEndPointException();
  389 + }
  390 + org.apache.axis.client.Call _call = createCall();
  391 + _call.setOperation(_operations[1]);
  392 + _call.setUseSOAPAction(true);
  393 + _call.setSOAPActionURI("http://tempuri.org/setCL");
  394 + _call.setEncodingStyle(null);
  395 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  396 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  397 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  398 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setCL"));
  399 +
  400 + setRequestHeaders(_call);
  401 + setAttachments(_call);
  402 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  403 +
  404 + if (_resp instanceof java.rmi.RemoteException) {
  405 + throw (java.rmi.RemoteException)_resp;
  406 + }
  407 + else {
  408 + extractAttachments(_call);
  409 + try {
  410 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  411 + } catch (java.lang.Exception _exception) {
  412 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  413 + }
  414 + }
  415 + } catch (org.apache.axis.AxisFault axisFaultException) {
  416 + throw axisFaultException;
  417 +}
  418 + }
  419 +
  420 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setLD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  421 + if (super.cachedEndpoint == null) {
  422 + throw new org.apache.axis.NoEndPointException();
  423 + }
  424 + org.apache.axis.client.Call _call = createCall();
  425 + _call.setOperation(_operations[2]);
  426 + _call.setUseSOAPAction(true);
  427 + _call.setSOAPActionURI("http://tempuri.org/setLD");
  428 + _call.setEncodingStyle(null);
  429 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  430 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  431 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  432 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setLD"));
  433 +
  434 + setRequestHeaders(_call);
  435 + setAttachments(_call);
  436 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  437 +
  438 + if (_resp instanceof java.rmi.RemoteException) {
  439 + throw (java.rmi.RemoteException)_resp;
  440 + }
  441 + else {
  442 + extractAttachments(_call);
  443 + try {
  444 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  445 + } catch (java.lang.Exception _exception) {
  446 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  447 + }
  448 + }
  449 + } catch (org.apache.axis.AxisFault axisFaultException) {
  450 + throw axisFaultException;
  451 +}
  452 + }
  453 +
  454 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setDDRB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  455 + if (super.cachedEndpoint == null) {
  456 + throw new org.apache.axis.NoEndPointException();
  457 + }
  458 + org.apache.axis.client.Call _call = createCall();
  459 + _call.setOperation(_operations[3]);
  460 + _call.setUseSOAPAction(true);
  461 + _call.setSOAPActionURI("http://tempuri.org/setDDRB");
  462 + _call.setEncodingStyle(null);
  463 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  464 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  465 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  466 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setDDRB"));
  467 +
  468 + setRequestHeaders(_call);
  469 + setAttachments(_call);
  470 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  471 +
  472 + if (_resp instanceof java.rmi.RemoteException) {
  473 + throw (java.rmi.RemoteException)_resp;
  474 + }
  475 + else {
  476 + extractAttachments(_call);
  477 + try {
  478 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  479 + } catch (java.lang.Exception _exception) {
  480 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  481 + }
  482 + }
  483 + } catch (org.apache.axis.AxisFault axisFaultException) {
  484 + throw axisFaultException;
  485 +}
  486 + }
  487 +
  488 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setJHBC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  489 + if (super.cachedEndpoint == null) {
  490 + throw new org.apache.axis.NoEndPointException();
  491 + }
  492 + org.apache.axis.client.Call _call = createCall();
  493 + _call.setOperation(_operations[4]);
  494 + _call.setUseSOAPAction(true);
  495 + _call.setSOAPActionURI("http://tempuri.org/setJHBC");
  496 + _call.setEncodingStyle(null);
  497 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  498 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  499 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  500 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setJHBC"));
  501 +
  502 + setRequestHeaders(_call);
  503 + setAttachments(_call);
  504 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  505 +
  506 + if (_resp instanceof java.rmi.RemoteException) {
  507 + throw (java.rmi.RemoteException)_resp;
  508 + }
  509 + else {
  510 + extractAttachments(_call);
  511 + try {
  512 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  513 + } catch (java.lang.Exception _exception) {
  514 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  515 + }
  516 + }
  517 + } catch (org.apache.axis.AxisFault axisFaultException) {
  518 + throw axisFaultException;
  519 +}
  520 + }
  521 +
  522 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setSKB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  523 + if (super.cachedEndpoint == null) {
  524 + throw new org.apache.axis.NoEndPointException();
  525 + }
  526 + org.apache.axis.client.Call _call = createCall();
  527 + _call.setOperation(_operations[5]);
  528 + _call.setUseSOAPAction(true);
  529 + _call.setSOAPActionURI("http://tempuri.org/setSKB");
  530 + _call.setEncodingStyle(null);
  531 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  532 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  533 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  534 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setSKB"));
  535 +
  536 + setRequestHeaders(_call);
  537 + setAttachments(_call);
  538 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  539 +
  540 + if (_resp instanceof java.rmi.RemoteException) {
  541 + throw (java.rmi.RemoteException)_resp;
  542 + }
  543 + else {
  544 + extractAttachments(_call);
  545 + try {
  546 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  547 + } catch (java.lang.Exception _exception) {
  548 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  549 + }
  550 + }
  551 + } catch (org.apache.axis.AxisFault axisFaultException) {
  552 + throw axisFaultException;
  553 +}
  554 + }
  555 +
  556 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setSJ(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  557 + if (super.cachedEndpoint == null) {
  558 + throw new org.apache.axis.NoEndPointException();
  559 + }
  560 + org.apache.axis.client.Call _call = createCall();
  561 + _call.setOperation(_operations[6]);
  562 + _call.setUseSOAPAction(true);
  563 + _call.setSOAPActionURI("http://tempuri.org/setSJ");
  564 + _call.setEncodingStyle(null);
  565 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  566 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  567 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  568 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setSJ"));
  569 +
  570 + setRequestHeaders(_call);
  571 + setAttachments(_call);
  572 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  573 +
  574 + if (_resp instanceof java.rmi.RemoteException) {
  575 + throw (java.rmi.RemoteException)_resp;
  576 + }
  577 + else {
  578 + extractAttachments(_call);
  579 + try {
  580 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  581 + } catch (java.lang.Exception _exception) {
  582 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  583 + }
  584 + }
  585 + } catch (org.apache.axis.AxisFault axisFaultException) {
  586 + throw axisFaultException;
  587 +}
  588 + }
  589 +
  590 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setLCYH(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  591 + if (super.cachedEndpoint == null) {
  592 + throw new org.apache.axis.NoEndPointException();
  593 + }
  594 + org.apache.axis.client.Call _call = createCall();
  595 + _call.setOperation(_operations[7]);
  596 + _call.setUseSOAPAction(true);
  597 + _call.setSOAPActionURI("http://tempuri.org/setLCYH");
  598 + _call.setEncodingStyle(null);
  599 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  600 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  601 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  602 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setLCYH"));
  603 +
  604 + setRequestHeaders(_call);
  605 + setAttachments(_call);
  606 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  607 +
  608 + if (_resp instanceof java.rmi.RemoteException) {
  609 + throw (java.rmi.RemoteException)_resp;
  610 + }
  611 + else {
  612 + extractAttachments(_call);
  613 + try {
  614 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  615 + } catch (java.lang.Exception _exception) {
  616 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  617 + }
  618 + }
  619 + } catch (org.apache.axis.AxisFault axisFaultException) {
  620 + throw axisFaultException;
  621 +}
  622 + }
  623 +
  624 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setXLPC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  625 + if (super.cachedEndpoint == null) {
  626 + throw new org.apache.axis.NoEndPointException();
  627 + }
  628 + org.apache.axis.client.Call _call = createCall();
  629 + _call.setOperation(_operations[8]);
  630 + _call.setUseSOAPAction(true);
  631 + _call.setSOAPActionURI("http://tempuri.org/setXLPC");
  632 + _call.setEncodingStyle(null);
  633 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  634 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  635 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  636 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setXLPC"));
  637 +
  638 + setRequestHeaders(_call);
  639 + setAttachments(_call);
  640 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  641 +
  642 + if (_resp instanceof java.rmi.RemoteException) {
  643 + throw (java.rmi.RemoteException)_resp;
  644 + }
  645 + else {
  646 + extractAttachments(_call);
  647 + try {
  648 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  649 + } catch (java.lang.Exception _exception) {
  650 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  651 + }
  652 + }
  653 + } catch (org.apache.axis.AxisFault axisFaultException) {
  654 + throw axisFaultException;
  655 +}
  656 + }
  657 +
  658 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setCS(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  659 + if (super.cachedEndpoint == null) {
  660 + throw new org.apache.axis.NoEndPointException();
  661 + }
  662 + org.apache.axis.client.Call _call = createCall();
  663 + _call.setOperation(_operations[9]);
  664 + _call.setUseSOAPAction(true);
  665 + _call.setSOAPActionURI("http://tempuri.org/setCS");
  666 + _call.setEncodingStyle(null);
  667 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  668 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  669 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  670 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setCS"));
  671 +
  672 + setRequestHeaders(_call);
  673 + setAttachments(_call);
  674 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  675 +
  676 + if (_resp instanceof java.rmi.RemoteException) {
  677 + throw (java.rmi.RemoteException)_resp;
  678 + }
  679 + else {
  680 + extractAttachments(_call);
  681 + try {
  682 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  683 + } catch (java.lang.Exception _exception) {
  684 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  685 + }
  686 + }
  687 + } catch (org.apache.axis.AxisFault axisFaultException) {
  688 + throw axisFaultException;
  689 +}
  690 + }
  691 +
  692 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setFZCKGM(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  693 + if (super.cachedEndpoint == null) {
  694 + throw new org.apache.axis.NoEndPointException();
  695 + }
  696 + org.apache.axis.client.Call _call = createCall();
  697 + _call.setOperation(_operations[10]);
  698 + _call.setUseSOAPAction(true);
  699 + _call.setSOAPActionURI("http://tempuri.org/setFZCKGM");
  700 + _call.setEncodingStyle(null);
  701 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  702 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  703 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  704 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setFZCKGM"));
  705 +
  706 + setRequestHeaders(_call);
  707 + setAttachments(_call);
  708 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  709 +
  710 + if (_resp instanceof java.rmi.RemoteException) {
  711 + throw (java.rmi.RemoteException)_resp;
  712 + }
  713 + else {
  714 + extractAttachments(_call);
  715 + try {
  716 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  717 + } catch (java.lang.Exception _exception) {
  718 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  719 + }
  720 + }
  721 + } catch (org.apache.axis.AxisFault axisFaultException) {
  722 + throw axisFaultException;
  723 +}
  724 + }
  725 +
  726 + public com.bsth.webService.trafficManage.up.org.tempuri.Results setJJZD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
  727 + if (super.cachedEndpoint == null) {
  728 + throw new org.apache.axis.NoEndPointException();
  729 + }
  730 + org.apache.axis.client.Call _call = createCall();
  731 + _call.setOperation(_operations[11]);
  732 + _call.setUseSOAPAction(true);
  733 + _call.setSOAPActionURI("http://tempuri.org/setJJZD");
  734 + _call.setEncodingStyle(null);
  735 + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
  736 + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
  737 + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
  738 + _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setJJZD"));
  739 +
  740 + setRequestHeaders(_call);
  741 + setAttachments(_call);
  742 + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
  743 +
  744 + if (_resp instanceof java.rmi.RemoteException) {
  745 + throw (java.rmi.RemoteException)_resp;
  746 + }
  747 + else {
  748 + extractAttachments(_call);
  749 + try {
  750 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
  751 + } catch (java.lang.Exception _exception) {
  752 + return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
  753 + }
  754 + }
  755 + } catch (org.apache.axis.AxisFault axisFaultException) {
  756 + throw axisFaultException;
  757 +}
  758 + }
  759 +
  760 +}
src/main/resources/static/pages/base/carpark/js/add-form-wizard.js
@@ -25,7 +25,7 @@ var FormWizard = function() { @@ -25,7 +25,7 @@ var FormWizard = function() {
25 rules : { 25 rules : {
26 'parkNamebooxt' : {required : true,},// 停车场名称 必填项 26 'parkNamebooxt' : {required : true,},// 停车场名称 必填项
27 'parkName' : {required : true,},// 停车场名称 必填项 27 'parkName' : {required : true,},// 停车场名称 必填项
28 - 'parkCode' : {required : true,alnum:true, remote : { 28 + 'parkCode' : {required : true,rangelength:[8,8], alnum:true, remote : {
29 type : "get",// 异步发送请求到服务器,验证parkCode 29 type : "get",// 异步发送请求到服务器,验证parkCode
30 url : "/carpark/isHaveParkCode",//需要服务器controllor 中提供停车场编码检查的方法 30 url : "/carpark/isHaveParkCode",//需要服务器controllor 中提供停车场编码检查的方法
31 cache:false, 31 cache:false,
@@ -40,7 +40,8 @@ var FormWizard = function() { @@ -40,7 +40,8 @@ var FormWizard = function() {
40 'descriptions' : {maxlength: 200,},// 描述/说明 最大长度200 40 'descriptions' : {maxlength: 200,},// 描述/说明 最大长度200
41 }, 41 },
42 messages:{ 42 messages:{
43 - 'parkCode':{remote:'停车场编码系统已存在,请您重新输入!',}, 43 + 'parkCode':{remote:'停车场编码系统已存在,请您重新输入!',
  44 + rangelength:'请填写8位长度的编码!'},
44 }, 45 },
45 /** 46 /**
46 * 类型:Callback。当未通过验证的表单提交时,可以在该回调函数中处理一些事情。 47 * 类型:Callback。当未通过验证的表单提交时,可以在该回调函数中处理一些事情。
src/main/resources/static/pages/history_sch/edit/js/data_basic.js
1 -/* 基础数据管理模块 */  
2 -  
3 -var gb_data_basic = (function () {  
4 -  
5 - var allPersonnel;  
6 - var stationRoutes, lineInformations, codeToLine={};  
7 - var ep = EventProxy.create("all_personnel"  
8 - , function (all_personnel) {  
9 - allPersonnel = all_personnel;  
10 - //gb_main_ep.emitLater('data-basic');  
11 - });  
12 -  
13 -/* //线路标准信息  
14 - gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {  
15 - var informations = {};  
16 - $.each(rs, function () {  
17 - informations[this.line.lineCode] = this;  
18 - delete this['line'];  
19 - });  
20 - ep.emit('lineInformations', informations);  
21 - });*/  
22 -  
23 - //人员信息  
24 - loadAllPersonnel(function (data) {  
25 - ep.emit('all_personnel', data);  
26 - });  
27 - function loadAllPersonnel(cb) {  
28 - $.get('/personnel/all_py', function (rs) {  
29 - //转换成自动补全组件需要的数据  
30 - var data = [], code;  
31 - for(var i =0, p; p = rs[i++];){  
32 - code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];  
33 - data.push({  
34 - value: code + '/' + p.name,  
35 - fullChars: p.fullChars.toUpperCase(),  
36 - camelChars: p.camelChars.toUpperCase()  
37 - });  
38 - }  
39 - cb && cb(data);  
40 - });  
41 - }  
42 -  
43 - var carparks = {};  
44 - //停车场数据  
45 - gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {  
46 - rs.list.sort(function (a, b) {  
47 - return a.parkName.localeCompare(b.parkName);  
48 - });  
49 - $.each(rs.list, function () {  
50 - carparks[this.parkCode] = this;  
51 - });  
52 - });  
53 -  
54 - //车辆数据  
55 - var carsArray;  
56 - $.get('/basic/cars?t=' + Math.random(), function (rs) {  
57 - carsArray = rs;  
58 - });  
59 -  
60 - var getCarparkByCode = function (code) {  
61 - return carparks[code];  
62 - };  
63 -  
64 - //line code to name  
65 - $.get('/basic/lineCode2Name', function (rs) {  
66 - ep.emit('lineCode2Name', rs);  
67 - });  
68 -  
69 - var getLineInformation = function (lineCode) {  
70 - return lineInformations[lineCode];  
71 - };  
72 -  
73 - var stationRouteSort = function (a, b) {  
74 - return a.stationRouteCode - b.stationRouteCode;  
75 - };  
76 -  
77 - function findLineByCodes(codeArr) {  
78 - var rs = [];  
79 - $.each(codeArr, function () {  
80 - rs.push(codeToLine[this]);  
81 - });  
82 - return rs;  
83 - }  
84 -  
85 - return {  
86 - getLineInformation: getLineInformation,  
87 - allInformations: function () {  
88 - return {};  
89 - },  
90 - allPersonnel: function () {  
91 - return allPersonnel;  
92 - },  
93 - getSvgAttr: function (lineCode) {  
94 - return svgAttrs[lineCode];  
95 - },  
96 - //刷新员工信息  
97 - refreshAllPersonnel: function (cb) {  
98 - loadAllPersonnel(function (data) {  
99 - allPersonnel = data;  
100 - cb && cb();  
101 - });  
102 - },  
103 - carsArray: function () {  
104 - return carsArray;  
105 - },  
106 - simpleParksArray: function () {  
107 - var map = {};  
108 - for(var code in carparks)  
109 - map[code] = carparks[code].parkName;  
110 - return map;  
111 - },  
112 - getLineInformation: getLineInformation,  
113 - allInformations: function () {  
114 - return lineInformations;  
115 - },  
116 - stationRoutes: function (lineCode) {  
117 - return stationRoutes[lineCode]  
118 - },  
119 - remarksMapps: function () {  
120 - return "";  
121 - },  
122 - findLineByCodes: findLineByCodes,  
123 - //初始化依赖数据  
124 - initData: function (lineCode) {  
125 - var ep = EventProxy.create("stationRoutes", "lineInformations", "codeToLineMap", function (routes, informations, _codeToLine) {  
126 - stationRoutes = routes;  
127 - lineInformations = informations;  
128 - codeToLine[_codeToLine.lineCode] = _codeToLine;  
129 - });  
130 -  
131 - //站点路由  
132 - gb_common.$get('/stationroute/multiLine', {lineIds: lineCode}, function (rs) {  
133 - var list = rs.list;  
134 - var routeData = gb_common.groupBy(list, 'lineCode');  
135 - //排序  
136 - for (var lineCode in routeData) {  
137 - routeData[lineCode].sort(stationRouteSort);  
138 - }  
139 - ep.emitLater('stationRoutes', routeData);  
140 - });  
141 -  
142 - //线路标准信息  
143 - gb_common.$get('/lineInformation/line/multi', {lineCodes: lineCode}, function (rs) {  
144 - var _informations = {};  
145 - $.each(rs, function () {  
146 - _informations[this.line.lineCode] = this;  
147 - delete this['line'];  
148 - });  
149 - ep.emitLater('lineInformations', _informations);  
150 - });  
151 -  
152 - //线路基础信息  
153 - gb_common.$get('/line/' + lineCode, {}, function (rs) {  
154 - ep.emitLater('codeToLineMap', rs);  
155 - });  
156 - }  
157 - };  
158 -})(); 1 +/* 基础数据管理模块 */
  2 +
  3 +var gb_data_basic = (function () {
  4 +
  5 + var allPersonnel;
  6 + var stationRoutes, lineInformations, codeToLine={};
  7 + var ep = EventProxy.create("all_personnel"
  8 + , function (all_personnel) {
  9 + allPersonnel = all_personnel;
  10 + //gb_main_ep.emitLater('data-basic');
  11 + });
  12 +
  13 +/* //线路标准信息
  14 + gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {
  15 + var informations = {};
  16 + $.each(rs, function () {
  17 + informations[this.line.lineCode] = this;
  18 + delete this['line'];
  19 + });
  20 + ep.emit('lineInformations', informations);
  21 + });*/
  22 +
  23 + //人员信息
  24 + loadAllPersonnel(function (data) {
  25 + ep.emit('all_personnel', data);
  26 + });
  27 + function loadAllPersonnel(cb) {
  28 + $.get('/personnel/all_py', function (rs) {
  29 + //转换成自动补全组件需要的数据
  30 + var data = [], code;
  31 + for(var i =0, p; p = rs[i++];){
  32 + code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];
  33 + data.push({
  34 + value: code + '/' + p.name,
  35 + fullChars: p.fullChars.toUpperCase(),
  36 + camelChars: p.camelChars.toUpperCase()
  37 + });
  38 + }
  39 + cb && cb(data);
  40 + });
  41 + }
  42 +
  43 + var carparks = {};
  44 + //停车场数据
  45 + gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
  46 + rs.list.sort(function (a, b) {
  47 + return a.parkName.localeCompare(b.parkName);
  48 + });
  49 + $.each(rs.list, function () {
  50 + carparks[this.parkCode] = this;
  51 + });
  52 + });
  53 +
  54 + //车辆数据
  55 + var carsArray;
  56 + $.get('/basic/cars?t=' + Math.random(), function (rs) {
  57 + carsArray = rs;
  58 + });
  59 +
  60 + var getCarparkByCode = function (code) {
  61 + return carparks[code];
  62 + };
  63 +
  64 + //line code to name
  65 + $.get('/basic/lineCode2Name', function (rs) {
  66 + ep.emit('lineCode2Name', rs);
  67 + });
  68 +
  69 + var getLineInformation = function (lineCode) {
  70 + return lineInformations[lineCode];
  71 + };
  72 +
  73 + var stationRouteSort = function (a, b) {
  74 + return a.stationRouteCode - b.stationRouteCode;
  75 + };
  76 +
  77 + function findLineByCodes(codeArr) {
  78 + var rs = [];
  79 + $.each(codeArr, function () {
  80 + rs.push(codeToLine[this]);
  81 + });
  82 + return rs;
  83 + }
  84 +
  85 + return {
  86 + getLineInformation: getLineInformation,
  87 + allInformations: function () {
  88 + return {};
  89 + },
  90 + allPersonnel: function () {
  91 + return allPersonnel;
  92 + },
  93 + getSvgAttr: function (lineCode) {
  94 + return svgAttrs[lineCode];
  95 + },
  96 + //刷新员工信息
  97 + refreshAllPersonnel: function (cb) {
  98 + loadAllPersonnel(function (data) {
  99 + allPersonnel = data;
  100 + cb && cb();
  101 + });
  102 + },
  103 + carsArray: function () {
  104 + return carsArray;
  105 + },
  106 + simpleParksArray: function () {
  107 + var map = {};
  108 + for(var code in carparks)
  109 + map[code] = carparks[code].parkName;
  110 + return map;
  111 + },
  112 + getLineInformation: getLineInformation,
  113 + allInformations: function () {
  114 + return lineInformations;
  115 + },
  116 + stationRoutes: function (lineCode) {
  117 + return stationRoutes[lineCode]
  118 + },
  119 + remarksMapps: function () {
  120 + return "";
  121 + },
  122 + findLineByCodes: findLineByCodes,
  123 + //初始化依赖数据
  124 + initData: function (lineCode) {
  125 + var ep = EventProxy.create("stationRoutes", "lineInformations", "codeToLineMap", function (routes, informations, _codeToLine) {
  126 + stationRoutes = routes;
  127 + lineInformations = informations;
  128 + codeToLine[_codeToLine.lineCode] = _codeToLine;
  129 + });
  130 +
  131 + //站点路由
  132 + gb_common.$get('/stationroute/multiLine', {lineIds: lineCode}, function (rs) {
  133 + var list = rs.list;
  134 + var routeData = gb_common.groupBy(list, 'lineCode');
  135 + //排序
  136 + for (var lineCode in routeData) {
  137 + routeData[lineCode].sort(stationRouteSort);
  138 + }
  139 + ep.emitLater('stationRoutes', routeData);
  140 + });
  141 +
  142 + //线路标准信息
  143 + gb_common.$get('/lineInformation/line/multi', {lineCodes: lineCode}, function (rs) {
  144 + var _informations = {};
  145 + $.each(rs, function () {
  146 + _informations[this.line.lineCode] = this;
  147 + delete this['line'];
  148 + });
  149 + ep.emitLater('lineInformations', _informations);
  150 + });
  151 +
  152 + //线路基础信息
  153 + gb_common.$get('/line/' + lineCode, {}, function (rs) {
  154 + ep.emitLater('codeToLineMap', rs);
  155 + });
  156 + }
  157 + };
  158 +})();
src/main/resources/static/pages/summary/destory_sch_detail/d_s_d_wrap.html
1 -<!-- 烂班明细统计 --> 1 +<!-- 烂班明细统计 -->
2 <iframe src="/pages/summary/destory_sch_detail/list.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe> 2 <iframe src="/pages/summary/destory_sch_detail/list.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe>
3 \ No newline at end of file 3 \ No newline at end of file
src/main/resources/static/pages/summary/destory_sch_detail/list.html
@@ -158,7 +158,10 @@ @@ -158,7 +158,10 @@
158 <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button> 158 <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
159 </div> 159 </div>
160 <div class="ct_field ct_field_bottom"> 160 <div class="ct_field ct_field_bottom">
161 - <span uk-icon="icon: question" title="导出功能先等等" uk-tooltip="pos: bottom"></span> 161 + <button class="uk-button uk-button-text export_excel" style="padding: 0 5px;">导出数据</button>
  162 + </div>
  163 + <div class="ct_field ct_field_bottom">
  164 + <span uk-icon="icon: question" title="不统计进出场和子任务" uk-tooltip="pos: bottom"></span>
162 </div> 165 </div>
163 </form> 166 </form>
164 </div> 167 </div>
@@ -191,18 +194,18 @@ @@ -191,18 +194,18 @@
191 194
192 <script id="destroy_sch_list_temp" type="text/html"> 195 <script id="destroy_sch_list_temp" type="text/html">
193 {{each list as obj i}} 196 {{each list as obj i}}
194 - <tr>  
195 - <td>{{obj.rq}}</td>  
196 - <td>{{obj.lineName}}</td>  
197 - <td>{{obj.nbbm}}</td>  
198 - <td>{{obj.jGh}}</td>  
199 - <td>{{obj.sGh}}</td>  
200 - <td>{{obj.reason}}</td>  
201 - <td><a>{{obj.size}}</a></td>  
202 - <td>{{obj.mileage}}</td>  
203 - <td>{{obj.timeStr}}</td>  
204 - <td>{{obj.remark}}</td>  
205 - </tr> 197 + <tr>
  198 + <td>{{obj.rq}}</td>
  199 + <td>{{obj.lineName}}</td>
  200 + <td>{{obj.nbbm}}</td>
  201 + <td>{{obj.jGh}}</td>
  202 + <td>{{obj.sGh}}</td>
  203 + <td>{{obj.reason}}</td>
  204 + <td><a style="text-decoration: underline;">{{obj.size}}</a></td>
  205 + <td>{{obj.mileage}}</td>
  206 + <td>{{obj.timeStr}}</td>
  207 + <td>{{obj.remark}}</td>
  208 + </tr>
206 {{/each}} 209 {{/each}}
207 </script> 210 </script>
208 211
@@ -251,7 +254,7 @@ @@ -251,7 +254,7 @@
251 if(!rs || rs.length==0) 254 if(!rs || rs.length==0)
252 return UIkit.notification('没有搜索到相关数据!!', 'danger'); 255 return UIkit.notification('没有搜索到相关数据!!', 'danger');
253 $.each(rs, function () { 256 $.each(rs, function () {
254 - this.timeStr=moment(this.t).format('HH:mm') 257 + this.timeStr=moment(this.t).format('HH:mm')
255 }); 258 });
256 259
257 var htmlStr = template('destroy_sch_list_temp', {list: rs}); 260 var htmlStr = template('destroy_sch_list_temp', {list: rs});
@@ -332,6 +335,19 @@ @@ -332,6 +335,19 @@
332 return false; 335 return false;
333 }); 336 });
334 337
  338 + /**
  339 + * 导出
  340 + */
  341 + $('.export_excel').on('click', function () {
  342 + var data = f.serializeJSON();
  343 + data.rq_ge = data.rq.substr(0, 10);
  344 + data.rq_le = data.rq.substr(13);
  345 + data.order='t';
  346 + delete data.rq;
  347 +
  348 + window.open('/summary/destroy_detail/excel?' + $.param(data));
  349 + });
  350 +
335 </script> 351 </script>
336 </body> 352 </body>
337 </html> 353 </html>
338 \ No newline at end of file 354 \ No newline at end of file
src/main/resources/static/pages/summary/excel/烂班明细情况.xls 0 → 100644
No preview for this file type
src/main/resources/static/pages/summary/fast_and_slow/main.html
@@ -259,7 +259,7 @@ @@ -259,7 +259,7 @@
259 <button class="uk-button uk-button-text export_excel" style="padding: 0 5px;">导出数据</button> 259 <button class="uk-button uk-button-text export_excel" style="padding: 0 5px;">导出数据</button>
260 </div> 260 </div>
261 <div class="ct_field ct_field_bottom"> 261 <div class="ct_field ct_field_bottom">
262 - <span uk-icon="icon: question" title="快1慢3; 排除进出场班次<br>一次至多查询5天的数据,如需更大查询范围,请导出" uk-tooltip="pos: bottom"></span> 262 + <span uk-icon="icon: question" title="快1慢3; 排除进出场和子任务班次<br>一次至多查询5天的数据,如需更大查询范围,请导出" uk-tooltip="pos: bottom"></span>
263 </div> 263 </div>
264 </form> 264 </form>
265 </div> 265 </div>
src/main/resources/static/real_control_v2/css/home.css
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
58 padding-left: 0; 58 padding-left: 0;
59 overflow: hidden; 59 overflow: hidden;
60 background: #fff; 60 background: #fff;
  61 + height: 100%;
61 } 62 }
62 63
63 .home-gps-table { 64 .home-gps-table {
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html
@@ -178,7 +178,8 @@ @@ -178,7 +178,8 @@
178 //将班次类型调整为放站 178 //将班次类型调整为放站
179 gb_common.$post('/realSchedule/changeBcType/' + sch.id, { 179 gb_common.$post('/realSchedule/changeBcType/' + sch.id, {
180 bcType: 'major', 180 bcType: 'major',
181 - remarks: remarks 181 + remarks: remarks,
  182 + majorStationName: $('[name=endStation]').find("option:selected").text()
182 }, function (rs) { 183 }, function (rs) {
183 UIkit.modal(modal).hide(); 184 UIkit.modal(modal).hide();
184 gb_schedule_table.updateSchedule(rs.t); 185 gb_schedule_table.updateSchedule(rs.t);
src/main/resources/static/real_control_v2/js/main.js
@@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) { @@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
168 function showUpdateDescription() { 168 function showUpdateDescription() {
169 //更新说明 169 //更新说明
170 var updateDescription = { 170 var updateDescription = {
171 - date: '2017-10-25',  
172 - text: '<h5>1、修正了双击调整待发时,备注会被清空的bug。!</h5><h5>2、现在发车和到站信使可以撤销和编辑。</h5>' 171 + date: '2017-11-01',
  172 + text: '<h5>1、修正了XP系统下主页滚动条的显示问题(Windows XP sp3 + chrome 49.0.2623.112)。</h5>'
173 }; 173 };
174 174
175 var storage = window.localStorage 175 var storage = window.localStorage