Commit 57a80070699223c8001b27442db49b47fa3e9af6
1 parent
89dfc861
BsicData添加公司信息
Showing
2 changed files
with
23 additions
and
1 deletions
src/main/java/com/bsth/data/BasicData.java
| @@ -25,6 +25,9 @@ import java.util.concurrent.TimeUnit; | @@ -25,6 +25,9 @@ import java.util.concurrent.TimeUnit; | ||
| 25 | */ | 25 | */ |
| 26 | @Component | 26 | @Component |
| 27 | public class BasicData implements CommandLineRunner { | 27 | public class BasicData implements CommandLineRunner { |
| 28 | + | ||
| 29 | + //公司代码和公司名对照(K: 公司编码,V:公司名) | ||
| 30 | + public static Map<String, String> businessCodeNameMap; | ||
| 28 | 31 | ||
| 29 | //设备号和车辆自编号 (K: 设备编码 ,V:车辆自编号) | 32 | //设备号和车辆自编号 (K: 设备编码 ,V:车辆自编号) |
| 30 | public static BiMap<String, String> deviceId2NbbmMap; | 33 | public static BiMap<String, String> deviceId2NbbmMap; |
| @@ -107,6 +110,9 @@ public class BasicData implements CommandLineRunner { | @@ -107,6 +110,9 @@ public class BasicData implements CommandLineRunner { | ||
| 107 | 110 | ||
| 108 | @Autowired | 111 | @Autowired |
| 109 | PersonnelRepository personnelRepository; | 112 | PersonnelRepository personnelRepository; |
| 113 | + | ||
| 114 | + @Autowired | ||
| 115 | + BusinessRepository businessRepository; | ||
| 110 | 116 | ||
| 111 | 117 | ||
| 112 | @Override | 118 | @Override |
| @@ -132,6 +138,8 @@ public class BasicData implements CommandLineRunner { | @@ -132,6 +138,8 @@ public class BasicData implements CommandLineRunner { | ||
| 132 | loadStationRouteInfo(); | 138 | loadStationRouteInfo(); |
| 133 | //人员信息 | 139 | //人员信息 |
| 134 | loadPersonnelInfo(); | 140 | loadPersonnelInfo(); |
| 141 | + //公司信息 | ||
| 142 | + loadBusinessInfo(); | ||
| 135 | logger.info("加载基础数据成功!,"); | 143 | logger.info("加载基础数据成功!,"); |
| 136 | } catch (Exception e) { | 144 | } catch (Exception e) { |
| 137 | logger.error("加载基础数据时出现异常,", e); | 145 | logger.error("加载基础数据时出现异常,", e); |
| @@ -164,6 +172,20 @@ public class BasicData implements CommandLineRunner { | @@ -164,6 +172,20 @@ public class BasicData implements CommandLineRunner { | ||
| 164 | } | 172 | } |
| 165 | 173 | ||
| 166 | /** | 174 | /** |
| 175 | + * loadBusinessInfo | ||
| 176 | + * (公司代码公司名对照) | ||
| 177 | + */ | ||
| 178 | + public void loadBusinessInfo(){ | ||
| 179 | + Map<String, String> businessMap=new HashMap<String,String>(); | ||
| 180 | + Iterator<Business> busIter=businessRepository.findAll().iterator(); | ||
| 181 | + Business t; | ||
| 182 | + while(busIter.hasNext()){ | ||
| 183 | + t=busIter.next(); | ||
| 184 | + businessMap.put(t.getBusinessCode(), t.getBusinessName()); | ||
| 185 | + } | ||
| 186 | + businessCodeNameMap=businessMap; | ||
| 187 | + } | ||
| 188 | + /** | ||
| 167 | * @Title: loadDeviceInfo | 189 | * @Title: loadDeviceInfo |
| 168 | * @Description: TODO(加载设备相关信息) | 190 | * @Description: TODO(加载设备相关信息) |
| 169 | */ | 191 | */ |
src/main/java/com/bsth/entity/oil/Ylb.java
| @@ -291,7 +291,7 @@ public class Ylb { | @@ -291,7 +291,7 @@ public class Ylb { | ||
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | public String getGsname() { | 293 | public String getGsname() { |
| 294 | - return BasicData.nbbm2CompanyCodeMap.get(this.nbbm); | 294 | + return BasicData.businessCodeNameMap.get(this.ssgsdm); |
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | public void setGsname(String gsname) { | 297 | public void setGsname(String gsname) { |