Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -766,6 +766,16 @@ public class RedisKeys {
 		return rootPrefix.concat("gov:access:nav:");
 	}
 
+	/**
+	 * Desc: 新五大图层获取菜单缓存key
+	 * @param
+	 * @author zxc
+	 * @date 2022/7/27 13:42
+	 */
+	public static String getCustomerMenuListFiveCoverage() {
+		return rootPrefix.concat("customer:govMenu:");
+	}
+
 	/**
 	 * 如果是省列表：epmet:areacode:parentCode:0
 	 * 山东省的下一级：epmet:areacode:parentCode:37

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java

@@ -375,6 +375,15 @@ public class RedisUtils {
         return redisTemplate.opsForSet().add(key,value);
     }
 
+    public void listAdd(String key,Object value){
+        redisTemplate.opsForList().rightPush(key,value);
+    }
+
+    public Object listGetAll(String key,Integer start, Integer end){
+        List<Object> result = redisTemplate.opsForList().range(key, start, end);
+        return result;
+    }
+
     /**
      * @Description  获取 zset 中带score的集合
      * @param key

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetCustomerMenuListFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/7/27 10:13
+ * @DESC
+ */
+@Data
+public class GetCustomerMenuListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 8143715578744359728L;
+
+    private String customerId;
+
+    /**
+     * 0：菜单；1：按钮
+     */
+    private Integer type;
+
+    private String language;
+
+    private String tableName;
+}

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java

@@ -2,10 +2,8 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.GetStaffExistRoleFormDTO;
-import com.epmet.dto.form.InitDefaultOperationsFormDTO;
-import com.epmet.dto.form.ListOpePermsFormDTO;
-import com.epmet.dto.form.RoleUserFormDTO;
+import com.epmet.dto.GovMenuDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.feign.fallback.GovAccessFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -52,4 +50,13 @@ public interface GovAccessFeignClient {
     @PostMapping("/gov/access/govroleuser/getStaffExistRole")
     Result<List<NewUserRoleResultDTO>> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO);
 
+    /**
+     * Desc: 获取客户下的菜单
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/27 10:22
+     */
+    @PostMapping("/gov/access/menu/getCustomerMenuList")
+    Result<List<GovMenuDTO>> getCustomerMenuList(@RequestBody GetCustomerMenuListFormDTO formDTO);
+
 }

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java

@@ -3,10 +3,8 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.GetStaffExistRoleFormDTO;
-import com.epmet.dto.form.InitDefaultOperationsFormDTO;
-import com.epmet.dto.form.ListOpePermsFormDTO;
-import com.epmet.dto.form.RoleUserFormDTO;
+import com.epmet.dto.GovMenuDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.feign.GovAccessFeignClient;
 
@@ -40,4 +38,9 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient {
     public Result<List<NewUserRoleResultDTO>> getStaffExistRole(GetStaffExistRoleFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getStaffExistRole", formDTO);
     }
+
+    @Override
+    public Result<List<GovMenuDTO>> getCustomerMenuList(GetCustomerMenuListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getCustomerMenuList", formDTO);
+    }
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java

@@ -11,6 +11,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.GovMenuDTO;
+import com.epmet.dto.form.GetCustomerMenuListFormDTO;
 import com.epmet.service.GovMenuService;
 import com.epmet.service.GovResourceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -155,4 +156,15 @@ public class GovMenuController {
 		govMenuService.clearOperUserAccess(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId());
 		return new Result();
 	}
+
+	/**
+	 * Desc: 获取客户下的菜单
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2022/7/27 10:22
+	 */
+	@PostMapping("getCustomerMenuList")
+	public Result<List<GovMenuDTO>> getCustomerMenuList(@RequestBody GetCustomerMenuListFormDTO formDTO){
+		return new Result<List<GovMenuDTO>>().ok(govMenuService.getCustomerMenuList(formDTO));
+	}
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java

@@ -78,6 +78,11 @@ public class GovCustomerMenuRedis {
         redisUtils.deleteByPattern(key);
     }
 
+    public void delAllCustomerMenuFiveCoverage(String customerId){
+        String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId);
+        redisUtils.delete(key);
+    }
+
     private boolean checkParam(String customerId, Integer type) {
         if (StringUtils.isBlank(customerId) || type == null){
             log.warn("checkParam fail, param is null");

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

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.GovMenuDTO;
+import com.epmet.dto.form.GetCustomerMenuListFormDTO;
 import com.epmet.entity.GovMenuEntity;
 
 import java.util.List;
@@ -145,4 +146,12 @@ public interface GovMenuService extends BaseService<GovMenuEntity> {
     List<GovMenuDTO> getListPid(String pid);
 
     void clearOperUserAccess(String app, String client, String userId);
+
+    /**
+     * Desc: 获取客户下的菜单
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/27 10:22
+     */
+    List<GovMenuDTO> getCustomerMenuList(GetCustomerMenuListFormDTO formDTO);
 }

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

@@ -115,6 +115,7 @@ public class GovCustomerMenuServiceImpl extends BaseServiceImpl<GovCustomerMenuD
                 entity.setCustomerId(customerId);
                 entity.setTableId(formDTO.getTableId());
                 entities.add(entity);
+                govCustomerMenuRedis.delAllCustomerMenuFiveCoverage(customerId);
             }
             insertBatch(entities);
         }

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

@@ -36,6 +36,7 @@ import com.epmet.dao.GovRoleDao;
 import com.epmet.dao.GovRoleMenuDao;
 import com.epmet.dao.GovRoleUserDao;
 import com.epmet.dto.GovMenuDTO;
+import com.epmet.dto.form.GetCustomerMenuListFormDTO;
 import com.epmet.entity.GovMenuEntity;
 import com.epmet.enums.MenuTypeEnum;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -343,6 +344,22 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
         logger.info(String.format("运营端用户退出系统%s,清空菜单、权限成功",userId));
     }
 
+    /**
+     * Desc: 获取客户下的菜单
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/27 10:22
+     */
+    @Override
+    public List<GovMenuDTO> getCustomerMenuList(GetCustomerMenuListFormDTO formDTO) {
+        List<GovMenuEntity> customerMenuList = baseDao.getCustomerMenuList(formDTO.getCustomerId(), formDTO.getType(), HttpContextUtils.getLanguage(), formDTO.getTableName());
+        if (CollectionUtils.isEmpty(customerMenuList)){
+            return new ArrayList<>();
+        }
+        return ConvertUtils.sourceToTarget(customerMenuList,GovMenuDTO.class);
+
+    }
+
     private void saveLanguage(String tableName, String tableId, String fieldName, String fieldValue){
         govLanguageService.saveOrUpdate(tableName, tableId, fieldName, fieldValue, HttpContextUtils.getLanguage());
     }

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

@@ -3190,15 +3190,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 resultMap.put("DOOR_NAME", doorName);
 
                 String houseType = StringUtils.isNotBlank(houseInfoDTO.getHouseType()) ? houseInfoDTO.getHouseType() : StrConstant.EPMETY_STR;
-                //房屋类型，1楼房，2平房，3别墅
-                resultMap.put(UserConstant.HOUSE_TYPE_KEY, "");
-                if (HouseTypeEnum.LOUFANG.getCode().equals(houseType)) {
-                    resultMap.put(UserConstant.HOUSE_TYPE_KEY, HouseTypeEnum.LOUFANG.getName());
-                } else if (HouseTypeEnum.PINGFANG.getCode().equals(houseType)) {
-                    resultMap.put(UserConstant.HOUSE_TYPE_KEY, HouseTypeEnum.PINGFANG.getName());
-                } else if (HouseTypeEnum.BIESHU.getCode().equals(houseType)) {
-                    resultMap.put(UserConstant.HOUSE_TYPE_KEY, HouseTypeEnum.BIESHU.getName());
-                }
                 resultMap.put(UserConstant.HOME_ID, neighBorName.concat(buildName).concat(unitName).concat(doorName));
 
             }