【报表】批量导出，优化

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ReportRequestAspect.java

@@ -1,6 +1,7 @@
 package com.epmet.commons.tools.aspect;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.redis.RedisUtils;
@@ -71,13 +72,13 @@ public class ReportRequestAspect {
     private void fillArgsToRequestBody(Object[] args, Map<String, Object> storedParams, Parameter[] parameters) {
         for (int i = 0; i < args.length; i++) {
             Object arg = args[i];
-            //Class<?> argClazz = arg.getClass();
             RequestBody requestBodyAnno = parameters[i].getAnnotation(RequestBody.class);
             if (arg != null && requestBodyAnno != null) {
                 Object argBean = BeanUtil.mapToBean(storedParams, arg.getClass(), true);
 
-                // 分页参数需要从
-                BeanUtil.copyProperties(argBean, arg, "pageSize", "pageNo", "isPage");
+                // "pageSize", "pageNo", "isPage"三个属性不从redis拷贝，而是取传递雇来的
+                // redis里面的字段如果是null，则不会赋值给arg
+                BeanUtil.copyProperties(argBean, arg, new CopyOptions(null, true, "pageSize", "pageNo", "isPage"));
                 return;
             }
         }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ReportHouseTestFormDTO.java

@@ -8,5 +8,6 @@ public class ReportHouseTestFormDTO {
     private Integer pageNo = 1;
     private Integer pageSize = 20;
     private String id;
+    private String test;
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ReportController.java

@@ -2,6 +2,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.ReportRequest;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.ReportHouseTestFormDTO;
 import com.epmet.dto.result.ReportHouseTestResultDTO;
@@ -9,6 +10,8 @@ import com.epmet.service.HouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
 @RestController
 @RequestMapping("report")
 public class ReportController {
@@ -16,6 +19,9 @@ public class ReportController {
     @Autowired
     private HouseService houseService;
 
+    @Autowired
+    private RedisUtils redisUtils;
+
     /**
      * todo 测试用的
      * @return
@@ -28,4 +34,12 @@ public class ReportController {
         return new Result<PageData<ReportHouseTestResultDTO>>().ok(pageData);
     }
 
+    @PostMapping("put")
+    public void put() {
+        final HashMap<String, Object> m = new HashMap<>();
+        m.put("test", "aaa");
+
+        redisUtils.hMSet("ttt", m);
+    }
+
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/ReportBatchExportFormDTO.java

@@ -2,6 +2,8 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 报表批量导出form dto
  */
@@ -9,7 +11,10 @@ import lombok.Data;
 public class ReportBatchExportFormDTO {
 
     //private String token;
+
     private String paramKey;
+
+    @NotBlank(message = "reportId必填")
     private String reportId;
 
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java

@@ -90,7 +90,7 @@ public class IcCustomerReportController {
      */
     @PostMapping("batch-export")
     public void batchExport(@RequestBody ReportBatchExportFormDTO input, HttpServletResponse response) {
-
+        ValidatorUtils.validateEntity(input);
         String reportId = input.getReportId();
         String paramKey = input.getParamKey();