Merge branch 'dev_bugfix_zxctopicdetail' into dev_temp

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;
 }

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<HeartUserInfoDao,
     @Override
     public Result<List<ResiLeaderboardResultDTO>> leaderboard(ResiActBaseFormDTO formDTO) {
         List<ResiLeaderboardResultDTO> resultDtoS = new ArrayList<>();
-        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
-        formDTO.setPageNo(pageIndex);
         // 获取排好序的 排行榜
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<HeartUserInfoDTO> leaderboardList = baseDao.selectListLeaderboard(formDTO);
         if (leaderboardList.size() > NumConstant.ZERO){
             // 根据用户ID获取微信昵称、头像
@@ -143,6 +143,7 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl<HeartUserInfoDao,
             if (userWxInfos.success() && userWxInfos.getData().size() > 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());

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
     </select>
 
     <update id="updateHeartUserInfoByUserId" parameterType="com.epmet.dto.HeartUserInfoDTO">

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<String> scopeKeys;
+
+    // 操作列表，及其范围
+    @Valid
+    @NotEmpty(message = "操作列表及其范围不能为空", groups = { AddMultiOperations4RoleGroup.class })
+    private List<OperationsAndScopes> 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<String> scopeKeys;
+
+        public String getOperationKey() {
+            return operationKey;
+        }
+
+        public void setOperationKey(String operationKey) {
+            this.operationKey = operationKey;
+        }
+
+        public List<String> getScopeKeys() {
+            return scopeKeys;
+        }
+
+        public void setScopeKeys(List<String> scopeKeys) {
+            this.scopeKeys = scopeKeys;
+        }
+    }
 }

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<String> 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();
+    }
+
 
 }

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<String> scopeKeys);
 
     void addOpeAndScopes4Role(String roleKey, String operationKey, List<String> scopeKeys);
+
+    void addOpesAndScopes4Role(String roleKey, List<AccessConfigAdd4RoletFormDTO.OperationsAndScopes> operations);
 }

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<AccessConfigAdd4RoletFormDTO.OperationsAndScopes> operations) {
+        for (AccessConfigAdd4RoletFormDTO.OperationsAndScopes operation : operations) {
+            String operationKey = operation.getOperationKey();
+            List<String> scopeKeys = operation.getScopeKeys();
+            addOpeAndScopes4Role(roleKey, operationKey, scopeKeys);
+        }
+    }
 }

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<ResiTopicDao, ResiTopi
         if (!r.success()){
             throw new RenException("查询话题发起人失败......");
         }
-        IssueInitiatorResultDTO issueInitiatorResult = r.getData();
-        if (!StringUtils.isBlank(issueInitiatorResult.getIssueInitiator())) {
-            topicInfo.setPublishedUser(issueInitiatorResult.getIssueInitiator());
+        if (null != r.getData()){
+            IssueInitiatorResultDTO issueInitiatorResult = r.getData();
+            if (!StringUtils.isBlank(issueInitiatorResult.getIssueInitiator())) {
+                topicInfo.setPublishedUser(issueInitiatorResult.getIssueInitiator());
+            }
         }
         return topicInfo;
     }