wuxw лет назад: 3
Родитель
Сommit
911013d8f5

+ 2 - 2
service-common/src/main/java/com/java110/common/api/MachineApi.java

@@ -74,8 +74,8 @@ public class MachineApi {
      *
      * @param reqJson
      * @return
-     * @serviceCode /machine/openDoor
-     * @path /app/machine/openDoor
+     * @serviceCode /machine/closeDoor
+     * @path /app/machine/closeDoor
      */
     @RequestMapping(value = "/closeDoor", method = RequestMethod.POST)
     public ResponseEntity<String> closeDoor(@RequestBody JSONObject reqJson,

+ 84 - 0
service-user/src/main/java/com/java110/user/cmd/car/QueryWaitPayFeeTempCarCmd.java

@@ -0,0 +1,84 @@
+package com.java110.user.cmd.car;
+
+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.dto.machine.CarInoutDetailDto;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.ownerCarOpenUser.OwnerCarOpenUserDto;
+import com.java110.intf.common.ICarInoutDetailInnerServiceSMO;
+import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerCarOpenUserV1InnerServiceSMO;
+import com.java110.user.dao.IOwnerCarOpenUserV1ServiceDao;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 查询待缴费临时车
+ */
+@Java110Cmd(serviceCode = "car.queryWaitPayFeeTempCar")
+public class QueryWaitPayFeeTempCarCmd extends Cmd {
+
+    @Autowired
+    private IOwnerCarOpenUserV1InnerServiceSMO ownerCarOpenUserV1InnerServiceSMOImpl;
+
+    @Autowired
+    private ICarInoutDetailInnerServiceSMO carInoutDetailInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "openId", "未包含开放用户");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        List<OwnerCarDto> ownerCarDtos = new ArrayList<>();
+        OwnerCarDto ownerCarDto = null;
+        if (!StringUtil.jsonHasKayAndValue(reqJson, "machineId")) {
+            OwnerCarOpenUserDto ownerCarOpenUserDto = new OwnerCarOpenUserDto();
+            ownerCarOpenUserDto.setOpenId(reqJson.getString("openId"));
+            List<OwnerCarOpenUserDto> ownerCarOpenUserDtos = ownerCarOpenUserV1InnerServiceSMOImpl.queryOwnerCarOpenUsers(ownerCarOpenUserDto);
+            for (OwnerCarOpenUserDto tmpOwnerCarOpenUserDto : ownerCarOpenUserDtos) {
+                ownerCarDto = new OwnerCarDto();
+                ownerCarDto.setCarNum(tmpOwnerCarOpenUserDto.getCarNum());
+                ownerCarDtos.add(ownerCarDto);
+            }
+            context.setResponseEntity(ResultVo.createResponseEntity(ownerCarDtos));
+            return;
+        }
+
+
+        //查询是否有车牌号
+
+        CarInoutDetailDto carInoutDetailDto = new CarInoutDetailDto();
+        carInoutDetailDto.setMachineId(reqJson.getString("machineId"));
+        carInoutDetailDto.setState(CarInoutDetailDto.STATE_IN_FAIL);
+        carInoutDetailDto.setCarInout(CarInoutDetailDto.CAR_INOUT_OUT);
+        carInoutDetailDto.setPage(1);
+        carInoutDetailDto.setRow(1);
+        List<CarInoutDetailDto> carInoutDetailDtos = carInoutDetailInnerServiceSMOImpl.queryCarInoutDetails(carInoutDetailDto);
+
+        if (carInoutDetailDtos == null || carInoutDetailDtos.size() < 1) {
+            context.setResponseEntity(ResultVo.createResponseEntity(ownerCarDtos));
+            return;
+        }
+
+        for (CarInoutDetailDto tmpCarInoutDetailDto : carInoutDetailDtos) {
+            ownerCarDto = new OwnerCarDto();
+            ownerCarDto.setCarNum(tmpCarInoutDetailDto.getCarNum());
+            ownerCarDtos.add(ownerCarDto);
+        }
+        context.setResponseEntity(ResultVo.createResponseEntity(ownerCarDtos));
+
+    }
+}