From eb5d0cce98c37e5652a5ac2a328faab36c184d68 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 12 Feb 2020 10:18:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=A0=A1=E9=AA=8C=E4=BB=8Eap?= =?UTF-8?q?i=E6=A8=A1=E5=9D=97=E7=A7=BB=E8=87=B3analysis=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/controller/AppIssueAnalysisController.java | 4 ++++ .../item/controller/AppItemAnalysisController.java | 11 +++++++++++ .../epdc/controller/ApiAnalysisIssueController.java | 3 --- .../epdc/controller/ApiAnalysisItemController.java | 9 --------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java index c4f78da57..12d9d7dda 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.modules.issue.controller; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; @@ -37,6 +38,9 @@ public class AppIssueAnalysisController { */ @GetMapping("getStatisticsByCategory") public Result> getStatisticsByCategory(@RequestBody IssueStatisticsInfoFormDTO formDTO) { + //效验数据 + ValidatorUtils.validateEntity(formDTO); + formDTO.setDeptIdList(SecurityUser.getUser().getDeptIdList()); List list = issueAnalysisService.listStatisticsByCategoryList(formDTO); return new Result>().ok(list); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java index 8f47772d1..fced3fb0c 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java @@ -1,6 +1,8 @@ package com.elink.esua.epdc.modules.item.controller; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.item.form.HotItemListFormDTO; import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; @@ -38,6 +40,9 @@ public class AppItemAnalysisController { */ @GetMapping("getItemAnalysis") public Result> getItemAnalysis(@RequestBody ItemAnalysisFormDTO formDto) { + //效验数据 + ValidatorUtils.validateEntity(formDto); + formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); List data = itemAnalysisService.getItemAnalysis(formDto); return new Result>().ok(data); } @@ -51,6 +56,9 @@ public class AppItemAnalysisController { */ @GetMapping("getItemSurvey") public Result getItemSurvey(@RequestBody ItemSurveyFormDTO formDTO) { + //效验数据 + ValidatorUtils.validateEntity(formDTO); + formDTO.setDeptIdList(SecurityUser.getUser().getDeptIdList()); ItemSurveyResultDTO data = itemAnalysisService.getItemSurvey(formDTO); return new Result().ok(data); } @@ -64,6 +72,9 @@ public class AppItemAnalysisController { */ @GetMapping("getHotItemList") public Result> getHotItemList(@RequestBody HotItemListFormDTO formDto) { + //效验数据 + ValidatorUtils.validateEntity(formDto); + formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); List data = itemAnalysisService.listHotItemList(formDto); return new Result>().ok(data); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java index d318f3482..a51749c4b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java @@ -53,9 +53,6 @@ public class ApiAnalysisIssueController { */ @GetMapping("getStatisticsByCategory") public Result> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) { - //效验数据 - ValidatorUtils.validateEntity(formDto); - formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); return analysisIssueService.listStatisticsByCategory(formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java index 76a9e3453..0f118bba1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java @@ -54,9 +54,6 @@ public class ApiAnalysisItemController { */ @GetMapping("getItemSurvey") public Result getItemSurvey(ItemSurveyFormDTO formDto) { - //效验数据 - ValidatorUtils.validateEntity(formDto); - formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); return analysisItemService.getItemSurvey(formDto); } @@ -69,9 +66,6 @@ public class ApiAnalysisItemController { */ @GetMapping("getItemAnalysis") public Result> getItemAnalysis(ItemAnalysisFormDTO formDto) { - //效验数据 - ValidatorUtils.validateEntity(formDto); - formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); Result> list = analysisItemService.getItemAnalysis(formDto); return list; } @@ -85,9 +79,6 @@ public class ApiAnalysisItemController { */ @GetMapping("getHotItemList") public Result> getHotItemList(HotItemListFormDTO formDto) { - //效验数据 - ValidatorUtils.validateEntity(formDto); - formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); Result> list = analysisItemService.listHotItemList(formDto); return list; }