Merge branch 'wxz_blockchain' into develop

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<MonthBarchartResultDTO>().ok(indexService.monthBarchart(monthBarchartFormDTO));
     }
 

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<MonthBarchartResult> 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轴，数据集合不全则进行数据填充
@@ -178,6 +183,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);
@@ -194,6 +200,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());
@@ -233,6 +240,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;
     }
 

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();
     }
 }

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<ProjectStaffEntity> assignedStaffEntities, String projectStaffId) {
 
-        if (true) {
-            return;
-        }
-
         // 1.项目主信息
         BlockChainProjectFormDTO project = null;