Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-11-07 259703a76d60972cc0ba8934b38864fd321005f3

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 server/system_service/src/main/java/com/doumee/dao/business/dao/CompanyMapper.java

@@ -2,6 +2,7 @@

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

import java.util.List;

@@ -9,6 +10,6 @@
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
public interface CompanyMapper extends BaseMapper<Company> {
public interface CompanyMapper extends MPJBaseMapper<Company> {

}

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

@@ -10,6 +10,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Cars;
import com.doumee.service.business.CarsService;
import com.doumee.service.business.ParkBookService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,8 @@

    @Autowired
    private CarsService carsService;
    @Autowired
    private ParkBookService parkBookService;
    @Autowired
    private HkSyncVehicleFromHKServiceImpl hkSyncVehicleFromHKService;

@@ -119,6 +122,9 @@
    })
    @CloudRequiredPermission("business:cars:create")
    public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(carsService.importBatch(file,this.getLoginUser(token)));
        List<Cars> carsList = carsService.importBatch(file,this.getLoginUser(token));
        //异步更新车辆授权数据
        carsService.dealCarsAuthBiz(carsList);
        return ApiResponse.success("导入成功");
    }
}

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

@@ -102,5 +102,4 @@
    }



}

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

@@ -10,10 +10,12 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
@@ -32,6 +34,10 @@
    @Autowired
    private SmsEmailService smsEmailService;

    @Autowired
    private EmayService emayService;


    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("发送短信验证码")
@@ -40,4 +46,15 @@
        return ApiResponse.success(smsEmailService.sendSms(smsEmail));
    }


    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("自定义短信内容")
    @PostMapping("/testSendSms")
    public ApiResponse testSendSms(@RequestBody SmsEmail smsEmail) {
        emayService.sendSmsByHk(smsEmail.getPhone(),smsEmail.getContent());
        return ApiResponse.success("操作成功");
    }


}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java

ÎļþÃû´Ó server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/OnSitDispatchController.java ÐÞ¸Ä
@@ -7,7 +7,9 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.PlatformLogMapper;
import com.doumee.dao.business.model.PlatformLog;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.PlatformLogService;
import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -21,6 +23,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -36,28 +39,19 @@
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/onSitDispatch")
public class OnSitDispatchController extends BaseController {
public class ChangNeiDiaoduController extends BaseController {

    @Autowired
    private PlatformLogMapper platformLogMapper;
    @Autowired
    private BoardService boardService;



    @LoginNoRequired
    @ApiOperation("中心数据")
    @ApiOperation("中心数据-今日车辆作业情况统计数据")
    @GetMapping("/centerData")
    public ApiResponse<OnSitDispatchBoardVO> centerData() {
        OnSitDispatchBoardVO data = boardService.getCnddCenterData();
        if(data == null){
            data = new OnSitDispatchBoardVO();
            data.setPlatformTotal(100);
            data.setFreePlatform(8);
            data.setReservationCar(97);
            data.setWorkingCar(56);
            data.setLineUpCar(35);
        }

        return ApiResponse.success(data);
    }

@@ -66,39 +60,47 @@
    @ApiOperation("今日月台完成订单统计")
    @GetMapping("/platformGroupFinish")
    public ApiResponse<List<PlatformGroupFinishVO>> platformGroupFinish() {
        List<PlatformGroupFinishVO> platformGroupFinishVOList = new ArrayList<>();
        Random random = new Random();
        for (int i = 0; i < 3; i++) {
            PlatformGroupFinishVO platformGroupFinishVO = new PlatformGroupFinishVO();
            platformGroupFinishVO.setPlatformGroupName(i+"_月台组名称");
            platformGroupFinishVO.setPlatformId(i);
            platformGroupFinishVO.setFinishData(300+random.nextInt(100));
            platformGroupFinishVOList.add(platformGroupFinishVO);
        }
        List<PlatformGroupFinishVO> platformGroupFinishVOList = boardService.platformGroupFinish();
        return ApiResponse.success(platformGroupFinishVOList);
    }


    @LoginNoRequired
    @ApiOperation("今日车辆作业情况-近N条日志列表")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "size", value = "查询最近记录数的记录条数，默认7条", required = false)
    })
    @GetMapping("/carWorkSituation")
    public ApiResponse<CarWorkSituationVO> carWorkSituation(@RequestParam Integer  size) {
        int limit = Constants.formatIntegerNum(size)>0?size:7;
        CarWorkSituationVO carWorkSituationVO = boardService.carWorkSituation(limit);
        return ApiResponse.success(carWorkSituationVO);
    }
    @LoginNoRequired
    @ApiOperation("实时告警-近N条列表")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "size", value = "查询最近记录数的记录条数，默认7条", required = false)
    })
    @GetMapping("/warningList")
    public ApiResponse<List<PlatformWarnEvent>> warningList(@RequestParam Integer  size) {
        int limit = Constants.formatIntegerNum(size)>0?size:7;
        List<PlatformWarnEvent> data = boardService.warningList(limit);
        return ApiResponse.success(data);
    }



    @LoginNoRequired
    @ApiOperation("今日月台工作时长趋势")
    @GetMapping("/platformDuration")
    public ApiResponse<List<PlatformDurationVO>> platformDuration() {
        List<PlatformDurationVO> platformDurationList = new ArrayList<>();
        Random random = new Random();
        for (int i = 0; i < 3; i++) {
            PlatformDurationVO platformDurationVO = new PlatformDurationVO();
            platformDurationVO.setPlatformName(i+"_月台名称");
            platformDurationVO.setPlatformId(i);
            platformDurationVO.setWorkTotalTime(100+random.nextInt(100));
            platformDurationVO.setOpenTotalTime(200+random.nextInt(100));
            platformDurationList.add(platformDurationVO);
        }
        List<PlatformDurationVO> platformDurationList = boardService.platformDuration();
        return ApiResponse.success(platformDurationList);
    }


    @LoginNoRequired
    @ApiOperation("今日月台工作时长趋势")
    @ApiOperation("实时作业效率")
    @GetMapping("/workEfficiency")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "查询类型：0=入库；1=出库", required = true),
@@ -120,27 +122,6 @@
        return ApiResponse.success(workEfficiencyVOList);
    }


    @LoginNoRequired
    @ApiOperation("今日车辆作业情况")
    @GetMapping("/carWorkSituation")
    public ApiResponse<CarWorkSituationVO> carWorkSituation() {

        Random random = new Random();
        CarWorkSituationVO carWorkSituationVO = new CarWorkSituationVO();
        carWorkSituationVO.setCallNum(200+random.nextInt(100));
        carWorkSituationVO.setFinishNum(100+random.nextInt(100));
        carWorkSituationVO.setCallNum(100+random.nextInt(100));
        carWorkSituationVO.setWorkingNum(100+random.nextInt(100));
        carWorkSituationVO.setFinishNum(100+random.nextInt(100));
        carWorkSituationVO.setInNum(100+random.nextInt(100));
        List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
                .orderByDesc(PlatformLog::getCreateDate)
                .last(" limit 7 ")
        );
        carWorkSituationVO.setPlatformLogList(platformLogList);
        return ApiResponse.success(carWorkSituationVO);
    }




 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/CarsImport.java

@@ -10,13 +10,15 @@
 * @date 2024/01/16 10:03
 */
@Data
@ApiModel("员工信息导入")
@ApiModel("车辆信息导入")
public class CarsImport {


    @ExcelColumn(name="*车牌号码",value = "code",index = 1)
    @ExcelColumn(name="*车牌号码",value = "code",index = 0)
    private String code;
    @ExcelColumn(name="*业务类型",value = "categoryName",index = 2)
    @ExcelColumn(name="*备注",value = "type",index = 1)
    private String type;
    @ExcelColumn(name="*车辆分类",value = "categoryName",index = 2)
    private String categoryName;

    @ExcelColumn(name="*组织路径",value = "companyName",index = 3)
@@ -29,11 +31,11 @@
    private String phone;
    @ExcelColumn(name="性别" , value = "sex",index = 6)
    private String sex;
    @ExcelColumn(name="身份证号" , value = "idcard",index = 7)
    @ExcelColumn(name="身份证号" , value = "idcard",index =7)
    private String idcard;
    @ExcelColumn(name="停车库名称" , value = "parkName",index = 8)
    private String parkName;
    @ExcelColumn(name="开始时间" , value = "startTime",index = 9)
    @ExcelColumn(name="开始时间" , value = "startTime",index =9)
    private String startTime;
    @ExcelColumn(name="结束时间" , value = "endTime",index = 10)
    private String endTime;

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Empower;
import com.doumee.dao.business.model.ParkBook;
import com.github.yulichang.base.MPJBaseMapper;

import java.util.List;

@@ -10,6 +11,6 @@
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
public interface ParkBookMapper extends BaseMapper<ParkBook> {
public interface ParkBookMapper extends MPJBaseMapper<ParkBook> {

}

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

@@ -2,11 +2,12 @@

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

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

}

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

@@ -183,6 +183,9 @@
    @ApiModelProperty(value = "一级分类名称", example = "1")
    @TableField(exist = false)
    private String catePName;
    @ApiModelProperty(value = "是否新增， 0否 1是", example = "1")
    @TableField(exist = false)
    private int isnew;

    @ApiModelProperty(value = "车辆部门名称", example = "1")
    @ExcelColumn(name="车辆组织部门名称")
@@ -193,6 +196,9 @@
    @ExcelColumn(name="车辆部门全路径名称")
    @TableField(exist = false)
    private String carCompanyNamePath;
    @ApiModelProperty(value = "车主对象", example = "1")
    @TableField(exist = false)
    private Member member;

    @ApiModelProperty(value = "授权停车场编码集合", example = "1")
    @TableField(exist = false)

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

@@ -69,8 +69,8 @@
    @ExcelColumn(name="任务主键")
    private Integer platformJobId;

    @ApiModelProperty(value = "预警类型 0 =  ä½œä¸šè¶…æ—¶ ï¼›1=停靠错误", example = "1")
    @ExcelColumn(name="预警类型 0 =  ä½œä¸šè¶…æ—¶ ï¼›1=停靠错误")
    @ApiModelProperty(value = "预警类型 0停靠错误 1-停靠错误 2-作业超时", example = "1")
    @ExcelColumn(name="预警类型 0停靠错误 1-停靠错误 2-作业超时")
    private Integer eventType;

    @ApiModelProperty(value = "月台名称")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.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;
@@ -87,4 +88,8 @@
    @ApiModelProperty(value = "上锁时间")
    @ExcelColumn(name="上锁时间")
    private String lockDate;

    @ApiModelProperty(value = "月分组名称" ,hidden = true)
    @TableField(exist = false)
    private String groupName ;
}

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

@@ -28,6 +28,14 @@

    @ApiModelProperty(value = "排队车辆")
    private int lineUpCar;
    @ApiModelProperty(value = "进入车辆作业情况-签到数")
    private int signedNum;
    @ApiModelProperty(value = "进入车辆作业情况-已叫号")
    private int calledNum;
    @ApiModelProperty(value = "进入车辆作业情况-已作业")
    private int workedNum;
    @ApiModelProperty(value = "进入车辆作业情况-已完成")
    private int doneNum;

    @ApiModelProperty(value = "今日月台完成订单统计" , hidden = true)
    private List<PlatformGroupFinishVO> platformGroupFinishList;
@@ -46,9 +54,6 @@

    @ApiModelProperty(value = "实时月台作业信息" , hidden = true)
    private List<PlatformWorkDataVO> platformWorkDataList;

    //TODO å®žæ—¶å‘Šè­¦ä¿¡æ¯



}

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

@@ -25,7 +25,4 @@
    @ApiModelProperty(value = "月台名称")
    private String platformName;




}

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

@@ -91,7 +91,7 @@
     * @return PageData<Cars>
     */
    PageData<Cars> findPage(PageWrap<Cars> pageWrap);
    String importBatch(MultipartFile file, LoginUserInfo loginUserInfo);
    List<Cars> importBatch(MultipartFile file, LoginUserInfo loginUserInfo);
    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
@@ -106,4 +106,5 @@
     * @return
     */
    PageData<CarsDTO> findCarPage(PageWrap<CarsQuery> pageWrap);
    void dealCarsAuthBiz(List<Cars> carsList);
}

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

@@ -99,4 +99,6 @@
    void reUpdate(ParkBook parkBook);

    String batchAuth(Cars parkBook);


}

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

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

import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,14 +13,15 @@
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.ScientificNotationTUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.CarsImport;
import com.doumee.dao.admin.request.CarsQuery;
import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.CarJoinMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
@@ -30,11 +33,13 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;

import java.math.BigDecimal;
import java.util.*;

/**
@@ -53,10 +58,16 @@
    @Autowired
    private CarJoinMapper carJoinMapper;
    @Autowired
    private CompanyMapper companyMapper;
    @Autowired
    private CategoryMapper categoryMapper;
    @Autowired
    private MemberMapper memberMapper;

    @Autowired
    private ParkBookJoinMapper parkBookJoinMapper;
    private ParkBookMapper parkBookJoinMapper;
    @Autowired
    private ParksMapper parksMapper;

    @Override
    public Integer create(Cars model) {
@@ -170,7 +181,72 @@
        }
        return true;
    }
    public   boolean  dealCancelBookBizNoException(String code,Date date){

        boolean r = true;
        List<ParkBook> parkBooks = parkBookJoinMapper.selectJoinList(ParkBook.class,new MPJLambdaWrapper<ParkBook>()
                .selectAll(ParkBook.class )
                .selectAs(Parks::getHkId,ParkBook::getParkHkId )
                .leftJoin(Parks.class,Parks::getId,ParkBook::getParkId)
                .eq(ParkBook::getCarCode,code)
                .eq(ParkBook::getIsdeleted,Constants.ZERO ));
        if(parkBooks !=null){
            for(ParkBook c : parkBooks){
                //如果取消预约，则进行取消包期
                if(StringUtils.isNotBlank(c.getParkHkId())
                        && StringUtils.isNotBlank(c.getCarCode())){
                    boolean result = HkSyncParkServiceImpl.cancelParkBookHk(c);
                    if(!result){
                        r=  false;
                        c.setHkStatus(Constants.ONE);
                        c.setRemark("取消包期失败");
                    }else{
                        c.setHkStatus(Constants.ONE);
                        c.setRemark("取消包期成功");
                    }
                }else{
                    c.setHkStatus(Constants.TWO);//下发失败
                    c.setRemark("无效停车场授权下发，取消包期失败，直接删除记录");
                }
                if(r){
                    c.setHkDate(date);
                    c.setIsdeleted(Constants.ONE);
                    parkBookJoinMapper.updateById(c);
                }
            }
        }
        return r;
    }
    @Override
    @Async
    public  void dealCarsAuthBiz(List<Cars> carsList){
        if(carsList== null || carsList.size() == 0 ){
            return;
        }
        Date date = new Date();
        MPJLambdaWrapper<Parks> queryWrapper1 = new MPJLambdaWrapper<>();
        queryWrapper1.selectAll(Parks.class);
        queryWrapper1.eq(Parks::getIsdeleted,Constants.ZERO );
        List<Parks>  parksList = parksMapper.selectList( queryWrapper1);
        if(parksList==null ||parksList.size() == 0){
            return;
        }
        for(Cars model : carsList){
            model.setAuthTimeType(Constants.ZERO);
            model.setStartTime(null);
            model.setEndTime(null);
            ParkBookServiceImpl.dealCarAuthByModel(model,model.getEdirot(),parksList,date,parkBookJoinMapper);
            model.setAuthStatus(Constants.ONE);//已授权
            carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
                    .eq(Cars::getId,model.getId())
                    .set(Cars::getEditDate,date)
                    .set(Cars::getEdirot,model.getEdirot())
                    .set(Cars::getAuthStatus,Constants.ONE)
                    .set(Cars::getStartTime,null)
                    .set(Cars::getEndTime,null)
            );
        }
    }
    @Override
    public void delete(Cars cars) {
        UpdateWrapper<Cars> deleteWrapper = new UpdateWrapper<>(cars);
@@ -394,7 +470,7 @@

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public String importBatch(MultipartFile file,  LoginUserInfo loginUserInfo){
    public List<Cars> importBatch(MultipartFile file,  LoginUserInfo loginUserInfo){
        Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.IMPORTING_CARS);
        if(importing!=null && importing){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，已存在车辆导入任务正在执行中，请稍后再试！");
@@ -404,7 +480,7 @@
            ExcelImporter ie = null;
            List<CarsImport> dataList =null;
            try {
                ie = new ExcelImporter(file,1,0);
                ie = new ExcelImporter(file,0,0);
                dataList = ie.getDataList(CarsImport.class,null);
            }  catch (Exception e) {
                e.printStackTrace();
@@ -412,38 +488,191 @@
            if(dataList == null || dataList.size() ==0){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，录入数据为空！");
            }
            List<Cars> list =  carJoinMapper.selectJoinList(Cars.class,new MPJLambdaWrapper<Cars>()
            List<Cars> allCarsList =  carJoinMapper.selectJoinList(Cars.class,new MPJLambdaWrapper<Cars>()
                    .selectAll(Cars.class)
                    .eq(Cars::getIsdeleted,Constants.ZERO)
            );
            List<Member> memberList  = memberMapper.selectList(new QueryWrapper<Member>().lambda()
            List<Company> companyList =  companyMapper.selectJoinList(Company.class,new MPJLambdaWrapper<Company>()
                    .selectAll(Company.class)
                    .eq(Company::getIsdeleted,Constants.ZERO)
            );
            List<Category> categoryList  = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
                    .eq(Category::getType,Constants.ONE)
                    .eq(Category::getIsdeleted,Constants.ZERO));

            List<Member> memberList  = memberMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
                    .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                    .selectAll(Member.class)
                    .selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath)
                    .eq(Member::getType,Constants.TWO)
                    .eq(Member::getIsdeleted,Constants.ZERO));
            List<Cars> newList = new ArrayList<>();
            List<Cars> updateList = new ArrayList<>();
            for(int i=0;i<dataList.size();i++){
                CarsImport model = dataList.get(i);
                model.setPhone(ScientificNotationTUtil.convertToString(model.getPhone()));
               /* if(StringUtils.isBlank(model.getCode())
                        &&StringUtils.isBlank(model.getIdcardNo())
               if(StringUtils.isBlank(model.getCode())
                        &&StringUtils.isBlank(model.getCategoryName())
                        &&StringUtils.isBlank(model.getType())
                        &&StringUtils.isBlank(model.getSex())
                        &&StringUtils.isBlank(model.getIdcard())
                        &&StringUtils.isBlank(model.getParkName())
                        &&StringUtils.isBlank(model.getPhone())
                        &&StringUtils.isBlank(model.getMemberName())
                        &&StringUtils.isBlank(model.getCompanyName())){
                    continue;
                }
                Cars car = checkModelParam(model,newList,i,loginUserInfo,list,companyList,);
                newList.add(car);*/
               checkModelParam(model,newList,updateList,i,loginUserInfo,allCarsList,memberList,companyList,categoryList);
            }
            if(newList == null || newList.size() ==0){
            if((newList == null || newList.size() ==0) && updateList.size() == 0){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，录入有效数据为空！");
            }
//          dealHkUserBizBatch(newList);
            return "导入成功";
            if(newList.size()>0){
                carsMapper.insert(newList);
            }
            if(updateList.size()>0){
                for (Cars c : updateList){
                    carsMapper.updateById(c);
                }
            }
            newList.addAll(updateList);
            return newList;
        }catch (BusinessException e){
            throw e;
        }catch (Exception e){
            e.printStackTrace();
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"车辆信息导入失败，请稍后重试");
        }finally {
            redisTemplate.delete(Constants.RedisKeys.IMPORTING_CARS);
        }

    }


    private Cars checkModelParam(CarsImport model, List<Cars> newList
            , List<Cars> updateList
            ,int index
            ,LoginUserInfo loginUserInfo
            ,List<Cars> allList
            ,List<Member> memberList
            ,List<Company> companyList
            ,List<Category> categoryList ) {
        if(StringUtils.isBlank(model.getCode())
                ||StringUtils.isBlank(model.getType())
                ||StringUtils.isBlank(model.getCategoryName())
                ||StringUtils.isBlank(model.getCompanyName())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+2)+"行车辆信息不完整，请检查表格内容！");
        }
        if(model.getPhone().indexOf(".")>=Constants.ZERO){
            model.setPhone(
                    String.valueOf(new BigDecimal(model.getPhone()).intValue())
            );
        }
        for(Cars param: newList){
            if(StringUtils.isNotBlank(model.getCode())&&StringUtils.isNotBlank(param.getCode())) {
                if (StringUtils.equals(model.getCode(), param.getCode())) {
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，第" + (index + 3) + "行车牌号【" + model.getCode() + "】重复出现，请检查表格内容！");
                }
            }
        }
        Cars cars = findCarsFromList(model.getCode(),allList);
        if(cars == null){
            cars = new Cars();
            cars.setCreator(loginUserInfo.getId());
            cars.setCreateDate(new Date());
            cars.setIsnew(Constants.ONE);
            newList.add(cars);
        }else{
            cars.setIsnew(Constants.ZERO);
            updateList.add(cars);
        }
        //类型 0安泰公务车 1安泰自有物流车 2其它
        if(StringUtils.equals(model.getType(),"安泰公务车")){
            cars.setType(Constants.ZERO);
        }else if(StringUtils.equals(model.getType(),"安泰自有物流车")){
            cars.setType(Constants.ONE);
        }else{
            cars.setType(Constants.TWO);
        }
        cars.setCode(model.getCode());
        Company company = findCompanyFromList(model.getCompanyName(),companyList);
        if(company == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+2)+"行组织名称【"+model.getCompanyName()+"】不存在，请检查表格内容！");
        }
        if(StringUtils.isNotBlank(model.getPhone())){
            Member member = findMemberFromListByPhone(model.getPhone(),memberList);
            if(member == null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+2)+"行车主手机号【"+model.getPhone()+"】不存在，请检查表格内容！");
            }
            cars.setMember(member);
            cars.setMemberId(member.getId());
        }
        Category category = findCategoryFromListByName(model.getCategoryName(),categoryList);
        if(category == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+2)+"行车辆分类【"+model.getCategoryName()+"】不存在，请检查表格内容！");
        }
        cars.setGroupId(company.getId());
        cars.setCateId(category.getId());
        cars.setEditDate(new Date());
        cars.setEdirot(loginUserInfo.getId());
        cars.setIsdeleted(Constants.ZERO);
        return cars;
    }
    private Company findCompanyFromList(String companyName, List<Company> companyList) {
        if(companyList !=null){
            for(Company company : companyList){
                if(StringUtils.equals(companyName,company.getCompanyNamePath())){
                    return  company;
                }
            }
        }
        return null;
    }
    private Cars findCarsFromList(String code, List<Cars> list) {
        if(list !=null){
            for(Cars model : list){
                if(StringUtils.equals(code,model.getCode())){
                    return  model;
                }
            }
        }
        return null;
    }
    private Member findMemberFromListByPhone(String phone, List<Member> list) {
        if(list !=null){
            for(Member member : list){
                if(StringUtils.equals(phone,member.getPhone())){
                    return  member;
                }
            }
        }
        return null;
    }
    private Category findCategoryFromListByName(String name, List<Category> list) {
        String[] names = name.split("/");
        if(names ==null || names.length !=2 ){
            return null;
        }
        Category pc = null;
        if(list !=null){
            for(Category model : list){
                if(StringUtils.equals(names[0],model.getName()) && model.getParentId() ==null){
                    pc = model;
                    break;
                }
            }
            if(pc ==null){
                return null;
            }
            for(Category model : list){
                if(StringUtils.equals(names[1],model.getName()) && Constants.equalsInteger(model.getParentId() ,pc.getId())){
                    pc = model;
                }
            }
            return  pc;
        }
        return null;
    }


}

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

@@ -323,7 +323,7 @@
                .select("t4.company_name_path",HiddenDanger::getCompanyName);
        queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
                .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getAreaId)
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
                .leftJoin("company t4 on t1.company_id=t4.id")
                .leftJoin("company t5 on t3.company_id=t5.id");


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

@@ -22,6 +22,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -121,6 +122,7 @@
       }
        hkSyncParkService.syncParkBookBySingleModel(model);
    }

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public   String batchAuth(Cars cars) {
@@ -180,7 +182,7 @@
           model.setAuthTimeType(cars.getAuthTimeType());
           model.setStartTime(startTime);
           model.setEndTime(endTime);
           dealCarAuthByModel(model,cars.getLoginUserInfo(),parksList,date);
           dealCarAuthByModel(model,cars.getLoginUserInfo().getId(),parksList,date,parkBookMapper);
           model.setAuthStatus(Constants.ONE);//已授权
           carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
                   .eq(Cars::getId,model.getId())
@@ -195,7 +197,7 @@

    }

    private int dealCarAuthByModel(Cars model, LoginUserInfo loginUserInfo, List<Parks> parksList,Date date) {
    public static int dealCarAuthByModel(Cars model, Integer userId, List<Parks> parksList,Date date,ParkBookMapper parkBookMapper) {
        //删除车量库记录数据
        parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
                .eq(ParkBook::getCarCode,model.getCode())
@@ -208,8 +210,8 @@
                ParkBook parkBook = new ParkBook();
                parkBook.setIsdeleted(Constants.ZERO);
                parkBook.setCreateDate(date);
                parkBook.setCreator(loginUserInfo.getId());
                parkBook.setEditor(loginUserInfo.getId());
                parkBook.setCreator(userId);
                parkBook.setEditor(userId);
                parkBook.setEditDate(date);
                parkBook.setCarCode(model.getCode());
                parkBook.setParkId(parks.getId());

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

@@ -15,14 +15,10 @@
import com.doumee.core.haikang.model.param.respose.PageSensorStatusResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.PlatformJobMapper;
import com.doumee.dao.business.PlatformLogMapper;
import com.doumee.dao.business.PlatformMapper;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.web.response.platformReport.CarmeraListVO;
import com.doumee.dao.web.response.platformReport.OnSitDispatchBoardVO;
import com.doumee.dao.web.response.platformReport.RegionTreeVO;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
@@ -30,8 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -45,7 +40,11 @@
    @Autowired
    private PlatformLogMapper platformLogMapper;
    @Autowired
    private PlatformWarnEventMapper platformWarnEventMapper;
    @Autowired
    private PlatformJobMapper platformJobMapper;
    @Autowired
    private PlatformWmsDetailMapper platformWmsDetailMapper;
    @Autowired
    private PlatformMapper platformMapper;
    /**
@@ -242,6 +241,77 @@
        return  allList;
    }
    @Override
    public  List<PlatformGroupFinishVO> platformGroupFinish(){
        List<PlatformGroupFinishVO> data = new ArrayList<>();
        List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
                .selectSum( PlatformWmsDetail::getIoQty)
                .selectAs(PlatformGroup::getName, PlatformWmsDetail::getGroupName)
                .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformWmsDetail::getJobId)
                .rightJoin(PlatformGroup.class,PlatformGroup::getId,PlatformJob::getPlatformGroupId)
                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
                .eq(PlatformJob::getIsdeleted, Constants.ZERO)
                .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
                        , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
                        , Constants.PlatformJobStatus.LEAVED.getKey())
                .apply("to_days(t1.create_data) = to_days(now())")
                .groupBy(PlatformGroup::getId)
        );
        if(jobList!=null){
            for(PlatformWmsDetail d : jobList){
                PlatformGroupFinishVO t = new PlatformGroupFinishVO();
                t.setFinishData(Constants.formatBigdecimal(d.getIoQty()).intValue());
                t.setPlatformGroupName(d.getGroupName());
            }
        }
        return data;
    }
    @Override
    public  CarWorkSituationVO carWorkSituation(int limit){
        CarWorkSituationVO carWorkSituationVO = new CarWorkSituationVO();
        List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
                .orderByDesc(PlatformLog::getCreateDate)
                .last(" limit "+limit)
        );
        carWorkSituationVO.setPlatformLogList(platformLogList);
        return carWorkSituationVO;
    }
    @Override
    public List<PlatformDurationVO> platformDuration(){
        List<PlatformDurationVO> platformDurationList = new ArrayList<>();
        List<Platform> jobList = platformMapper.selectJoinList(Platform.class, new MPJLambdaWrapper<Platform>()
                .selectAll( Platform.class)
                .select(" ( select ROUND( ifnull(SUM(pl.PARAM3),0)/60  , 2 )   from platform_log pl  where   pl.remark = t.id and to_days(pl.CREATE_DATE) =to_days  now())",Platform::getWorkCountTime)
                .eq(Platform::getIsdeleted, Constants.ZERO)
        );
        if(jobList!=null){
            //按工作时长累计倒序排序
            Collections.sort(jobList, new Comparator<Platform>() {
                @Override
                public int compare(Platform o1, Platform o2) {
                    return Constants.formatBigdecimal(o2.getWorkCountTime())-Constants.formatBigdecimal(o1.getWorkCountTime());
                }
            });
            for(Platform model : jobList){
                PlatformDurationVO data = new PlatformDurationVO();
                data.setPlatformId(model.getId());
                data.setPlatformName(model.getName());
                data.setWorkTotalTime(Constants.formatBigdecimal(model.getWorkCountTime()).intValue());
                platformDurationList.add(data);
            }
        }

        return platformDurationList;
    }
    @Override
    public      List<PlatformWarnEvent> warningList(int limit){
        List<PlatformWarnEvent> platformLogList = platformWarnEventMapper.selectList(new QueryWrapper<PlatformWarnEvent>().lambda()
                .eq(PlatformWarnEvent::getIsdeleted,Constants.ZERO)
                .orderByDesc(PlatformWarnEvent::getCreateDate)
                .last(" limit "+limit)
        );
        return platformLogList;
    }
    @Override
    public OnSitDispatchBoardVO getCnddCenterData(){
        OnSitDispatchBoardVO data = new OnSitDispatchBoardVO();
        //月台总数
@@ -268,20 +338,75 @@
            //-------------TODO----------【看板】爱确认需求--------------
            //     * 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 å·²è¿‡å· 12已取消
            for(PlatformJob model : jobList){
                //预约车辆
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())
                ||Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
                //待确认 ï¼ˆé¢„约车）
                if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())){
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                }
                // ä½œä¸šè½¦è¾†
                //待签到（预约车）
                if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                }
                //等待叫号（预约车、签到数、排队车）
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                    data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
                }
                //入园等待（预约车、签到数）
                if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                }
                //已叫号（预约车、签到数、已叫号）
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.CALLED.getKey()) ){
                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                    data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
                }
                // ä½œä¸šè½¦è¾†ï¼ˆé¢„约车、签到数、已叫号、作业车）
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                    data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setWorkedNum(data.getWorkedNum()+Constants.formatIntegerNum(model.getCountum()));
                }
                // ä½œä¸šå®Œæˆï¼ˆé¢„约车、签到数、已叫号、作业车、已完成）
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                    data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setWorkedNum(data.getWorkedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setDoneNum(data.getDoneNum()+Constants.formatIntegerNum(model.getCountum()));
                }
                // è½¬ç§»ä¸­ï¼ˆé¢„约车、签到数、排队车）
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())){
                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                    data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
                }
                // å·²æŽˆæƒç¦»å›­ï¼ˆé¢„约车、签到数、已叫号、作业车、已完成）
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                    data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setWorkedNum(data.getWorkedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setDoneNum(data.getDoneNum()+Constants.formatIntegerNum(model.getCountum()));
                }
                // å·²ç¦»å›­
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())){
                    data.setWorkingCar(data.getWorkingCar()+Constants.formatIntegerNum(model.getCountum()));
                }
                //排队车辆
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
                        ||Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
                     data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
                // å·²è¿‡å·ï¼ˆé¢„约车、签到数、排队车）
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.OVER_NUMBER.getKey())){
                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                    data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
                }
                // å·²å–消(预约车）
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.CANCEL.getKey())){
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                }

            }
        }


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

@@ -10,9 +10,8 @@
import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
import com.doumee.core.tms.model.response.TmsOrderListResponse;
import com.doumee.dao.web.response.platformReport.CarmeraListVO;
import com.doumee.dao.web.response.platformReport.OnSitDispatchBoardVO;
import com.doumee.dao.web.response.platformReport.RegionTreeVO;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.web.response.platformReport.*;

import java.util.List;

@@ -37,4 +36,12 @@
    List<PageSensorStatusResponse> sensorStatusList();

    OnSitDispatchBoardVO getCnddCenterData();

    List<PlatformGroupFinishVO> platformGroupFinish();

    CarWorkSituationVO carWorkSituation(int limit);

    List<PlatformWarnEvent> warningList(int limit);

    List<PlatformDurationVO> platformDuration();
}