bf

yiming
1 parent 488c669a
Showing 10 changed files with 27 additions and 49 deletions
bsthLineProfiles/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineExamineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryReportController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java
bsthLineProfiles/src/main/resources/application-druid.yml
bsthLineProfiles/src/main/resources/templates/system/line/line.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/line.html
@@ -71,7 +71,8 @@ public class UserRealm extends AuthorizingRealm
         else
         {
             roles = roleService.selectRoleKeys(user.getUserId());
-            menus = menuService.selectPermsByUserId(user.getUserId());
+            menus=user.getPermissions();
+            //menus = menuService.selectPermsByUserId(user.getUserId());
             // 角色加入AuthorizationInfo认证对象
             info.setRoles(roles);
             // 权限加入AuthorizationInfo认证对象
@@ -14,6 +14,7 @@ import com.ruoyi.project.system.line.service.IBsthTLineService;
 import com.ruoyi.project.system.user.domain.User;
 import com.ruoyi.project.system.user.service.IUserService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -52,7 +53,7 @@ public class BsthTLineAddController extends BaseController
     @Autowired
     private IUserService userService;
-    @RequiresPermissions("system:line:view")
+    @RequiresPermissions("system:lineAdd:view")
     @GetMapping()
     public ModelAndView line()
     {
@@ -62,17 +63,11 @@ public class BsthTLineAddController extends BaseController
         mv.addObject("companyList",companyList);
         return mv;
     }
-    
-    @GetMapping("/map")
-    public String map()
-    {
-        return prefix + "/map";
-    }
+
     /**
      * 线路新增分页
      */
-    @RequiresPermissions("system:line:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(BsthTLine bsthTLine)
@@ -98,7 +93,7 @@ public class BsthTLineAddController extends BaseController
     /**
      * 线路新增
      */
-    @RequiresPermissions("system:line:add")
+    @RequiresPermissions("system:lineAdd:add")
     @Log(title = "线路新增", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -145,7 +140,7 @@ public class BsthTLineAddController extends BaseController
     /**
      * 线路修改
      */
-    @RequiresPermissions("system:line:edit")
+    @RequiresPermissions("system:lineAdd:add")
     @Log(title = "线路修改", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -159,7 +154,7 @@ public class BsthTLineAddController extends BaseController
-    @RequiresPermissions("system:line:remove")
+    @RequiresPermissions("system:lineAdd:add")
     @Log(title = "线路删除", businessType = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
@@ -55,12 +55,11 @@ public class BsthTLineController extends BaseController
      */
     @RequiresPermissions("system:line:view")
     @GetMapping()
-    public ModelAndView line(String type)
+    public ModelAndView line()
     {
         ModelAndView mv=new ModelAndView(prefix + "/line");
         List<Map> companyList=bsthTLineService.selectCompany();
         mv.addObject("companyList",companyList);
-        mv.addObject("type",type);
         return mv;
     }
@@ -68,7 +67,6 @@ public class BsthTLineController extends BaseController
     /**
      * 线路分页
      */
-    @RequiresPermissions("system:line:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(BsthTLine bsthTLine)
@@ -89,7 +87,7 @@ public class BsthTLineController extends BaseController
         return prefix + "/detail";
     }
-    @RequiresPermissions("system:line:export")
+
     @Log(title = "线路导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
@@ -56,16 +56,9 @@ public class BsthTLineExamineController extends BaseController
         return mv;
     }
-    @GetMapping("/map")
-    public String map()
-    {
-        return prefix + "/map";
-    }
-
     /**
      * 审核分页
      */
-    @RequiresPermissions("system:line:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(BsthTLine bsthTLine)
@@ -92,6 +85,7 @@ public class BsthTLineExamineController extends BaseController
     /**
      * 审核
      */
+    @RequiresPermissions("system:lineExamine:examine")
     @PostMapping("/examine")
     @ResponseBody
     public AjaxResult examine(BsthTLine bsthTLine) {
 package com.ruoyi.project.system.line.controller;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
+
 import java.util.List;
 import java.util.Map;
@@ -18,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.system.dict.domain.DictData;
 import com.ruoyi.project.system.dict.service.IDictDataService;
 import com.ruoyi.project.system.line.domain.BsthTLine;
 import com.ruoyi.project.system.line.service.IBsthTLineService;
@@ -26,8 +22,6 @@ import com.ruoyi.project.system.user.domain.User;
 import com.ruoyi.project.system.user.service.IUserService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.security.ShiroUtils;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.servlet.ModelAndView;
@@ -69,7 +63,6 @@ public class BsthTLineHistoryController extends BaseController
     /**
      * 变更分页
      */
-    @RequiresPermissions("system:lineHistory:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(BsthTLine bsthTLine)
@@ -127,7 +120,7 @@ public class BsthTLineHistoryController extends BaseController
     }
-    @RequiresPermissions("system:lineHistory:view")
+    @RequiresPermissions("system:lineHistory:historyCompare")
     @GetMapping("/historyCompare")
     public String historyCompare()
     {
@@ -5,7 +5,6 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,7 +50,7 @@ public class BsthTLineHistoryReportController extends BaseController
     @Autowired
     private IUserService userService;
-    @RequiresPermissions("system:HistoryReport:view")
+    @RequiresPermissions("system:historyReport:view")
     @GetMapping()
     public String line()
     {
@@ -61,7 +60,6 @@ public class BsthTLineHistoryReportController extends BaseController
     /**
      * 查询【请填写功能名称】列表
      */
-    @RequiresPermissions("system:HistoryReport:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(BsthTLine bsthTLine)
@@ -71,7 +69,7 @@ public class BsthTLineHistoryReportController extends BaseController
         return getDataTable(list);
     }
-    @RequiresPermissions("system:HistoryReport:export")
+
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
@@ -183,8 +181,7 @@ public class BsthTLineHistoryReportController extends BaseController
     }
-    
-    @RequiresPermissions("system:HistoryReport:export2")
+
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @RequestMapping("/export2")
     @ResponseBody
@@ -48,14 +48,14 @@ public class MenuServiceImpl implements IMenuService
     {
         List<Menu> menus = new LinkedList<Menu>();
         // 管理员显示所有菜单信息
-//        if (user.isAdmin())
-//        {
+        if (user.isAdmin())
+        {
             menus = menuMapper.selectMenuNormalAll();
-//        }
-//        else
-//        {
-//            menus = menuMapper.selectMenusByUserId(user.getUserId());
-//        }
+        }
+        else
+        {
+            menus = menuMapper.selectMenusByUserId(user.getUserId());
+        }
         return TreeUtils.getChildPerms(menus, 0);
     }
 	@Override
@@ -9,7 +9,7 @@ spring:
                 url: jdbc:mysql://192.168.101.111:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: xldasys
                 password: bsth@pj2021
-#            # 主库数据源
+            # 主库数据源
 #            master:
 #                url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root
@@ -276,11 +276,11 @@
 			$('#company').on('change.select2', function (e) {
 				fCompanySelect()
 			});
-		if(type==2){
+/*		if(type==2){
 			$('#export').css("display", "show");
 		}else {
 			$('#export').css("display", "none");
-		}
+		}*/
 	});
 	function companySelect(){
@@ -34,7 +34,7 @@
 			<div class="btn-group-sm" id="toolbar" role="group">
-				<el-button plain size="mini" type="primary" icon="el-icon-plus"  onClick="add(this);"  shiro:hasPermission="system:line:add">新增</el-button>
+				<el-button plain size="mini" type="primary" icon="el-icon-plus"  onClick="add(this);"  shiro:hasPermission="system:lineAdd:add">新增</el-button>
 			</div>