From c426ba5b0878733082216744c83907c24732c936 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 10 Sep 2020 17:48:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7=E5=8A=A0=E9=94=81?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E4=B8=80=E4=B8=AA=E5=AE=A2=E6=88=B7=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E5=8F=AA=E8=83=BD=E6=9C=89=E4=B8=80=E4=B8=AA=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=89=A7=E8=A1=8C=E8=AE=A1=E7=AE=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 11 +++++ .../controller/IndexCalculateController.java | 41 +++++++++++++++---- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 0d623e2010..fc5c0c7a31 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -305,4 +305,15 @@ public class RedisKeys { public static String getIndexCodeFieldReKey() { return rootPrefix.concat("data:index:indexcode:field"); } + + /** + * 客户统计的计算标记。 + * 0:未在计算 + * 1:正在计算 + * @param customerId + * @return + */ + public static String getCustomerStatsCalFlag(String customerId) { + return String.format(rootPrefix+"stats:calflag:%s", customerId); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java index e1e2c85d78..887482d1a4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java @@ -2,6 +2,8 @@ package com.epmet.controller; import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; import com.epmet.commons.extappauth.bean.ExternalAppRequestParam; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.indexcal.CalculateCommonFormDTO; @@ -9,6 +11,7 @@ import com.epmet.service.evaluationindex.indexcal.CpcIndexCalculateService; import com.epmet.service.evaluationindex.indexcal.IndexCalculateService; import com.epmet.util.DimIdGenerator; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.sun.org.apache.xpath.internal.operations.Bool; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -43,6 +46,12 @@ public class IndexCalculateController { @Autowired private CpcIndexCalculateService cpcIndexCalculateService; + @Autowired + private RedisUtils redisUtils; + + // 计算同步锁 + private Object statsCalLock = new Object(); + /** * 按照客户计算所有指标(按照月份) * @@ -54,14 +63,32 @@ public class IndexCalculateController { @ExternalAppRequestAuth @PostMapping("all") public Result indexCalculate(ExternalAppRequestParam externalAppRequestParam, @RequestBody CalculateCommonFormDTO formDTO) { - singleThreadPool.execute(() -> { - formDTO.setCustomerId(externalAppRequestParam.getCustomerId()); - long start = System.currentTimeMillis(); - Boolean aBoolean = indexCalculateService.indexCalculate(formDTO); - if (aBoolean) { - log.error("全部指标计算完成，总耗时：{}秒", (System.currentTimeMillis() - start) / 1000); + String customerId = externalAppRequestParam.getCustomerId(); + Boolean executing = (Boolean) redisUtils.get(RedisKeys.getCustomerStatsCalFlag(customerId)); + if (executing == null || !executing) { + synchronized (statsCalLock) { + Boolean executing2 = (Boolean) redisUtils.get(RedisKeys.getCustomerStatsCalFlag(customerId)); + if (executing2 != null && executing2) { + log.error(String.format("该客户正在执行计算，请勿重复提交计算请求。", customerId)); + return new Result().ok(false); + } + singleThreadPool.execute(() -> { + formDTO.setCustomerId(customerId); + long start = System.currentTimeMillis(); + Boolean aBoolean = indexCalculateService.indexCalculate(formDTO); + if (aBoolean) { + log.error("全部指标计算完成，总耗时：{}秒", (System.currentTimeMillis() - start) / 1000); + } + redisUtils.set(RedisKeys.getCustomerStatsCalFlag(customerId), false); + }); + redisUtils.set(RedisKeys.getCustomerStatsCalFlag(customerId), true); } - }); + } else { + log.error(String.format("该客户正在执行计算，请勿重复提交计算请求。", customerId)); + return new Result().ok(false); + } + + return new Result().ok(true); } From ee4a6ecb0c12e7a58530407797e2593e8c2d77fd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 10 Sep 2020 19:48:13 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8C=BA=E7=9B=B4=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=80=BB=E5=88=86=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/indexcal/DeotScore.java | 47 ++++++++++ .../dto/indexcal/DeptScoreDetailDTO.java | 32 +++++++ .../com/epmet/controller/DemoController.java | 6 +- .../indexcal/DeptScoreDao.java | 13 ++- .../indexcal/DeptSubScoreDao.java | 4 +- .../indexcal/GridScoreDao.java | 6 +- .../indexcal/GridSubScoreDao.java | 2 +- .../indexcal/impl/DeptScoreServiceImpl.java | 87 +++++++++++++++++-- .../impl/GridCorreLationServiceImpl.java | 15 +++- .../IndexCalculateDistrictServiceImpl.java | 1 - .../evaluationindex/indexcal/DeptScoreDao.xml | 39 ++++++++- .../indexcal/DeptSubScoreDao.xml | 6 +- .../evaluationindex/indexcal/GridScoreDao.xml | 6 +- .../indexcal/GridSubScoreDao.xml | 6 +- 14 files changed, 241 insertions(+), 29 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeotScore.java create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeptScoreDetailDTO.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeotScore.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeotScore.java new file mode 100644 index 0000000000..351a4e9ad6 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeotScore.java @@ -0,0 +1,47 @@ +package com.epmet.dto.indexcal; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 区直部门-相关分值 + * + * @author yinzuomei@elink-cn.com + * @date 2020/9/10 18:13 + */ +@Data +public class DeotScore implements Serializable { + /** + * 部门id + */ + private String deptId; + + /** + * 客户Id + */ + private String customerId; + + /** + * 部门所属的机关Id + */ + private String agencyId; + + /** + * 季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4 + */ + private String quarterId; + + /** + * 年度ID: yyyy + */ + private String yearId; + + /** + * 月维度Id: yyyyMM + */ + private String monthId; + + private List detailList; +} diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeptScoreDetailDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeptScoreDetailDTO.java new file mode 100644 index 0000000000..e5f63cab5b --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeptScoreDetailDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.indexcal; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 区直部门相关分值 + * + * @author yinzuomei@elink-cn.com + * @date 2020/9/10 17:56 + */ +@Data +public class DeptScoreDetailDTO implements Serializable { + private static final long serialVersionUID = -1520962964833708922L; + + /** + * 1：总分；0不是 + */ + private String isTotal; + + /** + * 分值 + */ + private BigDecimal score; + + /** + * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；网格相关：quzhibumen + */ + private String indexCode; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index 6a46b4008d..59ed8ba771 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java @@ -157,6 +157,8 @@ public class DemoController { private FactIndexServiceAblityGridMonthlyDao factIndexServiceAblityGridMonthlyDao; @Autowired private ScreenCustomerGridDao screenCustomerGridDao; + @Autowired + private CpcIndexCalculateService cpcIndexCalculateService; // private static Integer testcal=100; @PostMapping("testcal") @@ -165,7 +167,9 @@ public class DemoController { // //查询总记录数 // List gridScoreDTOList=gridScoreDao.selectList(formDTO); // return new Result>().ok(gridScoreDTOList); -// gridCorreLationService.calculateGridCorreLation(formDTO); + + cpcIndexCalculateService.cpcIndexCalculate(formDTO); + gridCorreLationService.calculateGridCorreLation(formDTO); deptScoreService.calculateDeptCorreLation(formDTO); return new Result(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java index cbfa752bb0..c236c31e6c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java @@ -18,6 +18,8 @@ package com.epmet.dao.evaluationindex.indexcal; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.indexcal.CalculateCommonFormDTO; +import com.epmet.dto.indexcal.DeotScore; import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO; import com.epmet.dto.indexcal.DeptScoreDTO; import com.epmet.entity.evaluationindex.indexcal.DeptScoreEntity; @@ -79,7 +81,7 @@ public interface DeptScoreDao extends BaseDao { int deleteByDeptIdAndMonthId(@Param("customerId") String customerId, @Param("monthId")String monthId, @Param("indexCode") String indexCode, - @Param("deleteSize") int deleteSize); + @Param("deleteSize") Integer deleteSize); /** * @return int @@ -89,4 +91,13 @@ public interface DeptScoreDao extends BaseDao { * @Date 2020/9/10 10:40 **/ int insertBatchEntity(@Param("list") List deptScoreEntityList); + + /** + * @return java.util.List + * @param formDTO + * @author yinzuomei + * @description 查询每个部门下所有的指标对应的分值 + * @Date 2020/9/10 18:07 + **/ + List selectList(CalculateCommonFormDTO formDTO); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptSubScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptSubScoreDao.java index d0674e7fbd..fe388c6b6b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptSubScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptSubScoreDao.java @@ -53,8 +53,8 @@ public interface DeptSubScoreDao extends BaseDao { * @description 批量删除 * @Date 2020/9/10 12:28 **/ - int deleteByDeptIdAndMonthId(@Param("customerId") String customerId, + int deleteBatches(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentIndexCode") String allParentIndexCode, - @Param("deleteSize") int deleteSize); + @Param("deleteSize") Integer deleteSize); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java index bd0ba82f7e..e4eef189fd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java @@ -40,16 +40,16 @@ public interface GridScoreDao extends BaseDao { * @param customerId * @param monthId * @param indexCode - * @param deleteNum + * @param deleteSize * @return int * @author yinzuomei * @description * @Date 2020/8/31 14:00 **/ - int deleteByCusAndMonthId(@Param("customerId") String customerId, + int deleteBatches(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode, - @Param("deleteNum") int deleteNum); + @Param("deleteSize") Integer deleteSize); /** * @return int diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java index be9c55c66f..1005fcf781 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java @@ -51,7 +51,7 @@ public interface GridSubScoreDao extends BaseDao { * @description 批量删除 * @Date 2020/9/10 13:36 **/ - int deleteByDeptIdAndMonthId(@Param("customerId") String customerId, + int deleteBatches(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentIndexCode") String allParentIndexCode, @Param("deleteSize") Integer deleteSize); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java index 736d30710a..027a7efe27 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java @@ -31,9 +31,10 @@ import com.epmet.dao.evaluationindex.indexcal.DeptScoreDao; import com.epmet.dao.evaluationindex.indexcal.DeptSubScoreDao; import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyDao; import com.epmet.dao.evaluationindex.screen.ScreenCustomerDeptDao; -import com.epmet.dto.indexcal.CalculateCommonFormDTO; +import com.epmet.dto.indexcal.*; import com.epmet.entity.evaluationindex.indexcal.DeptScoreEntity; import com.epmet.entity.evaluationindex.indexcal.DeptSubScoreEntity; +import com.epmet.entity.evaluationindex.indexcal.GridScoreEntity; import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyEntity; import com.epmet.entity.evaluationindex.screen.IndexGroupDetailEntity; import com.epmet.entity.evaluationindex.screen.ScreenCustomerDeptEntity; @@ -63,6 +64,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; /** @@ -94,26 +97,38 @@ public class DeptScoreServiceImpl extends BaseServiceImpl indexGroupDetailEntityList = getDetailListByParentCode.getDetailListByParentCode(formDTO.getCustomerId(), IndexCodeEnum.QU_ZHI_BU_MEN.getCode(), IndexCodeEnum.ZHI_LI_NENG_LI.getCode()); if (CollectionUtils.isEmpty(indexGroupDetailEntityList)) { log.warn("calculateDeptCorreLation customerId:{} have not any indexGroupDetail", formDTO.getCustomerId()); - throw new RenException("客户【区直部门:治理能力】指标权重信息不存在"); + throw new RenException("客户【区直部门:治理能力】下级指标权重信息不存在"); } - log.info(JSON.toJSONString(indexGroupDetailEntityList)); - + // log.info(JSON.toJSONString(indexGroupDetailEntityList)); //1、查询总记录数 int total = factIndexGovrnAblityDeptMonthlyDao.selectCount(formDTO); if (NumConstant.ZERO == total) { log.warn(String.format("customerId=%s,monthId=%s,fact_index_govrn_ablity_dept_monthly have not any fact record", formDTO.getCustomerId(), formDTO.getMonthId())); - return Boolean.FALSE; + return; } //2、计算最大最小值 Map minAndMaxMap = factIndexGovrnAblityDeptMonthlyDao.selectExtremeValue(formDTO); @@ -139,7 +154,61 @@ public class DeptScoreServiceImpl extends BaseServiceImpl 0); - return true; + log.info("区直部门-治理能力- 计算完成"); + } + + /** + * @return void + * @param formDTO + * @author yinzuomei + * @description 区直部门总分 + * @Date 2020/9/10 17:20 + **/ + private void calculateDeptTotalScore(CalculateCommonFormDTO formDTO) { + //计算区直部门总分 + List indexList = getDetailListByParentCode.getDetailListByParentCode(formDTO.getCustomerId(), + IndexCodeEnum.QU_ZHI_BU_MEN.getCode()); + if (CollectionUtils.isEmpty(indexList)) { + log.warn("calculateDeptTotalScore customerId:{} have not any indexGroupDetail", formDTO.getCustomerId()); + throw new RenException("客户【区直部门】下级指标权重信息不存在"); + } + //查询总记录数 + List deptScoreDTOList = deptScoreDao.selectList(formDTO); + if(CollectionUtils.isEmpty(deptScoreDTOList)){ + log.error("calculateDeptTotalScore deptScoreDao.selectList return empty,customerId:{},monthId:{}", formDTO.getCustomerId(), formDTO.getMonthId()); + throw new RenException("客户一级指标分值记录不存在"); + } + Map indexMap = indexList.stream().collect(Collectors.toMap(IndexGroupDetailEntity::getIndexCode, Function.identity())); + List deotScoreEntityList = new ArrayList<>(); + for (DeotScore deptScore : deptScoreDTOList) { + DeptScoreEntity deptScoreEntity = ConvertUtils.sourceToTarget(deptScore, DeptScoreEntity.class); + deptScoreEntity.setIsTotal(NumConstant.ONE_STR); + deptScoreEntity.setIndexCode(IndexCodeEnum.QU_ZHI_BU_MEN.getCode()); + deptScoreEntity.setScore(BigDecimal.ZERO); + deptScoreEntity.setAllParentIndexCode(NumConstant.ZERO_STR); + for (DeptScoreDetailDTO deptScoreDetailDTO : deptScore.getDetailList()) { + BigDecimal indexScore = deptScoreDetailDTO.getScore().multiply(indexMap.get(deptScoreDetailDTO.getIndexCode()).getWeight()); + deptScoreEntity.setScore(deptScoreEntity.getScore().add(indexScore)); + } + deotScoreEntityList.add(deptScoreEntity); + } + //先删除 + int effectRow; + do { + effectRow = deptScoreDao.deleteByDeptIdAndMonthId(formDTO.getCustomerId(), + formDTO.getMonthId(), + IndexCodeEnum.QU_ZHI_BU_MEN.getCode(), + IndexCalConstant.DELETE_SIZE); + } while (effectRow > NumConstant.ZERO); + //后新增 + if (!CollectionUtils.isEmpty(deotScoreEntityList)) { + //批量插入 + List> partition = ListUtils.partition(deotScoreEntityList, IndexCalConstant.INSERT_SIZE); + partition.forEach(list -> { + deptScoreDao.insertBatchEntity(list); + }); + } + } /** @@ -165,7 +234,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl NumConstant.ZERO); + //批量插入 if (!CollectionUtils.isEmpty(gridScoreEntityList)) { - gridScoreDao.deleteByCusAndMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode, IndexCalConstant.DELETE_SIZE); //批量插入 List> partition = ListUtils.partition(gridScoreEntityList, IndexCalConstant.INSERT_SIZE); partition.forEach(list -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java index 0440fd84fd..2545dc4da1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java @@ -210,7 +210,6 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict List deptScoreAvgList = deptScoreDao.selectGovernDeptScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode()); if (CollectionUtils.isEmpty(deptScoreAvgList)) { log.error("查询所有直属部门治理能力平均值集合为空"); - return; } else{ MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(deptScoreAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList())); List> governAvg = ListUtils.partition(deptScoreAvgList, IndexCalConstant.PAGE_SIZE); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml index e6dff25c3d..f232171208 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml @@ -63,7 +63,9 @@ and INDEX_CODE=#{indexCode} - limit #{deleteSize} + + limit #{deleteSize} + @@ -110,4 +112,39 @@ ) + + + + + + + + + + + + + + + + + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml index 270477f93d..21ca50b196 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml @@ -46,11 +46,13 @@ - + delete from fact_index_dept_sub_score where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId} and ALL_PARENT_INDEX_CODE=#{allParentIndexCode} - limit #{deleteSize} + + limit #{deleteSize} + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml index b0970024c6..9fd9adbb43 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml @@ -24,7 +24,7 @@ - + DELETE FROM fact_index_grid_score @@ -32,7 +32,9 @@ CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId} AND INDEX_CODE = #{indexCode} - limit #{deleteNum} + + limit #{deleteSize} + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml index 85f66f9009..7111976b9d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml @@ -49,7 +49,7 @@ - + DELETE FROM fact_index_grid_sub_score @@ -57,6 +57,8 @@ CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId} AND ALL_PARENT_INDEX_CODE = #{allParentIndexCode} - limit #{deleteSize} + + limit #{deleteSize} + \ No newline at end of file From de4c426f12c782a557635193748ed6964a71e30f Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Sep 2020 19:59:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IndexCalculateCommunityServiceImpl.java | 2 +- .../IndexCalculateDistrictServiceImpl.java | 19 ++++++++++++------- .../impl/IndexCalculateStreetServiceImpl.java | 6 +++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java index a366daf0af..7673575b37 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java @@ -240,7 +240,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni List subGridServiceAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode()); if (CollectionUtils.isEmpty(subGridServiceAvg)) { log.error("查询社区下级所有网格服务能力得分平均值集合为空"); - return; + //todo return; } else { MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridServiceAvg.stream().map(o -> o.getScore()).collect(Collectors.toList())); List> serviceAvgList = ListUtils.partition(subGridServiceAvg, IndexCalConstant.PAGE_SIZE); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java index 2545dc4da1..d11a1e7df2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java @@ -210,6 +210,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict List deptScoreAvgList = deptScoreDao.selectGovernDeptScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode()); if (CollectionUtils.isEmpty(deptScoreAvgList)) { log.error("查询所有直属部门治理能力平均值集合为空"); + //return; } else{ MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(deptScoreAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList())); List> governAvg = ListUtils.partition(deptScoreAvgList, IndexCalConstant.PAGE_SIZE); @@ -280,11 +281,13 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict } }); BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator(); - HashMap scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS); - log.info("districtServiceAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS)); - log.info("districtServiceAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId)); - AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid); - insertDetail(result); + if (!CollectionUtils.isEmpty(indexInputVOS)) { + HashMap scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS); + log.info("districtServiceAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS)); + log.info("districtServiceAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId)); + AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid); + insertDetail(result); + } return true; } @@ -413,7 +416,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict score.setAllParentIndexCode(allParentIndexCode); score.setDataType(IndexCalConstant.DISTRICT_LEVEL); pid.forEach((agency, parentAgency) -> { - if (k.equals(agency)) { + //todo 确认 + if (k != null && k.equals(agency)) { score.setParentAgencyId(parentAgency); } }); @@ -431,7 +435,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict s.setAllParentIndexCode(streetScore.getAllParentIndexCode()); s.setDataType(IndexCalConstant.DISTRICT_LEVEL); pid.forEach((agency, parentAgency) -> { - if (k.equals(agency)) { + //todo 确认 + if (k != null && k.equals(agency)) { s.setParentAgencyId(parentAgency); } }); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java index d556a24894..08afc2a9f3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java @@ -118,7 +118,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ List subCommPartyAvgScore = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode()); if (CollectionUtils.isEmpty(subCommPartyAvgScore)) { log.error(IndexCalConstant.COMMUNITY_PARTY_AVG_NULL); - return; + //todo return; } else if (subCommPartyAvgScore.size() > NumConstant.ZERO) { MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subCommPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList())); Integer indexEnd = NumConstant.TEN; @@ -193,7 +193,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ List subGridGovernAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode()); if (CollectionUtils.isEmpty(subGridGovernAvg)){ log.error("查询街道下属所有社区治理能力汇总为空"); - return; + //todo return; }else if (subGridGovernAvg.size() > NumConstant.ZERO) { MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridGovernAvg.stream().map(o -> o.getScore()).collect(Collectors.toList())); List> governAvg = ListUtils.partition(subGridGovernAvg, IndexCalConstant.PAGE_SIZE); @@ -268,7 +268,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ List subCommServiceAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode()); if (CollectionUtils.isEmpty(subCommServiceAvg)) { log.error("查询街道下属社区服务能力得分平均值为空"); - return; + //todo return; } else if (subCommServiceAvg.size() > NumConstant.ZERO) { MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subCommServiceAvg.stream().map(o -> o.getScore()).collect(Collectors.toList())); List> serviceAvgList = ListUtils.partition(subCommServiceAvg, IndexCalConstant.PAGE_SIZE); From 43de268037bd23be5959b264d879024d7b94423e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 11 Sep 2020 08:57:34 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/indexcal/impl/DeptScoreServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java index 027a7efe27..439cfa155a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java @@ -34,8 +34,6 @@ import com.epmet.dao.evaluationindex.screen.ScreenCustomerDeptDao; import com.epmet.dto.indexcal.*; import com.epmet.entity.evaluationindex.indexcal.DeptScoreEntity; import com.epmet.entity.evaluationindex.indexcal.DeptSubScoreEntity; -import com.epmet.entity.evaluationindex.indexcal.GridScoreEntity; -import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyEntity; import com.epmet.entity.evaluationindex.screen.IndexGroupDetailEntity; import com.epmet.entity.evaluationindex.screen.ScreenCustomerDeptEntity; import com.epmet.eum.IndexCodeEnum; From 91650898d424791d1cc098374124a22c4304d9dc Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 11 Sep 2020 09:11:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=B8=82=E5=8C=97=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=EF=BC=8C=E5=85=9A=E5=91=98=E5=B9=B4=E9=BE=84=E5=88=86=E5=B8=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B0=86=E4=BD=BF=E7=94=A8ParentId?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=94=B9=E6=88=90=E4=BD=BF=E7=94=A8OrgId?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=EF=BC=8C=E5=8F=AA=E6=9F=A5=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E6=9C=BA=E5=85=B3/=E7=BD=91=E6=A0=BC=E7=9A=84=E5=85=9A?= =?UTF-8?q?=E5=91=98=E5=B9=B4=E9=BE=84=E5=88=86=E5=B8=83=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml index fa89221e37..573c7501fa 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml @@ -15,7 +15,7 @@ screen_cpc_base_data WHERE DEL_FLAG = '0' - AND PARENT_ID = #{agencyId} + AND ORG_ID = #{agencyId} \ No newline at end of file From 3fc8b1d00d79a8c1f429f33fea3ceb8185b3e967 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 11 Sep 2020 09:14:11 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B8=82=E5=8C=97=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=85=A8=E9=83=A8=E6=94=BE?= =?UTF-8?q?=E5=BC=80=E9=89=B4=E6=9D=83=E6=B3=A8=E8=A7=A3=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=B3=A8=E9=87=8A=E8=83=BD=E5=8A=9B=E5=80=BC?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/screen/AgencyController.java | 5 +++-- .../controller/screen/DistributionController.java | 11 ++++++----- .../controller/screen/GrassRootsGovernController.java | 11 ++++++----- .../screen/GrassrootsPartyDevController.java | 9 +++++---- .../datareport/controller/screen/IndexController.java | 11 ++++++----- .../controller/screen/PartyMemberLeadController.java | 11 ++++++----- .../controller/screen/ScreenProjectController.java | 3 ++- .../indexcal/impl/GridCorreLationServiceImpl.java | 5 +++-- 8 files changed, 37 insertions(+), 29 deletions(-) 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 c6d6de4ce3..1828f19ac8 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 @@ -1,5 +1,6 @@ package com.epmet.datareport.controller.screen; +import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; import com.epmet.commons.extappauth.bean.ExternalAppRequestParam; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -35,7 +36,7 @@ public class AgencyController { * @author zxc * @date 2020/8/18 2:04 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("tree") public Result tree(HttpServletRequest request, ExternalAppRequestParam externalAppRequestParam){ String customerId = request.getHeader("CustomerId"); @@ -51,7 +52,7 @@ public class AgencyController { * @author zxc * @date 2020/8/18 2:33 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("compartment") public Result compartment(@RequestBody CompartmentFormDTO compartmentFormDTO){ ValidatorUtils.validateEntity(compartmentFormDTO, CompartmentFormDTO.Compartment.class); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java index 248547cc4c..30f0f82584 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java @@ -1,5 +1,6 @@ package com.epmet.datareport.controller.screen; +import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.screen.DistributionService; @@ -32,7 +33,7 @@ public class DistributionController { * @author zxc * @date 2020/8/18 10:59 上午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("branch") public Result> branch(@RequestBody BranchFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, BranchFormDTO.Branch.class); @@ -45,7 +46,7 @@ public class DistributionController { * @author zxc * @date 2020/8/18 11:10 上午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("user") public Result user(@RequestBody UserFormDTO userFormDTO){ ValidatorUtils.validateEntity(userFormDTO, UserFormDTO.User.class); @@ -58,7 +59,7 @@ public class DistributionController { * @author zxc * @date 2020/8/18 11:20 上午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("parymember") public Result parymember(@RequestBody ParymemberFormDTO parymemberFormDTO){ ValidatorUtils.validateEntity(parymemberFormDTO, ParymemberFormDTO.Parymember.class); @@ -71,7 +72,7 @@ public class DistributionController { * @author zxc * @date 2020/8/19 1:29 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("project") public Result> project(@RequestBody ProjectFormDTO projectFormDTO){ ValidatorUtils.validateEntity(projectFormDTO, ProjectFormDTO.Project.class); @@ -84,7 +85,7 @@ public class DistributionController { * @author zxc * @date 2020/8/19 1:52 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("topprofile") public Result topProfile(@RequestBody TopProfileFormDTO topProfileFormDTO){ ValidatorUtils.validateEntity(topProfileFormDTO, TopProfileFormDTO.TopProfile.class); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java index 220fb0ca4a..1ee85baeb4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java @@ -1,5 +1,6 @@ package com.epmet.datareport.controller.screen; +import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.screen.GrassRootsGovernService; @@ -38,7 +39,7 @@ public class GrassRootsGovernController { * @author wangc * @date 2020.08.20 11:16 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("userpointrank") public Result userPointRank(@RequestBody AgencyAndNumFormDTO param){ ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class); @@ -53,7 +54,7 @@ public class GrassRootsGovernController { * @author wangc * @date 2020.08.20 13:55 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("difficultprojects") public Result> difficultProject(@RequestBody AgencyNumTypeParamFormDTO param){ ValidatorUtils.validateEntity(param, AgencyNumTypeParamFormDTO.AgencyNumTypeParamGroup.class); @@ -68,7 +69,7 @@ public class GrassRootsGovernController { * @author wangc * @date 2020.08.20 14:37 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("publicpartiprofile") public Result publicPartiProfile(@RequestBody AgencyFormDTO param){ ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class); @@ -83,7 +84,7 @@ public class GrassRootsGovernController { * @author wangc * @date 2020.08.20 15:32 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("publicpartirank") public Result> publicPartiRank(@RequestBody AgencyAndNumFormDTO param){ ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class); @@ -98,7 +99,7 @@ public class GrassRootsGovernController { * @author wangc * @date 2020.08.20 17:46 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("governcapacityrank") public Result> governCapacityRank(@RequestBody AgencyAndNumFormDTO param){ ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java index 66b7555ac8..db7c83089f 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java @@ -1,5 +1,6 @@ package com.epmet.datareport.controller.screen; +import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.screen.GrassrootsPartyDevService; @@ -37,7 +38,7 @@ public class GrassrootsPartyDevController { * @author wangc * @date 2020.08.18 16:59 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("basicinfo") public Result baseInfo(@RequestBody ParymemberFormDTO param){ ValidatorUtils.validateEntity(param, ParymemberFormDTO.Parymember.class); @@ -52,7 +53,7 @@ public class GrassrootsPartyDevController { * @author wangc * @date 2020.08.18 17:54 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("ageinfo") public Result ageInfo(@RequestBody ParymemberFormDTO param){ ValidatorUtils.validateEntity(param, ParymemberFormDTO.Parymember.class); @@ -67,7 +68,7 @@ public class GrassrootsPartyDevController { * @author wangc * @date 2020.08.19 11:02 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("branchbuildtrend") public Result branchBuildTrend(@RequestBody BranchBuildTrendFormDTO param){ ValidatorUtils.validateEntity(param, BranchBuildTrendFormDTO.branchBuildTrendGroup.class); @@ -82,7 +83,7 @@ public class GrassrootsPartyDevController { * @author wangc * @date 2020.08.19 15:25 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("branchbuildrank") public Result branchBuildRank(@RequestBody BranchBuildRankFormDTO param){ ValidatorUtils.validateEntity(param, BranchBuildRankFormDTO.BranchBuildRankGroup.class); 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 fea6239953..b2a6db2edf 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 @@ -1,5 +1,6 @@ package com.epmet.datareport.controller.screen; +import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.screen.IndexService; @@ -35,7 +36,7 @@ public class IndexController { * @author zxc * @date 2020/8/19 2:53 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("yearaverageindex") public Result yearAverageIndex(@RequestBody YearAverageIndexFormDTO yearAverageIndexFormDTO){ ValidatorUtils.validateEntity(yearAverageIndexFormDTO, YearAverageIndexFormDTO.YearAverageIndex.class); @@ -48,7 +49,7 @@ public class IndexController { * @author zxc * @date 2020/8/19 3:17 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("monthindexanalysis/piechart") public Result monthPieChart(@RequestBody MonthPieChartFormDTO monthPieChartFormDTO){ ValidatorUtils.validateEntity(monthPieChartFormDTO, MonthPieChartFormDTO.MonthPieChart.class); @@ -61,7 +62,7 @@ public class IndexController { * @author zxc * @date 2020/8/19 5:27 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("monthindexanalysis/barchart") public Result monthBarchart(@RequestBody MonthBarchartFormDTO monthBarchartFormDTO){ ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class); @@ -74,7 +75,7 @@ public class IndexController { * @author zxc * @date 2020/8/20 10:02 上午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("subagencyindexrank") public Result> subAgencyIndexRank(@RequestBody SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO){ ValidatorUtils.validateEntity(subAgencyIndexRankFormDTO, SubAgencyIndexRankFormDTO.SubAgencyIndexRank.class); @@ -89,7 +90,7 @@ public class IndexController { * @Author zhangyong * @Date 09:38 2020-09-08 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("dataclient/subagencyindexrank") public Result> anNingSubAgencyIndexRank(@RequestBody AnNingSubAgencyIndexRankFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, AnNingSubAgencyIndexRankFormDTO.SubAgencyIndexRank.class); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java index d3f4242013..5530fae8b0 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java @@ -1,5 +1,6 @@ package com.epmet.datareport.controller.screen; +import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.screen.PartyMemberLeadService; @@ -32,7 +33,7 @@ public class PartyMemberLeadController { * @author zxc * @date 2020/8/20 1:56 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("fineexample") public Result fineExample(@RequestBody FineExampleFormDTO fineExampleFormDTO){ ValidatorUtils.validateEntity(fineExampleFormDTO, FineExampleFormDTO.FineExample.class); @@ -45,7 +46,7 @@ public class PartyMemberLeadController { * @author zxc * @date 2020/8/20 2:35 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("contactmasslinechart") public Result contactMassLineChart(@RequestBody ContactMassLineChartFormDTO contactMassLineChartFormDTO){ ValidatorUtils.validateEntity(contactMassLineChartFormDTO, ContactMassLineChartFormDTO.ContactMassLineChart.class); @@ -58,7 +59,7 @@ public class PartyMemberLeadController { * @author zxc * @date 2020/8/20 3:19 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("volunteerservice") public Result volunteerService(@RequestBody VolunteerServiceFormDTO volunteerServiceFormDTO){ ValidatorUtils.validateEntity(volunteerServiceFormDTO, VolunteerServiceFormDTO.VolunteerService.class); @@ -73,7 +74,7 @@ public class PartyMemberLeadController { * @author wangc * @date 2020.08.21 11:05 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("advancedbranchrank") Result> advancedBranchRank(@RequestBody AgencyAndNumFormDTO param){ ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class); @@ -88,7 +89,7 @@ public class PartyMemberLeadController { * @author wangc * @date 2020.08.21 14:22 **/ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("advancedpartymemberrank") Result> advancedPartymemberRank(@RequestBody AgencyAndNumFormDTO param){ ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index dc80b5178e..5417767ee6 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -1,5 +1,6 @@ package com.epmet.datareport.controller.screen; +import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService; @@ -30,7 +31,7 @@ public class ScreenProjectController { * @author zxc * @date 2020/8/19 4:36 下午 */ - //@ExternalAppRequestAuth + @ExternalAppRequestAuth @PostMapping("detail") public Result projectDetail(@RequestBody ProjectDetailFormDTO projectDetailFormDTO){ ValidatorUtils.validateEntity(projectDetailFormDTO, ProjectDetailFormDTO.ProjectDetail.class); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java index 710ebd735b..711d56c77f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java @@ -695,10 +695,11 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { gridScoreEntity.setIndexCode(indexCode); gridScoreEntity.setScore(BigDecimal.ZERO); gridScoreEntity.setAllParentIndexCode(NumConstant.ZERO_STR); - if (!CollectionUtils.isEmpty(gridScoreDTO.getDetailList()) && gridScoreDTO.getDetailList().size() != 3) { + /*if (!CollectionUtils.isEmpty(gridScoreDTO.getDetailList()) && gridScoreDTO.getDetailList().size() != 3) { log.error("customerId:" + gridScoreDTO.getCustomerId() + ";gridId:" + gridScoreDTO.getGridId() + ";monthId:" + gridScoreDTO.getMonthId() + "能力值缺失,无法计算总值"); continue; - } + }*/ + log.warn("customerId:" + gridScoreDTO.getCustomerId() + ";gridId:" + gridScoreDTO.getGridId() + ";monthId:" + gridScoreDTO.getMonthId() + "能力值缺失"); for (GridScoreDetailDTO gridScoreDetailDTO : gridScoreDTO.getDetailList()) { BigDecimal indexScore = gridScoreDetailDTO.getScore().multiply(indexMap.get(gridScoreDetailDTO.getIndexCode()).getWeight()); gridScoreEntity.setScore(gridScoreEntity.getScore().add(indexScore));