From 9d4a4690882739998114f5f5bec40c9618962737 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 24 六月 2024 08:16:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/system/controller/RolePdaResourceController.java    |  125 +++++++++
 src/main/java/com/zy/system/entity/PdaResource.java                      |    4 
 src/main/java/com/zy/common/web/AuthController.java                      |  131 +++++++--
 src/main/resources/mapper/RolePdaResourceMapper.xml                      |   13 +
 src/main/java/com/zy/system/mapper/RolePdaResourceMapper.java            |   12 
 src/main/webapp/static/js/rolePdaResource/rolePdaResource.js             |  247 +++++++++++++++++++
 src/main/webapp/views/rolePdaResource/rolePdaResource.html               |  116 ++++++++
 src/main/java/com/zy/system/service/impl/RolePdaResourceServiceImpl.java |   12 
 src/main/java/com/zy/system/entity/RolePdaResource.java                  |   77 +++++
 src/main/java/com/zy/system/service/RolePdaResourceService.java          |    8 
 src/main/java/com/zy/common/CodeBuilder.java                             |    2 
 11 files changed, 717 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 364a52e..80569dd 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
         generator.url="127.0.0.1:1433;databasename=phyzasrs";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="sys_pda_resource";
+        generator.table="sys_role_pda_resource";
         generator.packagePath="com.zy.system";
         generator.sql = false;
         generator.build();
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index e311882..7f178c1 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -51,6 +51,8 @@
     private PermissionService permissionService;
     @Autowired
     private RolePermissionService rolePermissionService;
+    @Autowired
+    private RolePdaResourceService rolePdaResourceService;
 
     @RequestMapping("/login.action")
     @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
@@ -235,7 +237,6 @@
         functions.put("title", "pda鍔熻兘");
         functions.put("id", "function");
         functions.put("spread", true);
-        functions.put("checked", false);
         List<Map> funcs = new ArrayList<>();
         functions.put("children", funcs);
         List<PdaResource> oneLevs = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("level", 1).eq("status", 1).orderBy("sort"));
@@ -246,7 +247,7 @@
             oneLevelMap.put("title", oneLev.getName());
             oneLevelMap.put("id", oneLev.getId());
             oneLevelMap.put("spread", true);
-            oneLevelMap.put("checked", true);
+            oneLevelMap.put("checked", false);
             oneLevelMap.put("children", twoLevelsList);
 
             List<PdaResource> twoLevels = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("resource_id", oneLev.getId()).eq("level", 2).eq("status", 1).orderBy("sort"));
@@ -256,7 +257,7 @@
                 twoLevelMap.put("title", twoLevel.getName());
                 twoLevelMap.put("id", twoLevel.getId());
                 twoLevelMap.put("spread", false);
-                twoLevelMap.put("checked", true);
+                twoLevelMap.put("checked", false);
                 List<Map> threeLevelsList = new ArrayList<>();
                 twoLevelMap.put("children", threeLevelsList);
                 // 涓夌骇
@@ -265,7 +266,7 @@
                     Map<String, Object> threeLevelMap = new HashMap<>();
                     threeLevelMap.put("title", threeLevel.getName());
                     threeLevelMap.put("id", threeLevel.getId());
-                    threeLevelMap.put("checked", true);
+                    threeLevelMap.put("checked", false);
                     threeLevelsList.add(threeLevelMap);
                 }
                 twoLevelsList.add(twoLevelMap);
@@ -299,6 +300,25 @@
                 result.add(permission.getAction());
             }
         }
+        // pda鏉冮檺
+        List<RolePdaResource> rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<RolePdaResource>().eq("role_id", roleId));
+        for (RolePdaResource rolePdaResource : rolePdaResources) {
+            PdaResource pdaResource = pdaResourceService.selectById(rolePdaResource.getResourceId());
+            if (!Cools.isEmpty(pdaResource)) {
+                if (pdaResource.getLevel() == 1){
+                    List<PdaResource> pdaResources = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("resource_id", pdaResource.getId()));
+                    if (Cools.isEmpty(pdaResources)) {
+                        result.add(pdaResource.getId());
+                    }
+                }
+                if (pdaResource.getLevel() == 2){
+                    List<PdaResource> pdaResources = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("resource_id", pdaResource.getId()));
+                    if (Cools.isEmpty(pdaResources)) {
+                        result.add(pdaResource.getId());
+                    }
+                }
+            }
+        }
         return R.ok(result);
     }
 
@@ -310,6 +330,7 @@
         Long leaderId = role.getLeader();
         roleResourceService.delete(new EntityWrapper<RoleResource>().eq("role_id", roleId));
         rolePermissionService.delete(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+        rolePdaResourceService.delete(new EntityWrapper<RolePdaResource>().eq("role_id", roleId));
         if (!Cools.isEmpty(powers)){
             List<PowerDto> dtos = JSON.parseArray(powers, PowerDto.class);
             for (PowerDto dto : dtos) {
@@ -328,30 +349,67 @@
                         roleResource.setResourceId(resource.getId());
                         roleResourceService.insert(roleResource);
                     }
+
                 } else {
-                    Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
-                    if (!Cools.isEmpty(permission)){
-                        RolePermission rolePermission = new RolePermission();
-                        rolePermission.setRoleId(roleId);
-                        rolePermission.setPermissionId(permission.getId());
-                        rolePermissionService.insert(rolePermission);
+                    if (dto.getTwo().substring(0,1).contains("-")) {
+                        PdaResource pdaResource = pdaResourceService.selectOne(new EntityWrapper<PdaResource>().eq("id", dto.getTwo()).eq("level", 1));
+                        if (!Cools.isEmpty(pdaResource)) {
+                            // 鏍¢獙涓婄骇鏉冮檺
+                            if (leaderId != null) {
+                                RolePdaResource rolePdaResource = rolePdaResourceService.selectOne(new EntityWrapper<RolePdaResource>().eq("role_id", leaderId).eq("resource_id", pdaResource.getId()));
+                                if (null == rolePdaResource) {
+                                    throw new CoolException(pdaResource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
+                                }
+                            }
+                            RolePdaResource rolePdaResource = new RolePdaResource();
+                            rolePdaResource.setRoleId(roleId);
+                            rolePdaResource.setResourceId(pdaResource.getId());
+                            rolePdaResourceService.insert(rolePdaResource);
+                        }
+                    } else  {
+                        Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
+                        if (!Cools.isEmpty(permission)){
+                            RolePermission rolePermission = new RolePermission();
+                            rolePermission.setRoleId(roleId);
+                            rolePermission.setPermissionId(permission.getId());
+                            rolePermissionService.insert(rolePermission);
+                        }
                     }
+
                 }
                 for (String three : dto.getThree()){
-                    Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
-                    if (!Cools.isEmpty(resource1)) {
-                        // 鏍¢獙涓婄骇鏉冮檺
-                        if (leaderId != null) {
-                            RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
-                            if (null == roleResource) {
-                                throw new CoolException(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
+                    if (three.substring(0,1).contains("-")) {
+                        PdaResource pdaResource = pdaResourceService.selectOne(new EntityWrapper<PdaResource>().eq("id", three).eq("level", 2));
+                        if (!Cools.isEmpty(pdaResource)) {
+                            // 鏍¢獙涓婄骇鏉冮檺
+                            if (leaderId != null) {
+                                RolePdaResource rolePdaResource = rolePdaResourceService.selectOne(new EntityWrapper<RolePdaResource>().eq("role_id", leaderId).eq("resource_id", pdaResource.getId()));
+                                if (null == rolePdaResource) {
+                                    throw new CoolException(pdaResource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
+                                }
                             }
+                            RolePdaResource rolePdaResource = new RolePdaResource();
+                            rolePdaResource.setRoleId(roleId);
+                            rolePdaResource.setResourceId(pdaResource.getId());
+                            rolePdaResourceService.insert(rolePdaResource);
                         }
-                        RoleResource roleResource = new RoleResource();
-                        roleResource.setRoleId(roleId);
-                        roleResource.setResourceId(resource1.getId());
-                        roleResourceService.insert(roleResource);
+                    } else {
+                        Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
+                        if (!Cools.isEmpty(resource1)) {
+                            // 鏍¢獙涓婄骇鏉冮檺
+                            if (leaderId != null) {
+                                RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
+                                if (null == roleResource) {
+                                    throw new CoolException(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
+                                }
+                            }
+                            RoleResource roleResource = new RoleResource();
+                            roleResource.setRoleId(roleId);
+                            roleResource.setResourceId(resource1.getId());
+                            roleResourceService.insert(roleResource);
+                        }
                     }
+
                 }
             }
         }
@@ -419,21 +477,36 @@
 
     @RequestMapping("/menu/pda/auth")
     @ManagerAuth
-    public R menuPda(){
+    public R menuPda(@RequestBody HashMap<String,String> params){
         Long userId = getUserId();
-        List<RolePermission> rolePermissions;
+        String level = params.get("level");
+        Long id = Long.valueOf(params.get("id"));
+        List<RolePdaResource> rolePdaResources;
         if (userId == 9527L) {
-            rolePermissions = rolePermissionService.selectList(new EntityWrapper<>());
+            rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<>());
         } else {
             Long roleId = getUser().getRoleId();
-            rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+            rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<RolePdaResource>().eq("role_id", roleId));
         }
-        if (Cools.isEmpty(rolePermissions)) {
+        if (Cools.isEmpty(rolePdaResources)) {
             return R.ok();
         }
-        List<Long> collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList());
-        List<Permission> permissions = permissionService.selectBatchIds(collect);
-        return R.ok().add(permissions);
+        List<Long> collect = rolePdaResources.stream().map(RolePdaResource::getResourceId).distinct().collect(Collectors.toList());
+        List<PdaResource> pdaResources = pdaResourceService.selectBatchIds(collect);
+        List<PdaResource> results = new ArrayList<>();
+
+        for (PdaResource pdaResource : pdaResources) {
+            if (Integer.parseInt(level) == 1) {
+                if (pdaResource.getLevel().equals(Short.valueOf(level))) {
+                    results.add(pdaResource);
+                }
+            } else {
+                if (pdaResource.getLevel().equals(Short.valueOf(level)) && pdaResource.getResourceId().equals(id)) {
+                    results.add(pdaResource);
+                }
+            }
+        }
+        return R.ok().add(results);
     }
 
 }
diff --git a/src/main/java/com/zy/system/controller/RolePdaResourceController.java b/src/main/java/com/zy/system/controller/RolePdaResourceController.java
new file mode 100644
index 0000000..2280911
--- /dev/null
+++ b/src/main/java/com/zy/system/controller/RolePdaResourceController.java
@@ -0,0 +1,125 @@
+package com.zy.system.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.system.entity.RolePdaResource;
+import com.zy.system.service.RolePdaResourceService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class RolePdaResourceController extends BaseController {
+
+    @Autowired
+    private RolePdaResourceService rolePdaResourceService;
+
+    @RequestMapping(value = "/rolePdaResource/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(rolePdaResourceService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/rolePdaResource/list/auth")
+    @ManagerAuth
+    public R list(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam(required = false)String condition,
+                  @RequestParam Map<String, Object> param){
+        EntityWrapper<RolePdaResource> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(RolePdaResource.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(rolePdaResourceService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+        for (Map.Entry<String, Object> entry : map.entrySet()){
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+            } else {
+                wrapper.like(entry.getKey(), val);
+            }
+        }
+    }
+
+    @RequestMapping(value = "/rolePdaResource/add/auth")
+    @ManagerAuth
+    public R add(RolePdaResource rolePdaResource) {
+        rolePdaResourceService.insert(rolePdaResource);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/rolePdaResource/update/auth")
+	@ManagerAuth
+    public R update(RolePdaResource rolePdaResource){
+        if (Cools.isEmpty(rolePdaResource) || null==rolePdaResource.getId()){
+            return R.error();
+        }
+        rolePdaResourceService.updateById(rolePdaResource);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/rolePdaResource/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            rolePdaResourceService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/rolePdaResource/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<RolePdaResource> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("rolePdaResource"));
+        convert(map, wrapper);
+        List<RolePdaResource> list = rolePdaResourceService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/rolePdaResourceQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<RolePdaResource> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<RolePdaResource> page = rolePdaResourceService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (RolePdaResource rolePdaResource : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", rolePdaResource.getId());
+            map.put("value", rolePdaResource.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/rolePdaResource/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<RolePdaResource> wrapper = new EntityWrapper<RolePdaResource>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != rolePdaResourceService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(RolePdaResource.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+}
diff --git a/src/main/java/com/zy/system/entity/PdaResource.java b/src/main/java/com/zy/system/entity/PdaResource.java
index 61e9d57..117c210 100644
--- a/src/main/java/com/zy/system/entity/PdaResource.java
+++ b/src/main/java/com/zy/system/entity/PdaResource.java
@@ -123,5 +123,9 @@
         }
     }
 
+    public Short getLevel() {
+        return level;
+    }
+
 
 }
diff --git a/src/main/java/com/zy/system/entity/RolePdaResource.java b/src/main/java/com/zy/system/entity/RolePdaResource.java
new file mode 100644
index 0000000..28e3949
--- /dev/null
+++ b/src/main/java/com/zy/system/entity/RolePdaResource.java
@@ -0,0 +1,77 @@
+package com.zy.system.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.SpringUtils;
+import com.zy.system.service.RoleService;
+import com.zy.system.entity.Role;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.system.service.PdaResourceService;
+import com.zy.system.entity.PdaResource;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("sys_role_pda_resource")
+public class RolePdaResource implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 缂栧彿
+     */
+    @ApiModelProperty(value= "缂栧彿")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 瑙掕壊
+     */
+    @ApiModelProperty(value= "瑙掕壊")
+    @TableField("role_id")
+    private Long roleId;
+
+    /**
+     * pda鏉冮檺
+     */
+    @ApiModelProperty(value= "pda鏉冮檺")
+    @TableField("resource_id")
+    private Long resourceId;
+
+    public RolePdaResource() {}
+
+    public RolePdaResource(Long id,Long roleId,Long resourceId) {
+        this.roleId = roleId;
+        this.resourceId = resourceId;
+    }
+
+//    RolePdaResource rolePdaResource = new RolePdaResource(
+//            null,    // 缂栧彿[闈炵┖]
+//            null,    // 瑙掕壊[闈炵┖]
+//            null    // pda鏉冮檺[闈炵┖]
+//    );
+
+    public String getRoleId$(){
+        RoleService service = SpringUtils.getBean(RoleService.class);
+        Role role = service.selectById(this.roleId);
+        if (!Cools.isEmpty(role)){
+            return String.valueOf(role.getName());
+        }
+        return null;
+    }
+
+    public String getResourceId$(){
+        PdaResourceService service = SpringUtils.getBean(PdaResourceService.class);
+        PdaResource pdaResource = service.selectById(this.resourceId);
+        if (!Cools.isEmpty(pdaResource)){
+            return String.valueOf(pdaResource.getTitle());
+        }
+        return null;
+    }
+
+
+}
diff --git a/src/main/java/com/zy/system/mapper/RolePdaResourceMapper.java b/src/main/java/com/zy/system/mapper/RolePdaResourceMapper.java
new file mode 100644
index 0000000..16c993c
--- /dev/null
+++ b/src/main/java/com/zy/system/mapper/RolePdaResourceMapper.java
@@ -0,0 +1,12 @@
+package com.zy.system.mapper;
+
+import com.zy.system.entity.RolePdaResource;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface RolePdaResourceMapper extends BaseMapper<RolePdaResource> {
+
+}
diff --git a/src/main/java/com/zy/system/service/RolePdaResourceService.java b/src/main/java/com/zy/system/service/RolePdaResourceService.java
new file mode 100644
index 0000000..8f4e984
--- /dev/null
+++ b/src/main/java/com/zy/system/service/RolePdaResourceService.java
@@ -0,0 +1,8 @@
+package com.zy.system.service;
+
+import com.zy.system.entity.RolePdaResource;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface RolePdaResourceService extends IService<RolePdaResource> {
+
+}
diff --git a/src/main/java/com/zy/system/service/impl/RolePdaResourceServiceImpl.java b/src/main/java/com/zy/system/service/impl/RolePdaResourceServiceImpl.java
new file mode 100644
index 0000000..6651afd
--- /dev/null
+++ b/src/main/java/com/zy/system/service/impl/RolePdaResourceServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.system.service.impl;
+
+import com.zy.system.mapper.RolePdaResourceMapper;
+import com.zy.system.entity.RolePdaResource;
+import com.zy.system.service.RolePdaResourceService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("rolePdaResourceService")
+public class RolePdaResourceServiceImpl extends ServiceImpl<RolePdaResourceMapper, RolePdaResource> implements RolePdaResourceService {
+
+}
diff --git a/src/main/resources/mapper/RolePdaResourceMapper.xml b/src/main/resources/mapper/RolePdaResourceMapper.xml
new file mode 100644
index 0000000..08e5d14
--- /dev/null
+++ b/src/main/resources/mapper/RolePdaResourceMapper.xml
@@ -0,0 +1,13 @@
+<?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.zy.system.mapper.RolePdaResourceMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.system.entity.RolePdaResource">
+        <result column="id" property="id" />
+        <result column="role_id" property="roleId" />
+        <result column="resource_id" property="resourceId" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/rolePdaResource/rolePdaResource.js b/src/main/webapp/static/js/rolePdaResource/rolePdaResource.js
new file mode 100644
index 0000000..4ecd9d5
--- /dev/null
+++ b/src/main/webapp/static/js/rolePdaResource/rolePdaResource.js
@@ -0,0 +1,247 @@
+var pageCurr;
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#rolePdaResource',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/rolePdaResource/list/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            {type: 'checkbox'}
+            ,{field: 'id', align: 'center',title: '缂栧彿'}
+            ,{field: 'roleId$', align: 'center',title: '瑙掕壊'}
+            ,{field: 'resourceId$', align: 'center',title: 'pda鏉冮檺'}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        ]],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(rolePdaResource)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {curr: 1}
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(rolePdaResource)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id).data;
+        switch(obj.event) {
+            case 'addData':
+                showEditModel();
+                break;
+            case 'deleteData':
+               if (checkStatus.length === 0) {
+                   layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                   return;
+               }
+               del(checkStatus.map(function (d) {
+                   return d.id;
+               }));
+               break;
+            case 'exportData':
+                admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'rolePdaResource': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/rolePdaResource/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(rolePdaResource)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                del([data.id]);
+                break;
+        }
+    });
+
+    /* 寮圭獥 - 鏂板銆佷慨鏀� */
+    function showEditModel(mData) {
+        admin.open({
+            type: 1,
+            area: '600px',
+            title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+            content: $('#editDialog').html(),
+            success: function (layero, dIndex) {
+                layDateRender(mData);
+                form.val('detail', mData);
+                form.on('submit(editSubmit)', function (data) {
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/rolePdaResource/"+(mData?'update':'add')+"/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: data.field,
+                        method: 'POST',
+                        success: function (res) {
+                            layer.close(loadIndex);
+                            if (res.code === 200){
+                                layer.close(dIndex);
+                                layer.msg(res.msg, {icon: 1});
+                                tableReload();
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            }else {
+                                layer.msg(res.msg, {icon: 2});
+                            }
+                        }
+                    })
+                    return false;
+                });
+                $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                layui.form.render('select');
+            }
+        });
+    }
+
+    /* 鍒犻櫎 */
+    function del(ids) {
+        layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/rolePdaResource/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {ids: ids},
+                method: 'POST',
+                success: function (res) {
+                    layer.close(loadIndex);
+                    if (res.code === 200){
+                        layer.msg(res.msg, {icon: 1});
+                        tableReload();
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
+    // 鎼滅储
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender(data) {
+        setTimeout(function () {
+            layDate.render({
+                elem: '.layui-laydate-range'
+                ,type: 'datetime'
+                ,range: true
+            });
+
+        }, 300);
+    }
+    layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    tableIns.reload({
+        where: searchData,
+        page: {curr: pageCurr}
+     });
+}
diff --git a/src/main/webapp/views/rolePdaResource/rolePdaResource.html b/src/main/webapp/views/rolePdaResource/rolePdaResource.html
new file mode 100644
index 0000000..3f15c36
--- /dev/null
+++ b/src/main/webapp/views/rolePdaResource/rolePdaResource.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <div class="layui-form toolbar" id="search-box">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+                        </div>
+                    </div>
+                     <div class="layui-inline" style="width: 300px">
+                        <div class="layui-input-inline">
+                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="rolePdaResource" lay-filter="rolePdaResource"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+    </div>
+</script>
+
+<script type="text/html" id="operate">
+    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/rolePdaResource/rolePdaResource.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+        <input name="id" type="hidden">
+        <div class="layui-row">
+            <div class="layui-col-md12">
+                <div class="layui-form-item">
+                    <label class="layui-form-label layui-form-required">缂栧彿: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="id" placeholder="璇疯緭鍏ョ紪鍙�" lay-vertype="tips" lay-verify="required">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label layui-form-required">瑙掕壊: </label>
+                    <div class="layui-input-block cool-auto-complete">
+                        <input class="layui-input" name="roleId" placeholder="璇疯緭鍏ヨ鑹�" lay-vertype="tips" lay-verify="required" style="display: none">
+                        <input id="roleId$" name="roleId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ鑹�" onfocus=this.blur()>
+                        <div class="cool-auto-complete-window">
+                            <input class="cool-auto-complete-window-input" data-key="roleQueryByroleId" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                            <select class="cool-auto-complete-window-select" data-key="roleQueryByroleIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label layui-form-required">pda鏉冮檺: </label>
+                    <div class="layui-input-block cool-auto-complete">
+                        <input class="layui-input" name="resourceId" placeholder="璇疯緭鍏da鏉冮檺" lay-vertype="tips" lay-verify="required" style="display: none">
+                        <input id="resourceId$" name="resourceId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏da鏉冮檺" onfocus=this.blur()>
+                        <div class="cool-auto-complete-window">
+                            <input class="cool-auto-complete-window-input" data-key="pdaResourceQueryByresourceId" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                            <select class="cool-auto-complete-window-select" data-key="pdaResourceQueryByresourceIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+             </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </form>
+</script>
+</html>
+

--
Gitblit v1.9.1