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

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java

@@ -22,12 +22,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpContextUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.TreeUtils;
 import com.epmet.dao.GovMenuDao;
 import com.epmet.dao.GovRoleDao;
@@ -36,6 +38,7 @@ import com.epmet.dao.GovRoleUserDao;
 import com.epmet.dto.GovMenuDTO;
 import com.epmet.entity.GovMenuEntity;
 import com.epmet.enums.MenuTypeEnum;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.redis.GovCustomerMenuRedis;
 import com.epmet.redis.GovMenuRedis;
 import com.epmet.service.*;
@@ -77,6 +80,8 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
     private GovRoleMenuDao govRoleMenuDao;
     @Autowired
     private GovRoleUserDao govRoleUserDao;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Override
     public PageData<GovMenuDTO> page(Map<String, Object> params) {
@@ -235,6 +240,14 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
     public List<GovMenuDTO> navDigitalCommunity(TokenDto tokenDto, String tableName) {
         tableName = getTableName(tableName);
         List<GovMenuEntity> menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName);
+        Result<Boolean> isRootManager = epmetUserOpenFeignClient.getIsRootManager(tokenDto.getUserId());
+        if (!isRootManager.success()){
+            throw new EpmetException("getIsRootManager method is failure");
+        }
+        if (isRootManager.getData()){
+            List<GovMenuDTO> govMenuDTOS = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class);
+            return TreeUtils.buildTree(govMenuDTOS);
+        }
         disposeGovMenu(menuList,tokenDto.getUserId());
         Map<Boolean, List<GovMenuEntity>> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus));
         List<GovMenuDTO> dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class);

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -835,4 +835,13 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/icresiuser/getIcUserCount")
     Result<Map<String, Integer>> getIcUserCount(@RequestBody IcUserCountFormDTO formDTO);
+
+    /**
+     * Desc: 查询是否是超级管理员
+     * @param userId
+     * @author zxc
+     * @date 2022/7/13 11:03
+     */
+    @PostMapping("/epmetuser/staffrole/getIsRootManager")
+    Result<Boolean> getIsRootManager(@RequestParam("userId") String userId);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -636,4 +636,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIcUserCount", formDTO);
     }
 
+    @Override
+    public Result<Boolean> getIsRootManager(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIsRootManager", userId);
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java

@@ -217,4 +217,15 @@ public class StaffRoleController {
 
         return new Result<PageData<CustomerGridStaffResultDTO>>().ok(staffRoleService.getGridStaffList(formDTO));
     }
+
+    /**
+     * Desc: 查询是否是超级管理员
+     * @param userId
+     * @author zxc
+     * @date 2022/7/13 11:03
+     */
+    @PostMapping("getIsRootManager")
+    public Result<Boolean> getIsRootManager(@RequestParam("userId") String userId){
+        return new Result<Boolean>().ok(staffRoleService.getIsRootManager(userId));
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java

@@ -182,4 +182,6 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      * @date 2022/1/17 2:45 下午
      */
     List<CustomerGridStaffResultDTO> getStaffList(GridStaffFormDTO formDTO);
+
+    List<String> getRoleKeys(@Param("staffId")String staffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java

@@ -122,4 +122,12 @@ public interface StaffRoleService extends BaseService<StaffRoleEntity> {
      * @date 2022/1/17 2:37 下午
      */
     PageData<CustomerGridStaffResultDTO> getGridStaffList(GridStaffFormDTO formDTO);
+
+    /**
+     * Desc: 查询是否是超级管理员
+     * @param userId
+     * @author zxc
+     * @date 2022/7/13 11:03
+     */
+    Boolean getIsRootManager(String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java

@@ -204,4 +204,26 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
         return new PageData<>(result,count.get());
     }
 
+    /**
+     * Desc: 查询是否是超级管理员
+     * @param userId
+     * @author zxc
+     * @date 2022/7/13 11:03
+     */
+    @Override
+    public Boolean getIsRootManager(String userId) {
+        Boolean result = false;
+        List<String> roleKeys = baseDao.getRoleKeys(userId);
+        if (roleKeys.isEmpty()){
+            return result;
+        }
+        for (String roleKey : roleKeys) {
+            if (roleKey.equals("root_manager")){
+                result = true;
+                break;
+            }
+        }
+        return result;
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@@ -319,5 +319,13 @@
         AND gsr.del_flag = '0'
         ORDER BY cs.CREATED_TIME DESC
     </select>
+    <select id="getRoleKeys" resultType="java.lang.String">
+        SELECT
+            gs.ROLE_KEY
+        FROM staff_role sr
+        INNER JOIN gov_staff_role gs ON gs.ID = sr.ROLE_ID AND gs.DEL_FLAG = 0
+        WHERE sr.DEL_FLAG = 0
+          AND sr.STAFF_ID = #{staffId}
+    </select>
 
 </mapper>