代码初始化

k94314517

2024-05-21 12e8eb9e345adea19972c34df471b28b51fa71dd

代码初始化

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -67,6 +67,8 @@
    public static final String WORK_START = "WORK_START";
    public static final String WORK_END = "WORK_END";
    public static final String INTERVAL = "INTERVAL";
    public static final String USE_CAR_TAKE_CARE = "USE_CAR_TAKE_CARE";





 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -7,10 +7,13 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.Date;

import cn.hutool.core.date.DateUnit;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;

@@ -2851,7 +2854,19 @@
        try {
//            Date date = getISO8601DateByStr("2024-04-15T07:46:36.014+08:00");
//            Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
            System.out.println(DateUtil.afterMinutesDate(-5));
//            System.out.println(DateUtil.afterMinutesDate(-5));


            Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
            Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
            Long intervalTime = 35L;


            DateUtil.checkDateInterval( startTime.toInstant()
                    .atZone(ZoneId.systemDefault())
                    .toLocalDateTime(), endTime.toInstant()
                    .atZone(ZoneId.systemDefault())
                    .toLocalDateTime(),intervalTime);

        } catch (Exception ex) {
            ex.printStackTrace();
@@ -3264,4 +3279,20 @@
        System.out.println(time);
        return time;
    }



    public static List<LocalDateTime> checkDateInterval(LocalDateTime localStartTime,LocalDateTime localEndTime,Long interval){
        List<LocalDateTime> segments = new ArrayList<>();
        LocalDateTime current = localStartTime;
        while (current.isBefore(localEndTime)) {
            segments.add(current);
            current = current.plus(interval, ChronoUnit.MINUTES);
        }
        return segments;

    }



}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java

@@ -10,6 +10,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.CarUseBook;
import com.doumee.dao.business.vo.DateIntervalVO;
import com.doumee.service.business.CarUseBookService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -93,5 +94,10 @@
        return ApiResponse.success(carUseBookService.carUseBookList(carUseBook));
    }

    @ApiOperation("查询车辆可预约时段")
    @GetMapping("/carCanReservationDate")
    public ApiResponse<List<DateIntervalVO>> carCanReservationDate (@RequestParam Integer carId, @RequestParam String dateDay, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(carUseBookService.checkDateUse(carId,dateDay));
    }

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java

@@ -92,9 +92,13 @@
    @ExcelColumn(name="是否终审 0否 1是")
    private Integer isEndCheck;

    @ApiModelProperty(value = "访客申请记录编码(关联visit）", example = "1")
    @ExcelColumn(name="访客申请记录编码(关联visit）")
    private Integer visitId;
    @ApiModelProperty(value = "关联业务主键", example = "1")
    @ExcelColumn(name="关联业务主键")
    private Integer objId;

    @ApiModelProperty(value = "关联业务类型：0=访客申请；1=用车申请", example = "1")
    @ExcelColumn(name="关联业务类型：0=访客申请；1=用车申请")
    private Integer objType;

    @ApiModelProperty(value = "审批等级", example = "1")
    @ExcelColumn(name="审批等级")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java

@@ -166,7 +166,9 @@
    @ApiModelProperty(value = "查询截止始时间（基于创建时间）", example = "2024-05-20 11:48:46")
    @TableField(exist = false)
    private Date queryEndTime;

    @ApiModelProperty(value = "查询日期", example = "2024-05-20" ,notes = "H5使用")
    @TableField(exist = false)
    private String queryDate;
    @ApiModelProperty(value = "申请人电话")
    @TableField(exist = false)
    private String memberMobile;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/DateIntervalVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.doumee.dao.business.vo;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2024/5/21 11:01
 */
@Data
public class DateIntervalVO {

    @ApiModelProperty(value = "开始时间(时分)")
    private String startHours;
    
    @ApiModelProperty(value = "结束时间(时分)")
    private String endHours;

    @ApiModelProperty(value = "开始时间(全)")
    private String startTime;

    @ApiModelProperty(value = "结束时间(全)")
    private String endTime;

    @ApiModelProperty(value = "是否占用")
    private Integer isUse;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java

@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.CarUseBook;
import com.doumee.dao.business.vo.DateIntervalVO;

import java.util.List;

/**
@@ -97,4 +99,6 @@


    List<CarUseBook> carUseBookList(CarUseBook carUseBook);

    List<DateIntervalVO> checkDateUse(Integer cars, String dateDay);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java

@@ -148,8 +148,8 @@
        if (pageWrap.getModel().getIsEndCheck() != null) {
            queryWrapper.lambda().eq(Approve::getIsEndCheck, pageWrap.getModel().getIsEndCheck());
        }
        if (pageWrap.getModel().getVisitId() != null) {
            queryWrapper.lambda().eq(Approve::getVisitId, pageWrap.getModel().getVisitId());
        if (pageWrap.getModel().getObjId() != null) {
            queryWrapper.lambda().eq(Approve::getObjId, pageWrap.getModel().getObjId());
        }
        if (pageWrap.getModel().getLevel() != null) {
            queryWrapper.lambda().eq(Approve::getLevel, pageWrap.getModel().getLevel());

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java

@@ -3,15 +3,19 @@
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.join.CarUseBookJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.DateIntervalVO;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.CarUseBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -23,10 +27,15 @@
import org.springframework.stereotype.Service;
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;

/**
 * è½¦è¾†_用车申请信息表Service实现
@@ -72,7 +81,7 @@
        if(Objects.isNull(cars)||!cars.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"车辆信息异常");
        }
        //TODO æŸ¥è¯¢è½¦è¾†æäº¤æ—¶é—´æ˜¯å¦å­˜åœ¨å†²çªçš„预约记录
        //查询车辆提交时间是否存在冲突的预约记录
        List<CarUseBook> carUseBookList = carUseBookJoinMapper.selectJoinList(CarUseBook.class,
                new MPJLambdaWrapper<CarUseBook>()
                        .selectAll(CarUseBook.class)
@@ -81,9 +90,15 @@
                        .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 ) " )
                        .and(i->i.and(j->j.lt(CarUseBook::getStartTime,carUseBook.getStartTime()).gt(CarUseBook::getStartTime,carUseBook.getStartTime()))
                                .or()
                                .and(j->j.lt(CarUseBook::getEndTime,carUseBook.getEndTime()).gt(CarUseBook::getEndTime,carUseBook.getStartTime()))
                                .or()
                                .and(j->j.gt(CarUseBook::getStartTime,carUseBook.getStartTime()).lt(CarUseBook::getEndTime,carUseBook.getEndTime()))
                                .or()
                                .and(j->j.lt(CarUseBook::getStartTime,carUseBook.getStartTime()).gt(CarUseBook::getEndTime,carUseBook.getEndTime()))
                        )
        );

        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"存在车辆预约时间与已预约时间冲突~");
        }
@@ -207,6 +222,15 @@
                .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())
                .and(StringUtils.isNotBlank(pageWrap.getModel().getQueryDate()),
                        i->i.and(j->j.lt(CarUseBook::getStartTime,pageWrap.getModel().getQueryDate() +"00:00:00").gt(CarUseBook::getStartTime,pageWrap.getModel().getQueryDate() +"23:59:59"))
                        .or()
                        .and(j->j.lt(CarUseBook::getEndTime,pageWrap.getModel().getQueryDate() +"23:59:59").gt(CarUseBook::getEndTime,pageWrap.getModel().getQueryDate() +"00:00:00"))
                        .or()
                        .and(j->j.gt(CarUseBook::getStartTime,pageWrap.getModel().getQueryDate() +"00:00:00").lt(CarUseBook::getEndTime,pageWrap.getModel().getQueryDate() +"23:59:59"))
                        .or()
                        .and(j->j.lt(CarUseBook::getStartTime,pageWrap.getModel().getQueryDate() +"00:00:00").gt(CarUseBook::getEndTime,pageWrap.getModel().getQueryDate() +"23:59:59"))
                )
                .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())
@@ -251,26 +275,114 @@
                        .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 ) " )
                        .and(i->i.and(j->j.lt(CarUseBook::getStartTime,carUseBook.getStartTime()).gt(CarUseBook::getStartTime,carUseBook.getStartTime()))
                                .or()
                                .and(j->j.lt(CarUseBook::getEndTime,carUseBook.getStartTime()).gt(CarUseBook::getEndTime,carUseBook.getStartTime()))
                                .or()
                                .and(j->j.gt(CarUseBook::getStartTime,carUseBook.getStartTime()).lt(CarUseBook::getEndTime,carUseBook.getEndTime()))
                                .or()
                                .and(j->j.lt(CarUseBook::getStartTime,carUseBook.getStartTime()).gt(CarUseBook::getEndTime,carUseBook.getEndTime()))
                        )
        );
        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'  "))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){
            for (DateIntervalVO dateIntervalVO:dateIntervalVOList) {
                if(
                carUseBookList.stream().filter(
                        i->
                                ( i.getStartTime().getTime()<DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime()
                        && i.getEndTime().getTime() >  DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime())
                        ||
                        ( i.getStartTime().getTime()<DateUtil.stringToDate(dateIntervalVO.getEndTime(),"yyyy-MM-dd HH:mm:ss ").getTime()
                                && i.getEndTime().getTime() > DateUtil.stringToDate(dateIntervalVO.getEndTime(),"yyyy-MM-dd HH:mm:ss ").getTime())
                        ||
                        ( DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime() < i.getStartTime().getTime()
                                &&  DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime() > i.getStartTime().getTime())
                        ||
                        ( DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime() < i.getEndTime().getTime()
                                &&  DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime() > i.getEndTime().getTime())

                ).collect(Collectors.toList()).size()>Constants.ZERO){
                    dateIntervalVO.setIsUse(Constants.ONE);
                };
            }
        }
        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);
        }
        return dateIntervalVOList;
    }


    public void revoke(Integer id, LoginUserInfo loginUserInfo){
       CarUseBook carUseBook = carUseBookMapper.selectById(id);



    }


}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -301,7 +301,7 @@
            approve.setIsEndCheck(Constants.ZERO);
            approve.setType(Constants.ZERO);
            approve.setLevel(Constants.ONE);
            approve.setVisitId(visits.getId());
            approve.setObjId(visits.getId());
            approveMapper.insert(approve);
            if(!CollectionUtils.isNotEmpty(approveIds)){
                approve.setIsEndCheck(Constants.ONE);
@@ -336,7 +336,7 @@
        if(approve.getStatus().equals(Constants.approveStatus.wait)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"审批记录已处理!");
        }
        Visits visits = visitsMapper.selectById(approve.getVisitId());
        Visits visits = visitsMapper.selectById(approve.getObjId());
        if(Objects.isNull(visits)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
@@ -358,7 +358,7 @@
            if(approve.getApproveType().equals(Constants.ONE)){
                //会签 æŸ¥è¯¢æ˜¯å¦æ˜¯æœ€åŽä¸€æ¡è®°å½• å¦‚果是最后一条记录 åˆ™ç”Ÿæˆä¸‹çº§å®¡æ‰¹è®°å½• å¦‚果是最后一级，则进行审批确认
                if(approveMapper.selectCount(new QueryWrapper<Approve>().lambda()
                        .eq(Approve::getVisitId,visits.getId())
                        .eq(Approve::getObjId,visits.getId())
                        .eq(Approve::getLevel,approve.getLevel())
                        .ne(Approve::getId,approve.getId())
                )<=Constants.ZERO){
@@ -379,7 +379,7 @@
                        .set(Approve::getStatus,Constants.approveStatus.otherDeal)
                        .set(Approve::getEditDate,new Date())
                        .set(Approve::getCheorId,auditApproveDTO.getMemberId())
                        .eq(Approve::getVisitId,visits.getId())
                        .eq(Approve::getObjId,visits.getId())
                        .eq(Approve::getStatus,Constants.approveStatus.wait)
                        .ne(Approve::getId,approve.getId())
                        .eq(Approve::getLevel,approve.getLevel())
@@ -406,7 +406,7 @@
                    .set(Approve::getStatus,Constants.approveStatus.otherDeal)
                    .set(Approve::getEditDate,new Date())
                    .set(Approve::getCheorId,auditApproveDTO.getMemberId())
                    .eq(Approve::getVisitId,visits.getId())
                    .eq(Approve::getObjId,visits.getId())
                    .eq(Approve::getStatus,Constants.approveStatus.wait)
                    .ne(Approve::getId,approve.getId())
                    .eq(Approve::getLevel,approve.getLevel())
@@ -444,7 +444,7 @@
                approve.setTemplatId(approveParam.getId());
                approve.setChekorId(Integer.valueOf(id));
                approve.setType(Constants.ONE);
                approve.setVisitId(visitId);
                approve.setObjId(visitId);
                approveList.add(approve);
            }
            approveMapper.insertBatchSomeColumn(approveList);
@@ -471,7 +471,7 @@
                approve.setApproveType(approveParam.getApproveType());
                approve.setChekorId(id);
                approve.setType(Constants.ONE);
                approve.setVisitId(visitId);
                approve.setObjId(visitId);
                approveList.add(approve);
            }
            approveMapper.insertBatchSomeColumn(approveList);