权限中台

server/src/main/java/com/pica/cloud/permission/permission/server/constants/Constants.java

+package com.pica.cloud.permission.permission.server.constants;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+@SuppressWarnings("unused")
+public class Constants {
+
+    //delete_flag
+    public static final int DELETE_FLAG_VALID = 1;
+    public static final int DELETE_FLAG_INVALID = 2;
+
+}

server/src/main/java/com/pica/cloud/permission/permission/server/controller/DataPrivilegeController.java

+package com.pica.cloud.permission.permission.server.controller;
+
+import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.permission.permission.server.entity.DataPrivilege;
+import com.pica.cloud.permission.permission.server.service.DataPrivilegeService;
+import com.pica.cloud.permission.permission.server.validation.DataPrivilegeValidation;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+@Api(description = "数据权限管理")
+@RestController
+@RequestMapping("/permission")
+public class DataPrivilegeController {
+
+    @Autowired
+    private DataPrivilegeService dataPrivilegeService;
+
+    //根据ID获取数据权限
+    @GetMapping("/data-privilege/{id}")
+    public PicaResponse<DataPrivilege> getById(@PathVariable("id") int id) {
+        DataPrivilege dataPrivilege = dataPrivilegeService.getById(id);
+        return PicaResponse.toResponse(dataPrivilege);
+    }
+
+    //根据资源ID获取数据权限
+    @GetMapping("/data-privilege")
+    public PicaResponse<List<DataPrivilege>> getByResourceId(@RequestParam("resourceId") int resourceId) {
+        List<DataPrivilege> list = dataPrivilegeService.getByResourceId(resourceId);
+        return PicaResponse.toResponse(list);
+    }
+
+    //添加数据资源
+    @PostMapping("/data-privilege")
+    public PicaResponse addDataPrivilege(DataPrivilege dataPrivilege) {
+        DataPrivilegeValidation.addDataPrivilegeValidate(dataPrivilege);
+        dataPrivilegeService.addDataPrivilege(dataPrivilege);
+        return PicaResponse.toResponse();
+    }
+
+    //修改数据资源
+    @PutMapping("/data-privilege")
+    public PicaResponse updateDataPrivilege(DataPrivilege dataPrivilege) {
+        DataPrivilegeValidation.updateDataPrivilegeValidate(dataPrivilege);
+        dataPrivilegeService.updateDataPrivilege(dataPrivilege);
+        return PicaResponse.toResponse();
+    }
+
+    //逻辑删除数据资源
+    @DeleteMapping("/data-privilege")
+    public PicaResponse deleteDataPrivilege(@RequestParam("id") int id, @RequestParam("modifiedId") int modifiedId) {
+        dataPrivilegeService.deleteDataPrivilege(id, modifiedId);
+        return PicaResponse.toResponse();
+    }
+
+}

server/src/main/java/com/pica/cloud/permission/permission/server/controller/ResourceController.java

+package com.pica.cloud.permission.permission.server.controller;
+
+import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.permission.permission.server.entity.Resource;
+import com.pica.cloud.permission.permission.server.service.ResourceService;
+import com.pica.cloud.permission.permission.server.validation.ResourceValidation;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/8/30
+ */
+@Api(description = "资源管理")
+@RestController
+@RequestMapping("/permission")
+public class ResourceController {
+
+    @Autowired
+    private ResourceService resourceService;
+
+    //根据ID获取资源
+    @GetMapping("/resource/{id}")
+    public PicaResponse<Resource> getById(@PathVariable("id") int id) {
+        Resource resource = resourceService.getById(id);
+        return PicaResponse.toResponse(resource);
+    }
+
+    //根据条件获取资源
+    @GetMapping("/resource")
+    public PicaResponse<List<Resource>> getResource(@RequestParam(value = "productType", required = false) Integer productType,
+                                              @RequestParam(value = "category", required = false) Integer category,
+                                              @RequestParam(value = "type", required = false) Integer type,
+                                              @RequestParam(value = "code", required = false) String code,
+                                              @RequestParam(value = "parentId", required = false) Integer parentId) {
+        ResourceValidation.queryResourceValidate(productType, category, type, code, parentId);
+        List<Resource> list = resourceService.getByCriteria(new Resource(productType, category, type, code, parentId));
+        return PicaResponse.toResponse(list);
+    }
+
+    //添加资源
+    @PostMapping("/resource")
+    public PicaResponse addResource(@RequestBody Resource resource) {
+        ResourceValidation.addResourceValidate(resource);
+        resourceService.addResource(resource);
+        return PicaResponse.toResponse();
+    }
+
+    //修改资源
+    @PutMapping("/resource")
+    public PicaResponse updateResource(@RequestBody Resource resource) {
+        ResourceValidation.updateResourceValidate(resource);
+        resourceService.updateResource(resource);
+        return PicaResponse.toResponse();
+    }
+
+    //根据ID逻辑删除资源
+    @DeleteMapping("/resource")
+    public PicaResponse deleteResource(@RequestParam("id") int id, @RequestParam("modifiedId") int modifiedId) {
+        resourceService.deleteResource(id, modifiedId);
+        return PicaResponse.toResponse();
+    }
+
+
+}

server/src/main/java/com/pica/cloud/permission/permission/server/controller/RoleController.java

+package com.pica.cloud.permission.permission.server.controller;
+
+import com.pica.cloud.foundation.entity.PicaException;
+import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.foundation.entity.PicaResultCode;
+import com.pica.cloud.permission.permission.server.entity.Role;
+import com.pica.cloud.permission.permission.server.service.RoleService;
+import com.pica.cloud.permission.permission.server.validation.RoleValidation;
+import io.swagger.annotations.Api;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+@Api(description = "角色管理")
+@RestController
+@RequestMapping("/permission")
+public class RoleController {
+
+    @Autowired
+    private RoleService roleService;
+
+    //根据ID获取角色
+    @GetMapping("/role/{id}")
+    public PicaResponse<Role> getById(@PathVariable("id") int id) {
+        Role role = roleService.getById(id);
+        return PicaResponse.toResponse(role);
+    }
+
+    //根据角色编码或产品线类型获取角色
+    @GetMapping("/role")
+    public PicaResponse getByCode(@RequestParam(value = "code", required = false) String code,
+                                  @RequestParam(value = "productType", required = false) Integer productType) {
+        if (StringUtils.isNotBlank(code)) {
+            return PicaResponse.toResponse(roleService.getByCode(code));
+        }
+        if (productType != null) {
+            return PicaResponse.toResponse(roleService.getByProductType(productType));
+        }
+        throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "缺少查询参数");
+    }
+
+    //添加角色
+    @PostMapping("/role")
+    public PicaResponse addRole(@RequestBody Role role) {
+        RoleValidation.addRoleValidate(role);
+        roleService.addRole(role);
+        return PicaResponse.toResponse();
+    }
+
+    //修改角色
+    @PutMapping("/role")
+    public PicaResponse updateRole(@RequestBody Role role) {
+        RoleValidation.updateRoleValidate(role);
+        roleService.updateRole(role);
+        return PicaResponse.toResponse();
+    }
+
+    //删除角色
+    @DeleteMapping("/role")
+    public PicaResponse deleteRole(@RequestParam("id") int id, @RequestParam("modifiedId") int modifiedId) {
+        roleService.deleteRole(id, modifiedId);
+        return PicaResponse.toResponse();
+    }
+
+}

server/src/main/java/com/pica/cloud/permission/permission/server/controller/RoleResourceController.java

+package com.pica.cloud.permission.permission.server.controller;
+
+import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.permission.permission.server.entity.RoleResource;
+import com.pica.cloud.permission.permission.server.service.RoleResourceService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+@Api(description = "角色-资源管理")
+@RestController
+@RequestMapping("/permission")
+public class RoleResourceController {
+
+    @Autowired
+    private RoleResourceService roleResourceService;
+
+    //根据角色ID获取资源列表
+    @GetMapping("/role-resource")
+    public PicaResponse<List<RoleResource>> getByRoleId(@RequestParam("roleId") int roleId) {
+        List<RoleResource> list = roleResourceService.getByRoleId(roleId);
+        return PicaResponse.toResponse(list);
+    }
+
+    //添加角色资源关系
+    @PostMapping("/role-resource")
+    public PicaResponse addRoleResource(@RequestBody RoleResource roleResource) {
+        roleResourceService.addRoleResource(roleResource);
+        return PicaResponse.toResponse();
+    }
+
+    //删除角色资源关系
+    @DeleteMapping("/role-resource")
+    public PicaResponse deleteRoleResource(@RequestParam(value = "id", required = false) Integer id,
+                                           @RequestParam(value = "roleId", required = false) Integer roleId,
+                                           @RequestParam("modifiedId") int modifiedId) {
+        if (id != null) {
+            roleResourceService.deleteRoleResource(id, modifiedId);
+        }
+        if (roleId != null) {
+            roleResourceService.deleteAll(roleId, modifiedId);
+        }
+        return PicaResponse.toResponse();
+    }
+
+}

server/src/main/java/com/pica/cloud/permission/permission/server/entity/Resource.java

@@ -31,6 +31,16 @@ public class Resource {
 
     private Date modifiedTime;
 
+    public Resource() {}
+
+    public Resource(Integer productType, Integer category, Integer type, String code, Integer parentId) {
+        this.productType = productType;
+        this.category = category;
+        this.type = type;
+        this.code = code;
+        this.parentId = parentId;
+    }
+
     public Integer getId() {
         return id;
     }

server/src/main/java/com/pica/cloud/permission/permission/server/mapper/DataPrivilegeMapper.java

@@ -2,18 +2,17 @@ package com.pica.cloud.permission.permission.server.mapper;
 
 import com.pica.cloud.permission.permission.server.entity.DataPrivilege;
 import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
 
 @Mapper
 public interface DataPrivilegeMapper {
-    int deleteByPrimaryKey(Integer id);
 
-    int insert(DataPrivilege record);
+    int insertSelective(DataPrivilege dataPrivilege);
 
-    int insertSelective(DataPrivilege record);
+    DataPrivilege selectByPrimaryKey(int id);
 
-    DataPrivilege selectByPrimaryKey(Integer id);
+    List<DataPrivilege> getByResourceId(int resourceId);
 
-    int updateByPrimaryKeySelective(DataPrivilege record);
+    int updateByPrimaryKeySelective(DataPrivilege dataPrivilege);
 
-    int updateByPrimaryKey(DataPrivilege record);
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/permission/permission/server/mapper/ResourceMapper.java

@@ -2,18 +2,17 @@ package com.pica.cloud.permission.permission.server.mapper;
 
 import com.pica.cloud.permission.permission.server.entity.Resource;
 import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
 
 @Mapper
 public interface ResourceMapper {
-    int deleteByPrimaryKey(Integer id);
 
-    int insert(Resource record);
+    int insertSelective(Resource resource);
 
-    int insertSelective(Resource record);
+    Resource selectByPrimaryKey(int id);
 
-    Resource selectByPrimaryKey(Integer id);
+    int updateByPrimaryKeySelective(Resource resource);
 
-    int updateByPrimaryKeySelective(Resource record);
+    List<Resource> selectByCriteria(Resource resource);
 
-    int updateByPrimaryKey(Resource record);
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/permission/permission/server/mapper/RoleMapper.java

@@ -2,18 +2,19 @@ package com.pica.cloud.permission.permission.server.mapper;
 
 import com.pica.cloud.permission.permission.server.entity.Role;
 import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
 
 @Mapper
 public interface RoleMapper {
-    int deleteByPrimaryKey(Integer id);
 
-    int insert(Role record);
+    int insertSelective(Role role);
 
-    int insertSelective(Role record);
+    Role selectByPrimaryKey(int id);
 
-    Role selectByPrimaryKey(Integer id);
+    int updateByPrimaryKeySelective(Role role);
 
-    int updateByPrimaryKeySelective(Role record);
+    Role getByCode(String code);
+
+    List<Role> getByProductType(int productType);
 
-    int updateByPrimaryKey(Role record);
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/permission/permission/server/mapper/RoleResourceMapper.java

@@ -2,18 +2,19 @@ package com.pica.cloud.permission.permission.server.mapper;
 
 import com.pica.cloud.permission.permission.server.entity.RoleResource;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface RoleResourceMapper {
-    int deleteByPrimaryKey(Integer id);
 
-    int insert(RoleResource record);
+    int insertSelective(RoleResource roleResource);
 
-    int insertSelective(RoleResource record);
+    List<RoleResource> getByRoleId(int roleId);
 
-    RoleResource selectByPrimaryKey(Integer id);
+    int updateByPrimaryKeySelective(RoleResource roleResource);
 
-    int updateByPrimaryKeySelective(RoleResource record);
+    int deleteAll(@Param("roleId") int roleId, @Param("modifiedId") int modifiedId);
 
-    int updateByPrimaryKey(RoleResource record);
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/permission/permission/server/service/DataPrivilegeService.java

+package com.pica.cloud.permission.permission.server.service;
+
+import com.pica.cloud.permission.permission.server.entity.DataPrivilege;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+public interface DataPrivilegeService {
+
+    //添加数据权限
+    void addDataPrivilege(DataPrivilege dataPrivilege);
+
+    //根据ID查询数据权限
+    DataPrivilege getById(int id);
+
+    //根据资源ID查询数据权限
+    List<DataPrivilege> getByResourceId(int resourceId);
+
+    //修改数据权限
+    void updateDataPrivilege(DataPrivilege dataPrivilege);
+
+    //逻辑删除数据权限
+    void deleteDataPrivilege(int id, int modifiedId);
+
+}

server/src/main/java/com/pica/cloud/permission/permission/server/service/ResourceService.java

+package com.pica.cloud.permission.permission.server.service;
+
+import com.pica.cloud.permission.permission.server.entity.Resource;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/8/30
+ */
+public interface ResourceService {
+
+    //添加资源
+    void addResource(Resource resource);
+
+    //根据ID查询资源
+    Resource getById(int id);
+
+    //修改资源
+    void updateResource(Resource resource);
+
+    //根据条件查询资源
+    List<Resource> getByCriteria(Resource resource);
+
+    //根据ID逻辑删除资源
+    void deleteResource(int id, int modifiedId);
+
+}

server/src/main/java/com/pica/cloud/permission/permission/server/service/RoleResourceService.java

+package com.pica.cloud.permission.permission.server.service;
+
+import com.pica.cloud.permission.permission.server.entity.RoleResource;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+public interface RoleResourceService {
+
+    //添加角色资源关系
+    void addRoleResource(RoleResource roleResource);
+
+    //根据角色ID查询角色资源关系
+    List<RoleResource> getByRoleId(int roleId);
+
+    //逻辑删除角色资源关系
+    void deleteRoleResource(int id, int modifiedId);
+
+    //逻辑删除角色下全部资源
+    void deleteAll(int roleId, int modifiedId);
+
+}

server/src/main/java/com/pica/cloud/permission/permission/server/service/RoleService.java

+package com.pica.cloud.permission.permission.server.service;
+
+import com.pica.cloud.permission.permission.server.entity.Role;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+public interface RoleService {
+
+    //添加角色
+    void addRole(Role role);
+
+    //根据ID查询角色
+    Role getById(int id);
+
+    //根据角色编码查询角色
+    Role getByCode(String code);
+
+    //根据产品线类型查询角色列表
+    List<Role> getByProductType(int productType);
+
+    //修改角色
+    void updateRole(Role role);
+
+    //逻辑删除角色
+    void deleteRole(int id, int modifiedId);
+
+}

server/src/main/java/com/pica/cloud/permission/permission/server/service/impl/DataPrivilegeServiceImpl.java

+package com.pica.cloud.permission.permission.server.service.impl;
+
+import com.pica.cloud.permission.permission.server.constants.Constants;
+import com.pica.cloud.permission.permission.server.entity.DataPrivilege;
+import com.pica.cloud.permission.permission.server.mapper.DataPrivilegeMapper;
+import com.pica.cloud.permission.permission.server.service.DataPrivilegeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+@Service
+public class DataPrivilegeServiceImpl implements DataPrivilegeService {
+
+    @Autowired
+    private DataPrivilegeMapper dataPrivilegeMapper;
+
+    @Override
+    @Transactional
+    public void addDataPrivilege(DataPrivilege dataPrivilege) {
+        dataPrivilege.setModifiedId(dataPrivilege.getCreatedId());
+        dataPrivilege.setCreatedTime(new Date());
+        dataPrivilege.setModifiedTime(dataPrivilege.getCreatedTime());
+        dataPrivilegeMapper.insertSelective(dataPrivilege);
+    }
+
+    @Override
+    public DataPrivilege getById(int id) {
+        return dataPrivilegeMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public List<DataPrivilege> getByResourceId(int resourceId) {
+        return dataPrivilegeMapper.getByResourceId(resourceId);
+    }
+
+    @Override
+    @Transactional
+    public void updateDataPrivilege(DataPrivilege dataPrivilege) {
+        dataPrivilege.setModifiedTime(new Date());
+        dataPrivilegeMapper.updateByPrimaryKeySelective(dataPrivilege);
+    }
+
+    @Override
+    @Transactional
+    public void deleteDataPrivilege(int id, int modifiedId) {
+        DataPrivilege dataPrivilege = new DataPrivilege();
+        dataPrivilege.setId(id);
+        dataPrivilege.setDeleteFlag(Constants.DELETE_FLAG_INVALID);
+        dataPrivilege.setModifiedId(modifiedId);
+        dataPrivilege.setModifiedTime(new Date());
+        dataPrivilegeMapper.updateByPrimaryKeySelective(dataPrivilege);
+    }
+}

server/src/main/java/com/pica/cloud/permission/permission/server/service/impl/ResourceServiceImpl.java

+package com.pica.cloud.permission.permission.server.service.impl;
+
+import com.pica.cloud.permission.permission.server.constants.Constants;
+import com.pica.cloud.permission.permission.server.entity.Resource;
+import com.pica.cloud.permission.permission.server.mapper.ResourceMapper;
+import com.pica.cloud.permission.permission.server.service.ResourceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/8/30
+ */
+@Service
+public class ResourceServiceImpl implements ResourceService {
+
+    @Autowired
+    private ResourceMapper resourceMapper;
+
+    @Override
+    @Transactional
+    public void addResource(Resource resource) {
+        resource.setModifiedId(resource.getCreatedId());
+        resource.setCreatedTime(new Date());
+        resource.setModifiedTime(resource.getCreatedTime());
+        resourceMapper.insertSelective(resource);
+    }
+
+    @Override
+    public Resource getById(int id) {
+        return resourceMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    @Transactional
+    public void updateResource(Resource resource) {
+        resource.setModifiedTime(new Date());
+        resourceMapper.updateByPrimaryKeySelective(resource);
+    }
+
+    @Override
+    public List<Resource> getByCriteria(Resource resource) {
+        return resourceMapper.selectByCriteria(resource);
+    }
+
+    @Override
+    @Transactional
+    public void deleteResource(int id, int modifiedId) {
+        Resource resource = new Resource();
+        resource.setId(id);
+        resource.setDeleteFlag(Constants.DELETE_FLAG_INVALID);
+        resource.setModifiedId(modifiedId);
+        resource.setModifiedTime(new Date());
+        resourceMapper.updateByPrimaryKeySelective(resource);
+    }
+}

server/src/main/java/com/pica/cloud/permission/permission/server/service/impl/RoleResourceServiceImpl.java

+package com.pica.cloud.permission.permission.server.service.impl;
+
+import com.pica.cloud.permission.permission.server.constants.Constants;
+import com.pica.cloud.permission.permission.server.entity.RoleResource;
+import com.pica.cloud.permission.permission.server.mapper.RoleResourceMapper;
+import com.pica.cloud.permission.permission.server.service.RoleResourceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+@Service
+public class RoleResourceServiceImpl implements RoleResourceService {
+
+    @Autowired
+    private RoleResourceMapper roleResourceMapper;
+
+    @Override
+    @Transactional
+    public void addRoleResource(RoleResource roleResource) {
+        roleResource.setModifiedId(roleResource.getCreatedId());
+        roleResource.setCreatedTime(new Date());
+        roleResource.setModifiedTime(roleResource.getCreatedTime());
+        roleResourceMapper.insertSelective(roleResource);
+    }
+
+    @Override
+    public List<RoleResource> getByRoleId(int roleId) {
+        return roleResourceMapper.getByRoleId(roleId);
+    }
+
+    @Override
+    @Transactional
+    public void deleteRoleResource(int id, int modifiedId) {
+        RoleResource roleResource = new RoleResource();
+        roleResource.setId(id);
+        roleResource.setDeleteFlag(Constants.DELETE_FLAG_INVALID);
+        roleResource.setModifiedId(modifiedId);
+        roleResource.setModifiedTime(new Date());
+        roleResourceMapper.updateByPrimaryKeySelective(roleResource);
+    }
+
+    @Override
+    @Transactional
+    public void deleteAll(int roleId, int modifiedId) {
+        roleResourceMapper.deleteAll(roleId, modifiedId);
+    }
+}

server/src/main/java/com/pica/cloud/permission/permission/server/service/impl/RoleServiceImpl.java

+package com.pica.cloud.permission.permission.server.service.impl;
+
+import com.pica.cloud.permission.permission.server.constants.Constants;
+import com.pica.cloud.permission.permission.server.entity.Role;
+import com.pica.cloud.permission.permission.server.mapper.RoleMapper;
+import com.pica.cloud.permission.permission.server.service.RoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+@Service
+public class RoleServiceImpl implements RoleService {
+
+    @Autowired
+    private RoleMapper roleMapper;
+
+    @Override
+    @Transactional
+    public void addRole(Role role) {
+        role.setModifiedId(role.getCreatedId());
+        role.setCreatedTime(new Date());
+        role.setModifiedTime(role.getCreatedTime());
+        roleMapper.insertSelective(role);
+    }
+
+    @Override
+    public Role getById(int id) {
+        return roleMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public Role getByCode(String code) {
+        return roleMapper.getByCode(code);
+    }
+
+    @Override
+    public List<Role> getByProductType(int productType) {
+        return roleMapper.getByProductType(productType);
+    }
+
+    @Override
+    @Transactional
+    public void updateRole(Role role) {
+        role.setModifiedTime(new Date());
+        roleMapper.updateByPrimaryKeySelective(role);
+    }
+
+    @Override
+    @Transactional
+    public void deleteRole(int id, int modifiedId) {
+        Role role = new Role();
+        role.setId(id);
+        role.setDeleteFlag(Constants.DELETE_FLAG_INVALID);
+        role.setModifiedId(modifiedId);
+        role.setModifiedTime(new Date());
+    }
+}

server/src/main/java/com/pica/cloud/permission/permission/server/validation/DataPrivilegeValidation.java

+package com.pica.cloud.permission.permission.server.validation;
+
+import com.pica.cloud.foundation.entity.PicaException;
+import com.pica.cloud.foundation.entity.PicaResultCode;
+import com.pica.cloud.permission.permission.server.entity.DataPrivilege;
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+public class DataPrivilegeValidation {
+
+    public static void addDataPrivilegeValidate(DataPrivilege dataPrivilege) {
+        if (dataPrivilege.getResourceId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "资源ID为空");
+        }
+        if (StringUtils.isBlank(dataPrivilege.getDescription())) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "数据权限描述为空");
+        }
+        if (StringUtils.isBlank(dataPrivilege.getConfig())) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "数据权限配置为空");
+        }
+        if (dataPrivilege.getCreatedId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "操作人ID为空");
+        }
+    }
+
+    public static void updateDataPrivilegeValidate(DataPrivilege dataPrivilege) {
+        if (dataPrivilege.getId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "数据权限ID为空");
+        }
+        if (dataPrivilege.getModifiedId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "操作人ID为空");
+        }
+        if (dataPrivilege.getResourceId() == null && StringUtils.isBlank(dataPrivilege.getDescription())
+                && StringUtils.isBlank(dataPrivilege.getConfig()) && StringUtils.isBlank(dataPrivilege.getConfigExt())) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "缺少必要参数");
+        }
+    }
+
+}

server/src/main/java/com/pica/cloud/permission/permission/server/validation/ResourceValidation.java

+package com.pica.cloud.permission.permission.server.validation;
+
+import com.pica.cloud.foundation.entity.PicaException;
+import com.pica.cloud.foundation.entity.PicaResultCode;
+import com.pica.cloud.permission.permission.server.entity.Resource;
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * @author andong
+ * @create 2019/8/30
+ */
+public class ResourceValidation {
+
+    //添加资源校验
+    public static void addResourceValidate(Resource resource) {
+        if (resource.getProductType() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "产品线类型为空");
+        }
+        if (resource.getCategory() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "系统分类为空");
+        }
+        if (resource.getType() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "资源类型为空");
+        }
+        if (StringUtils.isBlank(resource.getCode())) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "资源编码为空");
+        }
+        if (StringUtils.isBlank(resource.getName())) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "资源名称为空");
+        }
+        if (resource.getCreatedId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "操作人ID为空");
+        }
+    }
+
+    //修改资源校验
+    public static void updateResourceValidate(Resource resource) {
+        if (resource.getId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "资源ID为空");
+        }
+        if (resource.getModifiedId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "操作人ID为空");
+        }
+        if (resource.getProductType() == null && resource.getCategory() == null
+                && resource.getType() == null && StringUtils.isBlank(resource.getCode())
+                && StringUtils.isBlank(resource.getName()) && StringUtils.isBlank(resource.getUrl())
+                && resource.getLevel() == null && resource.getParentId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "缺少必要参数");
+        }
+    }
+
+    //查询资源校验
+    public static void queryResourceValidate(Integer productType, Integer category, Integer type, String code, Integer parentId) {
+        if (productType == null && category == null && type == null && parentId == null && StringUtils.isBlank(code)) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "缺少查询参数");
+        }
+    }
+}

server/src/main/java/com/pica/cloud/permission/permission/server/validation/RoleValidation.java

+package com.pica.cloud.permission.permission.server.validation;
+
+import com.pica.cloud.foundation.entity.PicaException;
+import com.pica.cloud.foundation.entity.PicaResultCode;
+import com.pica.cloud.permission.permission.server.entity.Role;
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * @author andong
+ * @create 2019/9/2
+ */
+public class RoleValidation {
+
+    public static void addRoleValidate(Role role) {
+        if (role.getProductType() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "产品线类型为空");
+        }
+        if (StringUtils.isBlank(role.getCode())) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "角色编码为空");
+        }
+        if (StringUtils.isBlank(role.getName())) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "角色名称为空");
+        }
+        if (role.getCreatedId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "操作人ID为空");
+        }
+    }
+
+    public static void updateRoleValidate(Role role) {
+        if (role.getId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "角色ID为空");
+        }
+        if (role.getModifiedId() == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "操作人ID为空");
+        }
+        if (role.getProductType() == null && StringUtils.isBlank(role.getCode()) && StringUtils.isBlank(role.getName())) {
+            throw new PicaException(PicaResultCode.PARAM_IS_BLANK.code(), "缺少必要参数");
+        }
+    }
+}

server/src/main/resources/mybatis/DataPrivilegeMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pica.cloud.permission.permission.server.mapper.DataPrivilegeMapper">
+
   <resultMap id="BaseResultMap" type="com.pica.cloud.permission.permission.server.entity.DataPrivilege">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="resource_id" jdbcType="INTEGER" property="resourceId" />
@@ -13,36 +14,29 @@
     <result column="modified_id" jdbcType="INTEGER" property="modifiedId" />
     <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
   </resultMap>
+
   <sql id="Base_Column_List">
     id, resource_id, description, config, config_ext, delete_flag, created_id, created_time, 
     modified_id, modified_time
   </sql>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from perm_data_privilege
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and delete_flag = 1
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from perm_data_privilege
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.pica.cloud.permission.permission.server.entity.DataPrivilege">
-    insert into perm_data_privilege (id, resource_id, description, 
-      config, config_ext, delete_flag, 
-      created_id, created_time, modified_id, 
-      modified_time)
-    values (#{id,jdbcType=INTEGER}, #{resourceId,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR}, 
-      #{config,jdbcType=VARCHAR}, #{configExt,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER}, 
-      #{createdId,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER}, 
-      #{modifiedTime,jdbcType=TIMESTAMP})
-  </insert>
+
+  <select id="getByResourceId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from perm_data_privilege
+    where resource_id = #{resourceId,jdbcType=INTEGER} and delete_flag = 1
+  </select>
+
   <insert id="insertSelective" parameterType="com.pica.cloud.permission.permission.server.entity.DataPrivilege">
     insert into perm_data_privilege
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="resourceId != null">
         resource_id,
       </if>
@@ -72,9 +66,6 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="resourceId != null">
         #{resourceId,jdbcType=INTEGER},
       </if>
@@ -104,6 +95,7 @@
       </if>
     </trim>
   </insert>
+
   <update id="updateByPrimaryKeySelective" parameterType="com.pica.cloud.permission.permission.server.entity.DataPrivilege">
     update perm_data_privilege
     <set>
@@ -137,17 +129,5 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.pica.cloud.permission.permission.server.entity.DataPrivilege">
-    update perm_data_privilege
-    set resource_id = #{resourceId,jdbcType=INTEGER},
-      description = #{description,jdbcType=VARCHAR},
-      config = #{config,jdbcType=VARCHAR},
-      config_ext = #{configExt,jdbcType=VARCHAR},
-      delete_flag = #{deleteFlag,jdbcType=INTEGER},
-      created_id = #{createdId,jdbcType=INTEGER},
-      created_time = #{createdTime,jdbcType=TIMESTAMP},
-      modified_id = #{modifiedId,jdbcType=INTEGER},
-      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+
 </mapper>
\ No newline at end of file

server/src/main/resources/mybatis/ResourceMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pica.cloud.permission.permission.server.mapper.ResourceMapper">
+
   <resultMap id="BaseResultMap" type="com.pica.cloud.permission.permission.server.entity.Resource">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="product_type" jdbcType="INTEGER" property="productType" />
@@ -17,38 +18,22 @@
     <result column="modified_id" jdbcType="INTEGER" property="modifiedId" />
     <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
   </resultMap>
+
   <sql id="Base_Column_List">
     id, product_type, category, type, code, name, url, level, parent_id, delete_flag, 
     created_id, created_time, modified_id, modified_time
   </sql>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from perm_resource
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and delete_flag = 1
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from perm_resource
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.pica.cloud.permission.permission.server.entity.Resource">
-    insert into perm_resource (id, product_type, category, 
-      type, code, name, url, 
-      level, parent_id, delete_flag, 
-      created_id, created_time, modified_id, 
-      modified_time)
-    values (#{id,jdbcType=INTEGER}, #{productType,jdbcType=INTEGER}, #{category,jdbcType=INTEGER}, 
-      #{type,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, 
-      #{level,jdbcType=INTEGER}, #{parentId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, 
-      #{createdId,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER}, 
-      #{modifiedTime,jdbcType=TIMESTAMP})
-  </insert>
+
   <insert id="insertSelective" parameterType="com.pica.cloud.permission.permission.server.entity.Resource">
     insert into perm_resource
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="productType != null">
         product_type,
       </if>
@@ -90,9 +75,6 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="productType != null">
         #{productType,jdbcType=INTEGER},
       </if>
@@ -134,6 +116,7 @@
       </if>
     </trim>
   </insert>
+
   <update id="updateByPrimaryKeySelective" parameterType="com.pica.cloud.permission.permission.server.entity.Resource">
     update perm_resource
     <set>
@@ -179,21 +162,27 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.pica.cloud.permission.permission.server.entity.Resource">
-    update perm_resource
-    set product_type = #{productType,jdbcType=INTEGER},
-      category = #{category,jdbcType=INTEGER},
-      type = #{type,jdbcType=INTEGER},
-      code = #{code,jdbcType=VARCHAR},
-      name = #{name,jdbcType=VARCHAR},
-      url = #{url,jdbcType=VARCHAR},
-      level = #{level,jdbcType=INTEGER},
-      parent_id = #{parentId,jdbcType=INTEGER},
-      delete_flag = #{deleteFlag,jdbcType=INTEGER},
-      created_id = #{createdId,jdbcType=INTEGER},
-      created_time = #{createdTime,jdbcType=TIMESTAMP},
-      modified_id = #{modifiedId,jdbcType=INTEGER},
-      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+
+  <select id="selectByCriteria" resultMap="BaseResultMap" parameterType="com.pica.cloud.permission.permission.server.entity.Resource">
+    select
+    <include refid="Base_Column_List" />
+    from perm_resource
+    where delete_flag = 1
+    <if test="productType != null">
+      and product_type = #{productType,jdbcType=INTEGER}
+    </if>
+    <if test="category != null">
+      and category = #{category,jdbcType=INTEGER}
+    </if>
+    <if test="type != null">
+      and type = #{type,jdbcType=INTEGER}
+    </if>
+    <if test="code != null">
+      and code = #{code,jdbcType=VARCHAR}
+    </if>
+    <if test="parentId != null">
+      and parent_id = #{parentId,jdbcType=INTEGER}
+    </if>
+  </select>
+
 </mapper>
\ No newline at end of file

server/src/main/resources/mybatis/RoleMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pica.cloud.permission.permission.server.mapper.RoleMapper">
+
   <resultMap id="BaseResultMap" type="com.pica.cloud.permission.permission.server.entity.Role">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="product_type" jdbcType="INTEGER" property="productType" />
@@ -12,36 +13,36 @@
     <result column="modified_id" jdbcType="INTEGER" property="modifiedId" />
     <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
   </resultMap>
+
   <sql id="Base_Column_List">
     id, product_type, code, name, delete_flag, created_id, created_time, modified_id, 
     modified_time
   </sql>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from perm_role
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and delete_flag = 1
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from perm_role
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.pica.cloud.permission.permission.server.entity.Role">
-    insert into perm_role (id, product_type, code, 
-      name, delete_flag, created_id, 
-      created_time, modified_id, modified_time
-      )
-    values (#{id,jdbcType=INTEGER}, #{productType,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, 
-      #{name,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=INTEGER}, 
-      #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER}, #{modifiedTime,jdbcType=TIMESTAMP}
-      )
-  </insert>
+
+  <select id="getByCode" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from perm_role
+    where code = #{code,jdbcType=VARCHAR} and delete_flag = 1
+  </select>
+
+  <select id="getByProductType" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from perm_role
+    where product_type = #{productType,jdbcType=INTEGER} and delete_flag = 1
+  </select>
+
   <insert id="insertSelective" parameterType="com.pica.cloud.permission.permission.server.entity.Role">
     insert into perm_role
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="productType != null">
         product_type,
       </if>
@@ -68,9 +69,6 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="productType != null">
         #{productType,jdbcType=INTEGER},
       </if>
@@ -97,6 +95,7 @@
       </if>
     </trim>
   </insert>
+
   <update id="updateByPrimaryKeySelective" parameterType="com.pica.cloud.permission.permission.server.entity.Role">
     update perm_role
     <set>
@@ -127,16 +126,5 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.pica.cloud.permission.permission.server.entity.Role">
-    update perm_role
-    set product_type = #{productType,jdbcType=INTEGER},
-      code = #{code,jdbcType=VARCHAR},
-      name = #{name,jdbcType=VARCHAR},
-      delete_flag = #{deleteFlag,jdbcType=INTEGER},
-      created_id = #{createdId,jdbcType=INTEGER},
-      created_time = #{createdTime,jdbcType=TIMESTAMP},
-      modified_id = #{modifiedId,jdbcType=INTEGER},
-      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+
 </mapper>
\ No newline at end of file

server/src/main/resources/mybatis/RoleResourceMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pica.cloud.permission.permission.server.mapper.RoleResourceMapper">
+
   <resultMap id="BaseResultMap" type="com.pica.cloud.permission.permission.server.entity.RoleResource">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="role_id" jdbcType="INTEGER" property="roleId" />
@@ -12,36 +13,22 @@
     <result column="modified_id" jdbcType="INTEGER" property="modifiedId" />
     <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
   </resultMap>
+
   <sql id="Base_Column_List">
     id, role_id, resource_id, data_privilege_id, delete_flag, created_id, created_time, 
     modified_id, modified_time
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+
+  <select id="getByRoleId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from perm_role_resource
-    where id = #{id,jdbcType=INTEGER}
+    where role_id = #{roleId,jdbcType=INTEGER} and delete_flag = 1
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from perm_role_resource
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.pica.cloud.permission.permission.server.entity.RoleResource">
-    insert into perm_role_resource (id, role_id, resource_id, 
-      data_privilege_id, delete_flag, created_id, 
-      created_time, modified_id, modified_time
-      )
-    values (#{id,jdbcType=INTEGER}, #{roleId,jdbcType=INTEGER}, #{resourceId,jdbcType=INTEGER}, 
-      #{dataPrivilegeId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=INTEGER}, 
-      #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER}, #{modifiedTime,jdbcType=TIMESTAMP}
-      )
-  </insert>
+
   <insert id="insertSelective" parameterType="com.pica.cloud.permission.permission.server.entity.RoleResource">
     insert into perm_role_resource
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="roleId != null">
         role_id,
       </if>
@@ -68,9 +55,6 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="roleId != null">
         #{roleId,jdbcType=INTEGER},
       </if>
@@ -97,6 +81,7 @@
       </if>
     </trim>
   </insert>
+
   <update id="updateByPrimaryKeySelective" parameterType="com.pica.cloud.permission.permission.server.entity.RoleResource">
     update perm_role_resource
     <set>
@@ -127,16 +112,10 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.pica.cloud.permission.permission.server.entity.RoleResource">
-    update perm_role_resource
-    set role_id = #{roleId,jdbcType=INTEGER},
-      resource_id = #{resourceId,jdbcType=INTEGER},
-      data_privilege_id = #{dataPrivilegeId,jdbcType=INTEGER},
-      delete_flag = #{deleteFlag,jdbcType=INTEGER},
-      created_id = #{createdId,jdbcType=INTEGER},
-      created_time = #{createdTime,jdbcType=TIMESTAMP},
-      modified_id = #{modifiedId,jdbcType=INTEGER},
-      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
+
+  <update id="deleteAll">
+    update perm_role_resource set delete_flag = 2, modified_id = #{modifiedId}, modified_time = now()
+    where role_id = #{roleId}
   </update>
+
 </mapper>
\ No newline at end of file