添加车辆信息下载

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 extends VehicleExcelVo {
+public class ResultVehicleVo extends VehicleExcelVo  {
     /**
      * 主键(uuid)
      */
@@ -26,6 +26,12 @@ public class ResultVehicleVo extends VehicleExcelVo {
      */
     private String numberPlate;
 
+
+    /**
+     * 车型
+     */
+    private String vehicleType;
+
     /**
      * 品牌（编码，对应关系见相关常量），0-未填写
      */

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

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 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.PropertyUtils;
@@ -36,7 +37,8 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
         } else {
             params.put("companyList", Arrays.asList(-1));
         }
-        return mapper.getByPageNotAllData(params);
+
+        return  mapper.getByPageNotAllData(params);
     }
 
     public List getByPage(VehiclePageQueryVo vehiclePageQueryVo) throws Exception  {

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

@@ -12,9 +12,9 @@ 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);
 
     public int updateStatusById(Map<String, Object> params);
 

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

@@ -8,15 +8,19 @@ import com.alibaba.fastjson.JSONException;
 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.google.common.collect.Lists;
 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.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.pojo.ResultVehicleVo;
 import com.xxfc.platform.vehicle.pojo.VehicleExcelVo;
 import com.xxfc.platform.vehicle.pojo.VehiclePageQueryVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtilsBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,6 +30,8 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -47,7 +53,7 @@ public class VehicleInformationDownloadController extends BaseController<Vehicle
     HttpServletResponse response;
 
     @GetMapping("/excel")
-    public void downloadExcel(@RequestParam(value = "vehiclePageQueryVoJson",required = false) String vehiclePageQueryVoJson) throws IOException {
+    public void downloadExcel(@RequestParam(value = "vehiclePageQueryVoJson",required = false) String vehiclePageQueryVoJson) throws IOException, InvocationTargetException, IllegalAccessException {
         UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
         List<VehicleExcelVo> rows = baseBiz.getList(vehiclePageQueryVoJson, userDTO);
         ExcelWriter writer = ExcelUtil.getWriter(true);