优化代码

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

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

service-common/src/main/java/com/java110/common/bmo/machine/IMachineOpenDoorBMO.java

@@ -64,4 +64,11 @@ public interface IMachineOpenDoorBMO {
      * @return
      */
     ResponseEntity<String> customCarInOut(JSONObject reqJson);
+
+    /**
+     * 查询手工开闸记录
+     * @param reqJson
+     * @return
+     */
+    ResponseEntity<String> getManualOpenDoorLogs(JSONObject reqJson);
 }

service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java

@@ -173,4 +173,10 @@ public class MachineOpenDoorBMOImpl implements IMachineOpenDoorBMO {
         ResultVo resultVo = dataBusInnerServiceSMOImpl.customCarInOut(reqJson);
         return ResultVo.createResponseEntity(resultVo);
     }
+
+    @Override
+    public ResponseEntity<String> getManualOpenDoorLogs(JSONObject reqJson) {
+        ResultVo resultVo = dataBusInnerServiceSMOImpl.getManualOpenDoorLogs(reqJson);
+        return ResultVo.createResponseEntity(resultVo);
+    }
 }

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

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.common.cmd.machine;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
+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.core.log.LoggerFactory;
+import com.java110.dto.machine.CarBlackWhiteDto;
+import com.java110.dto.machine.CarInoutDto;
+import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
+import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
+import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
+import com.java110.intf.job.IDataBusInnerServiceSMO;
+import com.java110.intf.user.ICarBlackWhiteV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+
+import java.util.List;
+
+/**
+ * 类表述： 查询手动开闸记录
+ * 服务编码：machine.customCarInOutCmd
+ * 请求路劲：/app/machine.customCarInOutCmd
+ * add by 吴学文 at 2021-09-18 13:35:13 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "machine.getManualOpenDoorLogs")
+public class GetManualOpenDoorLogsCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(GetManualOpenDoorLogsCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IMachineOpenDoorBMO machineOpenDoorBMOImpl;
+
+
+    @Autowired
+    private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+
+
+        ResponseEntity<String> responseEntity = machineOpenDoorBMOImpl.getManualOpenDoorLogs(reqJson);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+}

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

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

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

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

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

@@ -103,5 +103,22 @@ public class GetTempCarFeeOrderAdapt extends DatabusAdaptImpl {
         return new ResultVo(paramOut.getInteger("code"), paramOut.getString("msg"), paramOut.getJSONObject("data"));
     }
 
+    /**
+     * 修改在场车辆车牌号
+     *
+     * @param reqJson
+     * @return
+     */
+    @Override
+    public ResultVo getManualOpenDoorLogs(JSONObject reqJson)  {
+        reqJson.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(reqJson.toJSONString(), getHeaders(outRestTemplate));
+        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.getUrl(IotConstant.GET_MANUAL_OPEN_DOOR_LOGS), HttpMethod.POST, httpEntity, String.class);
+        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"), paramOut.getJSONObject("data"));
+    }
 
 }

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

@@ -87,6 +87,8 @@ public class IotConstant {
 
     //修改车牌
     public static final String UPDATE_CAR_INOUT_CAR_NUM = "/extApi/car/updateCarInoutCarNum";
+    //修改车牌
+    public static final String GET_MANUAL_OPEN_DOOR_LOGS = "/extApi/machine/getManualOpenDoorLogs";
 
     //开门接口
     public static final String OPEN_DOOR = "/extApi/machine/openDoor";

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

@@ -114,6 +114,9 @@ public class OpenDoorAdapt extends DatabusAdaptImpl {
             JSONObject postParameters = new JSONObject();
             postParameters.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
             postParameters.put("machineCode", paramIn.getString("machineCode"));
+            postParameters.put("extStaffId", userId);
+            postParameters.put("staffName", userName);
+
             HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders(outRestTemplate));
             ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.getUrl(IotConstant.OPEN_DOOR), HttpMethod.POST, httpEntity, String.class);
             if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -137,6 +140,7 @@ public class OpenDoorAdapt extends DatabusAdaptImpl {
             machineTranslateInnerServiceSMOImpl.saveMachineTranslate(machineTranslateDto);
         }
     }
+
     /**
      * 开门实现方法
      *

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

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