Browse Source

1、运力导出接口调整;

zk 2 năm trước cách đây
mục cha
commit
4b79a15ece

+ 3 - 5
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfDriverController.java

@@ -4,13 +4,11 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.fleet.model.dto.*;
 import com.sckw.fleet.model.vo.*;
@@ -18,6 +16,7 @@ import com.sckw.fleet.service.KwfDriverService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -125,13 +124,12 @@ public class KwfDriverController {
      * @author zk
      * @date 2023/07/11
      **/
-    @PostMapping("/export")
-    public void export(@RequestBody Map<String, Object> params) {
+    @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
+    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         /**分页数据**/
         List<KwfDriverVo> drivers = driverService.findPage(params);
 
         if (!CollectionUtils.isEmpty(drivers)) {
-            HttpServletResponse response = RequestHolder.getResponse();
             ExcelUtil.downData(response, KwfDriverVo.class, drivers);
             //return null;
         }

+ 3 - 3
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfFleetController.java

@@ -16,6 +16,7 @@ import com.sckw.fleet.service.KwfFleetService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
@@ -78,14 +79,13 @@ public class KwfFleetController {
      * @author zk
      * @date 2023/07/11
      **/
-    @PostMapping("/export")
-    public HttpResult export(@RequestBody Map<String, Object> params) {
+    @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         params.put("entId", LoginUserHolder.getEntId());
         /**查询分页数据**/
         List<KwfFleetVo> fleets = fleetService.findPage(params);
 
         if (!CollectionUtils.isEmpty(fleets)) {
-            HttpServletResponse response = RequestHolder.getResponse();
             ExcelUtil.downData(response, KwfFleetVo.class, fleets);
             return null;
         }

+ 3 - 3
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -27,6 +27,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.BufferedReader;
@@ -136,13 +137,12 @@ public class KwfTruckController {
      * @author zk
      * @date 2023/07/11
      **/
-    @PostMapping("/export")
-    public HttpResult export(@RequestBody Map<String, Object> params) {
+    @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         /**查询数据**/
         List<KwfTruckVo> trucks = truckService.findPage(params);
 
         if (!CollectionUtils.isEmpty(trucks)) {
-            HttpServletResponse response = RequestHolder.getResponse();
             ExcelUtil.downData(response, KwfTruckVo.class, trucks);
             return null;
         }

+ 3 - 3
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckReportController.java

@@ -18,6 +18,7 @@ import com.sckw.fleet.service.KwfTruckReportService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -71,14 +72,13 @@ public class KwfTruckReportController {
      * @author zk
      * @date 2023/07/18
      **/
-    @PostMapping("/export")
-    public HttpResult export(@RequestBody Map<String, Object> params) {
+    @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         params.put("entId", LoginUserHolder.getEntId());
         /**查询数据**/
         List<KwfTruckReportVo> trucks = reportService.findPage(params);
 
         if (!CollectionUtils.isEmpty(trucks)) {
-            HttpServletResponse response = RequestHolder.getResponse();
             ExcelUtil.downData(response, KwfTruckReportVo.class, trucks);
             return null;
         }

+ 7 - 2
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfDriverVo.java

@@ -5,7 +5,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
-
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -14,8 +16,11 @@ import java.util.Date;
  * @date 2023/7/7 0007
  */
 @Data
+@Accessors(chain = true)
 @ExcelContext(fileName = "司机信息", sheetName = "司机信息")
-public class KwfDriverVo {
+public class KwfDriverVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419412386L;
 
     /**
      * 司机主键id

+ 7 - 1
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfFleetVo.java

@@ -4,6 +4,9 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import java.io.Serializable;
 
 /**
  * @author zk
@@ -11,8 +14,11 @@ import lombok.Data;
  * @date 2023/7/6 0006
  */
 @Data
+@Accessors(chain = true)
 @ExcelContext(fileName = "车队班组信息", sheetName = "车队班组信息")
-public class KwfFleetVo {
+public class KwfFleetVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419412686L;
 
     /**
      * 主键id

+ 7 - 1
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfTruckReportVo.java

@@ -4,6 +4,9 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import java.io.Serializable;
 
 /**
  * @desc 车辆上报
@@ -11,8 +14,11 @@ import lombok.Data;
  * @date 2023/7/15
  */
 @Data
+@Accessors(chain = true)
 @ExcelContext(fileName = "车辆上报信息", sheetName = "车辆上报信息")
-public class KwfTruckReportVo {
+public class KwfTruckReportVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419412486L;
 
     /**
      * 车辆主键id

+ 7 - 2
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfTruckVo.java

@@ -5,7 +5,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
-
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -14,8 +16,11 @@ import java.util.Date;
  * @date 2023/7/11 0011
  */
 @Data
+@Accessors(chain = true)
 @ExcelContext(fileName = "车辆信息", sheetName = "车辆信息")
-public class KwfTruckVo {
+public class KwfTruckVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419412586L;
 
     /**
      * 车辆信息主键id