From 3fd59b932ee08b4782f892d15b50fc40e814730b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Aug 2020 16:31:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E6=A0=91?= =?UTF-8?q?=EF=BC=8C=E7=BB=84=E7=BB=87=E5=8C=BA=E5=9F=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/screen/AgencyController.java | 6 +++--- ...ntroller.java => ScreenProjectController.java} | 2 +- .../datareport/service/screen/AgencyService.java | 4 ++-- ...jectService.java => ScreenProjectService.java} | 2 +- .../service/screen/impl/AgencyServiceImpl.java | 15 +++++++++++---- .../screen/impl/DistributionServiceImpl.java | 2 ++ .../screen/impl/GrassRootsGovernServiceImpl.java | 2 ++ .../service/screen/impl/IndexServiceImpl.java | 2 ++ .../screen/impl/PartyMemberLeadServiceImpl.java | 2 ++ .../service/screen/impl/ProjectServiceImpl.java | 12 ------------ .../screen/impl/ScreenProjectServiceImpl.java | 14 ++++++++++++++ .../mapper/screen/ScreenCustomerAgencyDao.xml | 1 + 12 files changed, 41 insertions(+), 23 deletions(-) rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/{ProjectController.java => ScreenProjectController.java} (89%) rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/{ProjectService.java => ScreenProjectService.java} (76%) delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java index e69b0d51f1..c37a2ad225 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java @@ -31,13 +31,13 @@ public class AgencyController { /** * @Description 1、组织机构树 - * @param tokenDto + * @param * @author zxc * @date 2020/8/18 2:04 下午 */ @PostMapping("tree") - public Result> tree(@LoginUser TokenDto tokenDto){ - return new Result>().ok(agencyService.tree(tokenDto)); + public Result tree(){ + return new Result().ok(agencyService.tree()); } /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java similarity index 89% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 4bf4b33342..a28be5899b 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -11,5 +11,5 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController("screeproject") @RequestMapping("/screen/project") -public class ProjectController { +public class ScreenProjectController { } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java index 317cfde18d..5b7a48177a 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java @@ -17,11 +17,11 @@ public interface AgencyService { /** * @Description 1、组织机构树 - * @param tokenDto + * @param * @author zxc * @date 2020/8/18 2:04 下午 */ - List tree(TokenDto tokenDto); + TreeResultDTO tree(); /** * @Description 2、组织区域查询 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ProjectService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ScreenProjectService.java similarity index 76% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ProjectService.java rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ScreenProjectService.java index 6998572bde..51354ec4f6 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ProjectService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ScreenProjectService.java @@ -6,5 +6,5 @@ package com.epmet.datareport.service.screen; * @author yinzuomei@elink-cn.com * @date 2020/8/18 10:22 */ -public interface ProjectService { +public interface ScreenProjectService { } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java index fdb36ae339..922b15000d 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java @@ -29,15 +29,22 @@ public class AgencyServiceImpl implements AgencyService { /** * @Description 1、组织机构树 - * @param tokenDto + * @param * @author zxc * @date 2020/8/18 2:04 下午 */ @Override - public List tree(TokenDto tokenDto) { + public TreeResultDTO tree() { // 1. 查询客户根组织ID - TreeResultDTO rootAgency = screenCustomerAgencyDao.selectRootAgencyId(tokenDto.getCustomerId()); - return this.getDepartmentList(("".equals(rootAgency.getPids()) ? "" : rootAgency.getPids() + ":") + rootAgency.getValue()); + // TODO 改成正式注解获取customerId + String customerId = "zxc"; + TreeResultDTO rootAgency = screenCustomerAgencyDao.selectRootAgencyId(customerId); + if (null == rootAgency){ + return new TreeResultDTO(); + } + List departmentList = this.getDepartmentList(("".equals(rootAgency.getPids()) ? "" : rootAgency.getPids() + ":") + rootAgency.getValue()); + rootAgency.setChildren(departmentList); + return rootAgency; } private List getDepartmentList(String subAgencyPids) { diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java index 7d2dad4706..c83c82aff7 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java @@ -7,6 +7,7 @@ import com.epmet.screen.dto.result.BranchResultDTO; import com.epmet.screen.dto.result.ParymemberResultDTO; import com.epmet.screen.dto.result.UserResultDTO; import com.epmet.datareport.service.screen.DistributionService; +import org.springframework.stereotype.Service; /** * 中央区相关各指标查询 @@ -14,6 +15,7 @@ import com.epmet.datareport.service.screen.DistributionService; * @author yinzuomei@elink-cn.com * @date 2020/8/18 10:19 */ +@Service public class DistributionServiceImpl implements DistributionService { /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java index 751b4b8c50..cb1e1fe160 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.datareport.service.screen.impl; import com.epmet.datareport.service.screen.GrassRootsGovernService; +import org.springframework.stereotype.Service; /** * 基层治理相关各指标查询 @@ -8,5 +9,6 @@ import com.epmet.datareport.service.screen.GrassRootsGovernService; * @author yinzuomei@elink-cn.com * @date 2020/8/18 10:20 */ +@Service public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java index 370d60016d..042e9b2229 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.datareport.service.screen.impl; import com.epmet.datareport.service.screen.IndexService; +import org.springframework.stereotype.Service; /** * 指数相关相关各指标查询 @@ -8,5 +9,6 @@ import com.epmet.datareport.service.screen.IndexService; * @author yinzuomei@elink-cn.com * @date 2020/8/18 10:21 */ +@Service public class IndexServiceImpl implements IndexService { } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java index cb85f7e75c..33903007a5 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.datareport.service.screen.impl; import com.epmet.datareport.service.screen.PartyMemberLeadService; +import org.springframework.stereotype.Service; /** * 党建引领相关各指标查询 @@ -8,5 +9,6 @@ import com.epmet.datareport.service.screen.PartyMemberLeadService; * @author yinzuomei@elink-cn.com * @date 2020/8/18 10:22 */ +@Service public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java deleted file mode 100644 index 44741a7921..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.epmet.datareport.service.screen.impl; - -import com.epmet.datareport.service.screen.ProjectService; - -/** - * 项目 - * - * @author yinzuomei@elink-cn.com - * @date 2020/8/18 10:23 - */ -public class ProjectServiceImpl implements ProjectService { -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java new file mode 100644 index 0000000000..5a09c8ce83 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java @@ -0,0 +1,14 @@ +package com.epmet.datareport.service.screen.impl; + +import com.epmet.datareport.service.screen.ScreenProjectService; +import org.springframework.stereotype.Service; + +/** + * 项目 + * + * @author yinzuomei@elink-cn.com + * @date 2020/8/18 10:23 + */ +@Service +public class ScreenProjectServiceImpl implements ScreenProjectService { +} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index 9650c3f164..fd9095fc7d 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -6,6 +6,7 @@