From c70704336ebe26d1ae310241f97e241b8787b5f1 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 2 Dec 2020 17:09:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BA=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E8=A7=92=E8=89=B2=EF=BC=8C=E6=89=B9=E9=87=8F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E4=B8=AA=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=92=8C=E6=93=8D=E4=BD=9C=E8=8C=83=E5=9B=B4=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/AccessConfigAdd4RoletFormDTO.java | 50 ++++++++++++++++++- .../controller/AccessConfigController.java | 17 ++++++- .../epmet/service/AccessConfigService.java | 4 +- .../service/impl/AccessConfigServiceImpl.java | 10 ++++ 4 files changed, 76 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java index 85b9e9d68d..d2a6770d41 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java @@ -2,16 +2,62 @@ package com.epmet.dto.form; import lombok.Data; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; import java.util.List; @Data public class AccessConfigAdd4RoletFormDTO { - @NotBlank(message = "角色Key不能为空") + + // 为角色添加单个操作 + public interface AddSingleOperation4RoleGroup {} + + // 为角色添加多个操作 + public interface AddMultiOperations4RoleGroup {} + + @NotBlank(message = "角色Key不能为空", groups = { AddSingleOperation4RoleGroup.class }) private String roleKey; - @NotBlank(message = "操作Key不能为空") + @NotBlank(message = "操作Key不能为空", groups = { AddSingleOperation4RoleGroup.class }) private String operationKey; private List scopeKeys; + + // 操作列表，及其范围 + @Valid + @NotEmpty(message = "操作列表及其范围不能为空", groups = { AddMultiOperations4RoleGroup.class }) + private List operationsAndScopes = new ArrayList<>(); + + /** + * 操作及其范围封装类 + */ + public static class OperationsAndScopes { + + // 操作key + @NotBlank(message = "角色Key不能为空", groups = { AddMultiOperations4RoleGroup.class }) + private String operationKey; + + // 范围key列表 + @NotEmpty(message = "操作Key列表不能为空", groups = { AddMultiOperations4RoleGroup.class }) + private List scopeKeys; + + public String getOperationKey() { + return operationKey; + } + + public void setOperationKey(String operationKey) { + this.operationKey = operationKey; + } + + public List getScopeKeys() { + return scopeKeys; + } + + public void setScopeKeys(List scopeKeys) { + this.scopeKeys = scopeKeys; + } + } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java index 76a7886947..0983ca46a4 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java @@ -118,14 +118,14 @@ public class AccessConfigController { } /** - * @Description 给角色添加操作权限和操作范围 + * @Description 给角色添加单个操作权限和操作范围 * @return * @author wxz * @date 2020.11.17 17:41 */ @PostMapping("add-ope-and-scopes-4role") public Result addOpeAndScopes4Role(@RequestBody AccessConfigAdd4RoletFormDTO form) { - ValidatorUtils.validateEntity(form); + ValidatorUtils.validateEntity(form, AccessConfigAdd4RoletFormDTO.AddSingleOperation4RoleGroup.class); String roleKey = form.getRoleKey(); String operationKey = form.getOperationKey(); List scopeKeys = form.getScopeKeys(); @@ -134,5 +134,18 @@ public class AccessConfigController { return new Result(); } + /** + * @Description 给角色添加单个操作权限和操作范围 + * @return + * @author wxz + * @date 2020.12.02 16:20 + */ + @PostMapping("add-opes-and-scopes-4role") + public Result addOpesAndScopes4Role(@RequestBody AccessConfigAdd4RoletFormDTO form) { + ValidatorUtils.validateEntity(form, AccessConfigAdd4RoletFormDTO.AddMultiOperations4RoleGroup.class); + accessConfigService.addOpesAndScopes4Role(form.getRoleKey(), form.getOperationsAndScopes()); + return new Result(); + } + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java index 508f3ad45f..a2b1850e04 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java @@ -1,6 +1,6 @@ package com.epmet.service; -import com.epmet.dto.form.AccessConfigRoleDefaultOpesFormDTO; +import com.epmet.dto.form.AccessConfigAdd4RoletFormDTO; import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; import com.epmet.dto.result.AccessConfigOpesResultDTO; import com.epmet.dto.result.AccessConfigOptionsResultDTO; @@ -27,4 +27,6 @@ public interface AccessConfigService { void saveOpeDefaultScopes(String roleKey, String operationKey, List scopeKeys); void addOpeAndScopes4Role(String roleKey, String operationKey, List scopeKeys); + + void addOpesAndScopes4Role(String roleKey, List operations); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java index 06f391eada..52a0ae282c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.*; +import com.epmet.dto.form.AccessConfigAdd4RoletFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.OperationScopeDefaultEntity; import com.epmet.entity.RoleOperationDefaultEntity; @@ -261,4 +262,13 @@ public class AccessConfigServiceImpl implements AccessConfigService { } } } + + @Override + public void addOpesAndScopes4Role(String roleKey, List operations) { + for (AccessConfigAdd4RoletFormDTO.OperationsAndScopes operation : operations) { + String operationKey = operation.getOperationKey(); + List scopeKeys = operation.getScopeKeys(); + addOpeAndScopes4Role(roleKey, operationKey, scopeKeys); + } + } } From 30ee0c8e97b681593887b054c7eab3a6094bf002 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Dec 2020 17:21:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E7=88=B1?= =?UTF-8?q?=E5=BF=83=E6=A6=9Cheart/resi/act/leaderboard=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java | 1 + .../com/epmet/service/impl/HeartUserInfoServiceImpl.java | 5 +++-- .../src/main/resources/mapper/HeartUserInfoDao.xml | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java index 44964cfd73..d0c223741c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java @@ -57,4 +57,5 @@ public class ResiLeaderboardResultDTO implements Serializable { * 参加次数 */ private Integer participationNum; + private String userId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java index 5c1dfaea87..91c1f7df09 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java @@ -35,6 +35,7 @@ import com.epmet.entity.HeartUserInfoEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.redis.HeartUserInfoRedis; import com.epmet.service.HeartUserInfoService; +import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -128,9 +129,8 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl> leaderboard(ResiActBaseFormDTO formDTO) { List resultDtoS = new ArrayList<>(); - int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); - formDTO.setPageNo(pageIndex); // 获取排好序的 排行榜 + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); List leaderboardList = baseDao.selectListLeaderboard(formDTO); if (leaderboardList.size() > NumConstant.ZERO){ // 根据用户ID获取微信昵称、头像 @@ -143,6 +143,7 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl NumConstant.ZERO){ for (HeartUserInfoDTO list : leaderboardList){ ResiLeaderboardResultDTO dto = new ResiLeaderboardResultDTO(); + dto.setUserId(list.getUserId()); dto.setKindnessTime(list.getKindnessTime()); dto.setVolunteerFlag(list.getVolunteerFlag()); dto.setParticipationNum(list.getParticipationNum()); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml index 9df9414e17..009f9c2ea3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml @@ -51,8 +51,7 @@ FROM heart_user_info ui WHERE ui.DEL_FLAG = '0' AND ui.CUSTOMER_ID = #{customerId} - ORDER BY ui.KINDNESS_TIME DESC, ui.PARTICIPATION_NUM DESC - LIMIT #{pageNo}, #{pageSize} + ORDER BY ui.KINDNESS_TIME DESC, ui.PARTICIPATION_NUM DESC,ui.VOLUNTEER_FLAG desc,ui.CREATED_TIME asc From edcd61b5e1253fd2994360b5d95c5c9838671692 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 9 Dec 2020 09:46:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 6efe2c7cbe..a2fc3925b0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -1230,9 +1230,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl