..

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyIssueFormDTO.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;
@@ -14,6 +16,8 @@ import java.util.List;
 public class AgencyIssueFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    public interface AgencyIssueForm extends CustomerClientShowGroup{}
+
     /**
      * 为true时需要删除历史数据
      */
@@ -21,6 +25,7 @@ public class AgencyIssueFormDTO implements Serializable {
     /**
      * 数据集合对象
      */
+    @NotEmpty(message = "数据集合对象不能为空",groups = AgencyIssueForm.class)
     private List<DataList> dataList;
 
     @Data

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyProjectFormDTO.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.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -14,6 +17,8 @@ import java.util.List;
 public class AgencyProjectFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    public interface AgencyProjectForm extends CustomerClientShowGroup {}
+
     /**
      * 为true时需要删除历史数据
      */
@@ -21,6 +26,7 @@ public class AgencyProjectFormDTO implements Serializable {
     /**
      * 数据集合对象
      */
+    @NotEmpty(message = "数据集合对象不能为空",groups = AgencyProjectForm.class)
     private List<DataList> dataList;
 
     @Data

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridProjectFormDTO.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;
@@ -14,6 +16,8 @@ import java.util.List;
 public class GridProjectFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    public interface GridProjectForm extends CustomerClientShowGroup {}
+
     /**
      * 为true时需要删除历史数据
      */
@@ -21,6 +25,7 @@ public class GridProjectFormDTO implements Serializable {
     /**
      * 数据集合对象
      */
+    @NotEmpty(message = "数据集合对象不能为空",groups = GridProjectForm.class)
     private List<DataList> dataList;
 
     @Data

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

@@ -155,6 +155,7 @@ public class BaseReportController {
      */
     @PostMapping("agencyissue")
     public Result agencyIssue(@RequestBody AgencyIssueFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AgencyIssueFormDTO.AgencyIssueForm.class);
         baseReportService.agencyIssue(formDTO);
         return new Result();
     }
@@ -166,6 +167,7 @@ public class BaseReportController {
      */
     @PostMapping("gridproject")
     public Result gridProject(@RequestBody GridProjectFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GridProjectFormDTO.GridProjectForm.class);
         baseReportService.gridProject(formDTO);
         return new Result();
     }
@@ -177,6 +179,7 @@ public class BaseReportController {
      */
     @PostMapping("agencyproject")
     public Result agencyProject(@RequestBody AgencyProjectFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AgencyProjectFormDTO.AgencyProjectForm.class);
         baseReportService.agencyProject(formDTO);
         return new Result();
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java

@@ -203,10 +203,6 @@ public class BaseReportServiceImpl implements BaseReportService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void agencyIssue(AgencyIssueFormDTO formDTO) {
-        if (CollectionUtils.isEmpty(formDTO.getDataList())){
-            log.warn(String.format(BaseReportConstant.DATA_IS_NULL),"组织议题");
-            return;
-        }
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
@@ -227,10 +223,6 @@ public class BaseReportServiceImpl implements BaseReportService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void gridProject(GridProjectFormDTO formDTO) {
-        if (CollectionUtils.isEmpty(formDTO.getDataList())){
-            log.warn(String.format(BaseReportConstant.DATA_IS_NULL),"网格项目");
-            return;
-        }
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
@@ -250,10 +242,6 @@ public class BaseReportServiceImpl implements BaseReportService {
      */
     @Override
     public void agencyProject(AgencyProjectFormDTO formDTO) {
-        if (CollectionUtils.isEmpty(formDTO.getDataList())){
-            log.warn(String.format(BaseReportConstant.DATA_IS_NULL),"组织项目");
-            return;
-        }
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {