diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 1e9334b0b0..ee2c68962d 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -233,6 +233,9 @@
lb://epmet-openapi-adv-server
+
+ lb://tduck-api
+
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
@@ -364,6 +367,9 @@
lb://epmet-openapi-adv-server
+
+ lb://tduck-api
+
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
@@ -461,6 +467,8 @@
lb://epmet-ext-server
lb://data-aggregator-server
+
+ lb://tduck-api
lb://epmet-openapi-adv-server
@@ -561,6 +569,8 @@
lb://epmet-openapi-adv-server
+
+ lb://tduck-api
https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 76ad4324d9..dfd051a5d6 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -336,12 +336,20 @@ spring:
# 宣传服务
- id: epmet-openapi-adv-server
uri: @gateway.routes.epmet-openapi-adv-server.url@
- order: 35
+ order: 36
predicates:
- Path=${server.servlet.context-path}/adv/**
filters:
- StripPrefix=1
- CpAuth=true
+ - id: tduck-api
+ uri: @gateway.routes.tduck-api.url@
+ order: 37
+ predicates:
+ - Path=${server.servlet.context-path}/tduck-api/**
+ filters:
+ - StripPrefix=1
+ - CpAuth=true
nacos:
discovery:
server-addr: @nacos.server-addr@
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
index 484c8f8055..2eb5afc433 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
@@ -18,4 +18,5 @@ public class MyPointRankResultDTO implements Serializable {
private String headPhoto;
private String gridRank;
private String customerRank;
+ private String userName;
}
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
index 5842e34bf6..c6a23b59df 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
@@ -23,6 +23,7 @@ import com.epmet.common.enu.AroundPartyConstant;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
@@ -351,6 +352,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl list = getUserPointList(tokenDto.getCustomerId(), null, null);
result.setCustomerRank(getRank(list, tokenDto.getUserId()));
@@ -378,7 +380,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl list = getGridPointList(tokenDto.getCustomerId(), null);
@@ -453,6 +455,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl list, String userId) {
Map map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getUserId, BizPointUserTotalDetailDTO::getTotalPoint));
+ String point = null == map.get(userId)?"0":Integer.toString(map.get(userId));
+ log.info("userPoint:" + point);
return null != map.get(userId);
}
@@ -463,6 +467,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getGridId, BizPointUserTotalDetailDTO::getTotalPoint));
+ String points = null == map.get(gridId)?"0":Integer.toString(map.get(gridId));
+ log.info("gridPoint:" + points);
if (null == map.get(gridId)) {
BizPointUserTotalDetailDTO dto = new BizPointUserTotalDetailDTO();
dto.setGridId(gridId);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
index d90ebb3941..c42a648c62 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
@@ -200,7 +200,7 @@
)
VALUES
(
- #{ID},
+ #{id},
#{customerId},
#{gridId},
#{userId},