Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp

# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ScreenCollFormDTO.java

@@ -1,8 +1,12 @@
 package com.epmet.dto.screencoll;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.Valid;
+import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.util.List;
 
@@ -14,21 +18,47 @@ import java.util.List;
  */
 @Data
 public class ScreenCollFormDTO<T> implements Serializable {
-
     private static final long serialVersionUID = 4605543711669000348L;
+
+    /**
+     * 添加用户操作的用户可见异常分组
+     * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup
+     * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容
+     */
+    public interface IsFirstShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface DateIdShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface MonthIdShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface CustomerIdShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface DataListShowGroup extends CustomerClientShowGroup {
+
+    }
+
     /**
      * 当为true时后台将先删除当前维度的数据，后新增
      */
+    @NotNull(message = "isFirst不能为空", groups = IsFirstShowGroup.class)
     private Boolean isFirst;
 
     /**
      * 日期Id, 数据更新至：yyyyMMdd
      */
+    @NotBlank(message = "dateId不能为空;", groups = DateIdShowGroup.class)
+    @Length(min = 8, max = 8, message = "dateId不能为空,格式应为yyyyMMdd;", groups = {DateIdShowGroup.class})
     private String dateId;
 
     /**
      * yyyyMM
      */
+    @NotBlank(message = "monthId不能为空,格式yyyyMM;", groups = MonthIdShowGroup.class)
+    @Length(min = 6, max = 6, message = "monthId不能为空,格式应为yyyyMM;", groups = {MonthIdShowGroup.class})
     private String monthId;
 
     /**
@@ -39,6 +69,8 @@ public class ScreenCollFormDTO<T> implements Serializable {
     /**
      * 数据集合
      */
+    @Valid
+    @NotEmpty(message = "dataList不能为空", groups = DataListShowGroup.class)
     private List<T> dataList;
 
     @Override
@@ -49,5 +81,6 @@ public class ScreenCollFormDTO<T> implements Serializable {
     /**
      * 当前客户id
      */
+    @NotBlank(message = "customerId不能为空;", groups = CustomerIdShowGroup.class)
     private String customerId;
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/AnCommunityProjectProfileFormDTO.java

@@ -1,7 +1,10 @@
 package com.epmet.dto.screencoll.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -14,23 +17,30 @@ import java.io.Serializable;
 public class AnCommunityProjectProfileFormDTO implements Serializable {
     private static final long serialVersionUID = 1466172677051250092L;
 
+    public interface DefaultShowGroup extends CustomerClientShowGroup {
+    }
+
     /**
      * 数据更新至: yyyy|yyyyMM|yyyyMMdd，项目根据实际情况赋值
      */
+    @NotBlank(message = "dataEndTime不能为空;", groups = DefaultShowGroup.class)
     private String dataEndTime;
 
     /**
      * 社区id
      */
+    @NotBlank(message = "orgId不能为空;", groups = DefaultShowGroup.class)
     private String orgId;
 
     /**
      * 项目数
      */
+    @NotNull(message = "projectTotal不能为空;", groups = DefaultShowGroup.class)
     private Integer projectTotal;
 
     /**
      * 等级
      */
+    @NotBlank(message = "level不能为空;", groups = DefaultShowGroup.class)
     private String level;
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/AnGrassRootsGovernMonthlyFormDTO.java

@@ -1,7 +1,10 @@
 package com.epmet.dto.screencoll.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -12,51 +15,63 @@ import java.math.BigDecimal;
  * @since v1.0.0 2020-10-09
  */
 @Data
-public class AnGrassRootsGovernMonthlyFormDTO  implements Serializable {
+public class AnGrassRootsGovernMonthlyFormDTO implements Serializable {
     private static final long serialVersionUID = -6947401956711903753L;
 
+    public interface DefaultShowGroup extends CustomerClientShowGroup {
+    }
+
     /**
      * 网格，街道或社区id
      */
+    @NotBlank(message = "orgId不能为空;", groups = DefaultShowGroup.class)
     private String orgId;
 
     /**
      * 网格，街道名称或者社区名称
      */
+    @NotBlank(message = "orgName不能为空;", groups = DefaultShowGroup.class)
     private String orgName;
 
     /**
      * 网格：grid;组织：agency
      */
+    @NotBlank(message = "orgType不能为空，网格：grid;组织：agency;", groups = DefaultShowGroup.class)
     private String orgType;
 
     /**
      * org_id的上一级id
      */
+    @NotBlank(message = "pid不能为空;", groups = DefaultShowGroup.class)
     private String pid;
 
     /**
      * 参与项目数
      */
+    @NotNull(message = "partiProjectTotal不能为空;", groups = DefaultShowGroup.class)
     private Integer partiProjectTotal;
 
     /**
      * 办结项目数
      */
+    @NotNull(message = "closedProjectTotal不能为空;", groups = DefaultShowGroup.class)
     private Integer closedProjectTotal;
 
     /**
      * 项目响应度 存储的是%前面的数
      */
+    @NotNull(message = "projectResponseRatio不能为空;", groups = DefaultShowGroup.class)
     private BigDecimal projectResponseRatio;
 
     /**
      * 项目满意率，存储的是%前面的数
      */
+    @NotNull(message = "projectSatisRatio不能为空;", groups = DefaultShowGroup.class)
     private BigDecimal projectSatisRatio;
 
     /**
      * 办结率 for  社区
      */
+    @NotNull(message = "closedProjectRatio不能为空;", groups = DefaultShowGroup.class)
     private BigDecimal closedProjectRatio;
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/AnGrassRootsOrgMonthlyFormDTO.java

@@ -1,7 +1,10 @@
 package com.epmet.dto.screencoll.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -13,39 +16,49 @@ import java.io.Serializable;
 @Data
 public class AnGrassRootsOrgMonthlyFormDTO implements Serializable {
     private static final long serialVersionUID = -7389300512268641307L;
+
+    public interface DefaultShowGroup extends CustomerClientShowGroup {}
+
     /**
      * 网格id或者组织(街道或社区)id
      */
+    @NotBlank(message = "orgId不能为空;", groups = DefaultShowGroup.class)
     private String orgId;
 
     /**
      * 组织名称OR网格名称
      */
+    @NotBlank(message = "orgName不能为空;", groups = DefaultShowGroup.class)
     private String orgName;
 
     /**
      * 网格：grid; 组织：agency
      */
+    @NotBlank(message = "orgType不能为空;", groups = DefaultShowGroup.class)
     private String orgType;
 
     /**
      * org_id的上一级id
      */
+    @NotBlank(message = "pid不能为空;", groups = DefaultShowGroup.class)
     private String pid;
 
     /**
      * 党群数
      */
+    @NotNull(message = "groupTotal不能为空;", groups = DefaultShowGroup.class)
     private Integer groupTotal;
 
     /**
      * 议题数
      */
+    @NotNull(message = "issueTotal不能为空;", groups = DefaultShowGroup.class)
     private Integer issueTotal;
 
     /**
      * 项目数
      */
+    @NotNull(message = "projectTotal不能为空;", groups = DefaultShowGroup.class)
     private Integer projectTotal;
 
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/AnGrassRootsPmRankFormDTO.java

@@ -1,7 +1,11 @@
 package com.epmet.dto.screencoll.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -13,60 +17,73 @@ import java.io.Serializable;
 @Data
 public class AnGrassRootsPmRankFormDTO implements Serializable {
     private static final long serialVersionUID = 3642729389245262928L;
+    public interface DefaultShowGroup extends CustomerClientShowGroup {}
 
     /**
-     *  月份Id
+     * 月份Id
      */
+    @NotBlank(message = "monthId不能为空;", groups = DefaultShowGroup.class)
+    @Length(min = 6, max = 6, message = "monthId不能为空,格式应为yyyyMM;", groups = {DefaultShowGroup.class})
     private String monthId;
 
     /**
      * 用户id
      */
+    @NotBlank(message = "userId不能为空;", groups = DefaultShowGroup.class)
     private String userId;
 
     /**
      * 姓名
      */
+    @NotBlank(message = "userName不能为空;", groups = DefaultShowGroup.class)
     private String userName;
 
     /**
      * 所属支部id
      */
+    @NotBlank(message = "branchId不能为空;", groups = DefaultShowGroup.class)
     private String branchId;
 
     /**
      * 所属支部名称
      */
+    @NotBlank(message = "branchName不能为空;", groups = DefaultShowGroup.class)
     private String branchName;
 
     /**
      * 所属社区id
      */
+    @NotBlank(message = "communityId不能为空;", groups = DefaultShowGroup.class)
     private String communityId;
 
     /**
      * 所属社区名称
      */
+    @NotBlank(message = "communityName不能为空;", groups = DefaultShowGroup.class)
     private String communityName;
 
     /**
      * 群成员数
      */
+    @NotNull(message = "groupMemberTotal不能为空;",groups =DefaultShowGroup.class )
     private Integer groupMemberTotal;
 
     /**
      * 话题数
      */
+    @NotNull(message = "topicTotal不能为空;",groups =DefaultShowGroup.class )
     private Integer topicTotal;
 
     /**
      * 参与人次
      */
+    @NotNull(message = "partiUserTotal不能为空;",groups =DefaultShowGroup.class )
     private Integer partiUserTotal;
 
     /**
      * 议题数
      */
+    @NotNull(message = "issueTotal不能为空;",groups =DefaultShowGroup.class )
     private Integer issueTotal;
 
     /**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/AnGrassRootsPmTotalMonthlyFormDTO.java

@@ -1,7 +1,10 @@
 package com.epmet.dto.screencoll.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -14,44 +17,54 @@ import java.io.Serializable;
 public class AnGrassRootsPmTotalMonthlyFormDTO implements Serializable {
     private static final long serialVersionUID = 8675347783888892404L;
 
+    public interface DefaultShowGroup extends CustomerClientShowGroup {}
+
     /**
      * 网格id或者组织(街道或社区)id
      */
+    @NotBlank(message = "orgId不能为空;", groups = DefaultShowGroup.class)
     private String orgId;
 
     /**
      * 组织名称OR网格名称
      */
+    @NotBlank(message = "orgName不能为空;", groups = DefaultShowGroup.class)
     private String orgName;
 
     /**
      * 网格：grid;组织：agency
      */
+    @NotBlank(message = "orgType不能为空;", groups = DefaultShowGroup.class)
     private String orgType;
 
     /**
      * org_id的上一级id
      */
+    @NotBlank(message = "pid不能为空;", groups = DefaultShowGroup.class)
     private String pid;
 
     /**
      * 群成员数
      */
+    @NotNull(message = "groupMemberTotal不能为空;", groups = DefaultShowGroup.class)
     private Integer groupMemberTotal;
 
     /**
      * 话题数
      */
+    @NotNull(message = "topicTotal不能为空;", groups = DefaultShowGroup.class)
     private Integer topicTotal;
 
     /**
      * 话题参与人次
      */
+    @NotNull(message = "topicPartiUserTotal不能为空;", groups = DefaultShowGroup.class)
     private Integer topicPartiUserTotal;
 
     /**
      * 议题数
      */
+    @NotNull(message = "issueTotal不能为空;", groups = DefaultShowGroup.class)
     private Integer issueTotal;
 
 }

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

@@ -1,11 +1,10 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.dto.screencoll.form.*;
 import com.epmet.service.evaluationindex.screen.AnScreenCollService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,79 +22,116 @@ public class AnScreenCollController {
     private AnScreenCollService screenCollService;
 
     /**
-     * @Description 安宁大屏数据采集 - 基层党员-各类总数
-     * @NEI https://nei.netease.com/interface/detail/?pid=57069&id=329494
      * @param formDTO
      * @return void
+     * @Description 安宁大屏数据采集 - 基层党员-各类总数
+     * @NEI https://nei.netease.com/interface/detail/?pid=57069&id=329494
      * @author wangc
      * @date 2020.10.09 17:20
      */
     @PostMapping("pmtotal")
-    public Result pmTotal(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnGrassRootsPmTotalMonthlyFormDTO> formDTO){
-        if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空");
-        screenCollService.pmTotal(formDTO,customerId);
+    public Result pmTotal(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnGrassRootsPmTotalMonthlyFormDTO> formDTO) {
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO,
+                ScreenCollFormDTO.IsFirstShowGroup.class,
+                ScreenCollFormDTO.MonthIdShowGroup.class,
+                ScreenCollFormDTO.CustomerIdShowGroup.class,
+                ScreenCollFormDTO.DataListShowGroup.class);
+        formDTO.getDataList().forEach(data -> {
+            ValidatorUtils.validateEntity(data, AnGrassRootsPmTotalMonthlyFormDTO.DefaultShowGroup.class);
+        });
+        screenCollService.pmTotal(formDTO);
         return new Result();
     }
 
     /**
-     * @Description 安宁大屏数据采集 - 基层党员-党员排行榜单
-     * @NEI https://nei.netease.com/interface/detail/?pid=57069&id=329483
      * @param formDTO
      * @return void
+     * @Description 安宁大屏数据采集 - 基层党员-党员排行榜单  按月
+     * @NEI https://nei.netease.com/interface/detail/?pid=57069&id=329483
      * @author wangc
      * @date 2020.10.09 17:19
      */
     @PostMapping("pmrank")
-    public Result pmRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnGrassRootsPmRankFormDTO> formDTO){
-        if (StringUtils.isBlank(formDTO.getMonthId())){
-            throw new ValidateException("月份Id不能为空");
-        }
-        screenCollService.pmRank(formDTO,customerId);
+    public Result pmRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnGrassRootsPmRankFormDTO> formDTO) {
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO,
+                ScreenCollFormDTO.IsFirstShowGroup.class,
+                ScreenCollFormDTO.MonthIdShowGroup.class,
+                ScreenCollFormDTO.CustomerIdShowGroup.class,
+                ScreenCollFormDTO.DataListShowGroup.class);
+        formDTO.getDataList().forEach(data -> {
+            ValidatorUtils.validateEntity(data, AnGrassRootsPmRankFormDTO.DefaultShowGroup.class);
+        });
+        screenCollService.pmRank(formDTO);
         return new Result();
     }
 
     /**
-     * @Description 安宁大屏数据采集 - 基层组织(党群数|议题数|项目数)-按月
-     * @NEI https://nei.netease.com/interface/detail/?pid=57069&id=329498
      * @param formDTO
      * @return void
+     * @Description 安宁大屏数据采集 - 基层组织(党群数|议题数|项目数)-按月
+     * @NEI https://nei.netease.com/interface/detail/?pid=57069&id=329498
      * @author wangc
      * @date 2020.10.09 17:22
      */
     @PostMapping("grassrootsorg")
-    public Result grassrootsOrg(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnGrassRootsOrgMonthlyFormDTO> formDTO){
-        if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空");
-        screenCollService.grassrootsOrg(formDTO,customerId);
+    public Result grassrootsOrg(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnGrassRootsOrgMonthlyFormDTO> formDTO) {
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO,
+                ScreenCollFormDTO.IsFirstShowGroup.class,
+                ScreenCollFormDTO.MonthIdShowGroup.class,
+                ScreenCollFormDTO.CustomerIdShowGroup.class,
+                ScreenCollFormDTO.DataListShowGroup.class);
+        formDTO.getDataList().forEach(data -> {
+            ValidatorUtils.validateEntity(data, AnGrassRootsOrgMonthlyFormDTO.DefaultShowGroup.class);
+        });
+        screenCollService.grassrootsOrg(formDTO);
         return new Result();
     }
 
     /**
-     * @Description 安宁大屏数据采集 - 基层治理-各类数
-     * @NEI https://nei.netease.com/interface/detail/?pid=57069&id=329499
      * @param formDTO
      * @return void
+     * @Description 安宁大屏数据采集 - 基层治理-各类数 按月
+     * @NEI https://nei.netease.com/interface/detail/?pid=57069&id=329499
      * @author wangc
      * @date 2020.10.09 17:23
      */
     @PostMapping("grassrootsgovern")
-    public Result grassrootsGovern(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnGrassRootsGovernMonthlyFormDTO> formDTO){
-        if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空");
-        screenCollService.grassrootsGovern(formDTO,customerId);
+    public Result grassrootsGovern(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnGrassRootsGovernMonthlyFormDTO> formDTO) {
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO,
+                ScreenCollFormDTO.IsFirstShowGroup.class,
+                ScreenCollFormDTO.MonthIdShowGroup.class,
+                ScreenCollFormDTO.CustomerIdShowGroup.class,
+                ScreenCollFormDTO.DataListShowGroup.class);
+        formDTO.getDataList().forEach(data -> {
+            ValidatorUtils.validateEntity(data, AnGrassRootsGovernMonthlyFormDTO.DefaultShowGroup.class);
+        });
+        screenCollService.grassrootsGovern(formDTO);
         return new Result();
     }
 
     /**
-     * @Description 安宁大屏数据采集 - 中央区-项目概要
-     * @NEI https://nei.netease.com/interface/detail/?pid=57069&id=329502
      * @param formDTO
      * @return void
+     * @Description 安宁大屏数据采集 - 中央区-项目概要
+     * @NEI https://nei.netease.com/interface/detail/?pid=57069&id=329502
      * @author wangc
      * @date 2020.10.09 16:41
      */
     @PostMapping("projectfile")
-    public Result projectFile(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnCommunityProjectProfileFormDTO> formDTO){
-        if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空");
-        screenCollService.communityProjectProfile(formDTO,customerId);
+    public Result projectFile(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnCommunityProjectProfileFormDTO> formDTO) {
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO,
+                ScreenCollFormDTO.IsFirstShowGroup.class,
+                ScreenCollFormDTO.CustomerIdShowGroup.class,
+                ScreenCollFormDTO.DataListShowGroup.class);
+        formDTO.getDataList().forEach(data -> {
+            ValidatorUtils.validateEntity(data, AnCommunityProjectProfileFormDTO.DefaultShowGroup.class);
+        });
+        screenCollService.communityProjectProfile(formDTO);
         return new Result();
     }
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.dto.screencoll.form.*;
 import com.epmet.service.evaluationindex.screen.KcScreenCollService;
@@ -35,7 +36,9 @@ public class KcScreenCollController {
     
     @PostMapping("homepage/platformsummary")
     public Result platFormSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcHomePageFormDTO> formDTO) {
-        kcScreenCollService.insertPlatFormSummary(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertPlatFormSummary(formDTO);
         return new Result();
     }
 
@@ -54,7 +57,9 @@ public class KcScreenCollController {
     
     @PostMapping("issue/summary")
     public Result issueSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO) {
-        kcScreenCollService.insertIssueSummary(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertIssueSummary(formDTO);
         return new Result();
     }
 
@@ -73,7 +78,9 @@ public class KcScreenCollController {
     
     @PostMapping("issue/trend")
     public Result issueTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO) {
-        kcScreenCollService.insertIssueTrend(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.MonthIdShowGroup.class);
+        kcScreenCollService.insertIssueTrend(formDTO);
         return new Result();
     }
 
@@ -92,7 +99,9 @@ public class KcScreenCollController {
     
     @PostMapping("user/summary")
     public Result userSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO) {
-        kcScreenCollService.insertUserSummary(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertUserSummary(formDTO);
         return new Result();
     }
 
@@ -111,7 +120,9 @@ public class KcScreenCollController {
     
     @PostMapping("volunteer/heartrank")
     public Result volunteerHeartRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO) {
-        kcScreenCollService.insertVolunteerHeartRank(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertVolunteerHeartRank(formDTO);
         return new Result();
     }
 
@@ -130,7 +141,9 @@ public class KcScreenCollController {
     
     @PostMapping("user/userheartrank")
     public Result userHeartRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO) {
-        kcScreenCollService.insertUserHeartRank(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.MonthIdShowGroup.class);
+        kcScreenCollService.insertUserHeartRank(formDTO);
         return new Result();
     }
 
@@ -149,7 +162,9 @@ public class KcScreenCollController {
     
     @PostMapping("act/summary")
     public Result actSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcActSummaryFormDTO> formDTO) {
-        kcScreenCollService.insertActSummary(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertActSummary(formDTO);
         return new Result();
     }
 
@@ -168,7 +183,9 @@ public class KcScreenCollController {
     
     @PostMapping("act/trend")
     public Result actTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcActTrendFormDTO> formDTO) {
-        kcScreenCollService.insertActTrend(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.MonthIdShowGroup.class);
+        kcScreenCollService.insertActTrend(formDTO);
         return new Result();
     }
 
@@ -187,7 +204,9 @@ public class KcScreenCollController {
     
     @PostMapping("act/volunteersummary")
     public Result volunteerSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO) {
-        kcScreenCollService.insertVolunteerSummary(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertVolunteerSummary(formDTO);
         return new Result();
     }
 
@@ -206,7 +225,9 @@ public class KcScreenCollController {
     
     @PostMapping("project/summary")
     public Result projectSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO) {
-        kcScreenCollService.insertProjectSummary(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertProjectSummary(formDTO);
         return new Result();
     }
 
@@ -225,7 +246,9 @@ public class KcScreenCollController {
     
     @PostMapping("project/categorysummary")
     public Result categorySummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO) {
-        kcScreenCollService.insertCategorySummary(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertCategorySummary(formDTO);
         return new Result();
     }
 
@@ -244,7 +267,9 @@ public class KcScreenCollController {
     
     @PostMapping("project/satisanalysis")
     public Result projectSatisanalysis(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO) {
-        kcScreenCollService.insertProjectSatisanalysis(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.MonthIdShowGroup.class);
+        kcScreenCollService.insertProjectSatisanalysis(formDTO);
         return new Result();
     }
 
@@ -263,7 +288,9 @@ public class KcScreenCollController {
     
     @PostMapping("news/summary")
     public Result newsSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO) {
-        kcScreenCollService.insertNewsSummary(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertNewsSummary(formDTO);
         return new Result();
     }
 
@@ -282,7 +309,9 @@ public class KcScreenCollController {
     
     @PostMapping("news/trend")
     public Result newsTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO) {
-        kcScreenCollService.insertNewsTrend(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.MonthIdShowGroup.class);
+        kcScreenCollService.insertNewsTrend(formDTO);
         return new Result();
     }
 
@@ -301,7 +330,9 @@ public class KcScreenCollController {
     
     @PostMapping("news/hotrank")
     public Result newsHotRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO) {
-        kcScreenCollService.insertNewsHotRank(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertNewsHotRank(formDTO);
         return new Result();
     }
 
@@ -320,7 +351,9 @@ public class KcScreenCollController {
     
     @PostMapping("news/categoryanalysis")
     public Result newsCategoryAnalysis(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO) {
-        kcScreenCollService.insertNewsCategoryAnalysis(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertNewsCategoryAnalysis(formDTO);
         return new Result();
     }
 
@@ -339,7 +372,9 @@ public class KcScreenCollController {
     
     @PostMapping("group/summary")
     public Result groupSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO) {
-        kcScreenCollService.insertGroupSummary(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertGroupSummary(formDTO);
         return new Result();
     }
 
@@ -358,7 +393,9 @@ public class KcScreenCollController {
     
     @PostMapping("group/detail")
     public Result groupDetail(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO) {
-        kcScreenCollService.insertGroupDetail(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
+        kcScreenCollService.insertGroupDetail(formDTO);
         return new Result();
     }
 
@@ -377,7 +414,9 @@ public class KcScreenCollController {
     
     @PostMapping("group/topictrend")
     public Result groupTopicTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO) {
-        kcScreenCollService.insertGroupTopicTrend(formDTO, customerId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.MonthIdShowGroup.class);
+        kcScreenCollService.insertGroupTopicTrend(formDTO);
         return new Result();
     }
 }

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

@@ -1,16 +1,14 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.screen.*;
 import com.epmet.dto.screen.form.ScreenProjectDataInfoFormDTO;
 import com.epmet.dto.screen.form.ScreenProjectProcessFormDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.service.evaluationindex.screen.*;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,10 +48,9 @@ public class ScreenProjectDataCollController {
      **/
     @RequestMapping("quantity-grid-monthly")
     public Result quantityGridMonthly(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectQuantityGridMonthlyDTO> param) {
-        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getMonthId())) {
-            throw new ValidateException("参数错误:dataList不能为空且monthId不能为空");
-        }
-        projectQuantityGridMonthlyService.collect(customerId, param);
+        param.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(param, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.MonthIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+        projectQuantityGridMonthlyService.collect(param);
         return new Result();
     }
 
@@ -63,10 +60,9 @@ public class ScreenProjectDataCollController {
      **/
     @RequestMapping("quantity-org-monthly")
     public Result quantityOrgMonthly(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectQuantityOrgMonthlyDTO> param) {
-        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getMonthId())) {
-            throw new ValidateException("参数错误:dataList不能为空且monthId不能为空");
-        }
-        projectQuantityOrgMonthlyService.collect(customerId, param);
+        param.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(param, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.MonthIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+        projectQuantityOrgMonthlyService.collect(param);
         return new Result();
     }
 
@@ -76,10 +72,9 @@ public class ScreenProjectDataCollController {
      **/
     @RequestMapping("project-grid-daily")
     public Result projectGridDaily(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectGridDailyDTO> param) {
-        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
-            throw new ValidateException("参数错误:dataList不能为空且dataId不能为空");
-        }
-        projectGridDailyService.collect(customerId, param);
+        param.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(param, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+        projectGridDailyService.collect(param);
         return new Result();
     }
 
@@ -89,10 +84,9 @@ public class ScreenProjectDataCollController {
      **/
     @RequestMapping("project-org-daily")
     public Result projectOrgDaily(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectOrgDailyDTO> param) {
-        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
-            throw new ValidateException("参数错误:dataList不能为空且dataId不能为空");
-        }
-        projectOrgDailyService.collect(customerId, param);
+        param.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(param, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+        projectOrgDailyService.collect(param);
         return new Result();
     }
 
@@ -107,10 +101,9 @@ public class ScreenProjectDataCollController {
      */
     @RequestMapping("category-grid-daily")
     public Result categoryGridDaily(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> param) {
-        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
-            throw new ValidateException("参数错误:dataList不能为空且dataId不能为空");
-        }
-        projectCategoryGridDailyService.collect(customerId, param);
+        param.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(param, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+        projectCategoryGridDailyService.collect(param);
         return new Result();
     }
 
@@ -124,10 +117,9 @@ public class ScreenProjectDataCollController {
      */
     @RequestMapping("category-org-daily")
     public Result categoryOrgDaily(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> param) {
-        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
-            throw new ValidateException("参数错误:dataList不能为空且dataId不能为空");
-        }
-        projectCategoryOrgDailyService.collect(customerId, param);
+        param.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(param, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+        projectCategoryOrgDailyService.collect(param);
         return new Result();
     }
     //上述两个接口可以有采集接口方便灌假数。后面项目分类统计两个方案A：从项目信息中分析计算到大屏表; B：下面三个子客户（榆山街道、孔村街道、锦水街道）单独上报；子客户根据area_code计算
@@ -140,10 +132,9 @@ public class ScreenProjectDataCollController {
      */
     @RequestMapping("uploadprojectinfo")
     public Result uploadProjectInfo(@RequestHeader("CustomerId") String customerId,@RequestBody ScreenCollFormDTO<ScreenProjectDataInfoFormDTO> param){
-        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
-            throw new ValidateException("参数错误:dataList不能为空且dateId不能为空");
-        }
-        projectDataService.collect(customerId,param);
+        param.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(param, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+        projectDataService.collect(param);
         return new Result();
     }
 
@@ -155,10 +146,9 @@ public class ScreenProjectDataCollController {
      */
     @RequestMapping("uploadprojectprocess")
     public Result uploadProjectProcess(@RequestHeader("CustomerId") String customerId,@RequestBody ScreenCollFormDTO<ScreenProjectProcessFormDTO> param){
-        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
-            throw new ValidateException("参数错误:dataList不能为空且dataId不能为空");
-        }
-        projectProcessService.collect(customerId,param);
+        param.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(param, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+        projectProcessService.collect(param);
         return new Result();
     }
 

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

@@ -1,6 +1,7 @@
 package com.epmet.controller.plugins;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.plugins.BidFormDTO;
 import com.epmet.dto.plugins.ContractFormDTO;
 import com.epmet.dto.plugins.OneListFormDTO;
@@ -32,6 +33,7 @@ public class OfsController {
     @PostMapping("onelist-daily")
     public Result collOneList(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<OneListFormDTO> formDTO){
         formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
         ofsService.collOneList(formDTO);
         return new Result();
     }
@@ -46,6 +48,7 @@ public class OfsController {
     @PostMapping("contract-daily")
     public Result collContract(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ContractFormDTO> formDTO){
         formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
         ofsService.collContract(formDTO);
         return new Result();
     }
@@ -60,6 +63,7 @@ public class OfsController {
     @PostMapping("bid-daily")
     public Result collBid(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<BidFormDTO> formDTO){
         formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class);
         ofsService.collBid(formDTO);
         return new Result();
     }

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

@@ -1,8 +1,7 @@
 package com.epmet.controller.plugins;
 
-import com.alibaba.fastjson.JSON;
-import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.plugins.ScreenCustomerWorkRecordDictDTO;
 import com.epmet.dto.plugins.ScreenWorkRecordCommonFormDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
@@ -10,9 +9,7 @@ import com.epmet.service.plugins.ScreenCustomerWorkRecordDictService;
 import com.epmet.service.plugins.ScreenWorkRecordOrgDailyService;
 import com.epmet.service.plugins.ScreenWorkRecordOrgMonthlyService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -44,13 +41,9 @@ public class WorkRecordColController {
 	*/
 	@PostMapping("resource-dict")
 	public Result resourceDict(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO<ScreenCustomerWorkRecordDictDTO> data){
-		if(StringUtils.isBlank(customerId) || CollectionUtils.isEmpty(data.getDataList()) ||
-				StringUtils.isBlank(data.getDateId())) {
-			log.error("com.epmet.controller.plugins.WorkRecordColController.resourceDict,param:{}", JSON.toJSONString(data));
-			throw new ValidateException("客户Id、上传数据列表、日期Id不可为空");
-		}
-		// log.info("【工作日志】客户资源字典信息上传"+JSON.toJSONString(data,true));
-		dictService.collect(customerId,data);
+		data.setCustomerId(customerId);
+		ValidatorUtils.validateEntity(data, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+		dictService.collect(data);
 		return new Result();
 	}
 
@@ -64,13 +57,9 @@ public class WorkRecordColController {
 	*/
 	@PostMapping("org-monthly")
 	public Result collectOrg(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data){
-		if(StringUtils.isBlank(customerId) || CollectionUtils.isEmpty(data.getDataList()) ||
-				StringUtils.isBlank(data.getMonthId())) {
-			log.error("com.epmet.controller.plugins.WorkRecordColController.collectOrg,param:{}", JSON.toJSONString(data));
-			throw new ValidateException("客户Id、上传数据列表、月份Id不可为空");
-		}
-		// log.info("【工作日志】组织按月统计"+JSON.toJSONString(data,true));
-		screenWorkRecordOrgMonthlyService.collect(customerId,data);
+		data.setCustomerId(customerId);
+		ValidatorUtils.validateEntity(data, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.MonthIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+		screenWorkRecordOrgMonthlyService.collect(data);
 		return new Result();
 	}
 
@@ -84,13 +73,9 @@ public class WorkRecordColController {
 	 */
 	@PostMapping("org-daily")
 	public Result collectOrgDaily(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data){
-		if(StringUtils.isBlank(customerId) || CollectionUtils.isEmpty(data.getDataList()) ||
-				StringUtils.isBlank(data.getDateId())) {
-			log.error("com.epmet.controller.plugins.WorkRecordColController.collectOrgDaily,param:{}", JSON.toJSONString(data));
-			throw new ValidateException("客户Id、上传数据列表、日期Id不可为空");
-		}
-		// log.info("【工作日志】组织按日统计  累计值"+JSON.toJSONString(data,true));
-		screenWorkRecordOrgDailyService.collectOrgDaily(customerId,data);
+		data.setCustomerId(customerId);
+		ValidatorUtils.validateEntity(data, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+		screenWorkRecordOrgDailyService.collectOrgDaily(data);
 		return new Result();
 	}
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/AnScreenCollService.java

@@ -17,7 +17,7 @@ public interface AnScreenCollService {
      * @author wangc
      * @date 2020.10.09 16:41
     */
-    void communityProjectProfile(ScreenCollFormDTO<AnCommunityProjectProfileFormDTO> formDTO,String customerId);
+    void communityProjectProfile(ScreenCollFormDTO<AnCommunityProjectProfileFormDTO> formDTO);
 
     /**
      * @Description 安宁大屏数据采集 - 基层党员-党员排行榜单
@@ -27,7 +27,7 @@ public interface AnScreenCollService {
      * @author wangc
      * @date 2020.10.09 17:19
     */
-    void pmRank(ScreenCollFormDTO<AnGrassRootsPmRankFormDTO> formDTO,String customerId);
+    void pmRank(ScreenCollFormDTO<AnGrassRootsPmRankFormDTO> formDTO);
 
     /**
      * @Description 安宁大屏数据采集 - 基层党员-各类总数
@@ -37,7 +37,7 @@ public interface AnScreenCollService {
      * @author wangc
      * @date 2020.10.09 17:20
     */
-    void pmTotal(ScreenCollFormDTO<AnGrassRootsPmTotalMonthlyFormDTO> formDTO,String customerId);
+    void pmTotal(ScreenCollFormDTO<AnGrassRootsPmTotalMonthlyFormDTO> formDTO);
 
     /**
      * @Description 安宁大屏数据采集 - 基层组织(党群数|议题数|项目数)-按月
@@ -46,7 +46,7 @@ public interface AnScreenCollService {
      * @author wangc
      * @date 2020.10.09 17:22
     */
-    void grassrootsOrg(ScreenCollFormDTO<AnGrassRootsOrgMonthlyFormDTO> formDTO,String customerId);
+    void grassrootsOrg(ScreenCollFormDTO<AnGrassRootsOrgMonthlyFormDTO> formDTO);
 
     /**
      * @Description 安宁大屏数据采集 - 基层治理-各类数
@@ -55,5 +55,5 @@ public interface AnScreenCollService {
      * @author wangc
      * @date 2020.10.09 17:23
     */
-    void grassrootsGovern(ScreenCollFormDTO<AnGrassRootsGovernMonthlyFormDTO> formDTO,String customerId);
+    void grassrootsGovern(ScreenCollFormDTO<AnGrassRootsGovernMonthlyFormDTO> formDTO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/KcScreenCollService.java

@@ -17,12 +17,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertPlatFormSummary(ScreenCollFormDTO<KcHomePageFormDTO> formDTO, String customerId);
+    void insertPlatFormSummary(ScreenCollFormDTO<KcHomePageFormDTO> formDTO);
 
     /**
      * 2、议题分析-各类总数
@@ -30,12 +29,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertIssueSummary(ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO, String customerId);
+    void insertIssueSummary(ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO);
 
     /**
      * 3、议题分析-参与趋势
@@ -43,12 +41,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertIssueTrend(ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO, String customerId);
+    void insertIssueTrend(ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO);
 
     /**
      * 4、用户分析-各类总数
@@ -56,12 +53,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertUserSummary(ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO, String customerId);
+    void insertUserSummary(ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO);
 
     /**
      * 5、公益互助-志愿者公益时长排名
@@ -69,12 +65,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertVolunteerHeartRank(ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO, String customerId);
+    void insertVolunteerHeartRank(ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO);
 
     /**
      * 6、用户分析-用户趋势
@@ -82,12 +77,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertUserHeartRank(ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO, String customerId);
+    void insertUserHeartRank(ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO);
 
     /**
      * 7、公益互助-活动各类总数
@@ -95,12 +89,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertActSummary(ScreenCollFormDTO<KcActSummaryFormDTO> formDTO, String customerId);
+    void insertActSummary(ScreenCollFormDTO<KcActSummaryFormDTO> formDTO);
 
     /**
      * 8、公益互助-活动次数趋势
@@ -108,12 +101,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertActTrend(ScreenCollFormDTO<KcActTrendFormDTO> formDTO, String customerId);
+    void insertActTrend(ScreenCollFormDTO<KcActTrendFormDTO> formDTO);
 
     /**
      * 9、公益互助-志愿者画像
@@ -121,12 +113,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertVolunteerSummary(ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO, String customerId);
+    void insertVolunteerSummary(ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO);
 
     /**
      * 10、项目分析-各类总数
@@ -134,12 +125,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertProjectSummary(ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO, String customerId);
+    void insertProjectSummary(ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO);
 
     /**
      * 11、项目分析-按分类统计
@@ -147,12 +137,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertCategorySummary(ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO, String customerId);
+    void insertCategorySummary(ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO);
 
     /**
      * 12、项目分析-满意度分析
@@ -160,12 +149,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertProjectSatisanalysis(ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO, String customerId);
+    void insertProjectSatisanalysis(ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO);
 
     /**
      * 13、党建声音-新闻各类总数汇总
@@ -173,12 +161,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertNewsSummary(ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO, String customerId);
+    void insertNewsSummary(ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO);
 
     /**
      * 14、党建声音-新闻阅读参与趋势
@@ -186,12 +173,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertNewsTrend(ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO, String customerId);
+    void insertNewsTrend(ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO);
 
     /**
      * 15、党建声音-热度新闻排行
@@ -199,12 +185,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertNewsHotRank(ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO, String customerId);
+    void insertNewsHotRank(ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO);
 
     /**
      * 16、党建声音-新闻按类别统计
@@ -212,12 +197,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertNewsCategoryAnalysis(ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO, String customerId);
+    void insertNewsCategoryAnalysis(ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO);
 
     /**
      * 17、邻里党群-各类总数汇总
@@ -225,12 +209,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertGroupSummary(ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO, String customerId);
+    void insertGroupSummary(ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO);
 
     /**
      * 18、邻里党群-小组详情
@@ -238,12 +221,11 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertGroupDetail(ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO, String customerId);
+    void insertGroupDetail(ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO);
 
     /**
      * 19、邻里党群-话题参与趋势
@@ -251,10 +233,9 @@ public interface KcScreenCollService {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *
      * @param formDTO
-     * @param customerId
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    void insertGroupTopicTrend(ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO, String customerId);
+    void insertGroupTopicTrend(ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java

@@ -98,9 +98,8 @@ public interface ScreenProjectCategoryGridDailyService extends BaseService<Scree
      * 【事件/项目分析】按类别统计-网格
      * @author zhaoqifeng
      * @date 2021/2/24 10:16
-     * @param customerId
      * @param param
      * @return void
      */
-    void collect(String customerId, ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> param);
+    void collect(ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> param);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java

@@ -98,9 +98,8 @@ public interface ScreenProjectCategoryOrgDailyService extends BaseService<Screen
      * 【事件/项目分析】按类别统计-组织
      * @author zhaoqifeng
      * @date 2021/2/24 10:17
-     * @param customerId
      * @param param
      * @return void
      */
-    void collect(String customerId, ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> param);
+    void collect(ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> param);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java

@@ -124,4 +124,5 @@ public interface ScreenProjectDataService extends BaseService<ScreenProjectDataE
      * @date 2021.03.09 17:36
     */
     void insertOrUpdateBatch(String customerId,String dateId,List<ScreenProjectDataDTO> meta,List<ScreenProjectDataDTO> orient);
+    void collect(ScreenCollFormDTO<ScreenProjectDataInfoFormDTO> param);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectGridDailyService.java

@@ -96,13 +96,12 @@ public interface ScreenProjectGridDailyService extends BaseService<ScreenProject
 
     /**
      * @Description 数据采集
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
      * @date 2021.01.28 09:33
      */
-    void collect(String customerId, ScreenCollFormDTO<ScreenProjectGridDailyDTO> data);
+    void collect(ScreenCollFormDTO<ScreenProjectGridDailyDTO> data);
 
     /**
      * @Description  数据抽取【网格-日】

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectOrgDailyService.java

@@ -96,13 +96,12 @@ public interface ScreenProjectOrgDailyService extends BaseService<ScreenProjectO
 
     /**
      * @Description 数据采集
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
      * @date 2021.01.28 09:33
      */
-    void collect(String customerId, ScreenCollFormDTO<ScreenProjectOrgDailyDTO> data);
+    void collect(ScreenCollFormDTO<ScreenProjectOrgDailyDTO> data);
 
     /**
      * @Description  数据抽取【机关-日】

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java

@@ -95,9 +95,8 @@ public interface ScreenProjectProcessService extends BaseService<ScreenProjectPr
      */
     void delete(String[] ids);
 
-    void collect(String customerId, ScreenCollFormDTO<ScreenProjectProcessFormDTO> param);
-
     boolean checkIfHistoricalDataExists(String customerId);
 
     void insertBatch(List<ScreenProjectProcessDTO> list,String customerId,String dateId);
+    void collect(ScreenCollFormDTO<ScreenProjectProcessFormDTO> param);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectQuantityGridMonthlyService.java

@@ -95,13 +95,12 @@ public interface ScreenProjectQuantityGridMonthlyService extends BaseService<Scr
     void delete(String[] ids);
     /**
      * @Description 数据采集
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
      * @date 2021.01.28 09:33
      */
-    void collect(String customerId, ScreenCollFormDTO<ScreenProjectQuantityGridMonthlyDTO> data);
+    void collect(ScreenCollFormDTO<ScreenProjectQuantityGridMonthlyDTO> data);
 
     /**
      * @Description  数据抽取 【网格-月】

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectQuantityOrgMonthlyService.java

@@ -96,13 +96,12 @@ public interface ScreenProjectQuantityOrgMonthlyService extends BaseService<Scre
 
     /**
      * @Description 数据采集
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
      * @date 2021.01.28 09:33
      */
-    void collect(String customerId, ScreenCollFormDTO<ScreenProjectQuantityOrgMonthlyDTO> data);
+    void collect(ScreenCollFormDTO<ScreenProjectQuantityOrgMonthlyDTO> data);
 
     /**
      * @Description  数据抽取【组织-月】

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/AnScreenCollServiceImpl.java

@@ -4,11 +4,7 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.dao.evaluationindex.screen.ScreenAnCommunityProjectProfileDao;
-import com.epmet.dao.evaluationindex.screen.ScreenAnGrassRootsGovernMonthlyDao;
-import com.epmet.dao.evaluationindex.screen.ScreenAnGrassRootsOrgMonthlyDao;
-import com.epmet.dao.evaluationindex.screen.ScreenAnGrassRootsPmRankDao;
-import com.epmet.dao.evaluationindex.screen.ScreenAnGrassRootsPmTotalMonthlyDao;
+import com.epmet.dao.evaluationindex.screen.*;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.dto.screencoll.form.*;
 import com.epmet.service.evaluationindex.screen.AnScreenCollService;
@@ -17,10 +13,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-
-import java.util.List;
 
 
 /**
@@ -56,17 +48,17 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void communityProjectProfile(ScreenCollFormDTO<AnCommunityProjectProfileFormDTO> formDTO,String customerId) {
-        List<AnCommunityProjectProfileFormDTO> dataList = formDTO.getDataList();
-        if(CollectionUtils.isEmpty(dataList)) return ;
+    public void communityProjectProfile(ScreenCollFormDTO<AnCommunityProjectProfileFormDTO> formDTO) {
+        /*List<AnCommunityProjectProfileFormDTO> dataList = formDTO.getDataList();
+        if(CollectionUtils.isEmpty(dataList)) return ;*/
         if(formDTO.getIsFirst()){
-            int affectRows = communityProjectProfileDao.deleteBatch(customerId);
+            int affectRows = communityProjectProfileDao.deleteBatch(formDTO.getCustomerId());
             while(affectRows >= NumConstant.ONE){
-                affectRows = communityProjectProfileDao.deleteBatch(customerId);
+                affectRows = communityProjectProfileDao.deleteBatch(formDTO.getCustomerId());
             }
         }
         Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {
-            communityProjectProfileDao.insertBatch(list,customerId);
+            communityProjectProfileDao.insertBatch(list,formDTO.getCustomerId());
         });
 
     }
@@ -81,17 +73,17 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void pmRank(ScreenCollFormDTO<AnGrassRootsPmRankFormDTO> formDTO,String customerId) {
-        List<AnGrassRootsPmRankFormDTO> dataList = formDTO.getDataList();
-        if(CollectionUtils.isEmpty(dataList)) return ;
+    public void pmRank(ScreenCollFormDTO<AnGrassRootsPmRankFormDTO> formDTO) {
+        /*List<AnGrassRootsPmRankFormDTO> dataList = formDTO.getDataList();
+        if(CollectionUtils.isEmpty(dataList)) return ;*/
         if(formDTO.getIsFirst()){
-            int affectRows = pmRankDao.deleteBatch(customerId,formDTO.getMonthId());
+            int affectRows = pmRankDao.deleteBatch(formDTO.getCustomerId(),formDTO.getMonthId());
             while(affectRows >= NumConstant.ONE){
-                affectRows = pmRankDao.deleteBatch(customerId,formDTO.getMonthId());
+                affectRows = pmRankDao.deleteBatch(formDTO.getCustomerId(),formDTO.getMonthId());
             }
         }
         Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {
-            pmRankDao.insertBatch(list,customerId);
+            pmRankDao.insertBatch(list,formDTO.getCustomerId());
         });
     }
 
@@ -105,21 +97,21 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void pmTotal(ScreenCollFormDTO<AnGrassRootsPmTotalMonthlyFormDTO> formDTO,String customerId) {
-        List<AnGrassRootsPmTotalMonthlyFormDTO> dataList = formDTO.getDataList();
-        if(CollectionUtils.isEmpty(dataList)) return ;
+    public void pmTotal(ScreenCollFormDTO<AnGrassRootsPmTotalMonthlyFormDTO> formDTO) {
+        /*List<AnGrassRootsPmTotalMonthlyFormDTO> dataList = formDTO.getDataList();
+        if(CollectionUtils.isEmpty(dataList)) return ;*/
 
         if(formDTO.getIsFirst()){
-            int affectRows = pmTotalMonthlyDao.deleteBatch(customerId,formDTO.getMonthId());
+            int affectRows = pmTotalMonthlyDao.deleteBatch(formDTO.getCustomerId(),formDTO.getMonthId());
             while(affectRows >= NumConstant.ONE){
-                affectRows = pmTotalMonthlyDao.deleteBatch(customerId,formDTO.getMonthId());
+                affectRows = pmTotalMonthlyDao.deleteBatch(formDTO.getCustomerId(),formDTO.getMonthId());
             }
         }
         String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
         Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {
             pmTotalMonthlyDao.insertBatch(list,
-                    customerId,
+                    formDTO.getCustomerId(),
                     formDTO.getMonthId(),
                     quarterId,
                     yearId);
@@ -136,21 +128,21 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void grassrootsOrg(ScreenCollFormDTO<AnGrassRootsOrgMonthlyFormDTO> formDTO,String customerId) {
-        List<AnGrassRootsOrgMonthlyFormDTO> dataList = formDTO.getDataList();
-        if(CollectionUtils.isEmpty(dataList)) return ;
+    public void grassrootsOrg(ScreenCollFormDTO<AnGrassRootsOrgMonthlyFormDTO> formDTO) {
+        /*List<AnGrassRootsOrgMonthlyFormDTO> dataList = formDTO.getDataList();
+        if(CollectionUtils.isEmpty(dataList)) return ;*/
 
         if(formDTO.getIsFirst()){
-            int affectRows = orgMonthlyDao.deleteBatch(customerId,formDTO.getMonthId());
+            int affectRows = orgMonthlyDao.deleteBatch(formDTO.getCustomerId(),formDTO.getMonthId());
             while(affectRows >= NumConstant.ONE){
-                affectRows = orgMonthlyDao.deleteBatch(customerId,formDTO.getMonthId());
+                affectRows = orgMonthlyDao.deleteBatch(formDTO.getCustomerId(),formDTO.getMonthId());
             }
         }
         String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
         Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {
             orgMonthlyDao.insertBatch(list,
-                    customerId,
+                    formDTO.getCustomerId(),
                     formDTO.getMonthId(),
                     quarterId,
                     yearId);
@@ -167,21 +159,21 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void grassrootsGovern(ScreenCollFormDTO<AnGrassRootsGovernMonthlyFormDTO> formDTO,String customerId) {
-        List<AnGrassRootsGovernMonthlyFormDTO> dataList = formDTO.getDataList();
-        if(CollectionUtils.isEmpty(dataList)) return ;
+    public void grassrootsGovern(ScreenCollFormDTO<AnGrassRootsGovernMonthlyFormDTO> formDTO) {
+        /*List<AnGrassRootsGovernMonthlyFormDTO> dataList = formDTO.getDataList();
+        if(CollectionUtils.isEmpty(dataList)) return ;*/
 
         if(formDTO.getIsFirst()){
-            int affectRows = governMonthlyDao.deleteBatch(customerId,formDTO.getMonthId());
+            int affectRows = governMonthlyDao.deleteBatch(formDTO.getCustomerId(),formDTO.getMonthId());
             while(affectRows >= NumConstant.ONE){
-                affectRows = governMonthlyDao.deleteBatch(customerId,formDTO.getMonthId());
+                affectRows = governMonthlyDao.deleteBatch(formDTO.getCustomerId(),formDTO.getMonthId());
             }
         }
         String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
         Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {
             governMonthlyDao.insertBatch(list,
-                    customerId,
+                    formDTO.getCustomerId(),
                     formDTO.getMonthId(),
                     quarterId,
                     yearId);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/KcScreenCollServiceImpl.java

@@ -82,285 +82,285 @@ public class KcScreenCollServiceImpl implements KcScreenCollService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertPlatFormSummary(ScreenCollFormDTO<KcHomePageFormDTO> formDTO, String customerId) {
+    public void insertPlatFormSummary(ScreenCollFormDTO<KcHomePageFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcPlatformSummaryDailyDao.deletePlatFormSummary(customerId, formDTO.getDateId());
+                deleteNum = screenKcPlatformSummaryDailyDao.deletePlatFormSummary(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcPlatformSummaryDailyDao.batchInsertPlatFormSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcPlatformSummaryDailyDao.batchInsertPlatFormSummary(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertIssueSummary(ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO, String customerId) {
+    public void insertIssueSummary(ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcIssueSummaryGridDailyDao.deleteIssueSummaryGrid(customerId, formDTO.getDateId());
+                deleteNum = screenKcIssueSummaryGridDailyDao.deleteIssueSummaryGrid(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcIssueSummaryGridDailyDao.batchInsertIssueSummaryGrid(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcIssueSummaryGridDailyDao.batchInsertIssueSummaryGrid(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertIssueTrend(ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO, String customerId) {
+    public void insertIssueTrend(ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcIssueTrendGridMonthlyDao.deleteIssueTrendGrid(customerId, formDTO.getMonthId());
+                deleteNum = screenKcIssueTrendGridMonthlyDao.deleteIssueTrendGrid(formDTO.getCustomerId(), formDTO.getMonthId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcIssueTrendGridMonthlyDao.batchInsertIssueTrendGrid(formDTO.getDataList(), customerId, formDTO.getMonthId());
+            screenKcIssueTrendGridMonthlyDao.batchInsertIssueTrendGrid(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getMonthId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertUserSummary(ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO, String customerId) {
+    public void insertUserSummary(ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcUserSummaryDailyDao.deleteUserSummary(customerId, formDTO.getDateId());
+                deleteNum = screenKcUserSummaryDailyDao.deleteUserSummary(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcUserSummaryDailyDao.batchInsertUserSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcUserSummaryDailyDao.batchInsertUserSummary(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertVolunteerHeartRank(ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO, String customerId) {
+    public void insertVolunteerHeartRank(ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcVolunteerHeatRankGridDailyDao.deleteVolunteerHeatRankGrid(customerId);
+                deleteNum = screenKcVolunteerHeatRankGridDailyDao.deleteVolunteerHeatRankGrid(formDTO.getCustomerId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcVolunteerHeatRankGridDailyDao.batchInsertVolunteerHeatRankGrid(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcVolunteerHeatRankGridDailyDao.batchInsertVolunteerHeatRankGrid(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertUserHeartRank(ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO, String customerId) {
+    public void insertUserHeartRank(ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcUserTrendGridMonthlyDao.deleteUserTrendGrid(customerId, formDTO.getMonthId());
+                deleteNum = screenKcUserTrendGridMonthlyDao.deleteUserTrendGrid(formDTO.getCustomerId(), formDTO.getMonthId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcUserTrendGridMonthlyDao.batchInsertUserTrendGrid(formDTO.getDataList(), customerId, formDTO.getMonthId());
+            screenKcUserTrendGridMonthlyDao.batchInsertUserTrendGrid(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getMonthId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertActSummary(ScreenCollFormDTO<KcActSummaryFormDTO> formDTO, String customerId) {
+    public void insertActSummary(ScreenCollFormDTO<KcActSummaryFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcActSummaryDailyDao.deleteActSummary(customerId, formDTO.getDateId());
+                deleteNum = screenKcActSummaryDailyDao.deleteActSummary(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcActSummaryDailyDao.batchInsertActSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcActSummaryDailyDao.batchInsertActSummary(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertActTrend(ScreenCollFormDTO<KcActTrendFormDTO> formDTO, String customerId) {
+    public void insertActTrend(ScreenCollFormDTO<KcActTrendFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcActTrendMonthlyDao.deleteActTrend(customerId, formDTO.getMonthId());
+                deleteNum = screenKcActTrendMonthlyDao.deleteActTrend(formDTO.getCustomerId(), formDTO.getMonthId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcActTrendMonthlyDao.batchInsertActTrend(formDTO.getDataList(), customerId, formDTO.getMonthId());
+            screenKcActTrendMonthlyDao.batchInsertActTrend(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getMonthId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertVolunteerSummary(ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO, String customerId) {
+    public void insertVolunteerSummary(ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcVolunteerSummaryDailyDao.deleteVolunteerSummary(customerId, formDTO.getDateId());
+                deleteNum = screenKcVolunteerSummaryDailyDao.deleteVolunteerSummary(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcVolunteerSummaryDailyDao.batchInsertVolunteerSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcVolunteerSummaryDailyDao.batchInsertVolunteerSummary(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertProjectSummary(ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO, String customerId) {
+    public void insertProjectSummary(ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcProjectSummaryGridDailyDao.deleteProjectSummary(customerId, formDTO.getDateId());
+                deleteNum = screenKcProjectSummaryGridDailyDao.deleteProjectSummary(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcProjectSummaryGridDailyDao.batchInsertProjectSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcProjectSummaryGridDailyDao.batchInsertProjectSummary(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertCategorySummary(ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO, String customerId) {
+    public void insertCategorySummary(ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcProjectCategoryGridDailyDao.deleteCategoryGrid(customerId, formDTO.getDateId());
+                deleteNum = screenKcProjectCategoryGridDailyDao.deleteCategoryGrid(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcProjectCategoryGridDailyDao.batchInsertCategoryGrid(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcProjectCategoryGridDailyDao.batchInsertCategoryGrid(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertProjectSatisanalysis(ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO, String customerId) {
+    public void insertProjectSatisanalysis(ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcProjectSatisGridMonthlyDao.deleteProjectSatisGrid(customerId, formDTO.getMonthId());
+                deleteNum = screenKcProjectSatisGridMonthlyDao.deleteProjectSatisGrid(formDTO.getCustomerId(), formDTO.getMonthId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcProjectSatisGridMonthlyDao.batchInsertProjectSatisGrid(formDTO.getDataList(), customerId, formDTO.getMonthId());
+            screenKcProjectSatisGridMonthlyDao.batchInsertProjectSatisGrid(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getMonthId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertNewsSummary(ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO, String customerId) {
+    public void insertNewsSummary(ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcNewsSummaryDailyDao.deleteNewsSummary(customerId, formDTO.getDateId());
+                deleteNum = screenKcNewsSummaryDailyDao.deleteNewsSummary(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcNewsSummaryDailyDao.batchInsertNewsSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcNewsSummaryDailyDao.batchInsertNewsSummary(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertNewsTrend(ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO, String customerId) {
+    public void insertNewsTrend(ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcNewsTrendMonthlyDao.deleteNewsTrend(customerId, formDTO.getMonthId());
+                deleteNum = screenKcNewsTrendMonthlyDao.deleteNewsTrend(formDTO.getCustomerId(), formDTO.getMonthId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcNewsTrendMonthlyDao.batchInsertNewsTrend(formDTO.getDataList(), customerId, formDTO.getMonthId());
+            screenKcNewsTrendMonthlyDao.batchInsertNewsTrend(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getMonthId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertNewsHotRank(ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO, String customerId) {
+    public void insertNewsHotRank(ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcNewsRankDao.deleteNewsRank(customerId);
+                deleteNum = screenKcNewsRankDao.deleteNewsRank(formDTO.getCustomerId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcNewsRankDao.batchInsertNewsRank(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcNewsRankDao.batchInsertNewsRank(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertNewsCategoryAnalysis(ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO, String customerId) {
+    public void insertNewsCategoryAnalysis(ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcNewsCategoryAnalysisDao.deleteNewsCategoryAnalysis(customerId, formDTO.getDateId());
+                deleteNum = screenKcNewsCategoryAnalysisDao.deleteNewsCategoryAnalysis(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcNewsCategoryAnalysisDao.batchInsertNewsCategoryAnalysis(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcNewsCategoryAnalysisDao.batchInsertNewsCategoryAnalysis(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertGroupSummary(ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO, String customerId) {
+    public void insertGroupSummary(ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcGroupSummaryGridDailyDao.deleteGroupSummaryGrid(customerId, formDTO.getDateId());
+                deleteNum = screenKcGroupSummaryGridDailyDao.deleteGroupSummaryGrid(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcGroupSummaryGridDailyDao.batchInsertGroupSummaryGrid(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcGroupSummaryGridDailyDao.batchInsertGroupSummaryGrid(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertGroupDetail(ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO, String customerId) {
+    public void insertGroupDetail(ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcGroupDetailGridDailyDao.deleteGroupDetailGrid(customerId, formDTO.getDateId());
+                deleteNum = screenKcGroupDetailGridDailyDao.deleteGroupDetailGrid(formDTO.getCustomerId(), formDTO.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcGroupDetailGridDailyDao.batchInsertGroupDetailGrid(formDTO.getDataList(), customerId, formDTO.getDateId());
+            screenKcGroupDetailGridDailyDao.batchInsertGroupDetailGrid(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getDateId());
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertGroupTopicTrend(ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO, String customerId) {
+    public void insertGroupTopicTrend(ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = screenKcTopicTrendGridMonthlyDao.deleteTopicTrendGrid(customerId, formDTO.getMonthId());
+                deleteNum = screenKcTopicTrendGridMonthlyDao.deleteTopicTrendGrid(formDTO.getCustomerId(), formDTO.getMonthId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcTopicTrendGridMonthlyDao.batchInsertTopicTrendGrid(formDTO.getDataList(), customerId, formDTO.getMonthId());
+            screenKcTopicTrendGridMonthlyDao.batchInsertTopicTrendGrid(formDTO.getDataList(), formDTO.getCustomerId(), formDTO.getMonthId());
         }
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java

@@ -21,19 +21,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao;
 import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity;
 import com.epmet.service.evaluationindex.screen.ScreenProjectCategoryGridDailyService;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -108,23 +106,22 @@ public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl<S
     /**
      * 【事件/项目分析】按类别统计-网格
      *
-     * @param customerId
      * @param param
      * @return void
      * @author zhaoqifeng
      * @date 2021/2/24 10:16
      */
     @Override
-    public void collect(String customerId, ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> param) {
+    public void collect(ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> param) {
         if(param.getIsFirst()){
             int deleteNum;
             do {
-                deleteNum = baseDao.deleteByDateIdAndCustomerId(customerId,param.getDateId());
+                deleteNum = baseDao.deleteByDateIdAndCustomerId(param.getCustomerId(),param.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(param.getDataList())) {
             param.getDataList().forEach(item -> {
-                item.setCustomerId(customerId);
+                item.setCustomerId(param.getCustomerId());
                 item.setDateId(param.getDateId());
             });
             insertBatch(ConvertUtils.sourceToTarget(param.getDataList(), ScreenProjectCategoryGridDailyEntity.class));

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java

@@ -107,23 +107,22 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
     /**
      * 【事件/项目分析】按类别统计-组织
      *
-     * @param customerId
      * @param param
      * @return void
      * @author zhaoqifeng
      * @date 2021/2/24 10:17
      */
     @Override
-    public void collect(String customerId, ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> param) {
+    public void collect(ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> param) {
         if(param.getIsFirst()){
             int deleteNum;
             do {
-                deleteNum = baseDao.deleteByDateIdAndCustomerId(customerId,param.getDateId());
+                deleteNum = baseDao.deleteByDateIdAndCustomerId(param.getCustomerId(),param.getDateId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(param.getDataList())) {
             param.getDataList().forEach(item -> {
-                item.setCustomerId(customerId);
+                item.setCustomerId(param.getCustomerId());
                 item.setDateId(param.getDateId());
             });
             Lists.partition(param.getDataList(), NumConstant.ONE_HUNDRED).forEach(list -> {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -21,10 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.*;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
@@ -33,6 +32,9 @@ import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.entity.evaluationindex.screen.*;
 import com.epmet.service.evaluationindex.screen.*;
 import org.apache.commons.collections4.ListUtils;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectDataEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectImgDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenProjectDataService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -121,11 +123,11 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
     @Override
     @Transactional(rollbackFor = Exception.class)
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
-    public void collect(String customerId, ScreenCollFormDTO<ScreenProjectDataInfoFormDTO> param) {
+    public void collect(ScreenCollFormDTO<ScreenProjectDataInfoFormDTO> param) {
         if (param.getIsFirst()) {
-            int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId, param.getDateId());
+            int affectedRows = baseDao.deleteByDateIdAndCustomerId(param.getCustomerId(), param.getDateId());
             while (affectedRows > 0) {
-                affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId, param.getDateId());
+                affectedRows = baseDao.deleteByDateIdAndCustomerId(param.getCustomerId(), param.getDateId());
             }
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -178,11 +180,11 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
             //先删除该projectId对应的旧数据
             QueryWrapper<ScreenProjectDataEntity> deleteWrapper = new QueryWrapper<>();
             deleteWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId())
-                    .eq(StringUtils.isNotBlank(customerId), "customer_id", customerId);
+                    .eq(StringUtils.isNotBlank(param.getCustomerId()), "customer_id", param.getCustomerId());
             baseDao.delete(deleteWrapper);
             QueryWrapper<ScreenProjectImgDataEntity> screenProjectImgDataEntityQueryWrapper = new QueryWrapper<>();
             screenProjectImgDataEntityQueryWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId())
-                    .eq(StringUtils.isNotBlank(customerId), "customer_id", customerId);
+                    .eq(StringUtils.isNotBlank(param.getCustomerId()), "customer_id", param.getCustomerId());
             screenProjectImgDataDao.delete(screenProjectImgDataEntityQueryWrapper);
 
             //如果orgType未知，获取一下
@@ -205,7 +207,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
 
             //插入项目表
             ScreenProjectDataEntity screenProjectDataEntity = ConvertUtils.sourceToTarget(item, ScreenProjectDataEntity.class);
-            screenProjectDataEntity.setCustomerId(customerId);
+            screenProjectDataEntity.setCustomerId(param.getCustomerId());
             screenProjectDataEntity.setDataEndTime(param.getDateId());
             baseDao.insert(screenProjectDataEntity);
             //插入图片表
@@ -213,7 +215,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
             if (ArrayUtils.isNotEmpty(projectImgUrl)) {
                 for (int i = 0; i < projectImgUrl.length; i++) {
                     ScreenProjectImgDataEntity screenProjectImgDataEntity = new ScreenProjectImgDataEntity();
-                    screenProjectImgDataEntity.setCustomerId(customerId);
+                    screenProjectImgDataEntity.setCustomerId(param.getCustomerId());
                     screenProjectImgDataEntity.setProjectId(item.getProjectId());
                     screenProjectImgDataEntity.setProjectImgUrl(projectImgUrl[i]);
                     screenProjectImgDataEntity.setSort(i);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectGridDailyServiceImpl.java

@@ -122,7 +122,6 @@ public class ScreenProjectGridDailyServiceImpl extends BaseServiceImpl<ScreenPro
 
     /**
      * @Description 数据采集
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
@@ -131,15 +130,15 @@ public class ScreenProjectGridDailyServiceImpl extends BaseServiceImpl<ScreenPro
     @Transactional(rollbackFor = Exception.class)
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
-    public void collect(String customerId, ScreenCollFormDTO<ScreenProjectGridDailyDTO> data) {
+    public void collect(ScreenCollFormDTO<ScreenProjectGridDailyDTO> data) {
         if(data.getIsFirst()){
-            int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+            int affectedRows = baseDao.deleteByDateIdAndCustomerId(data.getCustomerId(),data.getDateId());
             while(affectedRows > 0){
-                affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+                affectedRows = baseDao.deleteByDateIdAndCustomerId(data.getCustomerId(),data.getDateId());
             }
         }
         Lists.partition(data.getDataList(), NumConstant.ONE_HUNDRED).forEach(list -> {
-            baseDao.insertBatch(list,customerId,"APP_USER",data.getDateId());
+            baseDao.insertBatch(list,data.getCustomerId(),"APP_USER",data.getDateId());
         });
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java

@@ -125,7 +125,6 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl<ScreenProj
 
     /**
      * @Description 数据采集
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
@@ -134,15 +133,15 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl<ScreenProj
     @Transactional(rollbackFor = Exception.class)
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
-    public void collect(String customerId, ScreenCollFormDTO<ScreenProjectOrgDailyDTO> data) {
+    public void collect(ScreenCollFormDTO<ScreenProjectOrgDailyDTO> data) {
         if(data.getIsFirst()){
-            int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+            int affectedRows = baseDao.deleteByDateIdAndCustomerId(data.getCustomerId(),data.getDateId());
             while(affectedRows > 0){
-                affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+                affectedRows = baseDao.deleteByDateIdAndCustomerId(data.getCustomerId(),data.getDateId());
             }
         }
         Lists.partition(data.getDataList(), NumConstant.ONE_HUNDRED).forEach(list -> {
-            baseDao.insertBatch(list,customerId,"APP_USER",data.getDateId());
+            baseDao.insertBatch(list,data.getCustomerId(),"APP_USER",data.getDateId());
         });
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessServiceImpl.java

@@ -113,29 +113,29 @@ public class ScreenProjectProcessServiceImpl extends BaseServiceImpl<ScreenProje
     @Override
     @Transactional(rollbackFor = Exception.class)
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
-    public void collect(String customerId, ScreenCollFormDTO<ScreenProjectProcessFormDTO> param) {
+    public void collect(ScreenCollFormDTO<ScreenProjectProcessFormDTO> param) {
         if (param.getIsFirst()) {
-            int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId, param.getDateId());
+            int affectedRows = baseDao.deleteByDateIdAndCustomerId(param.getCustomerId(), param.getDateId());
             while (affectedRows > 0) {
-                affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId, param.getDateId());
+                affectedRows = baseDao.deleteByDateIdAndCustomerId(param.getCustomerId(), param.getDateId());
             }
         }
         param.getDataList().forEach(item -> {
             //先删除旧数据
             QueryWrapper<ScreenProjectProcessEntity> screenProjectProcessEntityQueryWrapper = new QueryWrapper<>();
             screenProjectProcessEntityQueryWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId())
-                    .eq(StringUtils.isNotBlank(customerId), "customer_id", customerId)
+                    .eq(StringUtils.isNotBlank(param.getCustomerId()), "customer_id", param.getCustomerId())
                     .eq(StringUtils.isNotBlank(item.getProcessId()), "process_id", item.getProcessId());
             baseDao.delete(screenProjectProcessEntityQueryWrapper);
 
             QueryWrapper<ScreenProjectProcessAttachmentEntity> screenProjectProcessAttachmentEntityQueryWrapper = new QueryWrapper<>();
             screenProjectProcessAttachmentEntityQueryWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId())
-                    .eq(StringUtils.isNotBlank(customerId), "customer_id", customerId)
+                    .eq(StringUtils.isNotBlank(param.getCustomerId()), "customer_id", param.getCustomerId())
                     .eq(StringUtils.isNotBlank(item.getProcessId()), "process_id", item.getProcessId());
             screenProjectProcessAttachmentDao.delete(screenProjectProcessAttachmentEntityQueryWrapper);
             //插入
             ScreenProjectProcessEntity screenProjectProcessEntity = ConvertUtils.sourceToTarget(item, ScreenProjectProcessEntity.class);
-            screenProjectProcessEntity.setCustomerId(customerId);
+            screenProjectProcessEntity.setCustomerId(param.getCustomerId());
             screenProjectProcessEntity.setDataEndTime(param.getDateId());
             baseDao.insert(screenProjectProcessEntity);
 
@@ -143,7 +143,7 @@ public class ScreenProjectProcessServiceImpl extends BaseServiceImpl<ScreenProje
             if (!CollectionUtils.isEmpty(attachments)){
                 for (int i = 0; i < attachments.size(); i++) {
                     ScreenProjectProcessAttachmentEntity attachmentEntity = ConvertUtils.sourceToTarget(attachments.get(i), ScreenProjectProcessAttachmentEntity.class);
-                    attachmentEntity.setCustomerId(customerId);
+                    attachmentEntity.setCustomerId(param.getCustomerId());
                     attachmentEntity.setProcessId(item.getProcessId());
                     attachmentEntity.setProjectId(item.getProjectId());
                     if (attachmentEntity.getSort() == null) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityGridMonthlyServiceImpl.java

@@ -123,7 +123,6 @@ public class ScreenProjectQuantityGridMonthlyServiceImpl extends BaseServiceImpl
 
     /**
      * @Description 数据采集
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
@@ -132,15 +131,15 @@ public class ScreenProjectQuantityGridMonthlyServiceImpl extends BaseServiceImpl
     @Transactional(rollbackFor = Exception.class)
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
-    public void collect(String customerId, ScreenCollFormDTO<ScreenProjectQuantityGridMonthlyDTO> data) {
+    public void collect(ScreenCollFormDTO<ScreenProjectQuantityGridMonthlyDTO> data) {
         if(data.getIsFirst()){
-            int affectedRows = baseDao.deleteByMonthIdAndCustomerId(customerId,data.getMonthId());
+            int affectedRows = baseDao.deleteByMonthIdAndCustomerId(data.getCustomerId(),data.getMonthId());
             while(affectedRows > 0){
-                affectedRows = baseDao.deleteByMonthIdAndCustomerId(customerId,data.getMonthId());
+                affectedRows = baseDao.deleteByMonthIdAndCustomerId(data.getCustomerId(),data.getMonthId());
             }
         }
         Lists.partition(data.getDataList(), NumConstant.ONE_HUNDRED).forEach(list -> {
-            baseDao.insertBatch(list,customerId,"APP_USER",data.getMonthId());
+            baseDao.insertBatch(list,data.getCustomerId(),"APP_USER",data.getMonthId());
         });
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java

@@ -123,7 +123,6 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
 
     /**
      * @Description 数据采集
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
@@ -132,15 +131,15 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
     @Transactional(rollbackFor = Exception.class)
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
-    public void collect(String customerId, ScreenCollFormDTO<ScreenProjectQuantityOrgMonthlyDTO> data) {
+    public void collect(ScreenCollFormDTO<ScreenProjectQuantityOrgMonthlyDTO> data) {
         if(data.getIsFirst()){
-            int affectedRows = baseDao.deleteByMonthIdAndCustomerId(customerId,data.getMonthId());
+            int affectedRows = baseDao.deleteByMonthIdAndCustomerId(data.getCustomerId(),data.getMonthId());
             while(affectedRows > 0){
-                affectedRows = baseDao.deleteByMonthIdAndCustomerId(customerId,data.getMonthId());
+                affectedRows = baseDao.deleteByMonthIdAndCustomerId(data.getCustomerId(),data.getMonthId());
             }
         }
         Lists.partition(data.getDataList(), NumConstant.ONE_HUNDRED).forEach(list -> {
-            baseDao.insertBatch(list,customerId,"APP_USER",data.getMonthId());
+            baseDao.insertBatch(list,data.getCustomerId(),"APP_USER",data.getMonthId());
         });
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/ScreenCustomerWorkRecordDictService.java

@@ -96,11 +96,10 @@ public interface ScreenCustomerWorkRecordDictService extends BaseService<ScreenC
 
     /**
      * @Description 数据录入
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
      * @date 2021.02.04 15:27
     */
-    void collect(String customerId, ScreenCollFormDTO<ScreenCustomerWorkRecordDictDTO> data);
+    void collect(ScreenCollFormDTO<ScreenCustomerWorkRecordDictDTO> data);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/ScreenWorkRecordOrgDailyService.java

@@ -30,5 +30,5 @@ import com.epmet.entity.plugins.ScreenWorkRecordOrgDailyEntity;
  */
 public interface ScreenWorkRecordOrgDailyService extends BaseService<ScreenWorkRecordOrgDailyEntity> {
 
-    void collectOrgDaily(String customerId, ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data);
+    void collectOrgDaily(ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/ScreenWorkRecordOrgMonthlyService.java

@@ -32,11 +32,10 @@ public interface ScreenWorkRecordOrgMonthlyService extends BaseService<ScreenWor
 
     /**
      * @Description 数据录入
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
      * @date 2021.02.04 15:27
      */
-    void collect(String customerId, ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data);
+    void collect(ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data);
 }

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

@@ -107,15 +107,15 @@ public class ScreenCustomerWorkRecordDictServiceImpl extends BaseServiceImpl<Scr
     @Transactional(rollbackFor = Exception.class)
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
-    public void collect(String customerId, ScreenCollFormDTO<ScreenCustomerWorkRecordDictDTO> data) {
+    public void collect(ScreenCollFormDTO<ScreenCustomerWorkRecordDictDTO> data) {
         if(data.getIsFirst()){
-            int affectedRows = baseDao.deleteBatch(customerId);
+            int affectedRows = baseDao.deleteBatch(data.getCustomerId());
             while(affectedRows > 0){
-                affectedRows = baseDao.deleteBatch(customerId);
+                affectedRows = baseDao.deleteBatch(data.getCustomerId());
             }
         }
         Lists.partition(data.getDataList(), NumConstant.ONE_HUNDRED).forEach(list -> {
-            baseDao.insertBatch(list,customerId,data.getDateId());
+            baseDao.insertBatch(list,data.getCustomerId(),data.getDateId());
         });
     }
 

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

@@ -41,15 +41,15 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
-    public void collectOrgDaily(String customerId, ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data) {
+    public void collectOrgDaily(ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data) {
         if(data.getIsFirst()){
-            int affectedRows = baseDao.deleteBatch(customerId,data.getDateId());
+            int affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getDateId());
             while(affectedRows > 0){
-                affectedRows = baseDao.deleteBatch(customerId,data.getDateId());
+                affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getDateId());
             }
         }
         Lists.partition(data.getDataList(), NumConstant.ONE_HUNDRED).forEach(list -> {
-            baseDao.insertBatch(list,customerId,data.getDateId());
+            baseDao.insertBatch(list,data.getCustomerId(),data.getDateId());
         });
     }
 }

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

@@ -42,7 +42,6 @@ public class ScreenWorkRecordOrgMonthlyServiceImpl extends BaseServiceImpl<Scree
 
     /**
      * @Description 数据录入
-     * @param customerId
      * @param data
      * @return void
      * @author wangc
@@ -51,15 +50,15 @@ public class ScreenWorkRecordOrgMonthlyServiceImpl extends BaseServiceImpl<Scree
     @Transactional(rollbackFor = Exception.class)
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
-    public void collect(String customerId, ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data) {
+    public void collect(ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data) {
         if(data.getIsFirst()){
-            int affectedRows = baseDao.deleteBatch(customerId,data.getMonthId());
+            int affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getMonthId());
             while(affectedRows > 0){
-                affectedRows = baseDao.deleteBatch(customerId,data.getMonthId());
+                affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getMonthId());
             }
         }
         Lists.partition(data.getDataList(), NumConstant.ONE_HUNDRED).forEach(list -> {
-            baseDao.insertBatch(list,customerId,data.getMonthId());
+            baseDao.insertBatch(list,data.getCustomerId(),data.getMonthId());
         });
     }