加入临时车审核入场

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

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

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

@@ -0,0 +1,38 @@
+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.getTempCarAuths")
+public class GetTempCarAuthsCmd extends Cmd {
+
+    @Autowired
+    private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        Assert.hasKeyAndValue(reqJson,"communityId","未包含小区ID");
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        ResultVo resultVo = dataBusInnerServiceSMOImpl.getTempCarAuths(reqJson);
+
+        context.setResponseEntity(ResultVo.createResponseEntity(resultVo));
+    }
+}

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

@@ -173,6 +173,18 @@ public abstract class DatabusAdaptImpl implements IDatabusAdapt {
         return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
     }
 
+    /**
+     * 查询待审核车辆
+     *
+     * @param reqJson
+     * @return
+     */
+    @Override
+    public ResultVo getTempCarAuths(JSONObject reqJson) {
+        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
+    }
+
+
 
     /**
      * 查询 临时车待支付订单

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

@@ -89,4 +89,6 @@ public interface IDatabusAdapt {
     ResultVo getManualOpenDoorLogs(JSONObject reqJson);
 
     ResultVo tempCarAuth(JSONObject reqJson);
+
+    ResultVo getTempCarAuths(JSONObject reqJson);
 }

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

@@ -125,6 +125,13 @@ public class IotConstant {
 
     public static final String TEMP_CAR_AUTH = "/extApi/tempCarAuth/updateCarInoutTempAuths";
 
+    /**
+     * 查询临时车审核
+     */
+    public static final String GET_CAR_INOUT_TEMPAUTHS = "/extApi/tempCarAuth/getCarInoutTempAuths";
+
+
+
     //添加车辆
     public static final String ADD_TEAM_CAR_FEE_CONFIG = "/extApi/fee/addTempCarFee";
     //添加修改停车劵

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

@@ -77,16 +77,16 @@ public class NotifyTempCarFeeOrderAdapt extends DatabusAdaptImpl {
         postParameters.put("payCharge", tempCarPayOrderDto.getPayCharge());
         postParameters.put("payTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         postParameters.put("payType", tempCarPayOrderDto.getPayType());
-        postParameters.put("extPccIds",tempCarPayOrderDto.getPccIds());
-        if(!StringUtil.isEmpty(tempCarPayOrderDto.getMachineId())) {
+        postParameters.put("extPccIds", tempCarPayOrderDto.getPccIds());
+        if (!StringUtil.isEmpty(tempCarPayOrderDto.getMachineId())) {
             postParameters.put("extMachineId", tempCarPayOrderDto.getMachineId());
         }
 
         HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders(outRestTemplate));
         ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.getUrl(IotConstant.NOTIFY_TEMP_CAR_FEE_ORDER), HttpMethod.POST, httpEntity, String.class);
-        System.out.println("缴费通知"+IotConstant.getUrl(IotConstant.NOTIFY_TEMP_CAR_FEE_ORDER));
-        System.out.println("请求报文"+postParameters.toJSONString());
-        System.out.println("返回报文"+responseEntity);
+        System.out.println("缴费通知" + IotConstant.getUrl(IotConstant.NOTIFY_TEMP_CAR_FEE_ORDER));
+        System.out.println("请求报文" + postParameters.toJSONString());
+        System.out.println("返回报文" + responseEntity);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             return new ResultVo(ResultVo.CODE_ERROR, responseEntity.getBody());
         }
@@ -107,15 +107,15 @@ public class NotifyTempCarFeeOrderAdapt extends DatabusAdaptImpl {
         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"));
+        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);
+        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());
         }
@@ -123,4 +123,31 @@ public class NotifyTempCarFeeOrderAdapt extends DatabusAdaptImpl {
         return new ResultVo(paramOut.getInteger("code"), paramOut.getString("msg"));
 
     }
+
+    /**
+     * 查询临时车审核
+     *
+     * @param reqJson 业务信息
+     * @return
+     */
+    @Override
+    public ResultVo getTempCarAuths(JSONObject reqJson) {
+
+        reqJson.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        reqJson.put("extCommunityId", reqJson.getString("communityId"));
+        reqJson.put("extPaId", reqJson.getString("paId"));
+        reqJson.put("communityId", "");
+        reqJson.put("paId", "");
+        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(reqJson.toJSONString(), getHeaders(outRestTemplate));
+        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.getUrl(IotConstant.GET_CAR_INOUT_TEMPAUTHS), HttpMethod.POST, httpEntity, String.class);
+        System.out.println("缴费通知" + IotConstant.getUrl(IotConstant.TEMP_CAR_AUTH));
+        System.out.println("请求报文" + reqJson.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.getIntValue("totalPage"),paramOut.getIntValue("total"),paramOut.getJSONArray("data"));
+
+    }
 }

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

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