update...

潘钊
1 parent 79af7dd7
Showing 2 changed files with 20 additions and 158 deletions
src/main/java/com/bsth/server_rs/base_info/car/Car.java
src/main/java/com/bsth/server_rs/base_info/car/buffer/CarRefreshThread.java
 package com.bsth.server_rs.base_info.car;
  
-import com.bsth.server_rs.adapter.DateAdapter_yMd;
-
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
-import java.util.Date;
  
 /**
  * 车辆信息
@@ -15,11 +11,6 @@ import java.util.Date;
 public class Car implements Serializable {
  
     /**
-     * 主键Id
-     */
-    private Integer id;
-
-    /**
      * 自编号/内部编号
      */
     private String insideCode;
@@ -41,48 +32,6 @@ public class Car implements Serializable {
      * 设备终端号
      */
     private String equipmentCode;
-
-    // 以下信息来自总公司的业务系统，可能需要调用相关接口
-    /**
-     * 车型类别
-     */
-    private String carClass;
-    /**
-     * 技术速度
-     */
-    private Double speed;
-    /**
-     * 座位数
-     */
-    private Integer carSeatnNumber;
-    /**
-     * 载客标准
-     */
-    private String carStandard;
-
-    /**
-     * 报废号
-     */
-    private String scrapCode;
-    /**
-     * 报废日期
-     */
-    private Date scrapDate;
-
-    /**
-     * 车辆等级标准
-     */
-    private String carGride;
-
-    /**
-     * 启用日期
-     */
-    private Date openDate;
-    /**
-     * 取消日期
-     */
-    private Date closeDate;
-
     /**
      * 车辆类型
      */
@@ -93,18 +42,9 @@ public class Car implements Serializable {
     private String vehicleStats;
  
     /**
-     * 营运证编码
-     */
-    private String serviceNo;
-    /**
      * 是否电车（TODO：在原系统里没有，这里暂时留着）
      */
     private Boolean sfdc;
-
-    /**
-     * 视频编号
-     */
-    private String videoCode;
     /**
      * 是否报废
      */
@@ -120,13 +60,9 @@ public class Car implements Serializable {
      */
     private String tagRfid;
  
-    public Integer getId() {
-        return id;
-    }
+    private String lineCode;
  
-    public void setId(Integer id) {
-        this.id = id;
-    }
+    private String lineName;
  
     public String getInsideCode() {
         return insideCode;
@@ -168,81 +104,6 @@ public class Car implements Serializable {
         this.equipmentCode = equipmentCode;
     }
  
-    public String getCarClass() {
-        return carClass;
-    }
-
-    public void setCarClass(String carClass) {
-        this.carClass = carClass;
-    }
-
-    public Double getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(Double speed) {
-        this.speed = speed;
-    }
-
-    public Integer getCarSeatnNumber() {
-        return carSeatnNumber;
-    }
-
-    public void setCarSeatnNumber(Integer carSeatnNumber) {
-        this.carSeatnNumber = carSeatnNumber;
-    }
-
-    public String getCarStandard() {
-        return carStandard;
-    }
-
-    public void setCarStandard(String carStandard) {
-        this.carStandard = carStandard;
-    }
-
-    public String getScrapCode() {
-        return scrapCode;
-    }
-
-    public void setScrapCode(String scrapCode) {
-        this.scrapCode = scrapCode;
-    }
-
-    @XmlJavaTypeAdapter(DateAdapter_yMd.class)
-    public Date getScrapDate() {
-        return scrapDate;
-    }
-
-    public void setScrapDate(Date scrapDate) {
-        this.scrapDate = scrapDate;
-    }
-
-    public String getCarGride() {
-        return carGride;
-    }
-
-    public void setCarGride(String carGride) {
-        this.carGride = carGride;
-    }
-
-    @XmlJavaTypeAdapter(DateAdapter_yMd.class)
-    public Date getOpenDate() {
-        return openDate;
-    }
-
-    public void setOpenDate(Date openDate) {
-        this.openDate = openDate;
-    }
-
-    @XmlJavaTypeAdapter(DateAdapter_yMd.class)
-    public Date getCloseDate() {
-        return closeDate;
-    }
-
-    public void setCloseDate(Date closeDate) {
-        this.closeDate = closeDate;
-    }
-
     public String getCarType() {
         return carType;
     }
@@ -259,14 +120,6 @@ public class Car implements Serializable {
         this.vehicleStats = vehicleStats;
     }
  
-    public String getServiceNo() {
-        return serviceNo;
-    }
-
-    public void setServiceNo(String serviceNo) {
-        this.serviceNo = serviceNo;
-    }
-
     public Boolean getSfdc() {
         return sfdc;
     }
@@ -275,14 +128,6 @@ public class Car implements Serializable {
         this.sfdc = sfdc;
     }
  
-    public String getVideoCode() {
-        return videoCode;
-    }
-
-    public void setVideoCode(String videoCode) {
-        this.videoCode = videoCode;
-    }
-
     public Boolean getScrapState() {
         return scrapState;
     }
@@ -306,4 +151,20 @@ public class Car implements Serializable {
     public void setTagRfid(String tagRfid) {
         this.tagRfid = tagRfid;
     }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
 }
@@ -26,7 +26,8 @@ public class CarRefreshThread extends Thread{
  
         try {
  
-            List<Car> list = jdbcTemplate.query("select * from bsth_c_cars", BeanPropertyRowMapper.newInstance(Car.class));
+            List<Car> list = jdbcTemplate.query("SELECT DISTINCT t1.*,t2.line_code,t2.name as line_name FROM(SELECTc.inside_code,c.business_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);
         }catch (Exception e){