优化代码

java110-bean/src/main/java/com/java110/dto/machine/CarInoutDetailDto.java

@@ -32,6 +32,8 @@ public class CarInoutDetailDto extends CarInoutDto implements Serializable {
 
     private String statusCd = "0";
 
+    private String remark;
+
 
     public String getInoutId() {
         return inoutId;
@@ -106,5 +108,11 @@ public class CarInoutDetailDto extends CarInoutDto implements Serializable {
         this.statusCd = statusCd;
     }
 
+    public String getRemark() {
+        return remark;
+    }
 
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java

@@ -22,6 +22,8 @@ public class CarInoutDto extends CarInoutPaymentDto implements Serializable {
     public static final String STATE_OUT = "100500";
     public static final String STATE_REPAY = "100600";
 
+    public static final String STATE_IN_FAIL = "100301";
+
 
     private String inTime;
     private String inoutId;

java110-bean/src/main/java/com/java110/po/car/CarInoutDetailPo.java

@@ -22,6 +22,8 @@ public class CarInoutDetailPo implements Serializable {
     private String paId;
     private String statusCd = "0";
 
+    private String remark;
+
     public String getDetailId() {
         return detailId;
     }
@@ -93,4 +95,12 @@ public class CarInoutDetailPo implements Serializable {
     public void setPaId(String paId) {
         this.paId = paId;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

java110-db/src/main/resources/mapper/common/CarInoutDetailV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存车辆进出明细信息 add by wuxw 2018-07-03 -->
     <insert id="saveCarInoutDetailInfo" parameterType="Map">
         insert into car_inout_detail(
-        inout_id,machine_id,machine_code,car_inout,pa_id,detail_id,car_num,community_id
+        inout_id,machine_id,machine_code,car_inout,pa_id,detail_id,car_num,community_id,remark
         ) values (
-        #{inoutId},#{machineId},#{machineCode},#{carInout},#{paId},#{detailId},#{carNum},#{communityId}
+        #{inoutId},#{machineId},#{machineCode},#{carInout},#{paId},#{detailId},#{carNum},#{communityId},#{remark}
         )
     </insert>
 
@@ -20,7 +20,7 @@
         select t.inout_id,t.inout_id inoutId,t.machine_id,t.machine_id machineId,t.machine_code,t.machine_code
         machineCode,t.car_inout,t.car_inout carInout,t.pa_id,t.pa_id paId,t.detail_id,t.detail_id
         detailId,t.car_num,t.car_num carNum,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,
-        ci.in_time inTime,ci.out_time outTime,cip.real_charge realCharge,ci.pa_id paId,td.name stateName
+        ci.in_time inTime,ci.out_time outTime,cip.real_charge realCharge,ci.pa_id paId,td.name stateName,t.remark
         from car_inout_detail t
         left join car_inout ci on t.inout_id = ci.inout_id and ci.status_cd = '0' and t.community_id = ci.community_id
         left join car_inout_payment cip on cip.inout_id = ci.inout_id and cip.community_id = ci.community_id
@@ -94,6 +94,9 @@
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
         where 1=1
         <if test="detailId !=null and detailId != ''">
             and t.detail_id= #{detailId}

service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java

@@ -67,7 +67,7 @@ public class ListCarInParkingAreaCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
-        Assert.hasKeyAndValue(reqJson, "paId", "未包含停车场信息");
+        Assert.hasKeyAndValue(reqJson, "boxId", "未包含岗亭信息");
     }
 
     @Override

service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java

@@ -308,13 +308,19 @@ public class MachineUploadCarLogCmd extends Cmd {
      * @param tempCar
      */
     private void carIn(JSONObject reqJson, MachineDto machineDto, int tempCar) {
+        String state = CarInoutDto.STATE_IN;
+        //进场失败记录
+        if(reqJson.containsKey("state") && "5".equals(reqJson.getString("state"))){
+            state = CarInoutDto.STATE_IN_FAIL;
+        }
+
         //保存
         CarInoutPo carInoutPo = new CarInoutPo();
         carInoutPo.setCarNum(reqJson.getString("carNum"));
         carInoutPo.setCommunityId(reqJson.getString("communityId"));
         carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         carInoutPo.setInTime(reqJson.getString("inTime"));
-        carInoutPo.setState(CarInoutDto.STATE_IN);
+        carInoutPo.setState(state);
         carInoutPo.setPaId(machineDto.getLocationObjId());
         int flag = carInoutV1InnerServiceSMOImpl.saveCarInout(carInoutPo);
 
@@ -333,6 +339,7 @@ public class MachineUploadCarLogCmd extends Cmd {
         carInoutDetailPo.setMachineCode(machineDto.getMachineCode());
         carInoutDetailPo.setMachineId(machineDto.getMachineId());
         carInoutDetailPo.setPaId(machineDto.getLocationObjId());
+        carInoutDetailPo.setRemark(reqJson.getString("remark"));
         flag = carInoutDetailV1InnerServiceSMOImpl.saveCarInoutDetail(carInoutDetailPo);
 
         if (flag < 1) {