车辆管理bug

zhanghua

2022-10-25 a26d2f7359a163c37edef8ea545f77a773bedc84

车辆管理bug

 ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java

@@ -7,6 +7,7 @@
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.dto.carManage.CarEnforcecarVo;
import com.ycl.entity.carManage.CarEnforcecar;
import com.ycl.entity.carManage.CarSlagcar;
import com.ycl.enums.common.ResultCode;
@@ -17,6 +18,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
@@ -38,15 +41,11 @@

    @ApiOperation(value = "查询执法车")
    @GetMapping("/query_enforce")
    public CommonResult searchEnforceCar(@RequestParam(required = false) String carNum,
                                         @RequestParam Integer size,
                                         @RequestParam Integer current) {
        Page<CarEnforcecar> carEnforcecarPage = new Page<>();
        carEnforcecarPage.setSize(size);
        carEnforcecarPage.setCurrent(current);
        return CommonResult.success(iCarEnforcecarService
                .page(carEnforcecarPage, new LambdaQueryWrapper<CarEnforcecar>()
                        .like(StringUtils.isNotBlank(carNum), CarEnforcecar::getCarNumber, carNum)));
    public CommonResult<Page<CarEnforcecarVo>> searchEnforceCar(@RequestParam(required = false) String carNum,
                                                                @RequestParam Integer size,
                                                                @RequestParam Integer current) {
        Page<CarEnforcecarVo> page = iCarEnforcecarService.searchEnforceCar(size, current, carNum);
        return CommonResult.success(page);
    }

    @ApiOperation(value = "查询渣土车")

 ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java

@@ -61,14 +61,21 @@
    private String trajectory;

    /**
     * 所属部门大队id
     */
    @TableField("depart_id")
    private String departId;
    /**
     * 所属大队
     */
    @TableField("belong")
    @Deprecated
    private String belong;

    /**
     * 所属部门
     */
    @TableField("depart")
    @Deprecated
    private String depart;
}

 ycl-platform/src/main/java/com/ycl/mapper/carManage/CarEnforcecarMapper.java

@@ -1,7 +1,11 @@
package com.ycl.mapper.carManage;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.dto.carManage.CarEnforcecarVo;
import com.ycl.entity.carManage.CarEnforcecar;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +17,5 @@
 */
public interface CarEnforcecarMapper extends BaseMapper<CarEnforcecar> {

    List<CarEnforcecarVo> searchEnforceCar(@Param("carNum") String carNum, @Param("offset") long offset, @Param("size") long size);
}

 ycl-platform/src/main/java/com/ycl/service/carManage/ICarEnforcecarService.java

@@ -1,6 +1,8 @@
package com.ycl.service.carManage;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.carManage.CarEnforcecarVo;
import com.ycl.entity.carManage.CarEnforcecar;

/**
@@ -13,4 +15,5 @@
 */
public interface ICarEnforcecarService extends IService<CarEnforcecar> {

    Page<CarEnforcecarVo> searchEnforceCar(Integer size, Integer current, String carNum);
}

 ycl-platform/src/main/java/com/ycl/service/carManage/impl/CarEnforcecarServiceImpl.java

@@ -1,10 +1,16 @@
package com.ycl.service.carManage.impl;

import com.alibaba.excel.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.carManage.CarEnforcecarVo;
import com.ycl.entity.carManage.CarEnforcecar;
import com.ycl.mapper.carManage.CarEnforcecarMapper;
import com.ycl.service.carManage.ICarEnforcecarService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +23,18 @@
@Service
public class CarEnforcecarServiceImpl extends ServiceImpl<CarEnforcecarMapper, CarEnforcecar> implements ICarEnforcecarService {

    @Override
    public Page<CarEnforcecarVo> searchEnforceCar(Integer size, Integer current, String carNum) {
        Page<CarEnforcecarVo> page = new Page<>();
        page.setSize(size);
        page.setCurrent(current);

        List<CarEnforcecarVo> ls = baseMapper.searchEnforceCar(carNum, page.offset(), page.getSize());
        page.setRecords(ls);
        LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<CarEnforcecar>()
                .like(StringUtils.isNotBlank(carNum), CarEnforcecar::getCarNumber, carNum);
        page.setTotal(this.count(queryWrapper));

        return page;
    }
}

 ycl-platform/src/main/resources/mapper/carManage/CarEnforcecarMapper.xml

@@ -4,18 +4,38 @@

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.carManage.CarEnforcecar">
        <id column="id" property="id" />
        <result column="car_number" property="carNumber" />
        <result column="owner_name" property="ownerName" />
        <result column="vehicle_user" property="vehicleUser" />
        <result column="contact" property="contact" />
        <result column="trajectory" property="trajectory" />
        <result column="group" property="group" />
        <id column="id" property="id"/>
        <result column="car_number" property="carNumber"/>
        <result column="owner_name" property="ownerName"/>
        <result column="vehicle_user" property="vehicleUser"/>
        <result column="contact" property="contact"/>
        <result column="trajectory" property="trajectory"/>
        <result column="depart_id" property="departId"/>
    </resultMap>

    <resultMap id="VoMap" type="com.ycl.dto.carManage.CarEnforcecarVo">
        <result column="depart_name" property="departName" jdbcType="VARCHAR"/>
        <result column="p_depart_name" property="pDepartName" jdbcType="VARCHAR"/>
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, car_number, owner_name, vehicle_user, contact, trajectory, group
        id
        , car_number, owner_name, vehicle_user, contact, trajectory, group
    </sql>
    <select id="searchEnforceCar" resultType="com.ycl.dto.carManage.CarEnforcecarVo">
        SELECT ce.*,IF(p.depart_name is null ,'',d.depart_name) depart_name,IFNULL(p.depart_name,d.depart_name)
        p_depart_name
        FROM ums_car_enforcecar ce
        LEFT JOIN ums_depart d on ce.depart_id = d.id
        LEFT JOIN ums_depart p on d.parent_id = p.id
        <where>
            <if test="carNum!=null">
                ce.car_number like CONCAT('%',#{carNum},'%')
            </if>
        </where>
        order by ce.id desc
        LIMIT #{offset}, #{size}
    </select>

</mapper>