From 52948ca63a59b58ffbf892d4ad8182c1667a3e60 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 22 Apr 2021 17:41:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=9F=9F=E5=90=8D=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index b7cc83fd9c..87675d742c 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -145,7 +145,7 @@ thirdplat: appkey: @thirdplat.jcet.g.appkey@ appsecret: @thirdplat.jcet.g.appsecret@ pyld: - domain: https://epmet-ext9.elinkservice.cn/platform + domain: https://epmet-ext1-py.elinkservice.cn/platform appId: 7a5aec009ba4eba8e254ee64fe3775e1 appKey: 14faef9af508d1c253b720ea5a43f9de appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595 From 28e6d52fbcb5a58cd88cf7e3306897ca796152d2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 23 Apr 2021 18:23:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StatsAchievementServiceImpl.java | 52 +++++++++++-------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java index 75eda59a4b..ecb1c8d3f5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java @@ -77,9 +77,9 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService case TOPIC: //查询话题数 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ResiTopicEntity::getCustomerId,customerId) - .eq(ResiTopicEntity::getGroupId,groupId) - .eq(ResiTopicEntity::getDelFlag,NumConstant.ZERO); + queryWrapper.lambda().eq(ResiTopicEntity::getCustomerId, customerId) + .eq(ResiTopicEntity::getGroupId, groupId) + .eq(ResiTopicEntity::getDelFlag, NumConstant.ZERO); currentValue = resiTopicDao.selectCount(queryWrapper); break; case MEMBER: @@ -88,49 +88,50 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService case TOISSUE: //查询已经转议题的话题数 queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ResiTopicEntity::getCustomerId,customerId) - .eq(ResiTopicEntity::getGroupId,groupId) + queryWrapper.lambda().eq(ResiTopicEntity::getCustomerId, customerId) + .eq(ResiTopicEntity::getGroupId, groupId) .eq(ResiTopicEntity::getShiftIssue, NumConstant.ONE) - .eq(ResiTopicEntity::getDelFlag,NumConstant.ZERO); + .eq(ResiTopicEntity::getDelFlag, NumConstant.ZERO); currentValue = resiTopicDao.selectCount(queryWrapper); break; case RESOVLE_TOPIC: //查询已经关闭且为已解决的话题数 queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ResiTopicEntity::getCustomerId,customerId) - .eq(ResiTopicEntity::getGroupId,groupId) + queryWrapper.lambda().eq(ResiTopicEntity::getCustomerId, customerId) + .eq(ResiTopicEntity::getGroupId, groupId) .eq(ResiTopicEntity::getStatus, TopicConstant.CLOSED) .eq(ResiTopicEntity::getClosedStatus, TopicConstant.RESOLVED) .eq(ResiTopicEntity::getShiftIssue, NumConstant.ONE) - .eq(ResiTopicEntity::getDelFlag,NumConstant.ZERO); + .eq(ResiTopicEntity::getDelFlag, NumConstant.ZERO); currentValue = resiTopicDao.selectCount(queryWrapper); break; default: log.info("calculateAcm error"); } - if(currentValue == 0){ + if (currentValue == 0) { return true; } - log.info("calculateAcm achievementType:{},groupId:{},currentValue:{}",groupId,currentValue,achievementType); + log.info("calculateAcm achievementType:{},groupId:{},currentValue:{}", groupId, currentValue, achievementType); calculateGroupAchievement(customerId, groupId, currentValue, achievementType); return true; } /** - * desc: 计算小组的人数等级 + * desc: 计算小组成就 * * @param customerId * @param groupId */ private void calculateGroupAchievement(String customerId, String groupId, int currentValue, String achievementType) { - + //根据成就类型获取小组未实现成就 数据库正常只会有一条 ResiGroupAchievementStatsEntity one = super.achievementStatsService.selectLastUnAchieved(customerId, groupId, achievementType); List haveArrive = new ArrayList<>(); - //如果没有实现的额成就则说明是初始化 + //如果没有实现的成就则说明是初始化 if (one == null) { initAchievementStat(customerId, groupId, achievementType, currentValue, haveArrive); - super.achievementStatsService.saveOrUpdate(haveArrive,false); + //初始化如果记录存在 只更新修改时间 + super.achievementStatsService.saveOrUpdate(haveArrive, false); return; } @@ -144,13 +145,13 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService int pageNum = NumConstant.ONE; int pageSize = NumConstant.TEN; do { - List list = getConfigByType(achievementType,pageNum++,pageSize); + List list = getConfigByType(achievementType, pageNum++, pageSize); isContinue = buildArriveList(customerId, groupId, achievementType, currentValue, one.getTargetValue(), haveArrive, list); - }while (isContinue); + } while (isContinue); } if (isBatch) { - super.achievementStatsService.saveOrUpdate(haveArrive,true); + super.achievementStatsService.saveOrUpdate(haveArrive, true); } else { //未实现 只更新当前值 ResiGroupAchievementStatsDTO newStat = new ResiGroupAchievementStatsDTO(); @@ -160,20 +161,27 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService } } + /** + * desc: 初始化成就 + * + * @return void + * @author LiuJanJun + * @date 2021/4/23 6:20 下午 + */ private void initAchievementStat(String customerId, String groupId, String achievementType, int currentValue, List haveArrive) { boolean isContinue; int pageNum = NumConstant.ONE; int pageSize = NumConstant.TEN; do { //没有任何数据说明是初始化 - List list = getConfigByType(achievementType,pageNum++,pageSize); + List list = getConfigByType(achievementType, pageNum++, pageSize); //查询和初始化都失败啦 if (CollectionUtils.isEmpty(list)) { log.error("calculateMember get config fail"); throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode()); } isContinue = buildArriveList(customerId, groupId, achievementType, currentValue, null, haveArrive, list); - }while (isContinue); + } while (isContinue); if (CollectionUtils.isEmpty(haveArrive)) { throw new RenException("小组达成成就失败"); } @@ -184,7 +192,7 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService for (ResiGroupAchievementConfigEntity configEntity : list) { if (targetValue != null) { //筛选出已经完成的成就 - if (configEntity.getTargetValue() getConfigByType(String achievementType,int pageNum,int pageSize) { + private List getConfigByType(String achievementType, int pageNum, int pageSize) { List list = super.getAchievemnetConfigPage(pageNum, pageSize, achievementType); if (CollectionUtils.isEmpty(list)) { log.warn("获取小组成就配置错误,{} 开始进行初始化规则", achievementType); From 2500482e1b624d41bf32ac801956da4b337125fe Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sun, 25 Apr 2021 09:24:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0sourceType=EF=BC=8C?= =?UTF-8?q?=E5=A1=AB=E5=85=85sourceId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/BizPointTotalDetailServiceImpl.java | 4 +++- .../com/epmet/service/impl/UserPointActionLogServiceImpl.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java index 6609bbe34c..282ae423aa 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java @@ -41,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.text.Collator; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -195,7 +196,8 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl { diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 736ca73451..9894e90d80 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -427,6 +427,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl Date: Sun, 25 Apr 2021 09:41:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=91=98?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=B8=BA=E8=B0=83=E6=95=B4=E4=B8=BA=E6=89=80?= =?UTF-8?q?=E6=9C=89=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/service/impl/StatsAchievementServiceImpl.java | 5 +++-- .../com/epmet/modules/member/dao/ResiGroupMemberDao.java | 2 +- .../main/java/com/epmet/modules/support/GroupLevelUtils.java | 2 +- .../src/main/resources/mapper/member/ResiGroupMemberDao.xml | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java index ecb1c8d3f5..973fda879d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java @@ -83,7 +83,7 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService currentValue = resiTopicDao.selectCount(queryWrapper); break; case MEMBER: - currentValue = resiGroupMemberDao.countMembers(customerId, groupId); + currentValue = resiGroupMemberDao.countAllMembers(customerId, groupId); break; case TOISSUE: //查询已经转议题的话题数 @@ -187,7 +187,8 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService } } - private boolean buildArriveList(String customerId, String groupId, String achievementType, int currentValue, Integer targetValue, List haveArrive, List list) { + private boolean buildArriveList(String customerId, String groupId, String achievementType, int currentValue, Integer targetValue, + List haveArrive, List list) { boolean isContinue = true; for (ResiGroupAchievementConfigEntity configEntity : list) { if (targetValue != null) { diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java index b80e9cacca..b626c8e51b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java @@ -154,5 +154,5 @@ public interface ResiGroupMemberDao extends BaseDao { * @author LiuJanJun * @date 2021/4/23 3:14 下午 */ - int countMembers(@Param("customerId") String customerId, @Param("groupId") String groupId); + int countAllMembers(@Param("customerId") String customerId, @Param("groupId") String groupId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupLevelUtils.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupLevelUtils.java index b6c6b12b8a..17d14fb2f6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupLevelUtils.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupLevelUtils.java @@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; /** - * 小组等级积分工具类 + * 小组等级积分工具类 0,300,700,1200,1800 * * @author zhaoqifeng * @date 2021/4/21 10:22 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml index 87197c1003..25341775cb 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml @@ -191,7 +191,7 @@ ORDER BY rgm.CREATED_TIME DESC - SELECT count(*) FROM @@ -199,7 +199,6 @@ WHERE rgm.RESI_GROUP_ID = #{groupId} AND rgm.CUSTOMER_ID = #{customerId} - and rgm.STATUS = 'approved' AND rgm.GROUP_LEADER_FLAG = 'member'