代码初始化

k94314517

2024-08-16 29cd606f6e2c614f765aa043435e6ca110c5c6cf

代码初始化

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java

@@ -14,6 +14,7 @@
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.VisitRecordVO;
import com.doumee.service.business.*;
@@ -94,7 +95,7 @@
    }


    /******************************************************任务接口************************************************************************/
    /******************************************************司机任务接口************************************************************************/

    @ApiOperation("任务签到")
    @PostMapping("/signIn")
@@ -111,6 +112,11 @@
    }


    @ApiOperation("查询排队情况")
    @PostMapping("/jobDetail")
    public ApiResponse<LineUpVO>  lineUpDetail (@RequestBody LineUpDetailDTO lineUpDetailDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(platformJobService.lineUpDetail(lineUpDetailDTO));
    }




 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
package com.doumee.cloud.web;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.PlatformBooks;
import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.business.model.PlatformShowParam;
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;
import com.doumee.service.business.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/12/28 14:31
 */

@Api(tags = "【公众号】PDA月台业务")
@Trace(exclude = true)
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/pdaPlatform")
@Slf4j
@LoginNoRequired
public class PdaPlatformController extends BaseController {


    @Autowired
    private PlatformJobService platformJobService;

    @Autowired
    private PlatformBooksService platformBooksService;

    @Autowired
    private PlatformGroupService platformGroupService;

    @Autowired
    private PlatformShowParamService platformShowParamService;



    @ApiOperation("获取月台组信息")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "queryType", dataType = "Integer", value = "0=全部月台；1=启用月台 2=配置我的月台", required = false)
    })
    @GetMapping("/getPlatformGroupList")
    public ApiResponse<List<PlatformGroup>>  getPlatformGroupList (@RequestParam Integer queryType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(platformGroupService.getAllPlatformGroup(queryType,getLoginUser(token)));
    }

    @ApiOperation("更新月台配置信息")
    @GetMapping("/updUserPlatformConfig")
    public ApiResponse  updUserPlatformConfig (@RequestBody List<Integer> ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        platformShowParamService.updUserConfig(ids,getLoginUser(token));
        return ApiResponse.success("操作成功");
    }


}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/PlatformJobJoinMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.PlatformJob;
import com.github.yulichang.base.mapper.MPJJoinMapper;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformJobJoinMapper extends MPJJoinMapper<PlatformJob> {

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/PlatformJoinMapper.java

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

import com.doumee.dao.business.model.Platform;
import com.github.yulichang.base.MPJBaseMapper;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformJoinMapper extends MPJBaseMapper<Platform> {

}

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

@@ -11,6 +11,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;

/**
 * æœˆå°ä¿¡æ¯è¡¨
@@ -48,6 +49,7 @@
    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;


    @ApiModelProperty(value = "名称")
    @ExcelColumn(name="名称")
@@ -162,4 +164,16 @@
    @TableField(exist = false)
    private String broadcaseNames;

    @ApiModelProperty(value = "作业中排队车辆", example = "1")
    @TableField(exist = false)
    private List<PlatformJob> workJobList;

    @ApiModelProperty(value = "已签到排队车辆", example = "1")
    @TableField(exist = false)
    private List<PlatformJob> signJobList;

    @ApiModelProperty(value = "配置显示")
    @TableField(exist = false)
    private Boolean showConfig = false;

}

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

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.util.List;

/**
 * æœˆå°_分组信息表
@@ -63,4 +65,7 @@
    @ExcelColumn(name="排序码")
    private Integer sortnum;

    @ApiModelProperty(value = "月台组下的月台")
    @TableField(exist = false)
    private List<Platform> platformList;
}

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

@@ -268,6 +268,10 @@
    @TableField(exist = false)
    private Long lineUpNum;

    @ApiModelProperty(value = "关联月台组编码（关联platform_group表）", example = "1")
    @TableField(exist = false)
    private Integer groupId;

    @ApiModelProperty(value = "作业月台名称")
    @TableField(exist = false)
    private String platformName ;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/LineUpDetailDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.doumee.dao.web.reqeust;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.business.model.PlatformJob;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/12/7 11:19
 */
@Data
@Api(tags = "排队情况请求类" )
public class LineUpDetailDTO {

    @ApiModelProperty(value = "查询类别：0=手机号；1=任务主键")
    private Integer queryType;

    @ApiModelProperty(value = "手机号")
    private String mobile;

    @ApiModelProperty(value = "任务主键")
    private Integer jobId;

    @ApiModelProperty(value = "用户", hidden = true)
    private LoginUserInfo loginUserInfo;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/LineUpVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.doumee.dao.web.response;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformJob;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/12/7 11:19
 */
@Data
@Api(tags = "排队情况" )
public class LineUpVO {

    @ApiModelProperty(value = "月台组信息")
    private List<Platform> platformList;

    @ApiModelProperty(value = "用户", hidden = true)
    private LoginUserInfo loginUserInfo;

}

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

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformGroup;
@@ -94,4 +95,17 @@
     * @return long
     */
    long count(PlatformGroup platformGroup);

    /**
     * èŽ·å–月台组信息
     * @param queryType
     * @param loginUserInfo
     * @return
     */
    List<PlatformGroup> getAllPlatformGroup(Integer queryType, LoginUserInfo loginUserInfo);





}

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

@@ -4,8 +4,10 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.web.reqeust.JobDetailDTO;
import com.doumee.dao.web.reqeust.LineUpDetailDTO;
import com.doumee.dao.web.reqeust.SignInDTO;
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;

import java.util.List;

@@ -114,5 +116,10 @@
     */
    PlatformJob getDetail(JobDetailDTO jobDetailDTO);


    /**
     * æŽ’队情况
     * @param lineUpDetailDTO
     * @return
     */
    LineUpVO lineUpDetail(LineUpDetailDTO lineUpDetailDTO);
}

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

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformShowParam;
@@ -94,4 +95,12 @@
     * @return long
     */
    long count(PlatformShowParam platformShowParam);


    /**
     * æ›´æ–°æœˆå°å¼€å¯é…ç½®
     * @param showIdList
     * @param loginUserInfo
     */
    void updUserConfig(List<Integer> showIdList, LoginUserInfo loginUserInfo);
}

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

@@ -1,20 +1,29 @@
package com.doumee.service.business.impl;

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.Utils;
import com.doumee.dao.business.PlatformGroupMapper;
import com.doumee.dao.business.PlatformShowParamMapper;
import com.doumee.dao.business.join.PlatformJoinMapper;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.dao.business.model.PlatformShowParam;
import com.doumee.service.business.PlatformGroupService;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * æœˆå°_分组信息表Service实现
@@ -26,6 +35,12 @@

    @Autowired
    private PlatformGroupMapper platformGroupMapper;

    @Autowired
    private PlatformJoinMapper platformJoinMapper;

    @Autowired
    private PlatformShowParamMapper platformShowParamMapper;

    @Override
    public Integer create(PlatformGroup platformGroup) {
@@ -118,4 +133,52 @@
        QueryWrapper<PlatformGroup> wrapper = new QueryWrapper<>(platformGroup);
        return platformGroupMapper.selectCount(wrapper);
    }


    @Override
    public List<PlatformGroup> getAllPlatformGroup(Integer queryType,LoginUserInfo loginUserInfo) {
        List<PlatformGroup> platformGroups = platformGroupMapper.selectList(
                new QueryWrapper<PlatformGroup>()
                        .lambda().eq(PlatformGroup::getIsdeleted, Constants.ZERO)
                        .orderByAsc(PlatformGroup::getSortnum)
        );
        //查询月台组下所有月台
        List<Platform> allPlatformList = platformJoinMapper.selectJoinList(Platform.class,
                new MPJLambdaWrapper<Platform>()
                        .selectAll(Platform.class)
                        .eq(Platform::getIsdeleted, Constants.ZERO)
                        //TODO å¾…确认月台状态字段
                        .eq(Objects.nonNull(queryType)&&!Constants.equalsInteger(queryType,Constants.ZERO),Platform::getStatus,Constants.ZERO)
        );
        //处理我的月台信息 æ˜¯å¦é…ç½®éšè—
        if(Constants.equalsInteger(queryType,Constants.TWO)){
            List<PlatformShowParam> platformShowParamList = platformShowParamMapper.selectList(new QueryWrapper<PlatformShowParam>()
                    .lambda()
                    .eq(PlatformShowParam::getIsdeleted, Constants.ZERO)
                    .eq(PlatformShowParam::getMemberId,loginUserInfo.getMemberId())
            );
            //如果未配置该数据 åˆ™å…¨éƒ¨æ˜¾ç¤º
            if(CollectionUtils.isEmpty(platformShowParamList)){
                for (Platform platform:allPlatformList) {
                    platform.setShowConfig(true);
                }
            }else{
                //根据配置显示数据
                for (PlatformShowParam platformShowParam:platformShowParamList) {
                    for (Platform platform:allPlatformList) {
                        if(Constants.equalsInteger(platform.getId(),platformShowParam.getPlatformId())){
                            platform.setShowConfig(true);
                            break;
                        }
                    }
                }
            }
        }
        for (PlatformGroup platformGroup:platformGroups) {
            platformGroup.setPlatformList(allPlatformList.stream().filter(m->Constants.equalsInteger(m.getGroupId(),platformGroup.getId())).collect(Collectors.toList()));
        }
        return platformGroups;
    }


}

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

@@ -13,17 +13,22 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformJobMapper;
import com.doumee.dao.business.PlatformMapper;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformBooks;
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.business.model.PlatformReason;
import com.doumee.dao.web.reqeust.JobDetailDTO;
import com.doumee.dao.web.reqeust.LineUpDetailDTO;
import com.doumee.dao.web.reqeust.SignInDTO;
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;
import com.doumee.service.business.PlatformJobService;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,6 +39,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * æœˆå°è°ƒåº¦ä½œä¸šä¿¡æ¯è¡¨Service实现
@@ -45,6 +51,9 @@

    @Autowired
    private PlatformJobMapper platformJobMapper;

    @Autowired
    private PlatformJobJoinMapper platformJobJoinMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
@@ -328,7 +337,78 @@



    @Override
    public LineUpVO lineUpDetail(LineUpDetailDTO lineUpDetailDTO){
        if(Objects.isNull(lineUpDetailDTO)
        || Objects.isNull(lineUpDetailDTO.getQueryType())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LineUpVO lineUpVO = new LineUpVO();
        //查询所有任务
        List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,
                new MPJLambdaWrapper<PlatformJob>()
                        .selectAll(PlatformJob.class)
                        .selectAs(PlatformReason::getGroupId,PlatformJob::getGroupId)
                        .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
                        .leftJoin(PlatformReason.class,PlatformReason::getId,PlatformBooks::getReasonId)
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(Constants.equalsInteger(lineUpDetailDTO.getQueryType(),Constants.ZERO)
                                ,PlatformJob::getDrivierPhone,lineUpDetailDTO.getMobile())
                        .eq(Constants.equalsInteger(lineUpDetailDTO.getQueryType(),Constants.ONE)
                                ,PlatformJob::getId,lineUpDetailDTO.getJobId())
                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
                                Constants.PlatformJobStatus.IN_WAIT.getKey(),
                                Constants.PlatformJobStatus.CALLED.getKey())
                        .orderByAsc(PlatformJob::getSignDate)
        );
        //获取所有月台
        List<Integer> platformIdList = platformJobList.stream().map(m->m.getGroupId()).collect(Collectors.toList());
        List<Platform> platformList = platformMapper.selectList(new QueryWrapper<Platform>().lambda()
                .eq(Platform::getIsdeleted,Constants.ZERO)
                .in(Platform::getId,platformIdList));

        for (Platform platform:platformList) {
            //查询本月台下 è‡ªå·±çš„数据 æœ€æ—©ç­¾åˆ°çš„
            PlatformJob platformJob = platformJobList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platform.getId())).findFirst().orElse(null);
            //查询在当前月台下 ç­¾åˆ°æŽ’队车辆数据
            List<PlatformJob> platformJobSignInList = platformJobJoinMapper.selectJoinList(PlatformJob.class,
                    new MPJLambdaWrapper<PlatformJob>()
                            .selectAll(PlatformJob.class)
                            .selectAs(PlatformReason::getGroupId,PlatformJob::getGroupId)
                            .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
                            .leftJoin(PlatformReason.class,PlatformReason::getId,PlatformBooks::getReasonId)
                            .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                            .ge(Objects.nonNull(platformJob),PlatformJob::getSignDate,DateUtil.getDate(platformJob.getSignDate(),"yyyy-MM-dd HH:mm:ss"))
                            .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
                                    Constants.PlatformJobStatus.IN_WAIT.getKey(),
                                    Constants.PlatformJobStatus.CALLED.getKey())
                            .orderByDesc(PlatformJob::getSignDate));
            platform.setSignJobList(platformJobSignInList);
            //查询当前月台下
            List<PlatformJob> platformJobWorkList = platformJobJoinMapper.selectJoinList(PlatformJob.class,
                    new MPJLambdaWrapper<PlatformJob>()
                            .selectAll(PlatformJob.class)
                            .selectAs(PlatformReason::getGroupId,PlatformJob::getGroupId)
                            .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
                            .leftJoin(PlatformReason.class,PlatformReason::getId,PlatformBooks::getReasonId)
                            .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                            .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
                            .orderByDesc(PlatformJob::getSignDate));
            platform.setSignJobList(platformJobSignInList);
            platform.setWorkJobList(platformJobWorkList);
        }







        lineUpVO.setPlatformList(platformList);


        return lineUpVO;
    }




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

@@ -1,7 +1,10 @@
package com.doumee.service.business.impl;

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.Utils;
import com.doumee.dao.business.PlatformShowParamMapper;
import com.doumee.dao.business.model.PlatformShowParam;
@@ -12,8 +15,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -118,4 +124,27 @@
        QueryWrapper<PlatformShowParam> wrapper = new QueryWrapper<>(platformShowParam);
        return platformShowParamMapper.selectCount(wrapper);
    }


    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updUserConfig(List<Integer> showIdList, LoginUserInfo loginUserInfo){
        platformShowParamMapper.delete(new QueryWrapper<PlatformShowParam>()
                .lambda().eq(PlatformShowParam::getMemberId,loginUserInfo.getMemberId())
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(showIdList)){
            List<PlatformShowParam> platformShowParamList = new ArrayList<>();
            for (Integer id:showIdList) {
                PlatformShowParam platformShowParam = new PlatformShowParam();
                platformShowParam.setCreateDate(new Date());
                platformShowParam.setMemberId(loginUserInfo.getMemberId());
                platformShowParam.setIsdeleted(Constants.ZERO);
                platformShowParam.setPlatformId(id);
                platformShowParamList.add(platformShowParam);
            }
            platformShowParamMapper.insert(platformShowParamList);
        }
    }


}