Commit b72e7f53bf6cf1c033270393abb60a912b05a9cf
1 parent
cfb18788
加入spy
Showing
1 changed file
with
14 additions
and
1 deletions
src/main/java/com/bsth/server_rs/schedule/dto/ScheduleCcInfoConfig.java
| @@ -3,6 +3,7 @@ package com.bsth.server_rs.schedule.dto; | @@ -3,6 +3,7 @@ package com.bsth.server_rs.schedule.dto; | ||
| 3 | import com.bsth.entity.ScheduleRealInfo; | 3 | import com.bsth.entity.ScheduleRealInfo; |
| 4 | import com.bsth.util.ConvertUtil; | 4 | import com.bsth.util.ConvertUtil; |
| 5 | import com.google.common.collect.ArrayListMultimap; | 5 | import com.google.common.collect.ArrayListMultimap; |
| 6 | +import org.apache.commons.lang3.StringUtils; | ||
| 6 | import org.slf4j.Logger; | 7 | import org.slf4j.Logger; |
| 7 | import org.slf4j.LoggerFactory; | 8 | import org.slf4j.LoggerFactory; |
| 8 | 9 | ||
| @@ -24,7 +25,7 @@ public class ScheduleCcInfoConfig { | @@ -24,7 +25,7 @@ public class ScheduleCcInfoConfig { | ||
| 24 | Class clazz = ScheduleRealInfo.class; | 25 | Class clazz = ScheduleRealInfo.class; |
| 25 | try { | 26 | try { |
| 26 | ArrayListMultimap<String, ScheduleRealInfo> multimap = | 27 | ArrayListMultimap<String, ScheduleRealInfo> multimap = |
| 27 | - new ConvertUtil<ScheduleRealInfo>().groupMultiList(list, ",", clazz.getDeclaredField("jGh"), clazz.getDeclaredField("clZbh")); | 28 | + new ConvertUtil<ScheduleRealInfo>().groupMultiList(list, ",", clazz.getDeclaredField("jGh"),clazz.getDeclaredField("sGh"), clazz.getDeclaredField("clZbh")); |
| 28 | 29 | ||
| 29 | ScheduleCcInfoConfig cc ; | 30 | ScheduleCcInfoConfig cc ; |
| 30 | Set<String> ks = multimap.keySet(); | 31 | Set<String> ks = multimap.keySet(); |
| @@ -34,6 +35,8 @@ public class ScheduleCcInfoConfig { | @@ -34,6 +35,8 @@ public class ScheduleCcInfoConfig { | ||
| 34 | 35 | ||
| 35 | cc = new ScheduleCcInfoConfig(); | 36 | cc = new ScheduleCcInfoConfig(); |
| 36 | cc.setJsy(sch.getjGh() + "/" + sch.getjName()); | 37 | cc.setJsy(sch.getjGh() + "/" + sch.getjName()); |
| 38 | + if(StringUtils.isNotEmpty(sch.getsGh())) | ||
| 39 | + cc.setSpy(sch.getsGh() + "/" + sch.getsName()); | ||
| 37 | cc.setClZhb(sch.getClZbh()); | 40 | cc.setClZhb(sch.getClZbh()); |
| 38 | cc.setLineCode(sch.getXlBm()); | 41 | cc.setLineCode(sch.getXlBm()); |
| 39 | cc.setLineName(sch.getXlName()); | 42 | cc.setLineName(sch.getXlName()); |
| @@ -50,6 +53,8 @@ public class ScheduleCcInfoConfig { | @@ -50,6 +53,8 @@ public class ScheduleCcInfoConfig { | ||
| 50 | 53 | ||
| 51 | private String jsy; | 54 | private String jsy; |
| 52 | 55 | ||
| 56 | + private String spy; | ||
| 57 | + | ||
| 53 | private String clZhb; | 58 | private String clZhb; |
| 54 | 59 | ||
| 55 | private String lineCode; | 60 | private String lineCode; |
| @@ -107,4 +112,12 @@ public class ScheduleCcInfoConfig { | @@ -107,4 +112,12 @@ public class ScheduleCcInfoConfig { | ||
| 107 | public void setGsBm(String gsBm) { | 112 | public void setGsBm(String gsBm) { |
| 108 | this.gsBm = gsBm; | 113 | this.gsBm = gsBm; |
| 109 | } | 114 | } |
| 115 | + | ||
| 116 | + public String getSpy() { | ||
| 117 | + return spy; | ||
| 118 | + } | ||
| 119 | + | ||
| 120 | + public void setSpy(String spy) { | ||
| 121 | + this.spy = spy; | ||
| 122 | + } | ||
| 110 | } | 123 | } |