根据Id获取菜单时不筛选类型 添加tableName参数

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

@@ -11,7 +11,6 @@ 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.result.MenuResourceDTO;
 import com.epmet.service.GovMenuService;
 import com.epmet.service.GovResourceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,11 +44,8 @@ public class GovMenuController {
 	}
 
 	@GetMapping("{id}")
-	public Result<GovMenuDTO> get(@PathVariable("id") String id){
-		GovMenuDTO data = govMenuService.get(id);
-
-		//菜单资源列表
-		List<MenuResourceDTO> resourceList = govResourceService.getMenuResourceList(id);
+	public Result<GovMenuDTO> get(@PathVariable("id") String id,String tableName){
+		GovMenuDTO data = govMenuService.get(id,tableName);
 
 		return new Result<GovMenuDTO>().ok(data);
 	}

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovMenuDao.java

@@ -24,7 +24,7 @@ import java.util.List;
 @Mapper
 public interface GovMenuDao extends BaseDao<GovMenuEntity> {
 
-    GovMenuEntity getById(@Param("id") String id, @Param("language") String language);
+    GovMenuEntity getById(@Param("id") String id, @Param("language") String language, @Param("tableName") String tableName);
 
     /**
      * 查询所有菜单列表

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

@@ -59,11 +59,12 @@ public interface GovMenuService extends BaseService<GovMenuEntity> {
      * 单条查询
      *
      * @param id
+     * @param tableName
      * @return GovMenuDTO
      * @author generator
      * @date 2020-03-18
      */
-    GovMenuDTO get(String id);
+    GovMenuDTO get(String id, String tableName);
 
     /**
      * 默认保存

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

@@ -94,8 +94,9 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
     }
 
     @Override
-    public GovMenuDTO get(String id) {
-        GovMenuEntity entity = baseDao.getById(id, HttpContextUtils.getLanguage());
+    public GovMenuDTO get(String id, String tableName) {
+        tableName = getTableName(tableName);
+        GovMenuEntity entity = baseDao.getById(id, HttpContextUtils.getLanguage(),tableName);
 
         return ConvertUtils.sourceToTarget(entity, GovMenuDTO.class);
     }
@@ -108,9 +109,7 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
         //保存菜单
         insert(entity);
         String tableName = dto.getTableName();
-        if (StringUtils.isBlank(tableName)){
-            tableName = "gov_menu";
-        }
+        tableName = getTableName(tableName);
         saveLanguage(tableName, entity.getId(), "name", entity.getName());
 
         //保存菜单资源
@@ -121,6 +120,18 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
         //govMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient());
     }
 
+    /**
+     * desc:获取tableName 默认 gov_menu
+     * @param tableName
+     * @return
+     */
+    private String getTableName(String tableName) {
+        if (StringUtils.isBlank(tableName)) {
+            tableName = "gov_menu";
+        }
+        return tableName;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(GovMenuDTO dto, TokenDto tokenDto) {
@@ -131,9 +142,7 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
             throw new RenException(ErrorCode.SUPERIOR_MENU_ERROR);
         }
         String tableName = dto.getTableName();
-        if (StringUtils.isBlank(tableName)){
-            tableName = "gov_menu";
-        }
+        tableName = getTableName(tableName);
 
         //更新菜单
         updateById(entity);
@@ -190,9 +199,7 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
 
     @Override
     public List<GovMenuDTO> getMenuList(Integer type, String tableName) {
-        if (StringUtils.isBlank(tableName)){
-            tableName = "gov_menu";
-        }
+        tableName = getTableName(tableName);
         List<GovMenuEntity> menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage(), tableName);
 
         List<GovMenuDTO> dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class);
@@ -210,9 +217,7 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
 //        }
         // PC端 每个客户的菜单信息，不放入缓存，每次登陆重新查询。
         // 或者 你可以选择，在给每个客户 配置可见菜单的时候， 在saveCustomerMenu方法中，增加更新缓存的逻辑
-        if (StringUtils.isBlank(tableName)){
-            tableName = "gov_menu";
-        }
+        tableName = getTableName(tableName);
         return getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(),tableName);
     }
 

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml

@@ -5,9 +5,9 @@
 
     <select id="getById" resultType="com.epmet.entity.GovMenuEntity">
         select t1.*,
-        (select lang.field_value from gov_language lang where lang.table_name='gov_menu' and lang.field_name='name'
+        (select lang.field_value from gov_language lang where lang.table_name=#{tableName} and lang.field_name='name'
         and lang.table_id=t1.pid and lang.language=#{language}) as parentName,
-        (select lang.field_value from gov_language lang where lang.table_name='gov_menu' and lang.field_name='name'
+        (select lang.field_value from gov_language lang where lang.table_name=#{tableName} and lang.field_name='name'
         and lang.table_id=t1.id and lang.language=#{language}) as name
         from gov_menu t1
           where t1.id = #{id} and t1.del_flag = 0