加入临时车审核入场

java110-bean/src/main/java/com/java110/dto/parking/ParkingBoxDto.java

@@ -18,6 +18,7 @@ public class ParkingBoxDto extends PageDto implements Serializable {
     private String yelowCarIn;
     private String fee;
     private String tempCarIn;
+    private String tempAuth;
     private String boxName;
     private String remark;
     private String communityId;
@@ -128,4 +129,12 @@ public class ParkingBoxDto extends PageDto implements Serializable {
     public void setPaNum(String paNum) {
         this.paNum = paNum;
     }
+
+    public String getTempAuth() {
+        return tempAuth;
+    }
+
+    public void setTempAuth(String tempAuth) {
+        this.tempAuth = tempAuth;
+    }
 }

java110-bean/src/main/java/com/java110/po/parkingBox/ParkingBoxPo.java

@@ -30,6 +30,8 @@ public class ParkingBoxPo implements Serializable {
     private String yelowCarIn;
     private String fee;
     private String tempCarIn;
+
+    private String tempAuth;
     private String boxName;
     private String remark;
     private String statusCd = "0";
@@ -109,5 +111,11 @@ public class ParkingBoxPo implements Serializable {
         this.boxId = boxId;
     }
 
+    public String getTempAuth() {
+        return tempAuth;
+    }
 
+    public void setTempAuth(String tempAuth) {
+        this.tempAuth = tempAuth;
+    }
 }

java110-db/src/main/resources/mapper/community/ParkingBoxV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存岗亭信息 add by wuxw 2018-07-03 -->
     <insert id="saveParkingBoxInfo" parameterType="Map">
         insert into parking_box(
-        yelow_car_in,fee,temp_car_in,box_name,remark,community_id,blue_car_in,box_id
+        yelow_car_in,fee,temp_car_in,box_name,remark,community_id,blue_car_in,box_id,temp_auth
         ) values (
-        #{yelowCarIn},#{fee},#{tempCarIn},#{boxName},#{remark},#{communityId},#{blueCarIn},#{boxId}
+        #{yelowCarIn},#{fee},#{tempCarIn},#{boxName},#{remark},#{communityId},#{blueCarIn},#{boxId},#{tempAuth}
         )
     </insert>
 
@@ -19,7 +19,7 @@
     <select id="getParkingBoxInfo" parameterType="Map" resultType="Map">
         select t.yelow_car_in,t.yelow_car_in yelowCarIn,t.fee,t.temp_car_in,t.temp_car_in
         tempCarIn,t.box_name,t.box_name boxName,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
-        communityId,t.blue_car_in,t.blue_car_in blueCarIn,t.box_id,t.box_id boxId,pba.pa_id paId,pa.num paNum
+        communityId,t.blue_car_in,t.blue_car_in blueCarIn,t.box_id,t.box_id boxId,pba.pa_id paId,pa.num paNum,t.temp_auth tempAuth
         from parking_box t
         left join parking_box_area pba on t.box_id = pba.box_id and pba.default_area = 'T' and pba.status_cd ='0'
         left join parking_area pa on pba.pa_id = pa.pa_id and pa.community_id = t.community_id and pa.status_cd = '0'
@@ -33,6 +33,9 @@
         <if test="tempCarIn !=null and tempCarIn != ''">
             and t.temp_car_in= #{tempCarIn}
         </if>
+        <if test="tempAuth !=null and tempAuth != ''">
+            and t.temp_auth= #{tempAuth}
+        </if>
         <if test="boxName !=null and boxName != ''">
             and t.box_name= #{boxName}
         </if>
@@ -80,17 +83,19 @@
         <if test="remark !=null and remark != ''">
             , t.remark= #{remark}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
         <if test="blueCarIn !=null and blueCarIn != ''">
             , t.blue_car_in= #{blueCarIn}
         </if>
+        <if test="tempAuth !=null and tempAuth != ''">
+            , t.temp_auth= #{tempAuth}
+        </if>
         where 1=1
         <if test="boxId !=null and boxId != ''">
             and t.box_id= #{boxId}
         </if>
-
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
     </update>
 
     <!-- 查询岗亭数量 add by wuxw 2018-07-03 -->
@@ -109,6 +114,9 @@
         <if test="tempCarIn !=null and tempCarIn != ''">
             and t.temp_car_in= #{tempCarIn}
         </if>
+        <if test="tempAuth !=null and tempAuth != ''">
+            and t.temp_auth= #{tempAuth}
+        </if>
         <if test="boxName !=null and boxName != ''">
             and t.box_name= #{boxName}
         </if>

java110-interface/src/main/java/com/java110/intf/job/IDataBusInnerServiceSMO.java

@@ -110,4 +110,7 @@ public interface IDataBusInnerServiceSMO {
 
     @RequestMapping(value = "/getManualOpenDoorLogs", method = RequestMethod.POST)
     ResultVo getManualOpenDoorLogs(@RequestBody JSONObject reqJson);
+
+    @RequestMapping(value = "/tempCarAuth", method = RequestMethod.POST)
+    ResultVo tempCarAuth(@RequestBody JSONObject reqJson);
 }

service-common/src/main/java/com/java110/common/cmd/machine/TempCarAuthCmd.java

@@ -0,0 +1,40 @@
+package com.java110.common.cmd.machine;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.job.IDataBusInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+
+@Java110Cmd(serviceCode = "machine.tempCarAuth")
+public class TempCarAuthCmd extends Cmd {
+
+    @Autowired
+    private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        Assert.hasKeyAndValue(reqJson,"authId","未包含审核ID");
+        Assert.hasKeyAndValue(reqJson,"state","未包含状态");
+        Assert.hasKeyAndValue(reqJson,"communityId","未包含小区ID");
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        ResultVo resultVo = dataBusInnerServiceSMOImpl.tempCarAuth(reqJson);
+        if(resultVo.getCode() != ResultVo.CODE_OK){
+            throw new CmdException(resultVo.getMsg());
+        }
+
+        context.setResponseEntity(ResultVo.createResponseEntity(resultVo));
+    }
+}

service-community/src/main/java/com/java110/community/cmd/parkingBox/ListParkingBoxCmd.java

@@ -23,6 +23,7 @@ import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.parking.ParkingBoxDto;
 import com.java110.intf.community.IParkingBoxV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
@@ -55,6 +56,7 @@ public class ListParkingBoxCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
     }
 
     @Override

service-job/src/main/java/com/java110/job/adapt/DatabusAdaptImpl.java

@@ -162,6 +162,18 @@ public abstract class DatabusAdaptImpl implements IDatabusAdapt {
     }
 
 
+    /**
+     * 修改在场车辆车牌号
+     *
+     * @param reqJson
+     * @return
+     */
+    @Override
+    public ResultVo tempCarAuth(JSONObject reqJson) {
+        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
+    }
+
+
     /**
      * 查询 临时车待支付订单
      *

service-job/src/main/java/com/java110/job/adapt/IDatabusAdapt.java

@@ -87,4 +87,6 @@ public interface IDatabusAdapt {
     ResultVo updateCarInoutCarNum(CarInoutDto carInoutDto);
 
     ResultVo getManualOpenDoorLogs(JSONObject reqJson);
+
+    ResultVo tempCarAuth(JSONObject reqJson);
 }

service-job/src/main/java/com/java110/job/adapt/hcIot/GetTempCarFeeOrderAdapt.java

@@ -122,4 +122,6 @@ public class GetTempCarFeeOrderAdapt extends DatabusAdaptImpl {
         return new ResultVo(paramOut.getInteger("code"), paramOut.getString("msg"), paramOut.getJSONArray("data"));
     }
 
+
+
 }

service-job/src/main/java/com/java110/job/adapt/hcIot/IotConstant.java

@@ -123,6 +123,8 @@ public class IotConstant {
     //查询临时停车费订单
     public static final String NOTIFY_TEMP_CAR_FEE_ORDER = "/extApi/fee/notifyTempCarFeeOrder";
 
+    public static final String TEMP_CAR_AUTH = "/extApi/tempCarAuth/updateCarInoutTempAuths";
+
     //添加车辆
     public static final String ADD_TEAM_CAR_FEE_CONFIG = "/extApi/fee/addTempCarFee";
     //添加修改停车劵

service-job/src/main/java/com/java110/job/adapt/hcIot/NotifyTempCarFeeOrderAdapt.java

@@ -95,4 +95,32 @@ public class NotifyTempCarFeeOrderAdapt extends DatabusAdaptImpl {
 
     }
 
+    /**
+     * 临时车审核
+     *
+     * @param reqJson 业务信息
+     * @return
+     */
+    @Override
+    public ResultVo tempCarAuth(JSONObject reqJson) {
+
+        JSONObject postParameters = new JSONObject();
+        postParameters.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        postParameters.put("authId", reqJson.getString("authId"));
+        postParameters.put("state",  reqJson.getString("state"));
+        postParameters.put("msg",  reqJson.getString("msg"));
+
+
+        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders(outRestTemplate));
+        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.getUrl(IotConstant.TEMP_CAR_AUTH), HttpMethod.POST, httpEntity, String.class);
+        System.out.println("缴费通知"+IotConstant.getUrl(IotConstant.TEMP_CAR_AUTH));
+        System.out.println("请求报文"+postParameters.toJSONString());
+        System.out.println("返回报文"+responseEntity);
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            return new ResultVo(ResultVo.CODE_ERROR, responseEntity.getBody());
+        }
+        JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+        return new ResultVo(paramOut.getInteger("code"), paramOut.getString("msg"));
+
+    }
 }

service-job/src/main/java/com/java110/job/smo/impl/DataBusInnerServiceSMOImpl.java

@@ -124,6 +124,12 @@ public class DataBusInnerServiceSMOImpl extends BaseServiceSMO implements IDataB
         return databusAdaptImpl.getManualOpenDoorLogs(reqJson);
     }
 
+    @Override
+    public ResultVo tempCarAuth(@RequestBody JSONObject reqJson) {
+        IDatabusAdapt databusAdaptImpl = ApplicationContextFactory.getBean(DEFAULT_NOTIFY_TEMP_CAR_FEE_ORDER_PROTOCOL, IDatabusAdapt.class);
+        return databusAdaptImpl.tempCarAuth(reqJson);
+    }
+
     @Override
     public ResultVo notifyTempCarFeeOrder(@RequestBody TempCarPayOrderDto tempCarPayOrderDto) {
         IDatabusAdapt databusAdaptImpl = ApplicationContextFactory.getBean(DEFAULT_NOTIFY_TEMP_CAR_FEE_ORDER_PROTOCOL, IDatabusAdapt.class);