Merge branch 'master-background-manager' into dev

xx-vehicle/xx-vehicle-api/pom.xml

@@ -17,7 +17,6 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-
     </dependencies>
     <build>
         <plugins>

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java

@@ -151,6 +151,24 @@ public class  Vehicle {
     @Column(name = "travel_status")
     private Integer travelStatus;
 
+    /**
+     * 终端号
+     */
+    @Column(name = "terminal_number")
+    private String terminalNumber;
+
+    /**
+     * SIM卡号
+     */
+    @Column(name = "sim_number")
+    private String simNumber;
+
+    /**
+     * 通讯类型
+     */
+    @Column(name = "communication_type")
+    private String communicationType;
+
     /**
      * 是否删除；0-正常；1-删除
      */

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/ResultVehicleVo.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-public class ResultVehicleVo {
+public class ResultVehicleVo   {
     /**
      * 主键(uuid)
      */
@@ -26,6 +26,12 @@ public class ResultVehicleVo {
      */
     private String numberPlate;
 
+
+    /**
+     * 车型
+     */
+    private String vehicleType;
+
     /**
      * 品牌（编码，对应关系见相关常量），0-未填写
      */

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleExcelVo.java

+package com.xxfc.platform.vehicle.pojo;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class VehicleExcelVo {
+
+
+    /**
+     * 车牌号，空字符串-没有
+     */
+    private String numberPlate;
+
+
+    /**
+     * 车辆编号，0-没有
+     */
+    private Integer code;
+
+    /**
+     * 车型
+     */
+    private String vehicleType;
+
+
+    /**
+     *
+     */
+    private String useType;
+
+
+    /**
+     * 停靠分支机构（名）
+     */
+    private String parkBranchCompanyName;
+
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleInformationDownloadBiz.java

+package com.xxfc.platform.vehicle.biz;
+
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageHelper;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.google.common.collect.Lists;
+import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.mapper.VehicleMapper;
+import com.xxfc.platform.vehicle.pojo.ResultVehicleVo;
+import com.xxfc.platform.vehicle.pojo.VehicleExcelVo;
+import com.xxfc.platform.vehicle.pojo.VehiclePageQueryVo;
+import org.apache.commons.beanutils.BeanUtilsBean;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicle> {
+
+    @Autowired
+    private VehicleBiz vehicleBiz;
+
+
+
+
+    public List<VehicleExcelVo> getByPageNotAllData(VehiclePageQueryVo vehiclePageQueryVo, List<Integer> companyList) throws Exception {
+        Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
+        //处理预定日期相关参数
+        vehicleBiz.adjustBookedInfoParam(params, vehiclePageQueryVo);
+        if (companyList != null && companyList.size() > 0) {
+            params.put("companyList", companyList);
+        } else {
+            params.put("companyList", Arrays.asList(-1));
+        }
+
+        return  mapper.getVehicleExcelVoNotAllData(params);
+    }
+
+    public List<VehicleExcelVo> getByPage(VehiclePageQueryVo vehiclePageQueryVo) throws Exception  {
+
+        Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
+        //处理预定日期相关参数
+        vehicleBiz.adjustBookedInfoParam(params, vehiclePageQueryVo);
+        params.get("yearMonthAndParam");
+        if (vehiclePageQueryVo.getModelId() == null) {
+            params.remove("modelId");
+        }
+        return  mapper.getVehicleExcelVo(params);
+    }
+
+    public List<VehicleExcelVo> getList(String vehiclePageQueryVoJson, UserDTO userDTO) {
+        VehiclePageQueryVo vehiclePageQueryVo = new VehiclePageQueryVo();
+        try {
+            if (StringUtils.isNotBlank(vehiclePageQueryVoJson)){
+                vehiclePageQueryVo = JSON.parseObject(vehiclePageQueryVoJson, VehiclePageQueryVo.class);
+            }
+
+                if (userDTO.getDataAll() == 2) {
+                    List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+                 return  getByPageNotAllData(vehiclePageQueryVo, companyList);
+                }
+
+          return   getByPage(vehiclePageQueryVo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new ArrayList();
+    }
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java

@@ -12,9 +12,13 @@ import java.util.Map;
 
 public interface VehicleMapper extends Mapper<Vehicle> {
 
-    public List<ResultVehicleVo> getByPage(Map<String, Object> params);
+    public   List<ResultVehicleVo> getByPage(Map<String, Object> params);
 
-    public List<ResultVehicleVo> getByPageNotAllData(Map<String, Object> params);
+    public   List<ResultVehicleVo> getByPageNotAllData(Map<String, Object> params);
+
+    List<VehicleExcelVo> getVehicleExcelVo(Map<String, Object> params);
+
+    List<VehicleExcelVo> getVehicleExcelVoNotAllData(Map<String, Object> params);
 
     public int updateStatusById(Map<String, Object> params);
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/VehicleInformationDownloadController.java

+package com.xxfc.platform.vehicle.rest.admin;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.xxfc.platform.vehicle.biz.VehicleBiz;
+import com.xxfc.platform.vehicle.biz.VehicleInformationDownloadBiz;
+import com.xxfc.platform.vehicle.common.BaseController;
+import com.xxfc.platform.vehicle.pojo.VehicleExcelVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+@RestController
+@RequestMapping("VehicleInformationDownload")
+@Slf4j
+public class VehicleInformationDownloadController extends BaseController<VehicleInformationDownloadBiz> {
+
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
+    @Autowired
+    private VehicleBiz vehicleBiz;
+
+    @Autowired
+    HttpServletResponse response;
+
+    @GetMapping("/excel")
+    public void downloadExcel(@RequestParam(value = "vehiclePageQueryVoJson",required = false) String vehiclePageQueryVoJson) throws Exception {
+        UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+        if (userDTO==null) {
+            throw  new BaseException("token已失效");
+        }
+        List<VehicleExcelVo> rows = baseBiz.getList(vehiclePageQueryVoJson, userDTO);
+        ExcelWriter writer = ExcelUtil.getWriter(true);
+        writer.addHeaderAlias("numberPlate", "车牌号");
+        writer.addHeaderAlias("code", "车辆编码");
+        writer.addHeaderAlias("vehicleType", "车型");
+        writer.addHeaderAlias("useType", "用途");
+        writer.addHeaderAlias("parkBranchCompanyName", "停靠分公司");
+        // 一次性写出内容，使用默认样式，强制输出标题
+        writer.write(rows, true);
+        //response为HttpServletResponse对象
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
+        response.setHeader("Content-Disposition", "attachment;filename=clxx.xlsx");
+        //out为OutputStream，需要写出到的目标流
+        ServletOutputStream out = response.getOutputStream();
+        writer.flush(out, true);
+        // 关闭writer，释放内存
+        writer.close();
+        //此处记得关闭输出Servlet流
+        IoUtil.close(out);
+    }
+}

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -71,7 +71,8 @@
         v.receive_time,
         v.update_time,
         v.model_id,
-        v.mileage_last_update as mileage
+        v.mileage_last_update as mileage,
+        vm.name as vehicleType
         <if test=" yearMonthAndParam != null ">
             ,vbi.booked_date
         </if>
@@ -90,6 +91,7 @@
         LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
         LEFT JOIN vehicle_book_record v2 on v2.vehicle_id = v.id
         LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
+        LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
         where
         v.is_del=0
         <if test="mRangeDateEnd !=null">
@@ -178,6 +180,7 @@
         ) r ORDER BY r.parkBranchCompanyName
     </select>
 
+
     <select id="getByPageNotAllData" parameterType="java.util.Map"
             resultType="com.xxfc.platform.vehicle.pojo.ResultVehicleVo">
         SELECT r.* FROM (
@@ -213,7 +216,8 @@
         v.receive_time,
         v.update_time,
         v.model_id,
-        v.mileage_last_update as mileage
+        v.mileage_last_update as mileage,
+        vm.name as vehicleType
         <if test=" yearMonthAndParam !=null ">
             ,vbi.booked_date
         </if>
@@ -228,6 +232,7 @@
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         -- 所属分公司
         LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
+        LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
         where
         v.is_del=0
         <if test="companyList != null">
@@ -333,6 +338,248 @@
         ) r ORDER BY r.parkBranchCompanyName
     </select>
 
+    <select id="getVehicleExcelVo" parameterType="java.util.Map"
+            resultType="com.xxfc.platform.vehicle.pojo.VehicleExcelVo">
+        SELECT r.* FROM (
+        select
+        v.`code`,
+        v.number_plate,
+        bc.name as parkBranchCompanyName,
+        c.val as useType,
+        vm.name as vehicleType
+        from vehicle v
+        <if test=" yearMonthAndParam != null  ">
+            left join
+            vehicle_book_info vbi on v.`id` = vbi.vehicle
+        </if>
+        -- LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
+        -- LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
+        -- 停车分公司
+        LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
+        -- 目的地分公司
+        LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
+        -- 所属分公司
+        LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
+        LEFT JOIN vehicle_book_record v2 on v2.vehicle_id = v.id
+        LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
+        LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
+        LEFT JOIN (select * from constant where  type = 2) c ON  v.use_type = c.code
+        where
+        v.is_del=0
+        <if test="mRangeDateEnd !=null">
+            and v.maintenance_date &lt;= #{mRangeDateEnd}
+        </if>
+        <if test="modelId != null and modelId != ''">
+            and v.model_id = #{modelId}
+        </if>
+        <if test="mRangeDateStart !=null">
+            and v.maintenance_date &gt;= #{mRangeDateStart}
+        </if>
+        <if test="aVRangeDateStart !=null">
+            and v.annual_verification_date &lt;= #{aVRangeDateEnd}
+        </if>
+        <if test="aVRangeDateEnd !=null">
+            and v.annual_verification_date &gt;= #{aVRangeDateStart}
+        </if>
+        <if test="insuranceDateRangeStart !=null">
+            and v.insurance_end_date &lt;= #{insuranceDateRangeEnd}
+        </if>
+        <if test="insuranceDateRangeEnd !=null">
+            and v.insurance_end_date &gt;= #{insuranceDateRangeStart}
+        </if>
+        <if test="insuranceCompany !=null">
+            and v.insurance_company = #{insuranceCompany}
+        </if>
+        <if test="belongToName !=null">
+            and v.belong_to_name = #{belongToName}
+        </if>
+        <if test="vin !=null and vin != ''">
+            and v.vin = #{vin}
+        </if>
+        <!--        <if test="subordinateBranch !=null">-->
+        <!--            and v.subordinate_branch = #{subordinateBranch}-->
+        <!--        </if>-->
+        <if test="code !=null">
+            and v.code = #{code}
+        </if>
+        <if test="status !=null and status != 6 and status != 7">
+            and v.status = #{status}
+        </if>
+        <if test="status !=null and status == 6">
+            and  v3.id is not NULL and v2.book_type = 3 and v3.state = 0
+        </if>
+        <if test="status !=null and status == 7">
+            and  v3.id is not NULL and v2.book_type = 6 and v3.state = 0
+        </if>
+        <if test="numberPlate !=null and numberPlate != ''">
+            and v.number_plate like concat('%',#{numberPlate},'%')
+        </if>
+        <if test="brand !=null">
+            and v.brand = #{brand}
+        </if>
+        <if test="useType !=null">
+            and v.use_type = #{useType}
+        </if>
+
+        -- 添加所属大区搜索条件
+        <if test="zoneId !=null">
+            and bc.zone_id=#{zoneId}
+        </if>
+        <!-- 若需根据预定日期条件查询，针对换为位操作  -->
+        <if test=" yearMonthAndParam !=null  ">
+            <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation">
+                and
+                ( (vbi.`year_month` = #{yearMonth} or vbi.`year_month` is null) and
+                ifnull(vbi.`booked_date`,0) &amp; #{andOperation.andOperationFactor} = #{andOperation.andOperationRs}
+                )
+            </foreach>
+        </if>
+        <if test="subordinateBranch !=null ">
+            and ( v.park_branch_company_id = #{subordinateBranch})
+        </if>
+        <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
+            <if test="addrProvince !=null">
+                and bc.addr_province=#{addrProvince}
+            </if>
+            <if test="addrCity !=null">
+                and  bc.addr_city=#{addrCity}
+            </if>
+            <if test="zoneId !=null">
+                and  bc.zone_id=#{zoneId}
+            </if>
+        </if>
+        order by v.code
+        ) r ORDER BY r.parkBranchCompanyName
+    </select>
+    <select id="getVehicleExcelVoNotAllData" parameterType="java.util.Map"
+            resultType="com.xxfc.platform.vehicle.pojo.VehicleExcelVo">
+        SELECT r.* FROM (
+        select
+        v.`code`,
+        v.number_plate,
+        bc.name as parkBranchCompanyName,
+        c.val as useType,
+        vm.name as vehicleType
+        from vehicle v
+        <if test=" yearMonthAndParam !=null  ">
+            left join
+            vehicle_book_info vbi on v.`id` = vbi.vehicle
+        </if>
+        -- 停车分公司
+        LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
+        -- 目的地分公司
+        LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
+        -- 所属分公司
+        LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
+        LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
+        LEFT JOIN (select * from constant where  type = 2) c ON  v.use_type = c.code
+        where
+        v.is_del=0
+        <if test="companyList != null">
+            and ( v.park_branch_company_id in (
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
+                    #{companyId},
+                </foreach>
+            </trim>
+            )
+            <!--or v.expect_destination_branch_company_id in (
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
+                    #{companyId},
+                </foreach>
+            </trim>
+            )-->
+            <!--            or v.subordinate_branch in (-->
+            <!--            <trim suffixOverrides=",">-->
+            <!--                <foreach collection="companyList" item="companyId">-->
+            <!--                    #{companyId},-->
+            <!--                </foreach>-->
+            <!--            </trim>-->
+            )
+        </if>
+        <if test="mRangeDateEnd !=null">
+            and v.maintenance_date &lt;= #{mRangeDateEnd}
+        </if>
+        <if test="modelId != null and modelId != ''">
+            and v.model_id = #{modelId}
+        </if>
+        <if test="mRangeDateStart !=null">
+            and v.maintenance_date &gt;= #{mRangeDateStart}
+        </if>
+        <if test="aVRangeDateStart !=null">
+            and v.annual_verification_date &lt;= #{aVRangeDateEnd}
+        </if>
+        <if test="aVRangeDateEnd !=null">
+            and v.annual_verification_date &gt;= #{aVRangeDateStart}
+        </if>
+        <if test="insuranceDateRangeStart !=null">
+            and v.insurance_end_date &lt;= #{insuranceDateRangeEnd}
+        </if>
+        <if test="insuranceDateRangeEnd !=null">
+            and v.insurance_end_date &gt;= #{insuranceDateRangeStart}
+        </if>
+        <if test="insuranceCompany !=null">
+            and v.insurance_company = #{insuranceCompany}
+        </if>
+        <if test="belongToName !=null">
+            and v.belong_to_name = #{belongToName}
+        </if>
+        <if test="vin !=null and vin != ''">
+            and v.vin = #{vin}
+        </if>
+        <!--        <if test="subordinateBranch !=null">-->
+        <!--            and v.subordinate_branch = #{subordinateBranch}-->
+        <!--        </if>-->
+        <if test="code !=null">
+            and v.code = #{code}
+        </if>
+        <if test="status !=null">
+            and v.status = #{status}
+        </if>
+        <if test="numberPlate !=null and numberPlate != ''">
+            and v.number_plate like concat('%',#{numberPlate},'%')
+        </if>
+        <if test="brand !=null">
+            and v.brand = #{brand}
+        </if>
+        <if test="useType !=null">
+            and v.use_type = #{useType}
+        </if>
+        -- 添加所属大区搜索条件
+        <if test="zoneId !=null">
+            and bc.zone_id=#{zoneId}
+        </if>
+        <!-- 若需根据预定日期条件查询，针对换为位操作  -->
+        <if test=" yearMonthAndParam !=null  ">
+            <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation">
+                and
+                ( (vbi.`year_month` = #{yearMonth} or vbi.`year_month` is null) and
+                ifnull(vbi.`booked_date`,0) &amp; #{andOperation.andOperationFactor} = #{andOperation.andOperationRs}
+                )
+            </foreach>
+        </if>
+        <if test="subordinateBranch !=null ">
+            and ( v.park_branch_company_id = #{subordinateBranch} or
+            v.expect_destination_branch_company_id=#{subordinateBranch} )
+        </if>
+        <if test=" addrProvince !=null or  addrCity !=null or zoneId !=null ">
+            <if test="addrProvince !=null">
+                and bc.addr_province=#{addrProvince}
+            </if>
+            <if test="addrCity !=null">
+                and  bc.addr_city=#{addrCity}
+            </if>
+            <if test="zoneId !=null">
+                and  bc.zone_id=#{zoneId}
+            </if>
+        </if>
+        order by v.code
+        ) r ORDER BY r.parkBranchCompanyName
+    </select>
+
+
+
     <select id="lockByCode" resultType="com.xxfc.platform.vehicle.entity.Vehicle"
             parameterType="com.xxfc.platform.vehicle.pojo.AddOrUpdateVehicleVo">
         select