Merge remote-tracking branch 'origin/custom-for-wangli' into custom-for-wangli

src/main/java/com/originspark/drp/controllers/UserController.java

@@ -15,7 +15,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.originspark.drp.models.User;
+import com.originspark.drp.util.SessionUtil;
 import com.originspark.drp.util.enums.Status;
+import com.originspark.drp.util.enums.UserType;
 import com.originspark.drp.util.json.FilterRequest;
 import com.originspark.drp.util.json.IdsJson;
 import com.originspark.drp.util.json.JsonUtils;
@@ -24,26 +26,48 @@ import com.originspark.drp.util.json.JsonUtils;
 @RequestMapping("users")
 public class UserController extends BaseController {
 
-    @RequestMapping(method = RequestMethod.POST)
+    @RequestMapping(value="/{type}", method = RequestMethod.POST)
     @ResponseBody
-    public String create(@RequestBody User user) {
+    public String create(@PathVariable String type, @RequestBody User user) {
+        if(type == null || "".equals(type)) {
+            return ok("参数错误");
+        }
+        User currentUser = getCurrentUser();
+        if(currentUser == null || !UserType.MANAGER.equals(currentUser.getType())) {
+            return ok("权限不足");
+        }
+        user.setType(UserType.valueOf(type.toUpperCase()));
         user.setPassword("123456");
         userService.save(user);
         return ok("创建成功");
     }
 
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/{type}/{id}", method = RequestMethod.DELETE)
     @ResponseBody
-    public String delete(@PathVariable Long id) {
+    public String delete(@PathVariable String type, @PathVariable Long id) {
+        if(type == null || "".equals(type) || id == null || id < 1) {
+            return ok("参数错误");
+        }
+        User currentUser = getCurrentUser();
+        if(currentUser == null || !UserType.MANAGER.equals(currentUser.getType())) {
+            return ok("权限不足");
+        }
         User leader = userService.findById(User.class, id);
         leader.setStatus(Status.DESTORYED);
         userService.update(leader);
         return ok("注销成功");
     }
 
-    @RequestMapping(value= "/deleteBatch",method = RequestMethod.GET)
+    @RequestMapping(value= "/{type}/deleteBatch",method = RequestMethod.GET)
     @ResponseBody
-    public String deleteBatch(HttpServletRequest request){
+    public String deleteBatch(@PathVariable String type, HttpServletRequest request){
+        if(type == null || "".equals(type)) {
+            return ok("参数错误");
+        }
+        User currentUser = getCurrentUser();
+        if(currentUser == null || !UserType.MANAGER.equals(currentUser.getType())) {
+            return ok("权限不足");
+        }
          String data = request.getParameter("data");
          ObjectMapper mapper = new ObjectMapper();
          IdsJson json=null;
@@ -63,10 +87,16 @@ public class UserController extends BaseController {
         return ok("注销成功");
     }
 
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/{type}/{id}", method = RequestMethod.PUT)
     @ResponseBody
-    public String update(@PathVariable Long id, @RequestBody User user) {
-
+    public String update(@PathVariable String type, @PathVariable Long id, @RequestBody User user) {
+        if(type == null || "".equals(type) || id == null || id < 1) {
+            return ok("参数错误");
+        }
+        User currentUser = getCurrentUser();
+        if(currentUser == null || !UserType.MANAGER.equals(currentUser.getType())) {
+            return ok("权限不足");
+        }
         User existingLeader = userService.findById(User.class, id);
         if (existingLeader == null) {
             return failure("您要更新的领导不存在");
@@ -84,13 +114,12 @@ public class UserController extends BaseController {
         return ok("更新成功");
     }
 
-    @RequestMapping(method = RequestMethod.GET)
+    @RequestMapping(value="/{type}", method = RequestMethod.GET)
     @ResponseBody
-    public String list(@RequestParam int start, @RequestParam int limit,@RequestParam(required = false) Object filter) {
-
+    public String list(@PathVariable String type, @RequestParam int start, @RequestParam int limit,@RequestParam(required = false) Object filter) {
         List<FilterRequest> filters = new ArrayList<FilterRequest>();
         
-        filters.add(new FilterRequest("type", "Leader"));
+        filters.add(new FilterRequest("type", type.toUpperCase()));
 
         if (filter != null) {
             filters.addAll(JsonUtils.getListFromJsonArray(filter));

src/main/java/com/originspark/drp/service/users/UserServiceBean.java

@@ -17,6 +17,7 @@ import com.originspark.drp.models.User;
 import com.originspark.drp.models.User.COLUMNS;
 import com.originspark.drp.util.enums.Gender;
 import com.originspark.drp.util.enums.Status;
+import com.originspark.drp.util.enums.UserType;
 import com.originspark.drp.util.json.FilterRequest;
 
 @Transactional
@@ -80,7 +81,7 @@ public class UserServiceBean extends BaseDAOSupport<User> implements UserService
                 switch (column) {
                     case TYPE :
                         if (value != null && !value.equals("")) {
-                            criteria.add(cb.equal(user.get("type"), value));
+                            criteria.add(cb.equal(user.get("type"), UserType.valueOf(value)));
                         }
                         break;
                     case NAME:

src/main/webapp/drp/app/controller/users/ManagerController.js

@@ -91,7 +91,7 @@ Ext.define("drp.app.controller.users.ManagerController", {
 
     deleteManager : function(btn) {
         //me.deleteModel(btn, managerGrid, "负责人");
-        me.deleteBatchModel(btn,managerGrid,"负责人","/projectManager/deleteBatch");
+        me.deleteBatchModel(btn,managerGrid,"负责人","users/manager/deleteBatch");
     },
 
     submitManagerForm : function(btn) {

src/main/webapp/drp/app/controller/users/RegulatorController.js

@@ -90,7 +90,7 @@ Ext.define("drp.app.controller.users.RegulatorController", {
     },
 
     deleteRegulator : function(btn) {
-        me.deleteBatchModel(btn,regulatorGrid,"经手人","/materialKeeper/deleteBatch");
+        me.deleteBatchModel(btn,regulatorGrid,"经手人","users/regulator/deleteBatch");
     },
 
     submitRegulatorForm : function(btn) {

src/main/webapp/drp/app/controller/users/WareKeeperController.js

@@ -91,7 +91,7 @@ Ext.define("drp.app.controller.users.WareKeeperController", {
 
     deleteWareKeeper : function(btn) {
         //me.deleteModel(btn, wareKeeperGrid, "库管");
-        me.deleteBatchModel(btn,wareKeeperGrid,"库管","/wareKeeper/deleteBatch");
+        me.deleteBatchModel(btn,wareKeeperGrid,"库管","users/wareKeeper/deleteBatch");
     },
 
     submitWareKeeperForm : function(btn) {

src/main/webapp/drp/app/model/users/ManagerModel.js

@@ -2,7 +2,7 @@ Ext.define("drp.app.model.users.ManagerModel", {
     extend : "drp.app.model.users.AbstractUserModel",
     proxy : {
         type : 'rest',
-        url : 'manager',
+        url : 'users/manager',
         reader : {
             type : "json",
             root : "data",

src/main/webapp/drp/app/model/users/RegulatorModel.js

@@ -2,7 +2,7 @@ Ext.define("drp.app.model.users.RegulatorModel", {
     extend : "drp.app.model.users.AbstractUserModel",
     proxy : {
         type : 'rest',
-        url : 'regulator',
+        url : 'users/regulator',
         reader : {
             type : "json",
             root : "data",

src/main/webapp/drp/app/model/users/WareKeeperModel.js

@@ -2,7 +2,7 @@ Ext.define("drp.app.model.users.WareKeeperModel", {
     extend : "drp.app.model.users.AbstractUserModel",
     proxy : {
         type : 'rest',
-        url : 'wareKeeper',
+        url : 'users/wareKeeper',
         reader : {
             type : "json",
             root : "data",

src/main/webapp/drp/app/view/users/ManagerView.js

@@ -100,7 +100,7 @@ Ext.define('drp.app.view.users.ManagerView', {
                         }, {
                             xtype : 'button',
                             margin : '5 0 0 20',
-                            action : 'searchProjectManager',
+                            action : 'searchManager',
                             icon : 'resources/images/icons/search.png',
                             text : '查询'
                         }, {

src/main/webapp/drp/app/view/users/ManagerViewForm.js

@@ -15,7 +15,7 @@ Ext.define("drp.app.view.users.ManagerViewForm", {
             margin : '5 0 0 5',
             name : 'name',
             allowBlank : false,
-            fieldLabel : '名称<font color="red">*</font>'
+            fieldLabel : '姓名<font color="red">*</font>'
         }, {
             xtype : 'textfield',
             anchor : '60%',

src/main/webapp/drp/app/view/users/RegulatorView.js

@@ -3,7 +3,7 @@ Ext.define('drp.app.view.users.RegulatorView', {
     alias : 'widget.regulatorview',
     margins : '0 0 0 0',
     border : 0,
-    title : '<center height=40>材料员</center>',
+    title : '<center height=40>经手人</center>',
     autoScroll : true,
     closable : true,
     layout : {

src/main/webapp/drp/app/view/users/RegulatorViewForm.js

 Ext.define("drp.app.view.users.MaterialKeeperViewForm", {
     extend : 'Ext.panel.Panel',
-    alias : 'widget.materialkeeperviewform',
+    alias : 'widget.regulatorviewform',
     author : '100%',
     autoScroll : true,
     items : [{
@@ -85,13 +85,13 @@ Ext.define("drp.app.view.users.MaterialKeeperViewForm", {
             items : [{
                 xtype : 'button',
                 margin : '5 0 0 5',
-                action : 'submitMaterialKeeperForm',
+                action : 'submitRegulatorForm',
                 width: 80,
                 text : '确认'
             }, {
                 xtype : 'button',
                 margin : '5 0 0 5',
-                action : 'closeMaterialKeeperForm',
+                action : 'closeRegulatorForm',
                 width: 80,
                 text : '取消'
             }]

src/main/webapp/drp/base/controller/MainController.js

@@ -50,7 +50,7 @@ Ext.define("drp.base.controller.MainController", {
         else if(record.data["id"] == "menu_manager"){//库管员
             itemViewXtype = "managerview";
             itemViewController = "drp.app.controller.users.ManagerController";
-            itemViewName = "drp.app.view.users.MaterialKeeperView";
+            itemViewName = "drp.app.view.users.ManagerView";
         }else if(record.data["id"] == "menu_warekeeper"){//负责人
             itemViewXtype = "warekeeperview";
             itemViewController = "drp.app.controller.users.WareKeeperController";