update...

潘钊
1 parent 9d4a81a2
Showing 2 changed files with 24 additions and 208 deletions
src/main/java/com/bsth/server_rs/base_info/car/Car.java
src/main/java/com/bsth/server_rs/base_info/person/PersonRestService.java
@@ -38,10 +38,6 @@ public class Car implements Serializable {
      */
     private String carPlate;
     /**
-     * 供应商名称
-     */
-    private String supplierName;
-    /**
      * 设备终端号
      */
     private String equipmentCode;
@@ -63,14 +59,7 @@ public class Car implements Serializable {
      * 载客标准
      */
     private String carStandard;
-    /**
-     * 标准油耗(开空调)
-     */
-    private Double kburnStandard;
-    /**
-     * 标准油耗(关空调)
-     */
-    private Double gburnStandard;
+
     /**
      * 报废号
      */
@@ -79,38 +68,12 @@ public class Car implements Serializable {
      * 报废日期
      */
     private Date scrapDate;
-    /**
-     * 厂牌型号1
-     */
-    private String makeCodeOne;
-    /**
-     * 厂牌型号2
-     */
-    private String makeCodeTwo;
+
     /**
      * 车辆等级标准
      */
     private String carGride;
-    /**
-     * 出厂排放标准
-     */
-    private String emissionsStandard;
-    /**
-     * 发动机号码1
-     */
-    private String engineCodeOne;
-    /**
-     * 发动机号码2
-     */
-    private String engineCodeTwo;
-    /**
-     * 车架号码1
-     */
-    private String carNumberOne;
-    /**
-     * 车架号码2
-     */
-    private String carNumberTwo;
+
     /**
      * 启用日期
      */
@@ -121,23 +84,6 @@ public class Car implements Serializable {
     private Date closeDate;
  
     /**
-     * 是否空调车
-     */
-    private Boolean hvacCar;
-    /**
-     * 有无人售票
-     */
-    private Boolean ticketType;
-    /**
-     * 是否有LED服务屏
-     */
-    private Boolean ledScreen;
-    /**
-     * 是否有TV视频
-     */
-    private Boolean tvVideoType;
-
-    /**
      * 车辆类型
      */
     private String carType;
@@ -145,10 +91,7 @@ public class Car implements Serializable {
      * 是否机动车（机动车类型选择）
      */
     private String vehicleStats;
-    /**
-     * 营运状态
-     */
-    private String operatorsState;
+
     /**
      * 营运证编码
      */
@@ -157,10 +100,6 @@ public class Car implements Serializable {
      * 是否电车（TODO：在原系统里没有，这里暂时留着）
      */
     private Boolean sfdc;
-    /**
-     * 备注/描述
-     */
-    private String descriptions;
  
     /**
      * 视频编号
@@ -172,14 +111,14 @@ public class Car implements Serializable {
     private Boolean scrapState;
  
     /**
-     * RFID 车卡号
+     * RFID 车卡ID号（16进制）
      */
-    private String icRFID;
+    private String idRfid;
  
     /**
      * RFID 标签号
      */
-    private String tagRFID;
+    private String tagRfid;
  
     public Integer getId() {
         return id;
@@ -221,14 +160,6 @@ public class Car implements Serializable {
         this.carPlate = carPlate;
     }
  
-    public String getSupplierName() {
-        return supplierName;
-    }
-
-    public void setSupplierName(String supplierName) {
-        this.supplierName = supplierName;
-    }
-
     public String getEquipmentCode() {
         return equipmentCode;
     }
@@ -269,22 +200,6 @@ public class Car implements Serializable {
         this.carStandard = carStandard;
     }
  
-    public Double getKburnStandard() {
-        return kburnStandard;
-    }
-
-    public void setKburnStandard(Double kburnStandard) {
-        this.kburnStandard = kburnStandard;
-    }
-
-    public Double getGburnStandard() {
-        return gburnStandard;
-    }
-
-    public void setGburnStandard(Double gburnStandard) {
-        this.gburnStandard = gburnStandard;
-    }
-
     public String getScrapCode() {
         return scrapCode;
     }
@@ -302,22 +217,6 @@ public class Car implements Serializable {
         this.scrapDate = scrapDate;
     }
  
-    public String getMakeCodeOne() {
-        return makeCodeOne;
-    }
-
-    public void setMakeCodeOne(String makeCodeOne) {
-        this.makeCodeOne = makeCodeOne;
-    }
-
-    public String getMakeCodeTwo() {
-        return makeCodeTwo;
-    }
-
-    public void setMakeCodeTwo(String makeCodeTwo) {
-        this.makeCodeTwo = makeCodeTwo;
-    }
-
     public String getCarGride() {
         return carGride;
     }
@@ -326,46 +225,6 @@ public class Car implements Serializable {
         this.carGride = carGride;
     }
  
-    public String getEmissionsStandard() {
-        return emissionsStandard;
-    }
-
-    public void setEmissionsStandard(String emissionsStandard) {
-        this.emissionsStandard = emissionsStandard;
-    }
-
-    public String getEngineCodeOne() {
-        return engineCodeOne;
-    }
-
-    public void setEngineCodeOne(String engineCodeOne) {
-        this.engineCodeOne = engineCodeOne;
-    }
-
-    public String getEngineCodeTwo() {
-        return engineCodeTwo;
-    }
-
-    public void setEngineCodeTwo(String engineCodeTwo) {
-        this.engineCodeTwo = engineCodeTwo;
-    }
-
-    public String getCarNumberOne() {
-        return carNumberOne;
-    }
-
-    public void setCarNumberOne(String carNumberOne) {
-        this.carNumberOne = carNumberOne;
-    }
-
-    public String getCarNumberTwo() {
-        return carNumberTwo;
-    }
-
-    public void setCarNumberTwo(String carNumberTwo) {
-        this.carNumberTwo = carNumberTwo;
-    }
-
     @XmlJavaTypeAdapter(DateAdapter_yMd.class)
     public Date getOpenDate() {
         return openDate;
@@ -384,38 +243,6 @@ public class Car implements Serializable {
         this.closeDate = closeDate;
     }
  
-    public Boolean getHvacCar() {
-        return hvacCar;
-    }
-
-    public void setHvacCar(Boolean hvacCar) {
-        this.hvacCar = hvacCar;
-    }
-
-    public Boolean getTicketType() {
-        return ticketType;
-    }
-
-    public void setTicketType(Boolean ticketType) {
-        this.ticketType = ticketType;
-    }
-
-    public Boolean getLedScreen() {
-        return ledScreen;
-    }
-
-    public void setLedScreen(Boolean ledScreen) {
-        this.ledScreen = ledScreen;
-    }
-
-    public Boolean getTvVideoType() {
-        return tvVideoType;
-    }
-
-    public void setTvVideoType(Boolean tvVideoType) {
-        this.tvVideoType = tvVideoType;
-    }
-
     public String getCarType() {
         return carType;
     }
@@ -432,14 +259,6 @@ public class Car implements Serializable {
         this.vehicleStats = vehicleStats;
     }
  
-    public String getOperatorsState() {
-        return operatorsState;
-    }
-
-    public void setOperatorsState(String operatorsState) {
-        this.operatorsState = operatorsState;
-    }
-
     public String getServiceNo() {
         return serviceNo;
     }
@@ -456,14 +275,6 @@ public class Car implements Serializable {
         this.sfdc = sfdc;
     }
  
-    public String getDescriptions() {
-        return descriptions;
-    }
-
-    public void setDescriptions(String descriptions) {
-        this.descriptions = descriptions;
-    }
-
     public String getVideoCode() {
         return videoCode;
     }
@@ -480,19 +291,19 @@ public class Car implements Serializable {
         this.scrapState = scrapState;
     }
  
-    public String getIcRFID() {
-        return icRFID;
+    public String getIdRfid() {
+        return idRfid;
     }
  
-    public void setIcRFID(String icRFID) {
-        this.icRFID = icRFID;
+    public void setIdRfid(String idRfid) {
+        this.idRfid = idRfid;
     }
  
-    public String getTagRFID() {
-        return tagRFID;
+    public String getTagRfid() {
+        return tagRfid;
     }
  
-    public void setTagRFID(String tagRFID) {
-        this.tagRFID = tagRFID;
+    public void setTagRfid(String tagRfid) {
+        this.tagRfid = tagRfid;
     }
 }
 package com.bsth.server_rs.base_info.person;
  
+import com.bsth.server_rs.base_info.dto.PersonCardDto;
 import com.bsth.server_rs.base_info.person.buffer.PersonBufferData;
  
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import java.util.List;
+import java.util.Map;
  
 /**
  * Created by panzhao on 2017/3/28.
@@ -33,4 +32,10 @@ public class PersonRestService {
     public Personnel findOne(@PathParam("workId") String workId) {
         return PersonBufferData.findOne(workId);
     }
+
+    @POST
+    public Map<String, Object> multiPostCards(List<PersonCardDto> list){
+        System.out.println(list);
+        return null;
+    }
 }