diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 794eafc85..7a0a9c016 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -369,7 +369,7 @@ public interface UserFeignClient { /** * 志愿者认证 - * + *needCachingUserInfoByUserId * @param userId * @return */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 6734fddc2..fe79cbd8f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -741,7 +741,10 @@ public class AppUserServiceImpl implements AppUserService { // IP地址 HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); - return this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request), formDto.getInviteUserId(), formDto.getGridId()); + + Result result = this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request), formDto.getInviteUserId(), formDto.getGridId()); + + return result; } @Override @@ -758,16 +761,6 @@ public class AppUserServiceImpl implements AppUserService { } epdcAppUserRegisterFormDTO.setWxCode(formDto.getWxCode()); Result maV2Token = this.getMaV2Token(epdcAppUserRegisterFormDTO); - // 注册埋点 - if (maV2Token.success()) { - PointLogFormDTO pointLogFormDTO = new PointLogFormDTO(); - pointLogFormDTO.setType(BehaviorEnum.POINTS_REGISTER_RULES.getValue()); - pointLogFormDTO.setUserId(maV2Token.getData().getUserId()); - pointFeignClient.updataPoint(pointLogFormDTO); - } else { - log.error("报错："+maV2Token.getMsg() + "-" + maV2Token.toString()); - } - return maV2Token; } @@ -987,6 +980,11 @@ public class AppUserServiceImpl implements AppUserService { Result cachingUserResult = userFeignClient.needCachingUserInfoByUserId(tokenDto.getUserId()); CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData(); EpdcAppAuthorizationDTO authorizationDto = cachingUserInfoForAuthorization(cachingUserInfoDTO, user.getGrid(), user.getState()); + // 注册埋点 + PointLogFormDTO pointLogFormDTO = new PointLogFormDTO(); + pointLogFormDTO.setType(BehaviorEnum.POINTS_REGISTER_RULES.getValue()); + pointLogFormDTO.setUserId(authorizationDto.getUserId()); + pointFeignClient.updataPoint(pointLogFormDTO); // 党员认证失败 if (100006001 == completeResult.getCode()) { @@ -996,10 +994,11 @@ public class AppUserServiceImpl implements AppUserService { } // 更新社群用户党员标识并加入关联的所有网格党员群 boolean partyFlag = UserTagUtils.containIdentity(cachingUserInfoDTO.getUserTagInfos(), UserTagEnum.PARTY_MEMBER); + if (partyFlag) { initPartyGroupInfo(cachingUserInfoDTO); // 积分埋点 党员认证规则 - PointLogFormDTO pointLogFormDTO = new PointLogFormDTO(); + pointLogFormDTO = new PointLogFormDTO(); pointLogFormDTO.setType(BehaviorEnum.POINTS_PARTY_AUTHENTICATION_RULES.getValue()); pointLogFormDTO.setUserId(tokenDto.getUserId()); pointFeignClient.updataPoint(pointLogFormDTO); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index d84eb0258..9c797b76f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -512,7 +512,7 @@ #{id} - and date_format( CREATED_TIME, '%Y-%m-%d' ) > date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' ) + date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' ) ]]> diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 54d6834e8..55e700d30 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -842,6 +842,7 @@ WHERE DEL_FLAG = '0' AND GRID_ID = #{deptId} + AND EVENT_ID is not null AND ITEM_STATE = #{state} AND ID NOT IN ( SELECT diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java index f5def3d74..ae306350b 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java @@ -161,11 +161,14 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl= 5) { + if (signCount >= Integer.parseInt(doubleTime)) { // 开启加倍 points = Integer.parseInt(points) * 2 + ""; } } + if ("0".equals(priod)) { + priod = "3"; + } // 查询当前用户积分状态 判断是否上线（次数） （上限） Map parames = new HashMap<>(); parames.put("userId", formDTO.getUserId()); @@ -173,36 +176,35 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl= Integer.parseInt(time) || pointInfo.getPointCount() >= Integer.parseInt(limit)) { return; } //没达到上限可以继续添加积分操作 ActivePointLogEntity logEntity = new ActivePointLogEntity(); - if (pointInfo.getPointCount() < Integer.parseInt(limit) && pointInfo.getPointTimeCount() < Integer.parseInt(time)) { - // 获取用户真实姓名 - Result infoById = userFeignClient.getInfoById(formDTO.getUserId()); - - logEntity.setUserId(formDTO.getUserId()); - logEntity.setOperationType(PointsOperationConstant.OPERATION_ADD); - logEntity.setPoints(Integer.parseInt(points)); - logEntity.setOperationCode(operationCode); - logEntity.setOperationDesc(operationDesc); - logEntity.setOperationTime(new Date()); - logEntity.setUserName(infoById.getData().getRealName()); - - logEntity.setDeptId(infoById.getData().getGridId()); - logEntity.setDeptName(infoById.getData().getRealName()); - logEntity.setParentDeptIds(infoById.getData().getRealName()); - logEntity.setParentDeptNames(infoById.getData().getRealName()); - logEntity.setAllDeptIds(infoById.getData().getRealName()); - logEntity.setAllDeptNames(infoById.getData().getRealName()); - baseDao.insert(logEntity); - // 更新用户表积分 - UserPointsFormDTO userPointsFormDTO = new UserPointsFormDTO(); - userPointsFormDTO.setPoints(Integer.parseInt(points)); - userPointsFormDTO.setUserId(formDTO.getUserId()); - userFeignClient.updataUserPoint(userPointsFormDTO); - } + // 获取用户真实姓名 + Result infoById = userFeignClient.getInfoById(formDTO.getUserId()); + + logEntity.setUserId(formDTO.getUserId()); + logEntity.setOperationType(PointsOperationConstant.OPERATION_ADD); + logEntity.setPoints(Integer.parseInt(points)); + logEntity.setOperationCode(operationCode); + logEntity.setOperationDesc(operationDesc); + logEntity.setOperationTime(new Date()); + logEntity.setUserName(infoById.getData().getRealName()); + + logEntity.setDeptId(infoById.getData().getGridId()); + logEntity.setDeptName(infoById.getData().getGridName()); + logEntity.setParentDeptIds(infoById.getData().getParentDeptIds()); + logEntity.setParentDeptNames(infoById.getData().getParentDeptNames()); + logEntity.setAllDeptIds(infoById.getData().getAllDeptIds()); + logEntity.setMobile(infoById.getData().getMobile()); + logEntity.setAllDeptNames(infoById.getData().getAllDeptNames()); + baseDao.insert(logEntity); + // 更新用户表积分 + UserPointsFormDTO userPointsFormDTO = new UserPointsFormDTO(); + userPointsFormDTO.setPoints(Integer.parseInt(points)); + userPointsFormDTO.setUserId(formDTO.getUserId()); + userFeignClient.updataUserPoint(userPointsFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml index c1ab36683..84e0e033b 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml @@ -75,10 +75,11 @@ pl.USER_ID = #{userId} AND pl.OPERATION_CODE = #{type} AND pl.DEL_FLAG = '0' - + + AND DATE_FORMAT(pl.CREATED_TIME, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') - + AND DATE_FORMAT(pl.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java index ad4b39824..6abd4a37d 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java @@ -269,5 +269,5 @@ public class UserEntity extends DeptScope { /** * 活跃积分 */ - private int activePoints; + private Integer activePoints; } diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_statistics_plantform_item_extracting.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_statistics_plantform_item_extracting.ktr index 35a1cc461..689dd5e9c 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_statistics_plantform_item_extracting.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_statistics_plantform_item_extracting.ktr @@ -605,6 +605,7 @@ AND eigp.DEL_FLAG = '0' WHERE item.DEL_FLAG = '0' + and item.EVENT_ID is not null GROUP BY item.GRID_ID)c GROUP BY diff --git a/esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb b/esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb index 01929accf..951a9e67e 100644 --- a/esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb +++ b/esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb @@ -515,7 +515,7 @@ behavior_basic 0 0 - Y + N Y Y @@ -524,7 +524,7 @@ behavior_participate 0 0 - Y + N Y N @@ -542,7 +542,7 @@ epdc_active_user_info 0 0 - Y + N Y N @@ -551,7 +551,7 @@ 成功 0 0 - Y + N Y N @@ -560,10 +560,19 @@ behavior_party 0 0 - Y + N Y N + + Start + epdc_active_user_info + 0 + 0 + Y + Y + Y + diff --git a/esua-epdc/kettle-Code/esua_epdc_behavior/behavior_basic.kjb b/esua-epdc/kettle-Code/esua_epdc_behavior/behavior_basic.kjb index fe5bbb275..9eee94fae 100644 --- a/esua-epdc/kettle-Code/esua_epdc_behavior/behavior_basic.kjb +++ b/esua-epdc/kettle-Code/esua_epdc_behavior/behavior_basic.kjb @@ -541,7 +541,7 @@ true; statDays - 1 + 8 CURRENT_JOB @@ -610,7 +610,7 @@ true; if(statDays>0) 0 0 - Y + N Y N @@ -664,7 +664,7 @@ true; 统计天数减1 0 0 - Y + N Y N diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_TYPICAL_CASE.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_TYPICAL_CASE.ktr index 27a33cc67..58015ac50 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_TYPICAL_CASE.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_TYPICAL_CASE.ktr @@ -591,8 +591,8 @@ 4 ) + IF( - sum( IF ( entity.BONUS_CATEGORY = '2', IFNULL( entity.BONUS, 0 ), 0 ) ) < 3, - sum( IF ( entity.BONUS_CATEGORY = '2', IFNULL( entity.BONUS, 0 ), 0 ) ), + sum( IF ( entity.BONUS_CATEGORY = '3', IFNULL( entity.BONUS, 0 ), 0 ) ) < 3, + sum( IF ( entity.BONUS_CATEGORY = '3', IFNULL( entity.BONUS, 0 ), 0 ) ), 3 ) ,2) AS TYPICAL_CASE,