提交 cd4cf862 编写于 作者: M megagao

使用统一的权限判断,删除了冗余代码

上级 106086db
......@@ -144,4 +144,5 @@ public class CustomController {
EUDataGridResult result = customService.searchCustomByCustomName(page, rows, searchValue);
return result;
}
}
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.Department;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.service.DepartmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -47,49 +42,11 @@ public class DepartmentController {
return departmentService.find();
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> departmentAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("department:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/add")
public String add() throws Exception{
return "department_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> departmentEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("department:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "department_edit";
......@@ -97,14 +54,16 @@ public class DepartmentController {
@RequestMapping("/list")
@ResponseBody
public EUDataGridResult getItemList(Integer page, Integer rows, Department department) throws Exception{
public EUDataGridResult getItemList(Integer page, Integer rows, Department department)
throws Exception{
EUDataGridResult result = departmentService.getList(page, rows, department);
return result;
}
@RequestMapping(value="/insert", method=RequestMethod.POST)
@ResponseBody
private CustomResult insert(@Valid Department department, BindingResult bindingResult) throws Exception {
private CustomResult insert(@Valid Department department, BindingResult bindingResult)
throws Exception {
CustomResult result;
if(bindingResult.hasErrors()){
FieldError fieldError = bindingResult.getFieldError();
......@@ -120,7 +79,8 @@ public class DepartmentController {
@RequestMapping(value="/update")
@ResponseBody
private CustomResult update(@Valid Department department, BindingResult bindingResult) throws Exception {
private CustomResult update(@Valid Department department, BindingResult bindingResult)
throws Exception {
if(bindingResult.hasErrors()){
FieldError fieldError = bindingResult.getFieldError();
return CustomResult.build(100, fieldError.getDefaultMessage());
......@@ -130,7 +90,8 @@ public class DepartmentController {
@RequestMapping(value="/update_all")
@ResponseBody
private CustomResult updateAll(@Valid Department department, BindingResult bindingResult) throws Exception {
private CustomResult updateAll(@Valid Department department, BindingResult bindingResult)
throws Exception {
if(bindingResult.hasErrors()){
FieldError fieldError = bindingResult.getFieldError();
return CustomResult.build(100, fieldError.getDefaultMessage());
......@@ -140,7 +101,8 @@ public class DepartmentController {
@RequestMapping(value="/update_note")
@ResponseBody
private CustomResult updateNote(@Valid Department department, BindingResult bindingResult) throws Exception {
private CustomResult updateNote(@Valid Department department, BindingResult bindingResult)
throws Exception {
if(bindingResult.hasErrors()){
FieldError fieldError = bindingResult.getFieldError();
return CustomResult.build(100, fieldError.getDefaultMessage());
......@@ -148,24 +110,6 @@ public class DepartmentController {
return departmentService.updateNote(department);
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> departmentDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("department:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping(value="/delete")
@ResponseBody
private CustomResult delete(String id) throws Exception {
......
......@@ -8,7 +8,7 @@ import javax.servlet.http.HttpSession;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.authority.SysPermission;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.customize.ActiveUser;
import org.hqu.production_ms.service.SysService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......
......@@ -13,7 +13,7 @@ import org.apache.shiro.authc.IncorrectCredentialsException;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.customize.ActiveUser;
import org.hqu.production_ms.service.SysService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.Manufacture;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.domain.po.ManufacturePO;
import org.hqu.production_ms.service.ManufactureService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -48,49 +43,11 @@ public class ManufactureController {
return manufactureService.find();
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> manufactureAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("manufacture:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/add")
public String add() throws Exception{
return "manufacture_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> manufactureEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("manufacture:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "manufacture_edit";
......@@ -139,24 +96,6 @@ public class ManufactureController {
return manufactureService.updateAll(manufacture);
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> manufactureDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("manufacture:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping(value="/delete")
@ResponseBody
private CustomResult delete(String id) throws Exception {
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.domain.MaterialConsume;
import org.hqu.production_ms.domain.po.MaterialConsumePO;
import org.hqu.production_ms.service.MaterialConsumeService;
......@@ -49,49 +44,11 @@ public class MaterialConsumeController {
return "materialConsume_list";
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> orderAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("materialConsume:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/add")
public String add() throws Exception{
return "materialConsume_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> orderEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("materialConsume:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "materialConsume_edit";
......@@ -155,24 +112,6 @@ public class MaterialConsumeController {
return materialConsumeService.updateNote(materialConsume);
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> orderDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("materialConsume:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping(value="/delete")
@ResponseBody
private CustomResult delete(String id) throws Exception {
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.domain.Material;
import org.hqu.production_ms.service.MaterialService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -48,49 +43,11 @@ public class MaterialController {
return materialService.find();
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> materialAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("material:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/add")
public String add() throws Exception{
return "material_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> materialEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("material:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "material_edit";
......@@ -149,24 +106,6 @@ public class MaterialController {
return materialService.updateNote(material);
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> materialDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("material:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping(value="/delete")
@ResponseBody
private CustomResult delete(String id) throws Exception {
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.domain.MaterialReceive;
import org.hqu.production_ms.domain.po.MaterialReceivePO;
import org.hqu.production_ms.service.MaterialReceiveService;
......@@ -38,56 +33,18 @@ public class MaterialReceiveController {
public String find() throws Exception{
return "materialReceive_list";
}
/*
@RequestMapping("/get_data")
/*@RequestMapping("/get_data")
@ResponseBody
/*public List<MaterialReceive> getData() {
public List<MaterialReceive> getData() {
return materialReceiveService.find();
}
*/
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> materialReceiveAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("materialReceive:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
}*/
@RequestMapping("/add")
public String add() throws Exception{
return "materialReceive_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> materialReceiveEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("materialReceive:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "materialReceive_edit";
......@@ -150,24 +107,6 @@ public class MaterialReceiveController {
return materialReceiveService.updateNote(materialReceive);
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> materialDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("materialReceive:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping(value="/delete")
@ResponseBody
private CustomResult delete(String id) throws Exception {
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.COrder;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.domain.po.COrderPO;
import org.hqu.production_ms.service.OrderService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -49,49 +44,11 @@ public class OrderController {
return "order_list";
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> orderAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("order:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/add")
public String add() throws Exception{
return "order_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> orderEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("order:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "order_edit";
......@@ -151,24 +108,6 @@ public class OrderController {
return orderService.updateNote(cOrder);
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> orderDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("order:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping(value="/delete")
@ResponseBody
private CustomResult delete(String id) throws Exception {
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.COrder;
import org.hqu.production_ms.domain.ProcessCountCheck;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.service.PCountCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -70,68 +65,11 @@ public class PCountCheckController {
return result;
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> pCountCheckAddJudge()
throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("pCountCheck:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "p_count_check_edit";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> pCountCheckEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("pCountCheck:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> pCountCheckDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("pCountCheck:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/list")
@ResponseBody
public EUDataGridResult getList(Integer page, Integer rows, ProcessCountCheck processCountCheck)
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.COrder;
import org.hqu.production_ms.domain.ProcessMeasureCheck;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.service.PMeasureCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -61,67 +55,11 @@ public class PMeasureCheckController {
return "p_measure_check_add";
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> pMeasureCheckAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("pMeasureCheck:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "p_measure_check_edit";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> pMeasureCheckEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("pMeasureCheck:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> pMeasureCheckDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("pMeasureCheck:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
//搜索
@RequestMapping("/search_pMeasureCheck_by_pMeasureCheckId")
@ResponseBody
......
......@@ -3,8 +3,8 @@ package org.hqu.production_ms.controller;
import java.util.List;
import org.hqu.production_ms.domain.authority.SysRolePermission;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.service.PermissionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.Process;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.service.ProcessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -41,49 +36,11 @@ public class ProcessController {
return "process_list";
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> processAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("process:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/add")
public String add() throws Exception{
return "process_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> processEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("process:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "process_edit";
......@@ -130,23 +87,6 @@ public class ProcessController {
return processService.updateAll(process);
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> processDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
if(!subject.isPermitted("process:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping(value="/delete_batch")
@ResponseBody
private CustomResult deleteBatch(String[] ids) throws Exception {
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.Product;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.service.ProductService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -47,49 +42,11 @@ public class ProductController {
return productService.find();
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> productAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("product:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/add")
public String add() throws Exception{
return "product_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> productEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("product:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "product_edit";
......@@ -148,24 +105,6 @@ public class ProductController {
return productService.updateNote(product);
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> productDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("product:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping(value="/delete")
@ResponseBody
private CustomResult delete(String id) throws Exception {
......
......@@ -4,11 +4,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.authority.SysRole;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.domain.po.RolePO;
import org.hqu.production_ms.service.RoleService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -48,33 +46,11 @@ public class RoleController {
return roleService.find();
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> roleAddJudge() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
Subject currentUser = SecurityUtils.getSubject();
if(!currentUser.isPermitted("role:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
return map;
}
@RequestMapping("/add")
public String add() throws Exception{
return "role_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> roleEditJudge() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
Subject currentUser = SecurityUtils.getSubject();
if(!currentUser.isPermitted("role:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "role_edit";
......@@ -137,17 +113,6 @@ public class RoleController {
return map;
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> roleDeleteJudge() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
Subject currentUser = SecurityUtils.getSubject();
if(!currentUser.isPermitted("role:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
return map;
}
@RequestMapping(value="/delete")
@ResponseBody
private CustomResult delete(String id) throws Exception {
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.Task;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.service.TaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -47,49 +42,11 @@ public class TaskController {
return taskService.find();
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> taskAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("task:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/add")
public String add() throws Exception{
return "task_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> taskEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("task:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "task_edit";
......@@ -138,24 +95,6 @@ public class TaskController {
return taskService.updateAll(task);
}
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> taskDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("task:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping(value="/delete")
@ResponseBody
private CustomResult delete(String id) throws Exception {
......
package org.hqu.production_ms.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.Valid;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.hqu.production_ms.domain.Technology;
import org.hqu.production_ms.domain.custom.ActiveUser;
import org.hqu.production_ms.domain.custom.CustomResult;
import org.hqu.production_ms.domain.custom.EUDataGridResult;
import org.hqu.production_ms.domain.customize.CustomResult;
import org.hqu.production_ms.domain.customize.EUDataGridResult;
import org.hqu.production_ms.service.TechnologyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -41,49 +36,11 @@ public class TechnologyController {
return "technology_list";
}
@RequestMapping("/add_judge")
@ResponseBody
public Map<String,Object> technologyAddJudge() throws Exception{
//从shiro的session中取activeUser
Subject subject = SecurityUtils.getSubject();
//取身份信息
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("technology:add")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/add")
public String add() throws Exception{
return "technology_add";
}
@RequestMapping("/edit_judge")
@ResponseBody
public Map<String,Object> technologyEditJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
}else{
if(!subject.isPermitted("technology:edit")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping("/edit")
public String edit() throws Exception{
return "technology_edit";
......@@ -130,32 +87,14 @@ public class TechnologyController {
}
return technologyService.updateAll(technology);
}
/*
@RequestMapping(value="/update_note")
/*@RequestMapping(value="/update_note")
@ResponseBody
private CustomResult updateNote(Technology technology) throws Exception {
CustomResult result = technologyService.updateNote(technology);
return result;
}
*/
}*/
@RequestMapping("/delete_judge")
@ResponseBody
public Map<String,Object> technologyDeleteJudge() throws Exception{
Subject subject = SecurityUtils.getSubject();
ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
Map<String,Object> map = new HashMap<String,Object>();
if(!activeUser.getUserStatus().equals("1")){
map.put("msg", "您的账户已被锁定,请切换账户登录!");
}else if(!activeUser.getRoleStatus().equals("1")){
map.put("msg", "当前角色已被锁定,请切换账户登录!");
if(!subject.isPermitted("technology:delete")){
map.put("msg", "您没有权限,请切换用户登录!");
}
}
return map;
}
@RequestMapping(value="/delete_batch")
@ResponseBody
private CustomResult deleteBatch(String[] ids) throws Exception {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册