From f74080fb3bb45b07a7a38c3a2f14f6b918aee3f6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 23 Jun 2021 14:18:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 1 + .../epmet/service/impl/StaffPatrolRecordServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 25e0a4d4d9..86edad6f0b 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-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java index bdc2d9d86b..fd9e5891cd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java @@ -191,7 +191,11 @@ public class StaffPatrolRecordServiceImpl 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()); From 0679a24421dd11061eafdfc005f479149fa9c414 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 23 Jun 2021 18:18:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=AA=E7=99=BB=E5=BD=95=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resolver/LoginUserHandlerMethodArgumentResolver.java | 1 + 1 file changed, 1 insertion(+) 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("-"); From 46445eb6abc0d81bd6d3852cc73c243785a1b4ba Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 24 Jun 2021 11:10:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=9B=B4=E6=96=B0bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BizPointTotalDetailServiceImpl.java | 15 +++++++++----- .../group/form/GroupPointDetailFormDTO.java | 19 ++++++++++++++++++ .../group/feign/ResiGroupOpenFeignClient.java | 6 +++--- .../group/controller/ResiGroupController.java | 6 +++--- .../group/service/ResiGroupService.java | 4 ++-- .../service/impl/ResiGroupServiceImpl.java | 20 ++++++++++++++----- 6 files changed, 52 insertions(+), 18 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupPointDetailFormDTO.java 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 e0828ce468..3401323760 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 @@ -246,11 +246,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 0cbfbe2e52..2bf8988434 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 @@ -558,12 +558,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 5616ddb4b3..2ff53e4651 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 @@ -1318,20 +1318,30 @@ public class ResiGroupServiceImpl extends BaseServiceImpl