doum
昨天 4936ba718f4ec2d069a9c28d07215573ed8548aa
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -8,6 +8,7 @@
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
import com.doumee.core.haikang.model.param.request.ParkReservationAddResvRequest;
import com.doumee.core.haikang.model.param.request.ParkReservationDelRequest;
import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
import com.doumee.core.haikang.service.HKService;
@@ -1143,8 +1144,14 @@
                        request.setOwner(platformJob.getDriverName());
                        request.setAllowTimes(Constants.ONE+"");
                        request.setIsCharge(Constants.ONE+"");
                        request.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
                        request.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
//                        request.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
//                        request.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
                        List<ParkReservationAddResvRequest> resvTime = new ArrayList<>();
                        ParkReservationAddResvRequest  resvRequest = new ParkReservationAddResvRequest();
                        resvRequest.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
                        resvRequest.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
                        resvTime.add(resvRequest);
                        request.setResvTime(resvTime);
                        BaseResponse response =  HKService.parkReservationAddition(request);
                        visitPark.setHkDate(new Date());
@@ -2708,7 +2715,8 @@
                Integer workNum = platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(PlatformJob::getPlatformId,platform.getId())
                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey(),Constants.PlatformJobStatus.WORKING.getKey())
                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey()
                                ,Constants.PlatformJobStatus.WORKING.getKey())
                ) .intValue();
                if(workNum>=workingNum){
                    log.error("========月台自动叫号============结束:超过自动叫号作业限制-"+platform.getName());
@@ -2849,8 +2857,9 @@
                Integer callNum = platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(PlatformJob::getPlatformId,platform.getId())
                        .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey())).intValue();
                if(callNum>=callReadyNum){
                        .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()))
                        .intValue();
                if(callReadyNum ==0 || callNum>=callReadyNum){
                    continue;
                };
@@ -2893,11 +2902,11 @@
                }
                try{
                    this.sendInPark(platformJob);
                    if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
                            && StringUtils.isNotBlank(platformJob.getBillCode())){
                        //通知WMS绑定月台信息
                        wmsService.orderPlatformBind(platformJob,1);
                    }
//                    if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
//                            && StringUtils.isNotBlank(platformJob.getBillCode())){
//                        //通知WMS绑定月台信息
//                        wmsService.orderPlatformBind(platformJob,1);
//                    }
                }catch (Exception e){
                    log.error("自动叫号入园权限下发失败:{}"+JSONObject.toJSONString(platformJob));
                }