潘钊 / control_service_data_Interface · Commits

Commit d8faa0a6ae681477e4fe1dc61414ebb0cdf21928

Authored by 潘钊
1 parent eb7afe22

update...

Inline Side-by-side
Showing 3 changed files with 11 additions and 11 deletions
src/main/java/com/bsth/server_rs/base_info/car/Car.java
  View file @d8faa0a
... ... @@ -13,7 +13,7 @@ public class Car implements Serializable {
13 13 /**
14 14 * 自编号/内部编号
15 15 */
16   - private String insideCode;
  16 + private String nbbm;
17 17  
18 18 /**
19 19 * 公司代码
... ... @@ -64,14 +64,6 @@ public class Car implements Serializable {
64 64  
65 65 private String lineName;
66 66  
67   - public String getInsideCode() {
68   - return insideCode;
69   - }
70   -
71   - public void setInsideCode(String insideCode) {
72   - this.insideCode = insideCode;
73   - }
74   -
75 67  
76 68 public String getBrancheCompanyCode() {
77 69 return brancheCompanyCode;
... ... @@ -168,4 +160,12 @@ public class Car implements Serializable {
168 160 public void setCompanyCode(String companyCode) {
169 161 this.companyCode = companyCode;
170 162 }
  163 +
  164 + public String getNbbm() {
  165 + return nbbm;
  166 + }
  167 +
  168 + public void setNbbm(String nbbm) {
  169 + this.nbbm = nbbm;
  170 + }
171 171 }
... ...
src/main/java/com/bsth/server_rs/base_info/car/buffer/CarBufferData.java
  View file @d8faa0a
... ... @@ -46,7 +46,7 @@ public class CarBufferData implements CommandLineRunner {
46 46 ArrayListMultimap<String, Car> listMap = ArrayListMultimap.create();
47 47  
48 48 for(Car car : data){
49   - idMapCopy.put(car.getInsideCode(), car);
  49 + idMapCopy.put(car.getNbbm(), car);
50 50 listMap.put(car.getCompanyCode(), car);
51 51 }
52 52 idMap = idMapCopy;
... ...
src/main/java/com/bsth/server_rs/base_info/car/buffer/CarRefreshThread.java
  View file @d8faa0a
... ... @@ -26,7 +26,7 @@ public class CarRefreshThread extends Thread{
26 26  
27 27 try {
28 28  
29   - List<Car> list = jdbcTemplate.query("SELECT DISTINCT t1.*,t2.line_code,t2.name as line_name FROM(SELECT c.inside_code,c.business_code as company_code,c.branche_company_code,c.car_plate,c.equipment_code,c.car_type,c.vehicle_stats,c.sfdc,c.scrap_state,c.id_rfid,c.tag_rfid,c2.xl FROM bsth_c_cars c LEFT JOIN bsth_c_s_ccinfo c2 ON c.id = c2.cl ) t1 LEFT JOIN bsth_c_line t2 on t1.xl=t2.id"
  29 + List<Car> list = jdbcTemplate.query("SELECT DISTINCT t1.*,t2.line_code,t2.name as line_name FROM(SELECT c.inside_code as nbbm,c.business_code as company_code,c.branche_company_code,c.car_plate,c.equipment_code,c.car_type,c.vehicle_stats,c.sfdc,c.scrap_state,c.id_rfid,c.tag_rfid,c2.xl FROM bsth_c_cars c LEFT JOIN bsth_c_s_ccinfo c2 ON c.id = c2.cl ) t1 LEFT JOIN bsth_c_line t2 on t1.xl=t2.id"
30 30 , BeanPropertyRowMapper.newInstance(Car.class));
31 31 if(list != null && list.size() > 0)
32 32 CarBufferData.replaceAll(list);
... ...