From a9c836c2f0ccb5b44b005682aecb278a4709f502 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 28 三月 2020 18:57:14 +0800
Subject: [PATCH] 优化 巡检查询功能

---
 CommunityService/src/main/java/com/java110/community/smo/impl/MenuInnerServiceSMOImpl.java |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/CommunityService/src/main/java/com/java110/community/smo/impl/MenuInnerServiceSMOImpl.java b/CommunityService/src/main/java/com/java110/community/smo/impl/MenuInnerServiceSMOImpl.java
index fbcf637..c7ef2c3 100644
--- a/CommunityService/src/main/java/com/java110/community/smo/impl/MenuInnerServiceSMOImpl.java
+++ b/CommunityService/src/main/java/com/java110/community/smo/impl/MenuInnerServiceSMOImpl.java
@@ -1,7 +1,7 @@
 package com.java110.community.smo.impl;
 
 
-import com.java110.common.util.BeanConvertUtil;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.community.dao.IMenuServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.menu.IMenuInnerServiceSMO;
@@ -11,6 +11,8 @@
 import com.java110.dto.menuGroup.MenuGroupDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -31,7 +33,7 @@
 
 
     @Override
-    public List<MenuGroupDto> queryMenuGroups(@RequestBody  MenuGroupDto menuGroupDto) {
+    public List<MenuGroupDto> queryMenuGroups(@RequestBody MenuGroupDto menuGroupDto) {
 
         //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
 
@@ -39,7 +41,6 @@
 
         if (page != PageDto.DEFAULT_PAGE) {
             menuGroupDto.setPage((page - 1) * menuGroupDto.getRow());
-            menuGroupDto.setRow(page * menuGroupDto.getRow());
         }
 
         List<MenuGroupDto> menuGroups = BeanConvertUtil.covertBeanList(menuServiceDaoImpl.getMenuGroupInfo(BeanConvertUtil.beanCovertMap(menuGroupDto)), MenuGroupDto.class);
@@ -66,7 +67,8 @@
 
     @Override
     public int queryMenuGroupsCount(@RequestBody MenuGroupDto menuGroupDto) {
-        return menuServiceDaoImpl.queryMenuGroupsCount(BeanConvertUtil.beanCovertMap(menuGroupDto));    }
+        return menuServiceDaoImpl.queryMenuGroupsCount(BeanConvertUtil.beanCovertMap(menuGroupDto));
+    }
 
     public IMenuServiceDao getMenuServiceDaoImpl() {
         return menuServiceDaoImpl;
@@ -78,7 +80,7 @@
 
 
     @Override
-    public List<BasePrivilegeDto> queryBasePrivileges(@RequestBody  BasePrivilegeDto basePrivilegeDto) {
+    public List<BasePrivilegeDto> queryBasePrivileges(@RequestBody BasePrivilegeDto basePrivilegeDto) {
 
         //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
 
@@ -86,7 +88,6 @@
 
         if (page != PageDto.DEFAULT_PAGE) {
             basePrivilegeDto.setPage((page - 1) * basePrivilegeDto.getRow());
-            basePrivilegeDto.setRow(page * basePrivilegeDto.getRow());
         }
 
         List<BasePrivilegeDto> basePrivileges = BeanConvertUtil.covertBeanList(menuServiceDaoImpl.getBasePrivilegeInfo(BeanConvertUtil.beanCovertMap(basePrivilegeDto)), BasePrivilegeDto.class);
@@ -113,12 +114,24 @@
 
     @Override
     public int queryBasePrivilegesCount(@RequestBody BasePrivilegeDto basePrivilegeDto) {
-        return menuServiceDaoImpl.queryBasePrivilegesCount(BeanConvertUtil.beanCovertMap(basePrivilegeDto));    }
+        return menuServiceDaoImpl.queryBasePrivilegesCount(BeanConvertUtil.beanCovertMap(basePrivilegeDto));
+    }
 
+    @Override
+    /**
+     * 鏌ヨ<p>灏忓尯妤�</p>鎬昏褰曟暟
+     *
+     * @param routeDto 鏁版嵁瀵硅薄鍒嗕韩
+     * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
+     */
+    @RequestMapping(value = "/checkUserHasResource", method = RequestMethod.POST)
+    public boolean checkUserHasResource(@RequestBody BasePrivilegeDto basePrivilegeDto) {
+        return menuServiceDaoImpl.checkUserHasResource(BeanConvertUtil.beanCovertMap(basePrivilegeDto));
+    }
 
 
     @Override
-    public List<MenuDto> queryMenus(@RequestBody  MenuDto menuDto) {
+    public List<MenuDto> queryMenus(@RequestBody MenuDto menuDto) {
 
         //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
 
@@ -126,7 +139,6 @@
 
         if (page != PageDto.DEFAULT_PAGE) {
             menuDto.setPage((page - 1) * menuDto.getRow());
-            menuDto.setRow(page * menuDto.getRow());
         }
 
         List<MenuDto> menus = BeanConvertUtil.covertBeanList(menuServiceDaoImpl.getMenuInfo(BeanConvertUtil.beanCovertMap(menuDto)), MenuDto.class);
@@ -153,6 +165,7 @@
 
     @Override
     public int queryMenusCount(@RequestBody MenuDto menuDto) {
-        return menuServiceDaoImpl.queryMenusCount(BeanConvertUtil.beanCovertMap(menuDto));    }
+        return menuServiceDaoImpl.queryMenusCount(BeanConvertUtil.beanCovertMap(menuDto));
+    }
 
 }

--
Gitblit v1.8.0