From b3ea311e1348214183b799da2a5df9cb0337c0aa Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Nov 2021 19:00:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9report=20=E5=86=85?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index fa6f9d7f73..c07cfe618a 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -9,10 +9,10 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./data-report.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./data-report.jar" restart: "unless-stopped" deploy: resources: limits: cpus: '0.1' - memory: 600M + memory: 1600M From be28295c4cec260e170740d4061a102d9e37c853 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 Nov 2021 16:37:52 +0800 Subject: [PATCH 2/7] =?UTF-8?q?subagencyindexrank-py=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml | 3 +++ 1 file changed, 3 insertions(+) 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 8b4eed6642..8e29ff2cec 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 @@ -388,6 +388,9 @@ ROUND((ROUND(sy.govern_ablity,1) * sy.GOVERN_ABLITY_WEIGHT),1) AS governAbility, ROUND((ROUND(sy.party_dev_ablity,1) * sy.PARTY_DEV_WEIGHT),1) AS partyDevAbility, ROUND((ROUND(sy.service_ablity,1) * sy.SERVICE_ABLITY_WEIGHT),1) AS serviceAbility, + ROUND(sy.govern_ablity,1) AS originGovernAbility, + ROUND(sy.party_dev_ablity,1) AS originPartyDevAbility, + ROUND(sy.service_ablity,1) AS originServiceAbility, sy.ORG_ID as orgId, scg.area_code as areaCode FROM screen_customer_grid scg From 3d2831a3998db28e188539c3d1c3cb0f976fc4cd Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 12 Nov 2021 10:57:43 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=9130=E5=A4=A9?= =?UTF-8?q?=E7=9A=84=20=E4=BA=8B=E4=BB=B6=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenProjectDataDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index accf6111e4..05753a7b3a 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -135,7 +135,7 @@ AND pd.ORG_TYPE = 'agency' AND pd.PROJECT_LEVEL != 0 AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%') - AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) + AND UNIX_TIMESTAMP(pd.PROJECT_CREATE_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) ) UNION ALL (SELECT pd.PROJECT_LEVEL @@ -145,7 +145,7 @@ AND pd.ORG_TYPE = 'grid' AND pd.PROJECT_LEVEL != 0 AND scg.AREA_CODE LIKE CONCAT(#{areaCode},'%') - AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) + AND UNIX_TIMESTAMP(pd.PROJECT_CREATE_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) ) UNION ALL (SELECT pd.PROJECT_LEVEL @@ -155,7 +155,7 @@ AND pd.ORG_TYPE = 'department' AND pd.PROJECT_LEVEL != 0 AND scd.AREA_CODE LIKE CONCAT(#{areaCode},'%') - AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) + AND UNIX_TIMESTAMP(pd.PROJECT_CREATE_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) ) From 6a752c6e94e70a96a1895d1a7cc9f58f63b22006 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 12 Nov 2021 12:06:08 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E5=B1=9E?= =?UTF-8?q?=E8=A1=97=E9=81=93=E7=9A=84=E5=88=86=E7=B1=BB=E6=95=B0=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7id=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/ScreenProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index bc23641267..ade6b21883 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -172,7 +172,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { List resultList = new ArrayList<>(); if (!CollectionUtils.isEmpty(resultDTOList)) { for (CategoryAnalysisResultDTO dto : resultDTOList) { - CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), dto.getCategoryOriginCustomerId()); + CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), customerId); if (null == projectCategoryDTO || StringUtils.isBlank(projectCategoryDTO.getCategoryName())) { log.warn(String.format("查询分类名称失败,当前客户：%s, categoryCode:%s", dto.getCategoryCode(), customerId)); continue; From 6ef25a305243750556b5ecc04be8f3c080f1c4a1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 12 Nov 2021 13:16:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E5=B1=9E?= =?UTF-8?q?=E8=A1=97=E9=81=93=E7=9A=84=E5=88=86=E7=B1=BB=E6=95=B0=20?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3=20=E5=BE=85=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=90=8E=E5=86=8D=E6=92=A4=E5=9B=9E=20=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenProjectCategoryOrgDailyDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml index b9dfb3faaa..14d64c7460 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -29,6 +29,7 @@ created_time desc limit 1 ) + GROUP BY m.DATE_ID,m.CATEGORY_CODE,m.PROJECT_TOTAL ORDER BY M.PROJECT_TOTAL desc @@ -117,4 +118,4 @@ AND p2.CUSTOMER_ID = #{customerId} AND p1.CATEGORY_CODE = p2.PARENT_CATEGORY_CODE - \ No newline at end of file + From c19cc7bfab3f3528b05c13fecf9b6190cbc409ad Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 12 Nov 2021 15:17:14 +0800 Subject: [PATCH 6/7] =?UTF-8?q?Revert=20"=E6=9F=A5=E8=AF=A2=E4=B8=8B?= =?UTF-8?q?=E5=B1=9E=E8=A1=97=E9=81=93=E7=9A=84=E5=88=86=E7=B1=BB=E6=95=B0?= =?UTF-8?q?=20=E5=88=86=E7=B1=BB=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3=20=E5=BE=85=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=90=8E=E5=86=8D=E6=92=A4=E5=9B=9E=20=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6ef25a30 --- .../mapper/screen/ScreenProjectCategoryOrgDailyDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml index 14d64c7460..b9dfb3faaa 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -29,7 +29,6 @@ created_time desc limit 1 ) - GROUP BY m.DATE_ID,m.CATEGORY_CODE,m.PROJECT_TOTAL ORDER BY M.PROJECT_TOTAL desc @@ -118,4 +117,4 @@ AND p2.CUSTOMER_ID = #{customerId} AND p1.CATEGORY_CODE = p2.PARENT_CATEGORY_CODE - + \ No newline at end of file From a42b97a2a66c42bcd03c6b1e5043b93ebf5bcdb4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 15 Nov 2021 17:17:06 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=A1=88=E7=8E=87?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/FactOriginProjectLogDailyDao.xml | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml index 92dd3ee38a..3c9de3e83b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml @@ -488,30 +488,32 @@