修复bug

jiangping

2024-08-13 6765787baa5e0b771d71f865c4deb776367410c4

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

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

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;
@@ -12,12 +15,15 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;

/**
@@ -30,6 +36,8 @@

    @Autowired
    private ParkBookMapper parkBookMapper;
    @Autowired
    private HkSyncParkServiceImpl hkSyncParkService;

    @Autowired
    private ParkBookJoinMapper parkBookJoinMapper;
@@ -44,7 +52,15 @@

    @Override
    public void deleteById(Integer id) {
        parkBookMapper.deleteById(id);
        LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        ParkBook parkBook = new ParkBook();
        parkBook.setIsdeleted(Constants.ZERO);
        parkBook.setEditDate(new Date());
        parkBook.setParkId(id);
        parkBook.setEditor(user.getId());
        parkBook.setHkStatus(Constants.ZERO);
        parkBook.setRemark("待同步安防平台");
        parkBookMapper.updateById(parkBook);
    }

    @Override
@@ -80,6 +96,22 @@
    public ParkBook findById(Integer id) {
        return parkBookMapper.selectById(id);
    }
    @Override
    public void reUpdate(ParkBook param) {
        MPJLambdaWrapper<ParkBook> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(ParkBook.class);
        queryWrapper.selectAs(Parks::getHkId,ParkBook::getParkHkId);
        queryWrapper.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
        queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
        queryWrapper.eq(ParkBook::getHkStatus,Constants.ZERO)
                .eq(ParkBook::getIsdeleted,Constants.ZERO)
                .eq(ParkBook::getId,param.getId());
        ParkBook model = parkBookJoinMapper.selectJoinOne(ParkBook.class,queryWrapper);
       if(model== null){
           throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"该记录当前不支持重新下发条件！");
       }
        hkSyncParkService.syncParkBookBySingleModel(model);
    }

    @Override
    public ParkBook findOne(ParkBook parkBook) {
@@ -98,7 +130,7 @@
        IPage<ParkBook> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<ParkBook> queryWrapper = new MPJLambdaWrapper<>();

        queryWrapper.selectAll(Cars.class);
        queryWrapper.selectAll(ParkBook.class);
        queryWrapper.selectAs(Parks::getName,Cars::getParksName);
        queryWrapper.selectAs(Member::getType,Cars::getMemberType);
        queryWrapper.selectAs(Member::getName,Cars::getMemberName);
@@ -109,10 +141,13 @@
        queryWrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);

        queryWrapper.eq(ParkBook::getIsdeleted, Constants.ZERO)
        queryWrapper
//                .eq(ParkBook::getIsdeleted, Constants.ZERO)
          .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getMemberName())
                .or().like(Member::getName,pageWrap.getModel().getMemberName()));
        queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCarCode()),ParkBook::getCarCode,pageWrap.getModel().getCarCode());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarCode()),ParkBook::getCarCode,pageWrap.getModel().getCarCode());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParksName()),Parks::getName,pageWrap.getModel().getParksName());
        queryWrapper.orderByDesc(ParkBook::getCreateDate);

        IPage<ParkBook> result = parkBookJoinMapper.selectJoinPage(page, ParkBook.class,queryWrapper);