添加shiro和controller权限

src/main/java/com/jeeplus/modules/sg/information/web/InformationController.java

@@ -34,6 +34,8 @@ import freemarker.template.Template;
 import io.swagger.models.auth.In;
 import net.sf.ehcache.util.concurrent.ConcurrentHashMap;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.session.Session;
 import org.h2.util.New;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,7 +86,7 @@ public class InformationController extends BaseController {
 	/**
 	 * 项目管理列表页
 	 */
-	//@RequiresPermissions("test:information:information:list")
+	@RequiresPermissions("modules:sg:information:information:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(Information information, Model model) {
 		model.addAttribute("informationList", information);
@@ -95,7 +97,7 @@ public class InformationController extends BaseController {
 	 * 项目管理列表数据
 	 */
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:list")
+	@RequiresPermissions("modules:sg:information:information:list")
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(Information information, HttpServletRequest request, HttpServletResponse response, Model model) {
 		HttpSession session = request.getSession();
@@ -105,6 +107,7 @@ public class InformationController extends BaseController {
 	}
 
 
+	@RequiresPermissions(value={"modules:sg:information:information:view","modules:sg:information:information:add","modules:sg:information:information:edit"},logical= Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(Information information, Model model) {
 		model.addAttribute("Information", information);
@@ -112,6 +115,7 @@ public class InformationController extends BaseController {
 	}
 
 	//配置超期时间节点页
+	@RequiresPermissions(value={"modules:sg:information:information:add","modules:sg:information:information:edit"},logical=Logical.OR)
 	@RequestMapping(value = "editOverTime")
 	public String constant(constant constant, Model model) {
 		String overTime = informationService.findOverTime("overTime");
@@ -121,11 +125,12 @@ public class InformationController extends BaseController {
 	}
 
 	//变更超期时间节点
+	@RequiresPermissions(value={"modules:sg:information:information:add","modules:sg:information:information:edit"},logical=Logical.OR)
 	@RequestMapping(value = "updateConstant")
 	@ResponseBody
 	public String updateConstant(constant constant) {
-		int s = informationService.updateConstant(constant);
-		if (s > 0 ) {
+		int count = informationService.updateConstant(constant);
+		if (count > 0 ) {
 			return "修改成功";
 		} else {
 			return "修改失败";
@@ -137,7 +142,7 @@ public class InformationController extends BaseController {
 	/**
 	 * 导入甲供物资Excel数据
 	 */
-	//@RequiresPermissions("test:onetomany:dialog:information:import")
+	@RequiresPermissions("modules:sg:information:information:import")
 	@ResponseBody
     @RequestMapping(value = "import")
    	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
@@ -167,6 +172,7 @@ public class InformationController extends BaseController {
 	/**
 	 *	导入综合信息Excel数据
 	 * */
+	@RequiresPermissions("modules:sg:information:information:import")
 	@ResponseBody
 	@RequestMapping(value = "importCom")
 	public AjaxJson importFileCom(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
@@ -191,7 +197,7 @@ public class InformationController extends BaseController {
 
 
 
-
+	@RequiresPermissions("modules:sg:information:information:import")
 	@ResponseBody
 	@RequestMapping(value = "importInTrial")
 	public AjaxJson importInTrial(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
@@ -214,7 +220,7 @@ public class InformationController extends BaseController {
 		return j;
 	}
 
-
+	@RequiresPermissions("modules:sg:information:information:import")
 	@ResponseBody
 	@RequestMapping(value = "btnSearch")
 	public Map<String, Object> btnSearch(@RequestParam("file")MultipartFile file, Information information, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -267,6 +273,7 @@ public class InformationController extends BaseController {
 		}
 
 	//导入原因类型
+	@RequiresPermissions("modules:sg:information:information:import")
 	@ResponseBody
 	@RequestMapping(value = "btnInReason")
 	public AjaxJson btnInReason(@RequestParam("file")MultipartFile file, Information information, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -307,7 +314,7 @@ public class InformationController extends BaseController {
 	 * 批量导入模板
 	 * */
 	@ResponseBody
-//	@RequiresPermissions("test:onetomany:form:testDataMain2:import")
+	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "import/template")
 	public AjaxJson importFileTemplate(HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();
@@ -324,8 +331,11 @@ public class InformationController extends BaseController {
 	}
 
 
+	/**
+	 * 导入送审模板下载
+	 * */
 	@ResponseBody
-//	@RequiresPermissions("test:onetomany:form:testDataMain2:import")
+	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "import/templates")
 	public AjaxJson importFileTemplateS(HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();
@@ -347,7 +357,7 @@ public class InformationController extends BaseController {
 
 	public static Map<String, ExportExcel> excelParamCache = new ConcurrentHashMap<>();
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:export")
+	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "exportMaterial")
 	public AjaxJson exportMaterial(Information information,HttpServletRequest request, HttpServletResponse response) {
 		String projectId = "";
@@ -429,7 +439,7 @@ public class InformationController extends BaseController {
 
 
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:export")
+	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "export")
 	public AjaxJson export(Information information,HttpServletRequest request, HttpServletResponse response) {
 		String projectId = "";
@@ -511,7 +521,7 @@ public class InformationController extends BaseController {
 
 	//导出word
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:export")
+	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "exportInformation")
 	public void exportInformation(Information information,HttpServletRequest request, HttpServletResponse response) {
 		String projectId = "";

src/main/java/com/jeeplus/modules/sg/material/web/MaterialController.java

@@ -14,6 +14,8 @@ import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.modules.sg.information.entity.Information;
 import com.jeeplus.modules.sg.material.entity.Material;
 import com.jeeplus.modules.sg.material.service.MaterialService;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -53,7 +55,7 @@ public class MaterialController extends BaseController {
 	/**
 	 * 物料详情列表页
 	 */
-	//@RequiresPermissions("test:information:information:list")
+	@RequiresPermissions("modules:sg:material:material:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(Material material, Model model) {
 		model.addAttribute("materialList", material);
@@ -65,24 +67,30 @@ public class MaterialController extends BaseController {
 	 * 物料详情列表数据
 	 */
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:list")
+	@RequiresPermissions("modules:sg:material:material:list")
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(Material material, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<Material> page = materialService.findPage(new Page<Material>(request, response), material);
 		return getBootstrapData(page);
 	}
 
+	@RequiresPermissions(value={"modules:sg:material:material:view","modules:sg:material:material:add","modules:sg:material:material:edit"},logical= Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(Material material, Model model) {
 		model.addAttribute("Material", material);
 		return "modules/sg/material/materialForm";
 	}
 
+
+	/**
+	 * 修改未完成领退料物料原因
+	 * */
+	@RequiresPermissions(value={"modules:sg:material:material:add","modules:sg:material:material:edit"},logical=Logical.OR)
 	@RequestMapping(value = "update")
 	@ResponseBody
 	public String updateInfo(Material material) {
-		Integer s = materialService.updateInfo(material);
-		if (s > 0 ) {
+		Integer count = materialService.updateInfo(material);
+		if (count > 0 ) {
 			return "修改成功";
 		} else {
 			return "修改失败";
@@ -90,7 +98,10 @@ public class MaterialController extends BaseController {
 	}
 
 
-	@RequestMapping(value = "findNeedBack")
+	/**
+	 * 用来读取当前数据是否完成领退料-未使用
+	 * */
+/*	@RequestMapping(value = "findNeedBack")
 	@ResponseBody
 	public String findNeedBack(String id) {
 		String s = materialService.findNeedBack(id);
@@ -99,7 +110,7 @@ public class MaterialController extends BaseController {
 		} else {
 			return "否";
 		}
-	}
+	}*/
 /*
 	*/
 /**
@@ -107,7 +118,7 @@ public class MaterialController extends BaseController {
 	 */
 
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:export")
+	@RequiresPermissions("modules:sg:material:material:export")
     @RequestMapping(value = "export")
     public AjaxJson exportFile(Material material, HttpServletRequest request, HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();

src/main/webapp/webpage/modules/sg/information/informationList.jsp

@@ -75,50 +75,59 @@
 	
 	<!-- 工具栏 -->
 	<div id="toolbar">
-		<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:add">
+		<shiro:hasPermission name="modules:sg:information:information:import">
 			<button id="btnCom" class="btn btn-info">
 				<i class="fa fa-folder-open-o"></i> 导入综合信息表
 			</button>
 		</shiro:hasPermission>
-			<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:add">
-				<button id="btnInformation" class="btn btn-info">
-					<i class="fa fa-folder-open-o"></i> 导入甲供材
-				</button>
-			</shiro:hasPermission>
-		<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:add">
+		<shiro:hasPermission name="modules:sg:information:information:import">
+			<button id="btnInformation" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导入甲供材
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="modules:sg:information:information:import">
 			<button id="btnInReason" class="btn btn-info">
 				<i class="fa fa-folder-open-o"></i> 导入原因类型
 			</button>
 		</shiro:hasPermission>
-		<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:add">
+		<shiro:hasPermission name="modules:sg:information:information:import">
 			<button id="btnInTrial" class="btn btn-info">
 				<i class="fa fa-folder-open-o"></i> 导入送审
 			</button>
 		</shiro:hasPermission>
-		<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:add">
+		<shiro:hasPermission name="modules:sg:information:information:import">
 			<button id="btnSearch" class="btn btn-info">
 				<i class="fa fa-folder-open-o"></i> 导入查询
 			</button>
 		</shiro:hasPermission>
-		<button id="exportMaterial" class="btn btn-warning">
-			<i class="fa fa-file-excel-o"></i> 导出项目
-		</button>
-		<button id="export" class="btn btn-warning">
-			<i class="fa fa-file-excel-o"></i> 导出物料清单
-		</button>
-		<button id="exportInformation" class="btn btn-warning">
-			<i class="fa fa-file-excel-o"></i> 导出欠供说明
-		</button>
-		<button id="editOverTime" class="btn btn-danger">
-			<i class="fa fa-file-excel-o"></i> 配置超期时间
-		</button>
+		<shiro:hasPermission name="modules:sg:information:information:export">
+			<button id="exportMaterial" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出项目
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="modules:sg:information:information:export">
+			<button id="export" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出物料清单
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="modules:sg:information:information:export">
+			<button id="exportInformation" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出欠供说明
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="modules:sg:information:information:edit">
+			<button id="editOverTime" class="btn btn-danger">
+				<i class="fa fa-file-excel-o"></i> 配置超期时间
+			</button>
+		</shiro:hasPermission>
+
 		    </div>
 		
 	<!-- 表格 -->
 	<table id="informationTable"   data-toolbar="#toolbar"></table>
 
     <!-- context menu -->
-    <ul id="context-menu" class="dropdown-menu">
+    <%--<ul id="context-menu" class="dropdown-menu">
     	<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:view">
         <li data-item="view"><a>查看</a></li>
         </shiro:hasPermission>
@@ -129,7 +138,7 @@
         <li data-item="delete"><a>删除</a></li>
         </shiro:hasPermission>
         <li data-item="action1"><a>取消</a></li>
-    </ul>  
+    </ul>  --%>
 	</div>
 	</div>
 	</div>

src/main/webapp/webpage/modules/sg/material/materialList.jsp

@@ -37,18 +37,17 @@
 	
 	<!-- 工具栏 -->
 			<div id="toolbar">
-<%--			<shiro:hasPermission name="test:onetomany:dialog:materialList:add">--%>
-			<button id="export" class="btn btn-warning">
-				<i class="fa fa-file-excel-o"></i> 导出
-			</button>
-<%--			</shiro:hasPermission>--%>
+				<shiro:hasPermission name="test:onetomany:dialog:materialList:export">
+					<button id="export" class="btn btn-warning">
+						<i class="fa fa-file-excel-o"></i> 导出
+					</button>
+				</shiro:hasPermission>
 		    </div>
 		
 	<!-- 表格 -->
 	<table id="informationTable"   data-toolbar="#toolbar"></table>
-
     <!-- context menu -->
-    <ul id="context-menu" class="dropdown-menu">
+<%--    <ul id="context-menu" class="dropdown-menu">
     	<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:view">
         <li data-item="view"><a>查看</a></li>
         </shiro:hasPermission>
@@ -59,7 +58,7 @@
         <li data-item="delete"><a>删除</a></li>
         </shiro:hasPermission>
         <li data-item="action1"><a>取消</a></li>
-    </ul>  
+    </ul>  --%>
 	</div>
 	</div>
 	</div>