Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@@ -87,7 +87,8 @@ public enum RequirePermissionEnum {
     /**
      * 徽章
      */
-    WORK_GRASSROOTS_BADGE_AUDIT("work_grassroots_badge_audit","基层治理:徽章审核:徽章审核","徽章审核权限，目前这个模块的操作都用这一个权限控制，没有细分"),
+    WORK_GRASSROOTS_BADGE_AUDIT("work_grassroots_badge_audit","基层治理:徽章审核:徽章审核","徽章审核"),
+    WORK_GRASSROOTS_BADGE_AUDITING_LIST("work_grassroots_badge_auditing_list","基层治理:徽章审核:待审核列表","待审核徽章列表"),
 
     /**
      * 工作-项目跟踪
@@ -143,7 +144,15 @@ public enum RequirePermissionEnum {
      * 爱心互助-自定义配置
      */
     MORE_HEART_CUSTOMIZED_VIEW("more_heart_customized_view","更多:爱心互助:自定义配置:查看","更多-爱心互助-自定义配置-查看"),
-    MORE_HEART_CUSTOMIZED_SAVE("more_heart_customized_save","更多:爱心互助:自定义配置:保存修改","更多-爱心互助-自定义配置-保存修改");
+    MORE_HEART_CUSTOMIZED_SAVE("more_heart_customized_save","更多:爱心互助:自定义配置:保存修改","更多-爱心互助-自定义配置-保存修改"),
+
+    /**
+     * 徽章管理
+     */
+    MORE_BADGE_MANAGE_LIST("more_badge_manage_list","更多:徽章:徽章管理:列表","徽章列表"),
+    MORE_BADGE_MANAGE_CREATE("more_badge_manage_create","更多:徽章:徽章管理:添加","添加徽章"),
+    MORE_BADGE_MANAGE_EDIT("more_badge_manage_edit","更多:徽章:徽章管理:编辑","编辑徽章"),
+    MORE_BADGE_MANAGE_DELETE("more_badge_manage_delete","更多:徽章:徽章管理:删除","删除徽章");
 
     private String key;
     private String name;

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyTopicsResultDTO.java

@@ -9,6 +9,7 @@ public class MyTopicsResultDTO {
     private Long releaseTime;
     private String topicContent;
     private String releaseGroupName;
+    private String releaseGridId;
     private String releaseGridName;
 
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -37,12 +37,15 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
+import com.epmet.constant.OrgInfoConstant;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CommonDataFilterResultDTO;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.dto.result.OrgInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.ResiGroupRedisKeys;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -141,6 +144,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
 
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
     @Autowired
     private GovIssueFeignClient govIssueFeignClient;
 
@@ -1386,7 +1392,25 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     public List<MyTopicsResultDTO> listMyTopics(String customerId, String userId, Integer pageNo, Integer pageSize) {
         PageHelper.startPage(pageNo, pageSize);
         List<MyTopicsResultDTO> myTopics = resiTopicDao.listMyTopics(userId, customerId);
-        // todo 查询网格名称，赋值
+
+        HashMap<String, String> gridIdAndNames = new HashMap<>();
+        Set<String> gridIds = myTopics.stream().map(c -> c.getReleaseGridId()).collect(Collectors.toSet());
+
+        OrgInfoFormDTO form = new OrgInfoFormDTO();
+        form.setOrgType(OrgInfoConstant.GRID);
+        form.setOrgIds(new ArrayList<>(gridIds));
+        Result<List<OrgInfoResultDTO>> gridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form);
+        if (gridInfoResult.success()) {
+            List<OrgInfoResultDTO> grids = gridInfoResult.getData();
+            for (OrgInfoResultDTO grid : grids) {
+                gridIdAndNames.put(grid.getOrgId(), grid.getOrgName());
+            }
+        }
+
+        for (MyTopicsResultDTO myTopic : myTopics) {
+            myTopic.setReleaseGridName(gridIdAndNames.get(myTopic.getReleaseGridId()));
+        }
+
         return myTopics;
     }
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -451,7 +451,8 @@
         select t.id            as topicId,
                t.topic_content as topicContent,
                unix_timestamp(t.created_time) as releaseTime,
-               g.GROUP_NAME    as releaseGroupName
+               g.GROUP_NAME    as releaseGroupName,
+               g.GRID_ID       as releaseGridId
         from resi_topic t
                  inner join resi_group g on (t.GROUP_ID = g.ID and g.CUSTOMER_ID = #{customerId})
         where t.CREATED_BY = #{userId}