diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 412fee30f7..05a34a690e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -109,6 +109,7 @@ public enum EpmetErrorCode { ONLINE_BADGE_COUNT(8517, "最多上线5个徽章"), PATROL_REPEATED_SUBMIT_ERROR(8521, "巡查已结束，请勿重复提交"), PATROL_END_TIME_ERROR(8522, "巡查结束时间不能小于巡查开始时间"), + TIME_FORMAT_ERROR(8523, "时间格式错误"), // 该错误不会提示给前端，只是后端传输错误信息用。 ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"), OPER_ADD_CUSTOMER_ROOT_AGENCY_ERROR(8702, "添加客户根级组织失败"), diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java index 57a537d027..5c725c2ec4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -71,6 +71,7 @@ public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgu //app-client-userId String redisKey = request.getHeader(Constant.APP_USER_KEY); if (StringUtils.isEmpty(redisKey)) { + logger.info("用户未登陆"); throw new RenException(ErrorCode.UNAUTHORIZED); } // String[] keyArray=redisKey.split("-"); 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 683347a350..d2398b4b00 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 @@ -29,6 +29,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dao.BizPointTotalDetailDao; import com.epmet.dto.BizPointTotalDetailDTO; import com.epmet.dto.form.GroupPointFormDTO; +import com.epmet.resi.group.dto.group.form.GroupPointDetailFormDTO; import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO; import com.epmet.dto.result.GroupPointRankingResultDTO; import com.epmet.entity.BizPointTotalDetailEntity; @@ -140,16 +141,20 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl result = resiGroupOpenFeignClient.groupPointDetail(formDTO.getGroupId()); - if (!result.success() || null == result.getData()) { - throw new RenException(result.getCode(), result.getMsg()); - } - GroupPointDetailResultDTO detail = result.getData(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("BIZ_TYPE", "group") .eq("OBJECT_ID", formDTO.getGroupId()) .eq("DEL_FLAG", NumConstant.ZERO_STR); BizPointTotalDetailEntity entity = baseDao.selectOne(wrapper); + + GroupPointDetailFormDTO groupPointDetailFormDTO = new GroupPointDetailFormDTO(); + groupPointDetailFormDTO.setGroupId(formDTO.getGroupId()); + groupPointDetailFormDTO.setPoint(null == entity?NumConstant.ZERO:entity.getTotalPoint()); + Result result = resiGroupOpenFeignClient.groupPointDetail(groupPointDetailFormDTO); + if (!result.success() || null == result.getData()) { + throw new RenException(result.getCode(), result.getMsg()); + } + GroupPointDetailResultDTO detail = result.getData(); Integer increase = userPointActionLogService.getIncrease("group", formDTO.getGroupId()); detail.setIncrease(increase.toString()); if (null == entity) { diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupPointDetailFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupPointDetailFormDTO.java new file mode 100644 index 0000000000..31a012c22f --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupPointDetailFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2021/6/24 10:50 + */ +@Data +public class GroupPointDetailFormDTO implements Serializable { + private static final long serialVersionUID = 2668579587643641113L; + private String groupId; + private Integer point; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index 0f1fb12a0e..8d54aaad0c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -236,11 +236,11 @@ public interface ResiGroupOpenFeignClient { * 小组积分详情 * @author zhaoqifeng * @date 2021/4/21 16:30 - * @param groupId + * @param formDTO * @return com.epmet.commons.tools.utils.Result */ - @PostMapping("resi/group/group/groupPointDetail/{groupId}") - Result groupPointDetail(@PathVariable String groupId); + @PostMapping("resi/group/group/groupPointDetail") + Result groupPointDetail(@RequestBody GroupPointDetailFormDTO formDTO); /** * @Description 查询话题的创建者 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 38a9dc2c57..1bcb04e244 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -557,12 +557,12 @@ public class ResiGroupController { * 小组积分详情 * @author zhaoqifeng * @date 2021/4/21 16:22 - * @param groupId + * @param formDTO * @return com.epmet.commons.tools.utils.Result */ @PostMapping("groupPointDetail/{groupId}") - public Result groupPointDetail(@PathVariable String groupId) { - return new Result().ok(resiGroupService.groupPointDetail(groupId)); + public Result groupPointDetail(@RequestBody GroupPointDetailFormDTO formDTO) { + return new Result().ok(resiGroupService.groupPointDetail(formDTO)); } /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index d5ae200dd7..d42a0d25e9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -404,10 +404,10 @@ public interface ResiGroupService extends BaseService { * 小组积分详情 * @author zhaoqifeng * @date 2021/4/21 16:22 - * @param groupId + * @param formDTO * @return com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO */ - GroupPointDetailResultDTO groupPointDetail(String groupId); + GroupPointDetailResultDTO groupPointDetail(GroupPointDetailFormDTO formDTO); /** * 小组近段时间实现的成就列表 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 7d07f11928..a651900dce 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1319,20 +1319,30 @@ public class ResiGroupServiceImpl extends BaseServiceImpl 0) { + Date endTime = DateUtils.parse(formDTO.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN); + if (null == endTime) { + throw new RenException(EpmetErrorCode.TIME_FORMAT_ERROR.getCode()); + } + if (record.getPatrolStartTime().compareTo(endTime) > 0) { throw new RenException(EpmetErrorCode.PATROL_END_TIME_ERROR.getCode()); } record.setActrualEndTime(new Date());