Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 6ec10fd9 f9376be6
Showing 3 changed files with 55 additions and 8 deletions
src/main/java/com/bsth/service/schedule/TTInfoDetailService.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/strategy/IStrategyImpl.java
@@ -27,6 +27,13 @@ public interface TTInfoDetailService extends BService&lt;TTInfoDetail, Long&gt; {
         /** 是偶分班 */
         private Boolean isfb;
  
+        /** 起点站 */
+        private Integer qdz;
+        /** 终点站 */
+        private Integer zdz;
+        /** 停车场 */
+        private Integer tcc;
+
         public FcInfo() {
         }
  
@@ -35,7 +42,10 @@ public interface TTInfoDetailService extends BService&lt;TTInfoDetail, Long&gt; {
                 String bc_type,
                 String fcsj,
                 String xldir,
-                String isfb) {
+                String isfb,
+                String qdz,
+                String zdz,
+                String tcc) {
             this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
             this.bc_type = bc_type;
             this.fcsj = fcsj;
@@ -47,6 +57,16 @@ public interface TTInfoDetailService extends BService&lt;TTInfoDetail, Long&gt; {
             else
                 this.isfb = false;
  
+            if (StringUtils.isNotEmpty(qdz) && !"null".equals(qdz)) {
+                this.qdz = Integer.valueOf(qdz);
+            }
+            if (StringUtils.isNotEmpty(zdz) && !"null".equals(zdz)) {
+                this.zdz = Integer.valueOf(zdz);
+            }
+            if (StringUtils.isNotEmpty(tcc) && !"null".equals(tcc)) {
+                this.tcc = Integer.valueOf(tcc);
+            }
+
         }
  
         public Long getTtdid() {
@@ -88,6 +108,30 @@ public interface TTInfoDetailService extends BService&lt;TTInfoDetail, Long&gt; {
         public void setIsfb(Boolean isfb) {
             this.isfb = isfb;
         }
+
+        public Integer getQdz() {
+            return qdz;
+        }
+
+        public void setQdz(Integer qdz) {
+            this.qdz = qdz;
+        }
+
+        public Integer getZdz() {
+            return zdz;
+        }
+
+        public void setZdz(Integer zdz) {
+            this.zdz = zdz;
+        }
+
+        public Integer getTcc() {
+            return tcc;
+        }
+
+        public void setTcc(Integer tcc) {
+            this.tcc = tcc;
+        }
     }
  
     /**
@@ -257,7 +257,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                 for (int r = 1; r < sheet.getRows(); r++) {
                     List<FcInfo> fcInfos = new ArrayList<>();
                     // 每行第一列都是路牌
-                    fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null)); // 用fcsj放置路牌显示
+                    fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null, null)); // 用fcsj放置路牌显示
  
                     int bc_ks = 0; // 空驶班次
                     int bc_yy = 0; // 营运班次
@@ -277,7 +277,11 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                             String xldir = content == null ? "" : content[5]; // 线路上下行
                             String isfb = content == null ? "" : content[6]; // 是否分班
  
-                            FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb);
+                            String qdz = content == null ? "" : content[7]; // 起点站
+                            String zdz = content == null ? "" : content[8]; // 终点站
+                            String tcc = content == null ? "" : content[9]; // 停车场
+
+                            FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdz, zdz, tcc);
  
                             if (StringUtils.isNotEmpty(fzdname))
                                 headarrays[c] = fzdname;
@@ -303,17 +307,17 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                             }
  
                         } catch (Exception exp) {
-                            LOGGER.info("{}行，{}数据有问题，数据={}，异常message={}", r, c, content_str, exp);
+                            LOGGER.info("第{}行，第{}列数据有问题，数据={}，异常message={}", r, c, content_str, exp.getCause());
                             break;
                         }
  
                     }
  
                     // 添加一列 空驶班次/空驶里程，fcsj放置数据
-                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_ks, lc_ks), null, null));
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_ks, lc_ks), null, null, null, null, null));
  
                     // 添加一列 营运班次/营运里程，fcsj放置数据
-                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_yy, lc_yy), null, null));
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_yy, lc_yy), null, null, null, null, null));
  
                     editInfo.getContents().add(fcInfos);
                 }
@@ -143,7 +143,6 @@ public class IStrategyImpl implements IStrategy {
         // return结果输出
         Map<Date, Multimap<Long, TTInfoDetail>> ttInfoDetailMultimap = new HashMap<>();
  
-        Map<String, Object> param = new HashMap<>();
         for (DateTime dateTime : outputMultimap.keySet()) {
             Collection<TTInfoResult_output> ttInfoResult_outputs = outputMultimap.get(dateTime);
             // 如果有多个，使用第一个
@@ -154,7 +153,7 @@ public class IStrategyImpl implements IStrategy {
                 // 查找时刻表明细
                 Multimap<Long, TTInfoDetail> ttinfodetailMap2 = ArrayListMultimap.create();
                 for (TTInfoDetail ttInfoDetail : ttInfoDetails) {
-                    if (ttInfoDetail.getTtinfo().getId() == Long.valueOf(ttInfoResult_output.getTtInfoId())) {
+                    if (ttInfoDetail.getTtinfo().getId().equals(Long.valueOf(ttInfoResult_output.getTtInfoId()))) {
                         ttinfodetailMap2.put(ttInfoDetail.getLp().getId(), ttInfoDetail);
                     }
                 }