From 6e97702cecce916515fdfdc43dd7f3a2b7cb7002 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 12 九月 2024 13:43:13 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 68 +++++++++++++++++++++++++++++++++ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java | 9 ++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java index 31bb57e..7b9f344 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java @@ -4,6 +4,10 @@ import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; +import com.doumee.core.haikang.model.HKConstants; +import com.doumee.core.haikang.model.param.BaseResponse; +import com.doumee.core.haikang.model.param.request.CarChargeAddRequest; +import com.doumee.core.haikang.service.HKService; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; @@ -27,6 +31,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl; +import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl; import com.doumee.service.system.NoticesService; import com.github.xiaoymin.knife4j.core.util.CollectionUtils; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -99,6 +105,12 @@ @Autowired private PlatformReasonMapper platformReasonMapper; + + @Autowired + private ParksMapper parksMapper; + + @Autowired + private ParkBookMapper parkBookMapper; @Override @@ -1415,6 +1427,8 @@ return memberNames; } + + public void dealBusinessData(ApproveDTO approveDTO,Approve approve){ if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit) ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit) @@ -1427,8 +1441,60 @@ visits.setStatus(approveDTO.getStatus()); visits.setEditDate(new Date()); visits.setEditor(approveDTO.getLoginUserInfo().getMemberId()); - visitsMapper.updateById(visits); + //涓嬪彂璁垮鎶ュ杞﹁締淇℃伅 + if(approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){ + Boolean sendStatus = true; + //鏌ヨ褰撳墠鍚敤鐨勫仠杞﹀満 + List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>() + .lambda() + .isNotNull(Parks::getHkId) + .eq(Parks::getIsdeleted,Constants.ZERO)); + List<ParkBook> parkBookList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(parksList)){ + for (Parks parks:parksList) { + ParkBook parkBook = new ParkBook(); + parkBook.setIsdeleted(Constants.ZERO); + parkBook.setCreateDate(new Date()); + parkBook.setVisitId(visits.getId()); + parkBook.setCarCode(visits.getCarNos()); + parkBook.setParkId(parks.getId()); + parkBook.setOrigin(Constants.TWO); + parkBook.setStartTime(visits.getStarttime()); + parkBook.setEndTime(visits.getEndtime()); + parkBook.setMemberId( visits.getMemberId()); + parkBook.setTimeType(Constants.ONE); + parkBook.setParkHkId(parks.getHkId()); + + CarChargeAddRequest param = new CarChargeAddRequest(); + param.setPlateNo(parkBook.getCarCode()); + param.setParkSyscode(parkBook.getParkHkId()); + param.setStartTime(Objects.isNull(parkBook.getStartTime())?DateUtil.getDate(new Date(),"yyyy-MM-dd"):DateUtil.getShortTimeToNull(parkBook.getStartTime())); + param.setEndTime(Objects.isNull(parkBook.getEndTime())?"2999-12-31":DateUtil.getShortTimeToNull(parkBook.getEndTime())); + BaseResponse response = HKService.carChargeAddtion(param); + parkBook.setHkDate(new Date()); + if(response!=null + && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){ + parkBook.setHkStatus(Constants.ONE); + parkBook.setRemark("鍖呮湡鎴愬姛"); + }else{ + parkBook.setHkStatus(Constants.TWO); + parkBook.setRemark("鍖呮湡澶辫触~"); + //涓嬪彂澶辫触 鏍囪涓讳笟鍔$姸鎬佷负涓嬪彂澶辫触 + sendStatus = false; + } + parkBookList.add(parkBook); + } + parkBookMapper.insert(parkBookList); + } + if(sendStatus){ + visits.setStatus(Constants.VisitStatus.xfFail); + }else{ + visits.setStatus(Constants.VisitStatus.xfSuccess); + } + } + + visitsMapper.updateById(visits); }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals( Constants.approveObjectType.unCityUseCar)){ this.updDriver(approveDTO,approve,true); diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java index 7710cd4..0f2803f 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java @@ -70,7 +70,6 @@ }finally { Constants.DEALING_HK_PARKBOOK =false; } - } private void dealParkBookBiz(ParkBook c,Date date) { @@ -138,6 +137,7 @@ parkBookMapper.updateById(c); } } + private boolean addParkBookHk(ParkBook c) { CarChargeAddRequest param = new CarChargeAddRequest(); param.setPlateNo(c.getCarCode()); @@ -152,6 +152,13 @@ return false; } } + + + + + + + public static boolean cancelParkBookHk(ParkBook c) { CarChargeDelRequest param = new CarChargeDelRequest(); param.setPlateNo(c.getCarCode()); -- Gitblit v1.9.3