优化代码

java110

2022-08-30 ceb01711acb75f7eda1d3b67ce583720c8811bd1

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

@@ -17,16 +17,29 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
import com.java110.common.dao.ICarInoutV1ServiceDao;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
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.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;

import java.util.List;

/**
 * 类表述：保存
@@ -39,7 +52,7 @@
 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
 */
@Java110Cmd(serviceCode = "machine.customCarInOutCmd")
public class CustomCarInOutCmd extends AbstractServiceCmdListener {
public class CustomCarInOutCmd extends Cmd {

    private static Logger logger = LoggerFactory.getLogger(CustomCarInOutCmd.class);

@@ -48,6 +61,16 @@
    @Autowired
    private IMachineOpenDoorBMO machineOpenDoorBMOImpl;


    @Autowired
    private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;

    @Autowired
    private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;

    @Autowired
    private ICarInoutV1InnerServiceSMO carInoutV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
@@ -55,11 +78,51 @@
        Assert.hasKeyAndValue(reqJson, "carNum", "请求报文中未包含车牌号");
        Assert.hasKeyAndValue(reqJson, "type", "请求报文中未包含类型");

        if("1101".equals(reqJson.getString("type"))) {
            return;
        }

        Assert.hasKeyAndValue(reqJson,"payType","未包含支付方式");
        Assert.hasKeyAndValue(reqJson,"amount","未包含支付金额");

        CarInoutDto carInoutDto = new CarInoutDto();
        carInoutDto.setCarNum(reqJson.getString("carNum"));
        carInoutDto.setStates(new String[]{
                CarInoutDto.STATE_IN,
                CarInoutDto.STATE_REPAY
        });
        int count = carInoutV1InnerServiceSMOImpl.queryCarInoutsCount(carInoutDto);

        if(count < 1){
            throw new CmdException("车辆未入场");
        }

    }

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {

        //出场时 先 补充费用信息
        if(!"1101".equals(reqJson.getString("type"))) {

            ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
            parkingBoxAreaDto.setBoxId(reqJson.getString("boxId"));
            parkingBoxAreaDto.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_TRUE);
            List<ParkingBoxAreaDto> parkingBoxAreaDtos = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxAreaDto);

            if(parkingBoxAreaDtos == null  || parkingBoxAreaDtos.size()< 1){
                throw new CmdException("未包含停车场信息");
            }

            TempCarPayOrderDto tempCarPayOrderDto = new TempCarPayOrderDto();
            tempCarPayOrderDto.setCarNum(reqJson.getString("carNum"));
            tempCarPayOrderDto.setPaId(parkingBoxAreaDtos.get(0).getPaId());
            tempCarPayOrderDto.setOrderId(reqJson.getString("inoutId"));
            tempCarPayOrderDto.setAmount(Double.parseDouble(reqJson.getString("amount")));
            tempCarPayOrderDto.setPayType(reqJson.getString("payType"));
            //tempCarPayOrderDto.setMachineId(reqJson.getString("machineId"));
            ResultVo resultVo = dataBusInnerServiceSMOImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
        }
        ResponseEntity<String> responseEntity = machineOpenDoorBMOImpl.customCarInOut(reqJson);
        cmdDataFlowContext.setResponseEntity(responseEntity);
    }