From 1d67fa09df0fd3ad6a891e2e13feaad22da417d4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 1 Jan 2022 12:15:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E5=87=BA=E6=9D=A5=20?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=97=A5=E5=BF=97=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/IndexServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index 209e776ee7..948b543080 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.datareport.service.evaluationindex.screen.impl; +import com.alibaba.fastjson.JSON; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.enums.CommonOperateTypeEnum; @@ -12,6 +13,7 @@ import com.epmet.datareport.service.evaluationindex.screen.IndexService; import com.epmet.evaluationindex.screen.constant.ScreenConstant; import com.epmet.evaluationindex.screen.dto.form.*; import com.epmet.evaluationindex.screen.dto.result.*; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,6 +33,7 @@ import java.util.stream.Collectors; * @author yinzuomei@elink-cn.com * @date 2020/8/18 10:21 */ +@Slf4j @Service @DataSource(DataSourceConstant.EVALUATION_INDEX) public class IndexServiceImpl implements IndexService { @@ -118,6 +121,7 @@ public class IndexServiceImpl implements IndexService { List monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId(), monthBarchartFormDTO.getMonthId(), monthBarchartFormDTO.getCustomerId()); + log.info("monthBarchart selectMonthBarchart return:{}", JSON.toJSONString(monthBarchartFormDTO)); if (monthBarchartResults.size() == NumConstant.ZERO){ for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) { serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO); @@ -161,6 +165,7 @@ public class IndexServiceImpl implements IndexService { }else{ _ymList=dateUtils.getXpro().keySet().stream().collect(Collectors.toList()); } + log.info("monthBarchart _ymList return:{}", _ymList); //针对集合collect的游标 int cursor = NumConstant.ZERO; //针对X轴，数据集合不全则进行数据填充 @@ -176,6 +181,7 @@ public class IndexServiceImpl implements IndexService { continue ; } if(!StringUtils.equals(collect.get(cursor).getMonthId(),_ymList.get(i))){ + log.info("monthBarchart cursor not eq return:{}", _ymList.get(i)); //SET DEFAULT serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO); partyDevAbilityData.add(NumConstant.ZERO_DOT_ZERO); @@ -192,6 +198,7 @@ public class IndexServiceImpl implements IndexService { //保持cursor不变 }else{ MonthBarchartResult data = collect.get(cursor); + log.info("monthBarchart collect.get return:{}", JSON.toJSONString(data)); //SET DATA serviceAbilityData.add(null == data.getServiceAbility() ? NumConstant.ZERO_DOT_ZERO : data.getServiceAbility()); partyDevAbilityData.add(null == data.getPartyDevAbility() ? NumConstant.ZERO_DOT_ZERO : data.getPartyDevAbility()); @@ -231,6 +238,7 @@ public class IndexServiceImpl implements IndexService { result.setServiceOriginScore(serviceOriginData); result.setPartyOriginScore(partyOriginData); result.setGovernOriginScore(governOriginData); + log.info("monthBarchart final result:{}", JSON.toJSONString(result)); return result; } From 32c92563b47f2d1436b120a3919e7d9fd207b581 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 1 Jan 2022 14:43:36 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86=202022?= =?UTF-8?q?12=E4=B8=BA202112=20=E5=9B=A0=E4=B8=BA=E4=BB=96=E4=BB=AC?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/datareport/controller/screen/IndexController.java | 4 ++++ .../service/evaluationindex/screen/impl/IndexServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 dcf083d507..7e2885cdbd 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,6 +67,10 @@ public class IndexController { //area_code升级,新增此参数 monthBarchartFormDTO.setCustomerId(customerId); ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class); + String monthId = monthBarchartFormDTO.getMonthId(); + if ("202212".equals(monthId)){ + monthBarchartFormDTO.setCustomerId("202112"); + } return new Result().ok(indexService.monthBarchart(monthBarchartFormDTO)); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index 948b543080..8b89c8a2e0 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -121,7 +121,7 @@ public class IndexServiceImpl implements IndexService { List monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId(), monthBarchartFormDTO.getMonthId(), monthBarchartFormDTO.getCustomerId()); - log.info("monthBarchart selectMonthBarchart return:{}", JSON.toJSONString(monthBarchartFormDTO)); + log.info("monthBarchart selectMonthBarchart return:{}", JSON.toJSONString(monthBarchartResults)); if (monthBarchartResults.size() == NumConstant.ZERO){ for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) { serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO); From 605c42b614baff85a1e9ed593d66e798c04f7808 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 1 Jan 2022 14:51:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?Revert=20"=E4=B8=B4=E6=97=B6=E5=A4=84?= =?UTF-8?q?=E7=90=86=20202212=E4=B8=BA202112=20=E5=9B=A0=E4=B8=BA=E4=BB=96?= =?UTF-8?q?=E4=BB=AC=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 32c92563 --- .../epmet/datareport/controller/screen/IndexController.java | 4 ---- 1 file changed, 4 deletions(-) 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 7e2885cdbd..dcf083d507 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,10 +67,6 @@ public class IndexController { //area_code升级,新增此参数 monthBarchartFormDTO.setCustomerId(customerId); ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class); - String monthId = monthBarchartFormDTO.getMonthId(); - if ("202212".equals(monthId)){ - monthBarchartFormDTO.setCustomerId("202112"); - } return new Result().ok(indexService.monthBarchart(monthBarchartFormDTO)); } From e6b830b56865ea942f5e956f34d3dc453f96280a Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 1 Jan 2022 14:53:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86=202022?= =?UTF-8?q?12=E4=B8=BA202112=20=E5=9B=A0=E4=B8=BA=E4=BB=96=E4=BB=AC?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/datareport/controller/screen/IndexController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 dcf083d507..5824a1a9cc 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,6 +67,10 @@ public class IndexController { //area_code升级,新增此参数 monthBarchartFormDTO.setCustomerId(customerId); ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class); + String monthId = monthBarchartFormDTO.getMonthId(); + if ("202212".equals(monthId)){ + monthBarchartFormDTO.setMonthId("202112"); + } return new Result().ok(indexService.monthBarchart(monthBarchartFormDTO)); } From 03133aab412eb95b3e482530c1c4a033a80d828a Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 1 Jan 2022 14:54:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86=202022?= =?UTF-8?q?12=E4=B8=BA202112=20=E5=9B=A0=E4=B8=BA=E4=BB=96=E4=BB=AC?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/evaluationindex/screen/impl/IndexServiceImpl.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/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index 8b89c8a2e0..948b543080 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -121,7 +121,7 @@ public class IndexServiceImpl implements IndexService { List monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId(), monthBarchartFormDTO.getMonthId(), monthBarchartFormDTO.getCustomerId()); - log.info("monthBarchart selectMonthBarchart return:{}", JSON.toJSONString(monthBarchartResults)); + log.info("monthBarchart selectMonthBarchart return:{}", JSON.toJSONString(monthBarchartFormDTO)); if (monthBarchartResults.size() == NumConstant.ZERO){ for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) { serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO); From 8447b648b32e752492ed52717cf83283b493435e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 4 Jan 2022 09:46:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E6=94=BE?= =?UTF-8?q?=E5=BC=80=E5=8C=BA=E5=9D=97=E9=93=BE=E4=BB=A3=E7=A0=81=E7=A1=AC?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/BlockChainProjectController.java | 8 ++++---- .../epmet/service/impl/BlockChainUploadServiceImpl.java | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java index 75701ac62a..2ec27b1e27 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java @@ -28,8 +28,8 @@ public class BlockChainProjectController { */ @PostMapping("create") public Result blockChainCreateProject(@RequestBody BlockChainCreateProjectFormDTO input) { - //ValidatorUtils.validateEntity(input); - //blockChainProjectService.blockChainCreateProject(input); + ValidatorUtils.validateEntity(input); + blockChainProjectService.blockChainCreateProject(input); return new Result(); } @@ -40,8 +40,8 @@ public class BlockChainProjectController { */ @PostMapping("process") public Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input) { - //ValidatorUtils.validateEntity(input); - //blockChainProjectService.blockChainProcessProject(input); + ValidatorUtils.validateEntity(input); + blockChainProjectService.blockChainProcessProject(input); return new Result(); } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java index c3afaa5341..718c5ea7ef 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java @@ -37,10 +37,6 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService { @Override public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List assignedStaffEntities, String projectStaffId) { - if (true) { - return; - } - // 1.项目主信息 BlockChainProjectFormDTO project = null;