From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 16 十月 2024 15:59:38 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 279 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 234 insertions(+), 45 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java index 6ca26bd..4569482 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java @@ -3,30 +3,44 @@ import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; +import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DESUtil; +import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; -import com.doumee.dao.business.CarUseBookMapper; -import com.doumee.dao.business.CarsMapper; +import com.doumee.dao.business.*; +import com.doumee.dao.business.join.ApproveJoinMapper; import com.doumee.dao.business.join.CarUseBookJoinMapper; import com.doumee.dao.business.model.*; +import com.doumee.dao.business.vo.ApproveDataVO; +import com.doumee.dao.business.vo.DateIntervalVO; +import com.doumee.dao.system.model.SystemDictData; +import com.doumee.dao.system.model.SystemUser; +import com.doumee.service.business.ApproveService; import com.doumee.service.business.CarUseBookService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.github.yulichang.wrapper.MPJLambdaWrapper; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛⊿ervice瀹炵幇 @@ -48,15 +62,27 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; + @Autowired + private ApproveJoinMapper approveJoinMapper; + + @Autowired + private ApproveService approveService; + + @Autowired + private CarDriverMapper carDriverMapper; + + @Autowired + private MemberMapper memberMapper; + @Override - public Integer create(CarUseBook carUseBook) { + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public Integer create(CarUseBook carUseBook) throws Exception { if(Objects.isNull(carUseBook) || Objects.isNull(carUseBook.getCarId()) || Objects.isNull(carUseBook.getStartTime()) || Objects.isNull(carUseBook.getEndTime()) || Objects.isNull(carUseBook.getCreator()) - || Objects.isNull(carUseBook.getMemberId()) || Objects.isNull(carUseBook.getPlanUseDate()) || Objects.isNull(carUseBook.getType()) || StringUtils.isEmpty(carUseBook.getMemberIds()) @@ -66,28 +92,42 @@ ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } + if(Objects.nonNull(carUseBook.getCreator())&&Objects.isNull(carUseBook.getMemberId())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐧诲綍鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�!"); + } + if(carUseBook.getEndTime().getTime()<=System.currentTimeMillis()){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"閫夋嫨鏃ユ湡寮傚父[缁撴潫鏃堕棿灏忎簬褰撳墠鏃堕棿],璇峰埛鏂伴噸璇�"); + } + if(!(DateUtil.getDateFromString(carUseBook.getPlanUseDate()+":00").getTime()>=carUseBook.getStartTime().getTime() + && DateUtil.getDateFromString(carUseBook.getPlanUseDate() +":00").getTime()<= carUseBook.getEndTime().getTime()) + ){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍑哄彂鏃堕棿閿欒"); + } carUseBook.setStatus(Constants.ZERO); carUseBook.setCreateDate(new Date()); + carUseBook.setIsdeleted(Constants.ZERO); Cars cars = carsMapper.selectById(carUseBook.getCarId()); - if(Objects.isNull(cars)||!cars.getType().equals(Constants.ONE)){ + if(Objects.isNull(cars)||!cars.getType().equals(Constants.ZERO)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"杞﹁締淇℃伅寮傚父"); } - //TODO 鏌ヨ杞﹁締鎻愪氦鏃堕棿鏄惁瀛樺湪鍐茬獊鐨勯绾﹁褰� - List<CarUseBook> carUseBookList = carUseBookJoinMapper.selectJoinList(CarUseBook.class, - new MPJLambdaWrapper<CarUseBook>() - .selectAll(CarUseBook.class) - .selectAs(Member::getName,CarUseBook::getMemberName) - .selectAs(Member::getPhone,CarUseBook::getMemberMobile) - .leftJoin(Member.class,Member::getId,CarUseBook::getMemberId) - .eq(CarUseBook::getId,carUseBook.getCarId()) - .in(CarUseBook::getStatus,0,1,2) -// .in( " ( '"+carUseBook.getStartTime()+"' < t.start_time AND '"+ carUseBook.getEndTime()+"'> t.end_time ) " ) + carUseBook.setCarCode(cars.getCode()); + //鏍规嵁杞﹁締鏌ヨ鍙告満淇℃伅 + CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda() + .eq(CarDriver::getCarId,cars.getId()) + .eq(CarDriver::getIsdeleted,Constants.ZERO) + .eq(CarDriver::getStatus,Constants.ONE) + .last( " limit 1 ") ); - - if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){ + if(Objects.nonNull(carDriver)&&Objects.nonNull(carDriver.getMemberId())){ + carUseBook.setDriverId(carDriver.getMemberId()); + } + //鏌ヨ杞﹁締鎻愪氦鏃堕棿鏄惁瀛樺湪鍐茬獊鐨勯绾﹁褰� + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(this.carUseBookList(carUseBook))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪杞﹁締棰勭害鏃堕棿涓庡凡棰勭害鏃堕棿鍐茬獊~"); } carUseBookMapper.insert(carUseBook); + //鐢ㄨ溅鐢宠 瀹℃壒璁板綍鍒涘缓 + approveService.createApproveFlow(carUseBook.getType()==0?3:4,carUseBook.getId(),carUseBook.getMemberId()); return carUseBook.getId(); } @@ -125,21 +165,57 @@ } } + /** + * + * @param id 涓婚敭 + * @param memberId + * @return + */ @Override - public CarUseBook findById(Integer id) { + public CarUseBook findById(Integer id,Integer memberId) { MPJLambdaWrapper<CarUseBook> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(CarUseBook.class); queryWrapper.select("t1.name",CarUseBook::getMemberName); queryWrapper.select("t1.phone",CarUseBook::getMemberPhone); queryWrapper.select("t2.name",CarUseBook::getDriverName); - queryWrapper.select("t3.phone",CarUseBook::getDriverPhone); + queryWrapper.select("t2.phone",CarUseBook::getDriverPhone); queryWrapper.select("t4.company_name_path",CarUseBook::getCompanyName); queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId) - .leftJoin("company t4 on t1.company_id=t4.id") .leftJoin(Member.class,Member::getId,CarUseBook::getDriverId) + .leftJoin("company t4 on t1.company_id=t4.id") .eq(CarUseBook::getId,id) .last("limit 1" ); CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper); + if(Objects.isNull(model)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id, + Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4, + memberId); + List<Approve> approveList = approveDataVO.getApproveList(); + if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){ + String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); + Member member1 = memberMapper.selectById(model.getCancelUser()); + + Approve approve = new Approve(); + approve.setApproveType(Constants.ZERO); + approve.setCreateDate(model.getCancelTime()); + approve.setTitle("鎾ら攢浜�"); + approve.setStatusInfo("宸叉挙閿�"); + approve.setStatus(Constants.FOUR); + approve.setType(Constants.ZERO); + if(member1!=null) { + approve.setMemberName(member1.getName()); + if (StringUtils.isNotBlank(member1.getFaceImg())) { + approve.setFaceImg(path + member1.getFaceImg()); + } + } + approve.setCheckInfo(model.getCancelInfo()); + approve.setCheckDate(model.getCancelTime()); + approveList.add(approve); + } + model.setApproveDateVO(approveDataVO); return model; } @@ -165,11 +241,11 @@ queryWrapper.select("t1.name",CarUseBook::getMemberName); queryWrapper.select("t1.phone",CarUseBook::getMemberPhone); queryWrapper.select("t2.name",CarUseBook::getDriverName); - queryWrapper.select("t3.phone",CarUseBook::getDriverPhone); + queryWrapper.select("t2.phone",CarUseBook::getDriverPhone); queryWrapper.select("t4.company_name_path",CarUseBook::getCompanyName); queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId) - .leftJoin("company t4 on t1.company_id=t4.id") - .leftJoin(Member.class,Member::getId,CarUseBook::getDriverId); + .leftJoin(Member.class,Member::getId,CarUseBook::getDriverId) + .leftJoin("company t4 on t1.company_id=t4.id"); queryWrapper .eq(pageWrap.getModel().getId() != null, CarUseBook::getId, pageWrap.getModel().getId()) .eq(pageWrap.getModel().getCreator() != null, CarUseBook::getCreator, pageWrap.getModel().getCreator()) @@ -192,10 +268,8 @@ .le(pageWrap.getModel().getCheckDate() != null, CarUseBook::getCheckDate, Utils.Date.getEnd(pageWrap.getModel().getCheckDate())) .eq(pageWrap.getModel().getCheckUserId() != null, CarUseBook::getCheckUserId, pageWrap.getModel().getCheckUserId()) .eq(pageWrap.getModel().getCheckInfo() != null, CarUseBook::getCheckInfo, pageWrap.getModel().getCheckInfo()) - .ge(pageWrap.getModel().getCancelType() != null, CarUseBook::getCancelType, Utils.Date.getStart(pageWrap.getModel().getCancelType())) - .le(pageWrap.getModel().getCancelType() != null, CarUseBook::getCancelType, Utils.Date.getEnd(pageWrap.getModel().getCancelType())) - .ge(pageWrap.getModel().getCancelStatus() != null, CarUseBook::getCancelStatus, Utils.Date.getStart(pageWrap.getModel().getCancelStatus())) - .le(pageWrap.getModel().getCancelStatus() != null, CarUseBook::getCancelStatus, Utils.Date.getEnd(pageWrap.getModel().getCancelStatus())) + .eq(pageWrap.getModel().getCancelType() != null, CarUseBook::getCancelType, pageWrap.getModel().getCancelType()) + .eq(pageWrap.getModel().getCancelStatus() != null, CarUseBook::getCancelStatus, pageWrap.getModel().getCancelStatus()) .ge(pageWrap.getModel().getCancelTime() != null, CarUseBook::getCancelTime, Utils.Date.getStart(pageWrap.getModel().getCancelTime())) .le(pageWrap.getModel().getCancelTime() != null, CarUseBook::getCancelTime, Utils.Date.getEnd(pageWrap.getModel().getCancelTime())) .eq(pageWrap.getModel().getCancelUser() != null, CarUseBook::getCancelUser, pageWrap.getModel().getCancelUser()) @@ -207,10 +281,12 @@ .eq(pageWrap.getModel().getAddr() != null, CarUseBook::getAddr, pageWrap.getModel().getAddr()) .eq(pageWrap.getModel().getMemberId() != null, CarUseBook::getMemberId, pageWrap.getModel().getMemberId()) .eq(pageWrap.getModel().getDriverId() != null, CarUseBook::getDriverId, pageWrap.getModel().getDriverId()) + .apply(pageWrap.getModel().getCompanyName() != null, "t4.company_name_path like '%"+pageWrap.getModel().getCompanyName()+"%'") + .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName()) .or().like(Member::getPhone,pageWrap.getModel().getMemberName())) - .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), Empower::getCreateDate,pageWrap.getModel().getQueryStartTime()) - .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),Empower::getCreateDate,pageWrap.getModel().getQueryEndTime()) + .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), CarUseBook::getPlanUseDate,pageWrap.getModel().getQueryStartTime()) + .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),CarUseBook::getPlanUseDate,pageWrap.getModel().getQueryEndTime()) .orderByDesc(Visits::getCreateDate) ; for(PageWrap.SortData sortData: pageWrap.getSorts()) { @@ -236,7 +312,7 @@ * @return */ @Override - public List<CarUseBook> carUseBookList(CarUseBook carUseBook){ + public List<CarUseBook> carUseBookList(CarUseBook carUseBook) throws Exception { if(Objects.isNull(carUseBook) || Objects.isNull(carUseBook.getCarId()) || Objects.isNull(carUseBook.getStartTime()) @@ -249,28 +325,141 @@ .selectAs(Member::getName,CarUseBook::getMemberName) .selectAs(Member::getPhone,CarUseBook::getMemberMobile) .leftJoin(Member.class,Member::getId,CarUseBook::getMemberId) - .eq(CarUseBook::getId,carUseBook.getCarId()) + .eq(CarUseBook::getCarId,carUseBook.getCarId()) .in(CarUseBook::getStatus,0,1,2) -// .in( " ( '"+carUseBook.getStartTime()+"' < t.start_time AND '"+ carUseBook.getEndTime()+"'> t.end_time ) " ) + .apply(" ( " + + " '"+DateUtil.getPlusTime(carUseBook.getStartTime())+"' <= t.start_time AND t.start_time < '"+DateUtil.getPlusTime(carUseBook.getEndTime())+"' " + + " or " + + " ( '"+DateUtil.getPlusTime(carUseBook.getStartTime())+"' < t.end_time AND t.end_time < '"+DateUtil.getPlusTime(carUseBook.getEndTime())+"' ) " + + " or " + + " ( '"+DateUtil.getPlusTime(carUseBook.getStartTime())+"' > t.start_time AND '"+DateUtil.getPlusTime(carUseBook.getEndTime())+"' < t.end_time )" + + " ) " ) ); return carUseBookList; } -// public void checkDateUse(Integer cars,String dateDay){ -// -// SystemDictData workStart = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.WORK_START); -// SystemDictData workEnd = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.WORK_END); -// SystemDictData interval = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INTERVAL); -// -// Date start = DateUtil.StringToDate(dateDay + workStart.getCode(),"yyyy-MM-dd HH:mm:ss"); -// -// -// -// -// -// } + /** + * 鏍规嵁鏃ユ湡鏌ヨ杞﹁締鍙绾︽儏鍐� + * @param cars + * @param dateDay + * @return + */ + @Override + public List<DateIntervalVO> checkDateUse(Integer cars,String dateDay){ + SystemDictData workStart = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.WORK_START); + SystemDictData workEnd = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.WORK_END); + SystemDictData interval = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INTERVAL); + if(Objects.isNull(workStart) + ||Objects.isNull(workEnd) + ||Objects.isNull(interval) + ||Objects.isNull(workStart.getCode()) + ||Objects.isNull(workEnd.getCode()) + ||Objects.isNull(interval.getCode())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閰嶇疆閿欒锛岃鑱旂郴绠$悊鍛�"); + } + Date startTime = DateUtil.StringToDate((dateDay + " " +workStart.getCode()),"yyyy-MM-dd HH:mm:ss"); + Date endTime = DateUtil.StringToDate(dateDay + " " + workEnd.getCode(),"yyyy-MM-dd HH:mm:ss"); + Long intervalTime = Long.valueOf(interval.getCode()); + LocalDateTime localStartTime = startTime.toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDateTime(); + LocalDateTime localEndTime = endTime.toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDateTime(); + List<DateIntervalVO> dateIntervalVOList = this.checkDate(localStartTime,localEndTime,intervalTime); + //鏌ヨ杞﹁締甯傚唴 + List<CarUseBook> carUseBookList = carUseBookMapper.selectList(new QueryWrapper<CarUseBook>().lambda() + .eq(CarUseBook::getIsdeleted,Constants.ZERO) + .eq(CarUseBook::getCarId,cars) + .in(CarUseBook::getStatus,0,1,2) + .and(i->i.like(CarUseBook::getStartTime,dateDay) + .or().like(CarUseBook::getEndTime,dateDay) + .or().apply(" START_TIME < '"+dateDay+" 00:00:00' and END_TIME > '"+dateDay+" 23:59:59' ")) + ); + for (DateIntervalVO dateIntervalVO:dateIntervalVOList) { + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){ + for (CarUseBook i:carUseBookList ) { + if( + (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() <= i.getStartTime().getTime() && + i.getStartTime().getTime() < DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()) + || + (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() < i.getEndTime().getTime() && + i.getEndTime().getTime() <= DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()) + || + (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() >= i.getStartTime().getTime() && + DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime() <= i.getEndTime().getTime()) + ){ + dateIntervalVO.setCarUseBookId(i.getId()); + dateIntervalVO.setIsUse(Constants.ONE); + break; + } + } + } + //鍒ゆ柇鏃堕棿鏄惁澶т簬褰撳墠 + if(Constants.equalsInteger(dateIntervalVO.getIsUse(),Constants.ZERO) && DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){ + dateIntervalVO.setIsUse(Constants.ONE); + continue; + } + } + return dateIntervalVOList; + } + public List<DateIntervalVO> checkDate(LocalDateTime localStartTime , LocalDateTime localEndTime ,Long intervalTime ){ + List<DateIntervalVO> dateIntervalVOList = new ArrayList<>(); + List<LocalDateTime> segments = DateUtil.checkDateInterval(localStartTime,localEndTime,intervalTime); + DateTimeFormatter dfTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + DateTimeFormatter dfHours = DateTimeFormatter.ofPattern("HH:mm"); + for (int i = 0; i < segments.size(); i++) { + String startHours = segments.get(i).format(dfHours); + String endHours = localEndTime.format(dfHours); + String startTime = segments.get(i).format(dfTime); + String endTime = localEndTime.format(dfTime); + if(i!=segments.size()-1){ + endHours = segments.get(i+1).format(dfHours); + endTime = segments.get(i+1).format(dfTime); + } + DateIntervalVO dateIntervalVO = new DateIntervalVO(); + dateIntervalVO.setStartHours(startHours); + dateIntervalVO.setEndHours(endHours); + dateIntervalVO.setStartTime(startTime); + dateIntervalVO.setEndTime(endTime); + dateIntervalVO.setIsUse(Constants.ZERO); + dateIntervalVOList.add(dateIntervalVO); + } + return dateIntervalVOList; + } + + + @Override + public void revoke(Integer id, String info, LoginUserInfo loginUserInfo){ + CarUseBook carUseBook = carUseBookMapper.selectById(id); + if(Objects.isNull(carUseBook)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄨ溅鐢宠淇℃伅"); + } + carUseBook.setCancelInfo(info); + carUseBook.setCancelTime(new Date()); + carUseBook.setCancelStatus(Constants.ONE); + carUseBook.setStatus(Constants.FOUR); + carUseBook.setCancelUser(loginUserInfo.getMemberId()); + carUseBook.setCancelType(Constants.ONE); + if(loginUserInfo.getId().equals(carUseBook.getCreator())){ + carUseBook.setCancelType(Constants.ZERO); + } + carUseBookMapper.updateById(carUseBook); + //澶勭悊瀹℃壒璁板綍 + approveJoinMapper.update(null,new UpdateWrapper<Approve>() + .lambda() + .set(Approve::getIsdeleted,Constants.ONE) + .set(Approve::getStatus,Constants.FOUR) + .set(Approve::getCheckInfo,"鐢ㄨ溅鐢宠鍙栨秷") + .in(Approve::getStatus,Constants.ZERO,Constants.ONE) + .in(Approve::getObjType,Constants.approveObjectType.cityUseCar,Constants.approveObjectType.unCityUseCar) + .eq(Approve::getObjId,id) + ); + } + + } -- Gitblit v1.9.3