添加车辆信息下载

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 extends VehicleExcelVo {
     /**
      * 主键(uuid)
      */

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

@@ -19,7 +19,7 @@ public class VehicleExcelVo {
     /**
      * 车型
      */
-    private String VehicleType;
+    private String vehicleType;
 
 
     /**

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

@@ -2,23 +2,17 @@ package com.xxfc.platform.vehicle.biz;
 
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 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.github.wxiaoqi.security.common.vo.PageDataVO;
 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.VehicleExcel;
 import com.xxfc.platform.vehicle.pojo.VehicleExcelVo;
 import com.xxfc.platform.vehicle.pojo.VehiclePageQueryVo;
-import lombok.extern.slf4j.Slf4j;
 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;
@@ -30,16 +24,11 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
     @Autowired
     private VehicleBiz vehicleBiz;
 
-    @Autowired
-    private UserFeign userFeign;
+
 
 
     public List getByPageNotAllData(VehiclePageQueryVo vehiclePageQueryVo, List<Integer> companyList) throws Exception {
         Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
-        Integer pageSize = (Integer) params.get("limit");
-        params.remove("pageSize");
-        Integer pageNo = (Integer) params.get("page");
-        params.remove("pageNo");
         //处理预定日期相关参数
         vehicleBiz.adjustBookedInfoParam(params, vehiclePageQueryVo);
         if (companyList != null && companyList.size() > 0) {
@@ -53,26 +42,21 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
     public List getByPage(VehiclePageQueryVo vehiclePageQueryVo) throws Exception  {
 
         Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
-        Integer pageSize = (Integer) params.get("limit");
-        params.remove("pageSize");
-        Integer pageNo = (Integer) params.get("page");
-        params.remove("pageNo");
         //处理预定日期相关参数
         vehicleBiz.adjustBookedInfoParam(params, vehiclePageQueryVo);
         params.get("yearMonthAndParam");
         if (vehiclePageQueryVo.getModelId() == null) {
             params.remove("modelId");
         }
-        PageHelper.startPage(pageNo, pageSize);
         return  mapper.getByPage(params);
-
     }
 
     public List<VehicleExcelVo> getList(String vehiclePageQueryVoJson, UserDTO userDTO) {
-        VehiclePageQueryVo vehiclePageQueryVo = null;
+        VehiclePageQueryVo vehiclePageQueryVo = new VehiclePageQueryVo();
         try {
+            if (StringUtils.isNotBlank(vehiclePageQueryVoJson)){
                 vehiclePageQueryVo = JSON.parseObject(vehiclePageQueryVoJson, VehiclePageQueryVo.class);
-
+            }
             if (userDTO != null) {
                 if (userDTO.getDataAll() == 2) {
                     List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());

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.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -11,6 +14,7 @@ import com.xxfc.platform.vehicle.common.BaseController;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import com.xxfc.platform.vehicle.pojo.VehicleExcelVo;
 import com.xxfc.platform.vehicle.pojo.VehiclePageQueryVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +23,9 @@ 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.io.IOException;
 import java.util.List;
 
 
@@ -36,10 +43,31 @@ public class VehicleInformationDownloadController extends BaseController<Vehicle
     @Autowired
     private VehicleBiz vehicleBiz;
 
+    @Autowired
+    HttpServletResponse response;
 
     @GetMapping("/excel")
-    public void downloadExcel(@RequestParam String vehiclePageQueryVoJson)  {
+    public void downloadExcel(@RequestParam(value = "vehiclePageQueryVoJson",required = false) String vehiclePageQueryVoJson) throws IOException {
         UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
-        List rows = baseBiz.getList(vehiclePageQueryVoJson, userDTO);
+        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("parkBranchCompanyId", "停靠分公司");
+        // 一次性写出内容，使用默认样式，强制输出标题
+        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">
@@ -213,7 +215,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 +231,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">