嵌套异常调整，入参非空判断

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyGroupTotalFormDTO.java

@@ -1,7 +1,9 @@
 package com.epmet.dto.basereport.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.List;
 
@@ -12,19 +14,20 @@ import java.util.List;
 @Data
 public class AgencyGroupTotalFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 数据集合对象
+     */
+    @NotEmpty(message = "至少有一条数据", groups = {GridGroupTotalFormDTO.saveList.class})
+    private List<DataList> dataList;
 
     /**
      * 为true时需要删除历史数据
      */
     private Boolean isFirst;
-    /**
-     * 数据集合对象
-     */
-    private List<DataList> dataList;
+    public interface saveList extends CustomerClientShowGroup {}
 
     @Data
-    public class DataList implements Serializable {
-        private static final long serialVersionUID = 1L;
+    public static class DataList {
 
         /**
          * 客户ID

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyHotTopicFormDTO.java

@@ -1,7 +1,9 @@
 package com.epmet.dto.basereport.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.List;
 
@@ -12,19 +14,20 @@ import java.util.List;
 @Data
 public class AgencyHotTopicFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 数据集合对象
+     */
+    @NotEmpty(message = "至少有一条数据", groups = {GridGroupTotalFormDTO.saveList.class})
+    private List<DataList> dataList;
 
     /**
      * 为true时需要删除历史数据
      */
     private Boolean isFirst;
-    /**
-     * 数据集合对象
-     */
-    private List<DataList> dataList;
+    public interface saveList extends CustomerClientShowGroup {}
 
     @Data
-    public class DataList implements Serializable {
-        private static final long serialVersionUID = 1L;
+    public static class DataList {
 
         /**
          * 客户ID

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyRegUserFormDTO.java

@@ -1,7 +1,9 @@
 package com.epmet.dto.basereport.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -13,19 +15,20 @@ import java.util.List;
 @Data
 public class AgencyRegUserFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 数据集合对象
+     */
+    @NotEmpty(message = "至少有一条数据", groups = {GridGroupTotalFormDTO.saveList.class})
+    private List<DataList> dataList;
 
     /**
      * 为true时需要删除历史数据
      */
     private Boolean isFirst;
-    /**
-     * 数据集合对象
-     */
-    private List<DataList> dataList;
+    public interface saveList extends CustomerClientShowGroup {}
 
     @Data
-    public class DataList implements Serializable {
-        private static final long serialVersionUID = 1L;
+    public static class DataList {
 
         /**
          * 客户id

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridGroupTotalFormDTO.java

@@ -1,7 +1,10 @@
 package com.epmet.dto.basereport.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -13,20 +16,19 @@ import java.util.List;
 @Data
 public class GridGroupTotalFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
-
-    /**
-     * 为true时需要删除历史数据
-     */
-    private Boolean isFirst;
     /**
      * 数据集合对象
      */
+    @NotEmpty(message = "至少有一条数据", groups = {saveList.class})
     private List<DataList> dataList;
+    /**
+     * 为true时需要删除历史数据
+     */
+    private Boolean isFirst;
+    public interface saveList extends CustomerClientShowGroup {}
 
     @Data
-    public class DataList implements Serializable {
-        private static final long serialVersionUID = 1L;
-
+    public static class DataList {
         /**
          * 客户ID
          */

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridHotTopicFormDTO.java

@@ -1,7 +1,9 @@
 package com.epmet.dto.basereport.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.List;
 
@@ -12,19 +14,20 @@ import java.util.List;
 @Data
 public class GridHotTopicFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 数据集合对象
+     */
+    @NotEmpty(message = "至少有一条数据", groups = {GridGroupTotalFormDTO.saveList.class})
+    private List<DataList> dataList;
 
     /**
      * 为true时需要删除历史数据
      */
     private Boolean isFirst;
-    /**
-     * 数据集合对象
-     */
-    private List<DataList> dataList;
+    public interface saveList extends CustomerClientShowGroup {}
 
     @Data
-    public class DataList implements Serializable {
-        private static final long serialVersionUID = 1L;
+    public static class DataList {
 
         /**
          * 客户ID

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridRegUserFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.basereport.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.epmet.dto.indexcollect.form.GridPartyAbilityFormDTO;
 import lombok.Data;
 
@@ -15,19 +16,20 @@ import java.util.List;
 @Data
 public class GridRegUserFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 数据集合对象
+     */
+    @NotEmpty(message = "至少有一条数据", groups = {GridGroupTotalFormDTO.saveList.class})
+    private List<DataList> dataList;
 
     /**
      * 为true时需要删除历史数据
      */
     private Boolean isFirst;
-    /**
-     * 数据集合对象
-     */
-    private List<DataList> dataList;
+    public interface saveList extends CustomerClientShowGroup {}
 
     @Data
-    public class DataList implements Serializable {
-        private static final long serialVersionUID = 1L;
+    public static class DataList {
 
         /**
          * 客户id

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/BaseReportController.java

@@ -1,10 +1,14 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.basereport.form.*;
 import com.epmet.service.BaseReportService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Author sun
@@ -24,6 +28,7 @@ public class BaseReportController {
      */
     @PostMapping("gridreguser")
     public Result gridRegUser(@RequestBody GridRegUserFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GridRegUserFormDTO.saveList.class);
         baseReportService.gridRegUser(formDTO);
         return new Result();
     }
@@ -35,6 +40,7 @@ public class BaseReportController {
      */
     @PostMapping("agencyreguser")
     public Result agencyRegUser(@RequestBody AgencyRegUserFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AgencyRegUserFormDTO.saveList.class);
         baseReportService.agencyRegUser(formDTO);
         return new Result();
     }
@@ -46,6 +52,7 @@ public class BaseReportController {
      */
     @PostMapping("gridgrouptotal")
     public Result gridGroupTotal(@RequestBody GridGroupTotalFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GridGroupTotalFormDTO.saveList.class);
         baseReportService.gridGroupTotal(formDTO);
         return new Result();
     }
@@ -57,6 +64,7 @@ public class BaseReportController {
      */
     @PostMapping("agencygrouptotal")
     public Result agencyGroupTotal(@RequestBody AgencyGroupTotalFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AgencyGroupTotalFormDTO.saveList.class);
         baseReportService.agencyGroupTotal(formDTO);
         return new Result();
     }
@@ -68,6 +76,7 @@ public class BaseReportController {
      */
     @PostMapping("gridhottopic")
     public Result gridHotTopic(@RequestBody GridHotTopicFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GridHotTopicFormDTO.saveList.class);
         baseReportService.gridHotTopic(formDTO);
         return new Result();
     }
@@ -79,6 +88,7 @@ public class BaseReportController {
      */
     @PostMapping("agencyhottopic")
     public Result agencyHotTopic(@RequestBody AgencyHotTopicFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AgencyHotTopicFormDTO.saveList.class);
         baseReportService.agencyHotTopic(formDTO);
         return new Result();
     }