diff --git a/src/main/java/com/supwisdom/dlpay/device/controller/DeviceManageController.java b/src/main/java/com/supwisdom/dlpay/device/controller/DeviceManageController.java
index d166494..8b875c7 100644
--- a/src/main/java/com/supwisdom/dlpay/device/controller/DeviceManageController.java
+++ b/src/main/java/com/supwisdom/dlpay/device/controller/DeviceManageController.java
@@ -37,15 +37,21 @@
     @ResponseBody
     public PageResult<TDevice> getDataList(@RequestParam("page") Integer pageNo,
                                          @RequestParam("limit") Integer pageSize,
-                                         @RequestParam(value = "searchkey", required = false) Integer searchKey) {
+                                         @RequestParam(value = "id", required = false) Integer id,
+                                           @RequestParam(value = "devphyid", required = false) String devphyid,
+                                           @RequestParam(value = "factoryid", required = false) String factoryid,
+                                           @RequestParam(value = "devicename", required = false) String devicename) {
         try {
             if (null == pageNo || pageNo < 1) pageNo = WebConstant.PAGENO_DEFAULT;
             if (null == pageSize || pageSize < 1) pageSize = WebConstant.PAGESIZE_DEFAULT;
             DeviceSearchBean searchBean = new DeviceSearchBean();
             searchBean.setPageNo(pageNo);
-            searchBean.setId(searchKey);
+            searchBean.setId(id);
+            searchBean.setDevphyid(devphyid);
+            searchBean.setDevicename(devicename);
+            searchBean.setFactoryid(factoryid);
             searchBean.setPageSize(pageSize);
-            return deviceService.getDeviceByKey(searchBean);
+            return deviceService.getDeviceByParam(searchBean);
         } catch (Exception e) {
             e.printStackTrace();
             return new PageResult<>(99, "系统查询错误");
diff --git a/src/main/java/com/supwisdom/dlpay/device/dao/DeviceDao.java b/src/main/java/com/supwisdom/dlpay/device/dao/DeviceDao.java
index 5af40fb..5c3f38e 100644
--- a/src/main/java/com/supwisdom/dlpay/device/dao/DeviceDao.java
+++ b/src/main/java/com/supwisdom/dlpay/device/dao/DeviceDao.java
@@ -17,7 +17,7 @@
     Page<TDevice> findAllByDevgroupid(Integer devgroupid, Pageable pageable);
 
 
-    @Query("select count(*) from TDevice t where t.devgroupid =:id and t.state=0")
+    @Query("select count(*) from TDevice t where t.devgroupid =:id and t.state=1")
     Integer countByDevgroupid(Integer Devgroupid);
 
     Integer countByDevphyid(String devphyid);
diff --git a/src/main/java/com/supwisdom/dlpay/device/dao/impl/DeviceDaoImpl.java b/src/main/java/com/supwisdom/dlpay/device/dao/impl/DeviceDaoImpl.java
deleted file mode 100644
index 9dea9d7..0000000
--- a/src/main/java/com/supwisdom/dlpay/device/dao/impl/DeviceDaoImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.supwisdom.dlpay.device.dao.impl;
-
-import com.supwisdom.dlpay.device.dao.DeviceDao;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-public class DeviceDaoImpl {
-    @PersistenceContext
-    EntityManager manager;
-
-}
diff --git a/src/main/resources/db/migration/V1.0__init_data.sql b/src/main/resources/db/migration/V1.0__init_data.sql
index 8e765df..8fb41a7 100644
--- a/src/main/resources/db/migration/V1.0__init_data.sql
+++ b/src/main/resources/db/migration/V1.0__init_data.sql
@@ -2,7 +2,6 @@
 INSERT INTO "tb_apiclient" VALUES ('200001', 'ROLE_THIRD_CONSUME,ROLE_THIRD_COMMON', 'oUw2NmA09ficiVWD4TUQLDOkPyzQa3VzbjjsW0B2qTk=', 'normal');
 INSERT INTO "tb_apiclient" VALUES ('100001', 'ROLE_THIRD_ADMIN', 'oUw2NmA09ficiVWD4TUQLDOkPyzQa3VzbjjsW0B2qTk=', 'normal');
 
-
 INSERT INTO "tb_function" VALUES (1, NULL, 0, NULL, 'layui-icon-home', '#', '主页', 1, -1);
 INSERT INTO "tb_function" VALUES (2, NULL, 1, NULL, 'layui-icon-home', '/home/console', '控制台', 1, 1);
 INSERT INTO "tb_function" VALUES (3, NULL, 0, NULL, 'layui-icon-set', '#', '系统中心', 2, -1);
@@ -16,45 +15,50 @@
 INSERT INTO "tb_function" VALUES (12, NULL, 1, NULL, 'layui-icon-util', '/param/businesspara', '业务参数配置', 2, 10);
 INSERT INTO "tb_function" VALUES (17, NULL, 1, NULL, 'layui-icon-util', '/param/apiclientpara', '应用参数配置', 3, 10);
 INSERT INTO "tb_function" VALUES (18, NULL, 1, NULL, 'layui-icon-util', '/param/paytype', '支付能力配置', 4, 10);
+INSERT INTO "tb_function" VALUES (8, NULL, 0, NULL, 'layui-icon-home', '#', '区域管理', 23, -1);
+INSERT INTO "tb_function" VALUES (13, NULL, 1, NULL, 'layui-icon-home', '/area/index', '地区管理', 1, 8);
+INSERT INTO "tb_function" VALUES (14, NULL, 0, NULL, 'layui-icon-app', '#', '设备管理', 8, -1);
+INSERT INTO "tb_function" VALUES (15, NULL, 1, NULL, 'layui-icon-app', '/device/index', '注册设备', 1, 14);
+INSERT INTO "tb_function" VALUES (16, NULL, 1, NULL, 'layui-icon-home', '/devicegroup/index', '设备组管理', 2, 14);
 INSERT INTO "tb_oper_role" VALUES ('2c9cab836a90185f016a901b005f001b', '402882816a8fe884016a8fe8c0530000', '2c9cab836a8af5d5016a8af6ece20000');
 INSERT INTO "tb_oper_role" VALUES ('ff8080816aaf2ec3016aaf30c1b60007', 'LOR2IwRkbOjp+sVG9KR2BpHZbwGKepS4', 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
 INSERT INTO "tb_oper_role" VALUES ('ff8080816ab96daf016ab9743dc60050', '2c9cab836a9666e0016a96694bbb0004', 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
 INSERT INTO "tb_operator" VALUES ('2c9cab836a9666e0016a96694bbb0004', NULL, '', '', '20190508', 'test1', 'test1', '$2a$10$lkfzdX.0ioX9FU2BmPzHz.tv2DTR8XvaZzA0vpkEYV5vx/IDtIsGy', 'oper', 'normal', 'male');
 INSERT INTO "tb_operator" VALUES ('402882816a8fe884016a8fe8c0530000', NULL, '', '', '20190507', 'test', '11112', '$2a$10$Xa/UKDQ/WkiKVQAyv5Hu4eiqt6HtwVK3YA0Glg1/y1uiEsXnG7ZeS', 'oper', 'normal', 'male');
 INSERT INTO "tb_operator" VALUES ('LOR2IwRkbOjp+sVG9KR2BpHZbwGKepS4', '20500101', '', '', '20190101', 'system', '系统管理员', '$2a$10$Ex9xp11.vCaD8D0a7ahiUOKqDij1TcCUBwRAmrqXeDvAkmzLibn4.', 'oper', 'normal', 'male');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518160054', 16, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518160055', 17, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518160056', 19, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518160057', 20, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518160058', 21, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba451816005a', 6, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba451816005b', 7, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba451816005c', 8, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba451816005d', 9, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba451816005e', 22, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518170060', 4, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518170061', 5, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518170062', 10, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518170063', 11, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518170064', 12, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518170065', 13, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518170066', 14, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518180067', 15, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518180069', 24, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba451819006d', 27, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba451819006e', 26, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518190070', 28, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518190071', 29, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518190072', 30, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518190073', 33, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518190074', 32, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba4518190076', 34, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba45181a0077', 35, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba45181a0078', 37, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba45181a0079', 36, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba45181a007a', 39, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba45181a007b', 40, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_permission" VALUES ('ff8080816aba2931016aba45181b007d', 41, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088a000f', 16, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088b0010', 17, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088b0011', 19, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088b0012', 20, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088b0013', 21, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088c0015', 6, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088c0016', 7, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088c0017', 8, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088d0018', 9, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088d0019', 22, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088e001b', 4, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088e001c', 5, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088e001d', 10, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088e001e', 11, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088e001f', 12, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088f0020', 13, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088f0021', 14, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb088f0022', 15, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08900024', 24, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08900028', 26, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08900029', 27, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0891002b', 28, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0891002c', 29, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0891002d', 30, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0891002e', 32, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0891002f', 33, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08920031', 34, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08920032', 35, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08920033', 36, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08920034', 37, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08920035', 39, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08920036', 40, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08930038', 41, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
 INSERT INTO "tb_permission" VALUES ('ff8080816aaf2ec3016aaf4edaa80085', 16, NULL, '2c9cab836a8af5d5016a8af6ece20000');
 INSERT INTO "tb_permission" VALUES ('ff8080816aaf2ec3016aaf4edaa80086', 17, NULL, '2c9cab836a8af5d5016a8af6ece20000');
 INSERT INTO "tb_permission" VALUES ('ff8080816aaf2ec3016aaf4edaa90087', 19, NULL, '2c9cab836a8af5d5016a8af6ece20000');
@@ -76,6 +80,22 @@
 INSERT INTO "tb_permission" VALUES ('ff8080816aaf2ec3016aaf4edaaa009a', 24, NULL, '2c9cab836a8af5d5016a8af6ece20000');
 INSERT INTO "tb_permission" VALUES ('ff8080816aaf2ec3016aaf4edaab009e', 26, NULL, '2c9cab836a8af5d5016a8af6ece20000');
 INSERT INTO "tb_permission" VALUES ('ff8080816aaf2ec3016aaf4edaac009f', 27, NULL, '2c9cab836a8af5d5016a8af6ece20000');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0893003b', 1, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0893003c', 2, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0894003d', 3, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0894003e', 18, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08950041', 23, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08950042', 25, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08950043', 31, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08950044', 38, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08950045', 42, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08950046', 43, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08960047', 44, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb08960049', 45, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0896004a', 46, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0897004b', 47, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0897004c', 48, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_permission" VALUES ('297e0a7e6b6ef212016b6efb0897004d', 49, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
 INSERT INTO "tb_resource" VALUES (4, '1', 4, '添加功能', '/function/add');
 INSERT INTO "tb_resource" VALUES (5, '', 4, '添加父功能', '/function/loadadd');
 INSERT INTO "tb_resource" VALUES (6, '1', 6, '查询', '/operator/index');
@@ -109,6 +129,22 @@
 INSERT INTO "tb_resource" VALUES (39, '', 17, '修改', '/param/updateapiclientpara');
 INSERT INTO "tb_resource" VALUES (40, '', 17, '新增', '/param/addapiclientpara');
 INSERT INTO "tb_resource" VALUES (41, '', 18, '查询', '/param/paytype');
+INSERT INTO "tb_resource" VALUES (1, '', 13, '查询', '/area/index');
+INSERT INTO "tb_resource" VALUES (2, '', 13, '添加页面', '/area/loadadd');
+INSERT INTO "tb_resource" VALUES (3, '', 13, '添加', '/area/add');
+INSERT INTO "tb_resource" VALUES (18, '', 13, '删除', '/area/delete');
+INSERT INTO "tb_resource" VALUES (23, '', 15, '查询', '/device/index');
+INSERT INTO "tb_resource" VALUES (25, '', 15, '添加页面', '/device/loadadd');
+INSERT INTO "tb_resource" VALUES (31, '', 15, '添加', '/device/add');
+INSERT INTO "tb_resource" VALUES (38, '', 15, '修改状态', '/device/updatestate');
+INSERT INTO "tb_resource" VALUES (42, '', 15, '导入页面', '/device/loadimport');
+INSERT INTO "tb_resource" VALUES (43, '', 15, '下载模板', '/device/download');
+INSERT INTO "tb_resource" VALUES (44, '', 15, '导入', '/device/import');
+INSERT INTO "tb_resource" VALUES (45, '', 16, '查询', '/devicegroup/listDevice');
+INSERT INTO "tb_resource" VALUES (46, '', 16, '展示树', '/devicegroup/listTree');
+INSERT INTO "tb_resource" VALUES (47, '', 16, '显示添加', '/devicegroup/loadadd');
+INSERT INTO "tb_resource" VALUES (48, '', 16, '添加', '/devicegroup/add');
+INSERT INTO "tb_resource" VALUES (49, '', 16, '删除', '/devicegroup/delete');
 INSERT INTO "tb_role" VALUES ('d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs', '20190101000000', 0, '', 'ROLE_ADMIN', '超级管理员', '超级管理员');
 INSERT INTO "tb_role" VALUES ('2c9cab836a8af5d5016a8af6ece20000', '20190506102639', 1, '', 'ROLE_ADMIN', '系统管理员', '系统管理员');
 INSERT INTO "tb_role_function" VALUES ('ff8080816aaf2ec3016aaf4edaa80081', 1, NULL, '2c9cab836a8af5d5016a8af6ece20000');
@@ -121,19 +157,24 @@
 INSERT INTO "tb_role_function" VALUES ('ff8080816aaf2ec3016aaf4edaaa009b', 7, NULL, '2c9cab836a8af5d5016a8af6ece20000');
 INSERT INTO "tb_role_function" VALUES ('ff8080816aaf2ec3016aaf4edaab009c', 10, NULL, '2c9cab836a8af5d5016a8af6ece20000');
 INSERT INTO "tb_role_function" VALUES ('ff8080816aaf2ec3016aaf4edaab009d', 11, NULL, '2c9cab836a8af5d5016a8af6ece20000');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba4518150050', 1, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba4518150051', 2, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba4518150052', 3, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba4518150053', 5, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba4518160059', 6, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba451817005f', 4, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba4518180068', 9, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba451818006a', 7, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba451818006b', 10, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba451818006c', 11, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba451819006f', 12, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba4518190075', 17, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
-INSERT INTO "tb_role_function" VALUES ('ff8080816aba2931016aba45181b007c', 18, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb0885000b', 1, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb0885000c', 2, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb0886000d', 3, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb0886000e', 5, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb088b0014', 6, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb088d001a', 4, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb088f0023', 9, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb08900025', 7, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb08900026', 10, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb08900027', 11, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb0891002a', 12, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb08910030', 17, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb08930037', 18, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb08930039', 8, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb0893003a', 13, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb0894003f', 14, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb08940040', 15, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
+INSERT INTO "tb_role_function" VALUES ('297e0a7e6b6ef212016b6efb08960048', 16, NULL, 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs');
 
 INSERT INTO "tb_area" VALUES (1, '地区1', 1, '', 0, NULL);
 commit;