权限和组织、角色操作移到service，增加事务

zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsRolePermissionService.java

@@ -1,5 +1,6 @@
 package com.zheng.upms.rpc.api;
 
+import com.alibaba.fastjson.JSONArray;
 import com.zheng.common.base.BaseService;
 import com.zheng.upms.dao.model.UpmsRolePermission;
 import com.zheng.upms.dao.model.UpmsRolePermissionExample;
@@ -10,4 +11,12 @@ import com.zheng.upms.dao.model.UpmsRolePermissionExample;
 */
 public interface UpmsRolePermissionService extends BaseService<UpmsRolePermission, UpmsRolePermissionExample> {
 
+    /**
+     * 角色权限
+     * @param datas 权限数据
+     * @param id 角色id
+     * @return
+     */
+    int rolePermission(JSONArray datas, int id);
+
 }

zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsRolePermissionServiceMock.java

@@ -1,9 +1,12 @@
 package com.zheng.upms.rpc.api;
 
+import com.alibaba.fastjson.JSONArray;
 import com.zheng.common.base.BaseServiceMock;
 import com.zheng.upms.dao.mapper.UpmsRolePermissionMapper;
 import com.zheng.upms.dao.model.UpmsRolePermission;
 import com.zheng.upms.dao.model.UpmsRolePermissionExample;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
 * 降级实现UpmsRolePermissionService接口
@@ -11,4 +14,12 @@ import com.zheng.upms.dao.model.UpmsRolePermissionExample;
 */
 public class UpmsRolePermissionServiceMock extends BaseServiceMock<UpmsRolePermissionMapper, UpmsRolePermission, UpmsRolePermissionExample> implements UpmsRolePermissionService {
 
+    private static Logger _log = LoggerFactory.getLogger(UpmsRolePermissionServiceMock.class);
+
+    @Override
+    public int rolePermission(JSONArray datas, int id) {
+        _log.info("UpmsRolePermissionServiceMock => rolePermission");
+        return 0;
+    }
+
 }

zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsUserOrganizationService.java

@@ -10,4 +10,12 @@ import com.zheng.upms.dao.model.UpmsUserOrganizationExample;
 */
 public interface UpmsUserOrganizationService extends BaseService<UpmsUserOrganization, UpmsUserOrganizationExample> {
 
+    /**
+     * 用户组织
+     * @param organizationIds 组织ids
+     * @param id 用户id
+     * @return
+     */
+    int organization(String[] organizationIds, int id);
+
 }

zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsUserOrganizationServiceMock.java

@@ -4,6 +4,8 @@ import com.zheng.common.base.BaseServiceMock;
 import com.zheng.upms.dao.mapper.UpmsUserOrganizationMapper;
 import com.zheng.upms.dao.model.UpmsUserOrganization;
 import com.zheng.upms.dao.model.UpmsUserOrganizationExample;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
 * 降级实现UpmsUserOrganizationService接口
@@ -11,4 +13,12 @@ import com.zheng.upms.dao.model.UpmsUserOrganizationExample;
 */
 public class UpmsUserOrganizationServiceMock extends BaseServiceMock<UpmsUserOrganizationMapper, UpmsUserOrganization, UpmsUserOrganizationExample> implements UpmsUserOrganizationService {
 
+    private static Logger _log = LoggerFactory.getLogger(UpmsUserOrganizationServiceMock.class);
+
+    @Override
+    public int organization(String[] organizationIds, int id) {
+        _log.info("UpmsUserOrganizationServiceMock => organization");
+        return 0;
+    }
+
 }

zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsUserPermissionService.java

@@ -1,5 +1,6 @@
 package com.zheng.upms.rpc.api;
 
+import com.alibaba.fastjson.JSONArray;
 import com.zheng.common.base.BaseService;
 import com.zheng.upms.dao.model.UpmsUserPermission;
 import com.zheng.upms.dao.model.UpmsUserPermissionExample;
@@ -10,4 +11,12 @@ import com.zheng.upms.dao.model.UpmsUserPermissionExample;
 */
 public interface UpmsUserPermissionService extends BaseService<UpmsUserPermission, UpmsUserPermissionExample> {
 
+    /**
+     * 用户权限
+     * @param datas 权限数据
+     * @param id 用户id
+     * @return
+     */
+    int permission(JSONArray datas, int id);
+
 }

zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsUserPermissionServiceMock.java

@@ -1,9 +1,12 @@
 package com.zheng.upms.rpc.api;
 
+import com.alibaba.fastjson.JSONArray;
 import com.zheng.common.base.BaseServiceMock;
 import com.zheng.upms.dao.mapper.UpmsUserPermissionMapper;
 import com.zheng.upms.dao.model.UpmsUserPermission;
 import com.zheng.upms.dao.model.UpmsUserPermissionExample;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
 * 降级实现UpmsUserPermissionService接口
@@ -11,4 +14,12 @@ import com.zheng.upms.dao.model.UpmsUserPermissionExample;
 */
 public class UpmsUserPermissionServiceMock extends BaseServiceMock<UpmsUserPermissionMapper, UpmsUserPermission, UpmsUserPermissionExample> implements UpmsUserPermissionService {
 
+    private static Logger _log = LoggerFactory.getLogger(UpmsUserPermissionServiceMock.class);
+
+    @Override
+    public int permission(JSONArray datas, int id) {
+        _log.info("UpmsUserPermissionServiceMock => permission");
+        return 0;
+    }
+
 }

zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsUserRoleService.java

@@ -10,4 +10,12 @@ import com.zheng.upms.dao.model.UpmsUserRoleExample;
 */
 public interface UpmsUserRoleService extends BaseService<UpmsUserRole, UpmsUserRoleExample> {
 
+    /**
+     * 用户角色
+     * @param roleIds 角色ids
+     * @param id 用户id
+     * @return
+     */
+    int role(String[] roleIds, int id);
+
 }

zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsUserRoleServiceMock.java

@@ -4,6 +4,8 @@ import com.zheng.common.base.BaseServiceMock;
 import com.zheng.upms.dao.mapper.UpmsUserRoleMapper;
 import com.zheng.upms.dao.model.UpmsUserRole;
 import com.zheng.upms.dao.model.UpmsUserRoleExample;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
 * 降级实现UpmsUserRoleService接口
@@ -11,4 +13,12 @@ import com.zheng.upms.dao.model.UpmsUserRoleExample;
 */
 public class UpmsUserRoleServiceMock extends BaseServiceMock<UpmsUserRoleMapper, UpmsUserRole, UpmsUserRoleExample> implements UpmsUserRoleService {
 
+    private static Logger _log = LoggerFactory.getLogger(UpmsUserRoleServiceMock.class);
+
+    @Override
+    public int role(String[] roleIds, int id) {
+        _log.info("UpmsUserRoleServiceMock => role");
+        return 0;
+    }
+
 }

zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsRolePermissionServiceImpl.java

@@ -1,5 +1,7 @@
 package com.zheng.upms.rpc.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.zheng.common.annotation.BaseService;
 import com.zheng.common.base.BaseServiceImpl;
 import com.zheng.upms.dao.mapper.UpmsRolePermissionMapper;
@@ -12,6 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
 * UpmsRolePermissionService实现
 * Created by shuzheng on 2017/3/20.
@@ -26,4 +31,30 @@ public class UpmsRolePermissionServiceImpl extends BaseServiceImpl<UpmsRolePermi
     @Autowired
     UpmsRolePermissionMapper upmsRolePermissionMapper;
 
+    @Override
+    public int rolePermission(JSONArray datas, int id) {
+        List<Integer> deleteIds = new ArrayList<>();
+        for (int i = 0; i < datas.size(); i ++) {
+            JSONObject json = datas.getJSONObject(i);
+            if (!json.getBoolean("checked")) {
+                deleteIds.add(json.getIntValue("id"));
+            } else {
+                // 新增权限
+                UpmsRolePermission upmsRolePermission = new UpmsRolePermission();
+                upmsRolePermission.setRoleId(id);
+                upmsRolePermission.setPermissionId(json.getIntValue("id"));
+                upmsRolePermissionMapper.insertSelective(upmsRolePermission);
+            }
+        }
+        // 删除权限
+        if (deleteIds.size() > 0) {
+            UpmsRolePermissionExample upmsRolePermissionExample = new UpmsRolePermissionExample();
+            upmsRolePermissionExample.createCriteria()
+                    .andPermissionIdIn(deleteIds)
+                    .andRoleIdEqualTo(id);
+            upmsRolePermissionMapper.deleteByExample(upmsRolePermissionExample);
+        }
+        return datas.size();
+    }
+
 }

zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsUserOrganizationServiceImpl.java

@@ -6,6 +6,8 @@ import com.zheng.upms.dao.mapper.UpmsUserOrganizationMapper;
 import com.zheng.upms.dao.model.UpmsUserOrganization;
 import com.zheng.upms.dao.model.UpmsUserOrganizationExample;
 import com.zheng.upms.rpc.api.UpmsUserOrganizationService;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,4 +28,27 @@ public class UpmsUserOrganizationServiceImpl extends BaseServiceImpl<UpmsUserOrg
     @Autowired
     UpmsUserOrganizationMapper upmsUserOrganizationMapper;
 
+    @Override
+    public int organization(String[] organizationIds, int id) {
+        int result = 0;
+        // 删除旧记录
+        UpmsUserOrganizationExample upmsUserOrganizationExample = new UpmsUserOrganizationExample();
+        upmsUserOrganizationExample.createCriteria()
+                .andUserIdEqualTo(id);
+        upmsUserOrganizationMapper.deleteByExample(upmsUserOrganizationExample);
+        // 增加新记录
+        if (null != organizationIds) {
+            for (String organizationId : organizationIds) {
+                if (StringUtils.isBlank(organizationId)) {
+                    continue;
+                }
+                UpmsUserOrganization upmsUserOrganization = new UpmsUserOrganization();
+                upmsUserOrganization.setUserId(id);
+                upmsUserOrganization.setOrganizationId(NumberUtils.toInt(organizationId));
+                result = upmsUserOrganizationMapper.insertSelective(upmsUserOrganization);
+            }
+        }
+        return result;
+    }
+
 }

zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsUserPermissionServiceImpl.java

@@ -1,5 +1,7 @@
 package com.zheng.upms.rpc.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.zheng.common.annotation.BaseService;
 import com.zheng.common.base.BaseServiceImpl;
 import com.zheng.upms.dao.mapper.UpmsUserPermissionMapper;
@@ -26,4 +28,27 @@ public class UpmsUserPermissionServiceImpl extends BaseServiceImpl<UpmsUserPermi
     @Autowired
     UpmsUserPermissionMapper upmsUserPermissionMapper;
 
+    @Override
+    public int permission(JSONArray datas, int id) {
+        for (int i = 0; i < datas.size(); i ++) {
+            JSONObject json = datas.getJSONObject(i);
+            if (json.getBoolean("checked")) {
+                // 新增权限
+                UpmsUserPermission upmsUserPermission = new UpmsUserPermission();
+                upmsUserPermission.setUserId(id);
+                upmsUserPermission.setPermissionId(json.getIntValue("id"));
+                upmsUserPermission.setType(json.getByte("type"));
+                upmsUserPermissionMapper.insertSelective(upmsUserPermission);
+            } else {
+                // 删除权限
+                UpmsUserPermissionExample upmsUserPermissionExample = new UpmsUserPermissionExample();
+                upmsUserPermissionExample.createCriteria()
+                        .andPermissionIdEqualTo(json.getIntValue("id"))
+                        .andTypeEqualTo(json.getByte("type"));
+                upmsUserPermissionMapper.deleteByExample(upmsUserPermissionExample);
+            }
+        }
+        return datas.size();
+    }
+
 }

zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsUserRoleServiceImpl.java

@@ -6,6 +6,8 @@ import com.zheng.upms.dao.mapper.UpmsUserRoleMapper;
 import com.zheng.upms.dao.model.UpmsUserRole;
 import com.zheng.upms.dao.model.UpmsUserRoleExample;
 import com.zheng.upms.rpc.api.UpmsUserRoleService;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,4 +28,27 @@ public class UpmsUserRoleServiceImpl extends BaseServiceImpl<UpmsUserRoleMapper,
     @Autowired
     UpmsUserRoleMapper upmsUserRoleMapper;
 
+    @Override
+    public int role(String[] roleIds, int id) {
+        int result = 0;
+        // 删除旧记录
+        UpmsUserRoleExample upmsUserRoleExample = new UpmsUserRoleExample();
+        upmsUserRoleExample.createCriteria()
+                .andUserIdEqualTo(id);
+        upmsUserRoleMapper.deleteByExample(upmsUserRoleExample);
+        // 增加新记录
+        if (null != roleIds) {
+            for (String roleId : roleIds) {
+                if (StringUtils.isBlank(roleId)) {
+                    continue;
+                }
+                UpmsUserRole upmsUserRole = new UpmsUserRole();
+                upmsUserRole.setUserId(id);
+                upmsUserRole.setRoleId(NumberUtils.toInt(roleId));
+                result = upmsUserRoleMapper.insertSelective(upmsUserRole);
+            }
+        }
+        return result;
+    }
+
 }

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java

@@ -71,28 +71,8 @@ public class UpmsRoleController extends BaseController {
     @ResponseBody
     public Object permission(@PathVariable("id") int id, HttpServletRequest request) {
         JSONArray datas = JSONArray.parseArray(request.getParameter("datas"));
-        List<Integer> deleteIds = new ArrayList<>();
-        for (int i = 0; i < datas.size(); i ++) {
-            JSONObject json = datas.getJSONObject(i);
-            if (!json.getBoolean("checked")) {
-                deleteIds.add(json.getIntValue("id"));
-            } else {
-                // 新增权限
-                UpmsRolePermission upmsRolePermission = new UpmsRolePermission();
-                upmsRolePermission.setRoleId(id);
-                upmsRolePermission.setPermissionId(json.getIntValue("id"));
-                upmsRolePermissionService.insertSelective(upmsRolePermission);
-            }
-        }
-        // 删除权限
-        if (deleteIds.size() > 0) {
-            UpmsRolePermissionExample upmsRolePermissionExample = new UpmsRolePermissionExample();
-            upmsRolePermissionExample.createCriteria()
-                    .andPermissionIdIn(deleteIds)
-                    .andRoleIdEqualTo(id);
-            upmsRolePermissionService.deleteByExample(upmsRolePermissionExample);
-        }
-        return new UpmsResult(UpmsResultConstant.SUCCESS, datas.size());
+        int result = upmsRolePermissionService.rolePermission(datas, id);
+        return new UpmsResult(UpmsResultConstant.SUCCESS, result);
     }
 
     @ApiOperation(value = "角色列表")

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java

@@ -86,23 +86,7 @@ public class UpmsUserController extends BaseController {
     @ResponseBody
     public Object organization(@PathVariable("id") int id, HttpServletRequest request) {
         String[] organizationIds = request.getParameterValues("organizationId");
-        // 删除旧记录
-        UpmsUserOrganizationExample upmsUserOrganizationExample = new UpmsUserOrganizationExample();
-        upmsUserOrganizationExample.createCriteria()
-                .andUserIdEqualTo(id);
-        upmsUserOrganizationService.deleteByExample(upmsUserOrganizationExample);
-        // 增加新记录
-        if (null != organizationIds) {
-            for (String organizationId : organizationIds) {
-                if (StringUtils.isBlank(organizationId)) {
-                    continue;
-                }
-                UpmsUserOrganization upmsUserOrganization = new UpmsUserOrganization();
-                upmsUserOrganization.setUserId(id);
-                upmsUserOrganization.setOrganizationId(NumberUtils.toInt(organizationId));
-                upmsUserOrganizationService.insertSelective(upmsUserOrganization);
-            }
-        }
+        upmsUserOrganizationService.organization(organizationIds, id);
         return new UpmsResult(UpmsResultConstant.SUCCESS, "");
     }
 
@@ -128,23 +112,7 @@ public class UpmsUserController extends BaseController {
     @ResponseBody
     public Object role(@PathVariable("id") int id, HttpServletRequest request) {
         String[] roleIds = request.getParameterValues("roleId");
-        // 删除旧记录
-        UpmsUserRoleExample upmsUserRoleExample = new UpmsUserRoleExample();
-        upmsUserRoleExample.createCriteria()
-                .andUserIdEqualTo(id);
-        upmsUserRoleService.deleteByExample(upmsUserRoleExample);
-        // 增加新记录
-        if (null != roleIds) {
-            for (String roleId : roleIds) {
-                if (StringUtils.isBlank(roleId)) {
-                    continue;
-                }
-                UpmsUserRole upmsUserRole = new UpmsUserRole();
-                upmsUserRole.setUserId(id);
-                upmsUserRole.setRoleId(NumberUtils.toInt(roleId));
-                upmsUserRoleService.insertSelective(upmsUserRole);
-            }
-        }
+        upmsUserRoleService.role(roleIds, id);
         return new UpmsResult(UpmsResultConstant.SUCCESS, "");
     }
 
@@ -163,24 +131,7 @@ public class UpmsUserController extends BaseController {
     @ResponseBody
     public Object permission(@PathVariable("id") int id, HttpServletRequest request) {
         JSONArray datas = JSONArray.parseArray(request.getParameter("datas"));
-        for (int i = 0; i < datas.size(); i ++) {
-            JSONObject json = datas.getJSONObject(i);
-            if (json.getBoolean("checked")) {
-                // 新增权限
-                UpmsUserPermission upmsUserPermission = new UpmsUserPermission();
-                upmsUserPermission.setUserId(id);
-                upmsUserPermission.setPermissionId(json.getIntValue("id"));
-                upmsUserPermission.setType(json.getByte("type"));
-                upmsUserPermissionService.insertSelective(upmsUserPermission);
-            } else {
-                // 删除权限
-                UpmsUserPermissionExample upmsUserPermissionExample = new UpmsUserPermissionExample();
-                upmsUserPermissionExample.createCriteria()
-                        .andPermissionIdEqualTo(json.getIntValue("id"))
-                        .andTypeEqualTo(json.getByte("type"));
-                upmsUserPermissionService.deleteByExample(upmsUserPermissionExample);
-            }
-        }
+        upmsUserPermissionService.permission(datas, id);
         return new UpmsResult(UpmsResultConstant.SUCCESS, datas.size());
     }