update...

潘钊
1 parent eb7afe22
Showing 3 changed files with 11 additions and 11 deletions
src/main/java/com/bsth/server_rs/base_info/car/Car.java
src/main/java/com/bsth/server_rs/base_info/car/buffer/CarBufferData.java
src/main/java/com/bsth/server_rs/base_info/car/buffer/CarRefreshThread.java
@@ -13,7 +13,7 @@ public class Car implements Serializable {
     /**
      * 自编号/内部编号
      */
-    private String insideCode;
+    private String nbbm;
     /**
      * 公司代码
@@ -64,14 +64,6 @@ public class Car implements Serializable {
     private String lineName;
-    public String getInsideCode() {
-        return insideCode;
-    }
-
-    public void setInsideCode(String insideCode) {
-        this.insideCode = insideCode;
-    }
-
     public String getBrancheCompanyCode() {
         return brancheCompanyCode;
@@ -168,4 +160,12 @@ public class Car implements Serializable {
     public void setCompanyCode(String companyCode) {
         this.companyCode = companyCode;
     }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
 }
@@ -46,7 +46,7 @@ public class CarBufferData implements CommandLineRunner {
         ArrayListMultimap<String, Car> listMap = ArrayListMultimap.create();
         for(Car car : data){
-            idMapCopy.put(car.getInsideCode(), car);
+            idMapCopy.put(car.getNbbm(), car);
             listMap.put(car.getCompanyCode(), car);
         }
         idMap = idMapCopy;
@@ -26,7 +26,7 @@ public class CarRefreshThread extends Thread{
         try {
-            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"
+            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"
                     , BeanPropertyRowMapper.newInstance(Car.class));
             if(list != null && list.size() > 0)
                 CarBufferData.replaceAll(list);