最新版本

jiangping

2024-05-23 37f9d55f69d393b729b7775d65810836e64171e7

最新版本

 admin/src/components/business/OperaCarAuthWindow.vue

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

@@ -38,6 +38,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:cars:create")
    public ApiResponse create(@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        cars.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(carsService.create(cars));
    }

@@ -45,7 +46,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:cars:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        carsService.deleteById(id);
        carsService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -58,7 +59,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        carsService.deleteByIdInBatch(idList);
        carsService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -66,6 +67,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:cars:update")
    public ApiResponse updateById(@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        cars.setLoginUserInfo(this.getLoginUser(token));
        carsService.updateById(cars);
        return ApiResponse.success(null);
    }

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

@@ -29,7 +29,7 @@

    @ApiModelProperty(value = "创建人编码")
    @ExcelColumn(name="创建人编码")
    private String creator;
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
@@ -37,7 +37,7 @@

    @ApiModelProperty(value = "更新人编码")
    @ExcelColumn(name="更新人编码")
    private String edirot;
    private Integer edirot;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
@@ -67,9 +67,6 @@
    @ExcelColumn(name="车库编码（关联parks)")
    private Integer parkId;

    @ApiModelProperty(value = "海康标识", example = "1")
    @ExcelColumn(name="海康标识")
    private String hkId2;

    @ApiModelProperty(value = "海康同步状态 0未同步 1已同步", example = "1")
    @ExcelColumn(name="海康同步状态 0未同步 1已同步")
@@ -148,6 +145,9 @@
    @ExcelColumn(name="姓名")
    @TableField(exist = false)
    private String memberName;
    @ApiModelProperty(value = "车主海康编码", example = "1")
    @TableField(exist = false)
    private String memberHkId;

    @ApiModelProperty(value = "手机号", example = "1")
    @ExcelColumn(name="手机号")

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.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.admin.request.CarsQuery;
@@ -27,7 +28,7 @@
     *
     * @param id 主键
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * 删除
@@ -41,7 +42,7 @@
     *
     * @param ids 主键集
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * 主键更新

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

@@ -4,6 +4,9 @@
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.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;
@@ -11,18 +14,24 @@
import com.doumee.dao.admin.request.CarsQuery;
import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.join.CarJoinMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.CarsService;
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.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.UUID;

/**
 * 车辆信息表Service实现
@@ -37,19 +46,107 @@

    @Autowired
    private CarJoinMapper carJoinMapper;
    @Autowired
    private MemberMapper memberMapper;

    @Autowired
    private ParkBookJoinMapper parkBookJoinMapper;

    @Override
    public Integer create(Cars cars) {
        carsMapper.insert(cars);
        return cars.getId();
    public Integer create(Cars model) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(loginUserInfo == null){
            loginUserInfo = model.getLoginUserInfo();
        }
        if(StringUtils.isNotBlank(model.getCode())
            ||model.getType()==null
            ||model.getType()<0
            ||model.getType()>3
        ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(model.getMemberId()!=null){
            //检查车主信息
            Member member =memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                    .eq(Member::getId,model.getMemberId() )
                    .eq(Member::getType,Constants.TWO )
                    .eq(Member::getIsdeleted,Constants.ZERO)
                    .last("limit 1"));
            if(member == null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，车主信息不存在，请返回刷新重试!");
            }
            model.setMemberHkId(member.getHkId());
        }
        //检查车牌号是否重复
        if(carsMapper.selectCount(new QueryWrapper<Cars>().lambda()
                .eq(Cars::getCode,model.getCode() )
                .eq(Cars::getIsdeleted,Constants.ZERO )
        ) >0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，车辆已经录入，不能重复录入!");
        }
        model.setType(Constants.formatIntegerNum(model.getType()));
        model.setCreateDate(new Date());
        model.setCreator(loginUserInfo.getId());
        model.setEditDate(new Date());
        model.setEdirot(loginUserInfo.getId());
        model.setStatus(Constants.ZERO);
        model.setIsdeleted(Constants.ZERO);
        model.setHkStatus(Constants.ZERO);
        model.setRemark("");
//        model.setHkDate(model.getCreateDate());
//        model.setHkId(UUID.randomUUID().toString().replace("-",""));
        carsMapper.insert(model);

        return model.getId();
    }

    @Override
    public void deleteById(Integer id) {
        carsMapper.deleteById(id);
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void deleteById(Integer id, LoginUserInfo user) {
        Cars car = carJoinMapper.selectById(id);
        if(car ==null ||Constants.equalsInteger(car.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，车辆信息不存在！");

        }
        Date date = new Date();
        //删除已授权下发的包期授权
        dealCancelBookBiz(car.getCode(),date);
        Cars model = new Cars();
        model.setEditDate(date);
        model.setEdirot(user.getId());
        model.setId(id);
        model.setIsdeleted(Constants.ONE);
        carsMapper.updateById(model);
    }
    public   boolean  dealCancelBookBiz(String code,Date date){

        List<ParkBook> parkBooks = parkBookJoinMapper.selectJoinList(ParkBook.class,new MPJLambdaWrapper<ParkBook>()
                    .selectAll(ParkBook.class )
                    .selectAs(Parks::getHkId,ParkBook::getParkHkId )
                .leftJoin(Parks.class,Parks::getId,ParkBook::getParkHkId)
                .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){
                        throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，取消已下发授权失败，请联系管理员处理~");
                    }
                    c.setHkStatus(Constants.ONE);
                    c.setRemark("取消包期成功");
                }else{
                    c.setHkStatus(Constants.TWO);//下发失败
                    c.setRemark("无效停车场授权下发，取消包期失败，直接删除记录");
                }
                c.setHkDate(date);
                c.setIsdeleted(Constants.ONE);
                parkBookJoinMapper.updateById(c);
            }
        }
        return true;
    }

    @Override
@@ -59,16 +156,63 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        carsMapper.deleteBatchIds(ids);
        for(Integer id : ids){
            deleteById(id,user);
        }
    }

    @Override
    public void updateById(Cars cars) {
        carsMapper.updateById(cars);
    public void updateById(Cars model) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(loginUserInfo == null){
            loginUserInfo = model.getLoginUserInfo();
        }
        if(StringUtils.isNotBlank(model.getCode())
                ||model.getId()==null
                ||model.getType()==null
                ||model.getType()<0
                ||model.getType()>3
        ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Cars car = carJoinMapper.selectById(model.getId());
        if(car ==null ||Constants.equalsInteger(car.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，车辆信息不存在！");

        }
        if(model.getMemberId()!=null){
            //检查车主信息
            Member member =memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                    .eq(Member::getId,model.getMemberId() )
                    .eq(Member::getType,Constants.TWO )
                    .eq(Member::getIsdeleted,Constants.ZERO)
                    .last("limit 1"));
            if(member == null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，车主信息不存在，请返回刷新重试!");
            }
            model.setMemberHkId(member.getHkId());
        }
        //检查车牌号是否重复
        if(carsMapper.selectCount(new QueryWrapper<Cars>().lambda()
                .eq(Cars::getCode,model.getCode() )
                .ne(Cars::getId,model.getId() )
                .eq(Cars::getIsdeleted,Constants.ZERO )
        ) >0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，车辆已经录入，不能重复录入!");
        }
        model.setType(Constants.formatIntegerNum(model.getType()));
        model.setEditDate(new Date());
        model.setEdirot(loginUserInfo.getId());
        model.setIsdeleted(Constants.ZERO);
        model.setHkStatus(Constants.ZERO);
        model.setRemark("");
        dealCancelBookBiz(model.getCode(),model.getEditDate());
        carsMapper.updateById(model);
    }

    @Override

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

@@ -152,7 +152,7 @@
            return  false;
        }
    }
    private boolean cancelParkBookHk(ParkBook c) {
    public static boolean cancelParkBookHk(ParkBook c) {
        CarChargeDelRequest param = new CarChargeDelRequest();
        param.setPlateNo(c.getCarCode());
        param.setParkSyscode(c.getParkHkId());