Commit afde4d994740fafab3a3b97e2bf6c3e97547f596

Authored by 廖磊
1 parent 945e95b0

basicData

src/main/java/com/bsth/data/BasicData.java
@@ -28,6 +28,9 @@ public class BasicData implements CommandLineRunner { @@ -28,6 +28,9 @@ public class BasicData implements CommandLineRunner {
28 28
29 //公司代码和公司名对照(K: 公司编码,V:公司名) 29 //公司代码和公司名对照(K: 公司编码,V:公司名)
30 public static Map<String, String> businessCodeNameMap; 30 public static Map<String, String> businessCodeNameMap;
  31 +
  32 + //分公司公司代码和分公司公司名对照(K: 公司编码+分公司编码,V:分公司公司名)
  33 + public static Map<String, String> businessFgsCodeNameMap;
31 34
32 //设备号和车辆自编号 (K: 设备编码 ,V:车辆自编号) 35 //设备号和车辆自编号 (K: 设备编码 ,V:车辆自编号)
33 public static BiMap<String, String> deviceId2NbbmMap; 36 public static BiMap<String, String> deviceId2NbbmMap;
@@ -177,13 +180,16 @@ public class BasicData implements CommandLineRunner { @@ -177,13 +180,16 @@ public class BasicData implements CommandLineRunner {
177 */ 180 */
178 public void loadBusinessInfo(){ 181 public void loadBusinessInfo(){
179 Map<String, String> businessMap=new HashMap<String,String>(); 182 Map<String, String> businessMap=new HashMap<String,String>();
  183 + Map<String, String> businessFgsMap=new HashMap<String,String>();
180 Iterator<Business> busIter=businessRepository.findAll().iterator(); 184 Iterator<Business> busIter=businessRepository.findAll().iterator();
181 Business t; 185 Business t;
182 while(busIter.hasNext()){ 186 while(busIter.hasNext()){
183 t=busIter.next(); 187 t=busIter.next();
184 businessMap.put(t.getBusinessCode(), t.getBusinessName()); 188 businessMap.put(t.getBusinessCode(), t.getBusinessName());
  189 + businessFgsMap.put(t.getBusinessCode()+"_"+t.getUpCode(), t.getBusinessName());
185 } 190 }
186 businessCodeNameMap=businessMap; 191 businessCodeNameMap=businessMap;
  192 + businessFgsCodeNameMap=businessFgsMap;
187 } 193 }
188 /** 194 /**
189 * @Title: loadDeviceInfo 195 * @Title: loadDeviceInfo