From b835e8a888baef9bb5eaa38cc0aa774827379a14 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Aug 2020 13:24:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=88=86=E5=B8=83=E3=80=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=86=E5=B8=83=E3=80=81=E6=9C=88=E5=BA=A6?= =?UTF-8?q?=E6=8C=87=E6=95=B0-=E6=9F=B1=E7=8A=B6=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/ParymemberDistributionResultDTO.java | 2 ++ .../screen/dto/result/UserDistributionResultDTO.java | 2 ++ .../java/com/epmet/screen/dto/result/UserResultDTO.java | 2 +- .../datareport/controller/screen/IndexController.java | 4 ++-- .../datareport/dao/screen/ScreenIndexDataMonthlyDao.java | 3 +-- .../epmet/datareport/service/screen/IndexService.java | 3 +-- .../datareport/service/screen/impl/IndexServiceImpl.java | 9 ++------- .../mapper/screen/ScreenIndexDataMonthlyDao.xml | 1 - 8 files changed, 11 insertions(+), 15 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java index 397b53287b..180d6fd3c8 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.screen.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -31,6 +32,7 @@ public class ParymemberDistributionResultDTO implements Serializable { /** * 坐标区域 */ + @JsonIgnore private String areaMarks = ""; /** diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java index 15787f28ed..de772f423b 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.screen.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -31,6 +32,7 @@ public class UserDistributionResultDTO implements Serializable { /** * 坐标区域 */ + @JsonIgnore private String areaMarks; /** diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java index cea3d4b7ad..592b3fd4af 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java @@ -30,7 +30,7 @@ public class UserResultDTO implements Serializable { * 当前所选组织的坐标区域 */ @JsonIgnore - private String areaMarks = ""; + private String areaMarks; /** * 机关级别 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java index 401ee272a9..ba4a24ec52 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java @@ -67,9 +67,9 @@ public class IndexController { */ //@ExternalAppRequestAuth @PostMapping("monthindexanalysis/barchart") - public Result monthBarchart(@RequestBody MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam){ + public Result monthBarchart(@RequestBody MonthBarchartFormDTO monthBarchartFormDTO){ ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class); - return new Result().ok(indexService.monthBarchart(monthBarchartFormDTO,externalAppRequestParam)); + return new Result().ok(indexService.monthBarchart(monthBarchartFormDTO)); } /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java index 2e18647c39..028fbf6142 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java @@ -46,12 +46,11 @@ public interface ScreenIndexDataMonthlyDao{ /** * @Description 查询近一年的指数值【不包括本月】 - * @param customerId * @param agencyId * @author zxc * @date 2020/8/20 9:02 上午 */ - List selectMonthBarchart(@Param("customerId")String customerId, @Param("agencyId")String agencyId); + List selectMonthBarchart(@Param("agencyId")String agencyId); /** * @Description 4、下级部门指数排行 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java index 5c0b5e4ade..5f840c2369 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java @@ -1,6 +1,5 @@ package com.epmet.datareport.service.screen; -import com.epmet.commons.extappauth.bean.ExternalAppRequestParam; import com.epmet.screen.dto.form.MonthBarchartFormDTO; import com.epmet.screen.dto.form.MonthPieChartFormDTO; import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO; @@ -42,7 +41,7 @@ public interface IndexService { * @author zxc * @date 2020/8/19 5:27 下午 */ - MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam); + MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO); /** * @Description 4、下级部门指数排行 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 cd7063f05e..a747d93c31 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 @@ -77,12 +77,7 @@ public class IndexServiceImpl implements IndexService { */ @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true) @Override - public MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam) { - -// String customerId = externalAppRequestParam.getCustomerId(); - - // 验签关闭，customerId无法获取，暂时写死 - String customerId = "b09527201c4409e19d1dbc5e3c3429a1"; + public MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO) { MonthBarchartResultDTO result = new MonthBarchartResultDTO(); List serviceAbilityData = new ArrayList<>(); List partyDevAbilityData = new ArrayList<>(); @@ -91,7 +86,7 @@ public class IndexServiceImpl implements IndexService { // 1. x轴 result.setXAxis(partyMemberLeadServiceImpl.getXPro()); // 2. 查询近一年的指数值【不包括本月】 - List monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(customerId, monthBarchartFormDTO.getAgencyId()); + List monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId()); if (monthBarchartResults.size() == NumConstant.ZERO){ for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) { serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 21293ad4c6..3adcde64e8 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -31,7 +31,6 @@ WHERE del_flag = '0' AND org_id = #{agencyId} - AND customer_id = #{customerId} ORDER BY MONTH_ID DESC LIMIT 12