commit：同步2.0版本

orange-demo-single/orange-demo-single-web/src/api/Controller/DictionaryController.js

@@ -133,17 +133,6 @@ export default class DictionaryController {
   static dictReloadGradeCachedData (sender, params, axiosOption, httpOption) {
     return sender.doUrl('/admin/app/grade/reloadCachedData', 'get', params, axiosOption, httpOption);
   }
-  static dictSchoolInfo (sender, params, axiosOption, httpOption) {
-    return new Promise((resolve, reject) => {
-      sender.doUrl('/admin/app/schoolInfo/listDict', 'get', params, axiosOption, httpOption).then(res => {
-        let dictData = new staticDict.DictionaryBase('校区');
-        dictData.setList(res.data);
-        resolve(dictData);
-      }).catch(err => {
-        reject(err);
-      });
-    });
-  }
   static dictStudent (sender, params, axiosOption, httpOption) {
     return new Promise((resolve, reject) => {
       sender.doUrl('/admin/app/student/listDict', 'get', params, axiosOption, httpOption).then(res => {
@@ -155,4 +144,31 @@ export default class DictionaryController {
       });
     });
   }
+  static dictSysDept (sender, params, axiosOption, httpOption) {
+    return new Promise((resolve, reject) => {
+      sender.doUrl('/admin/upms/sysDept/listDict', 'get', params, axiosOption, httpOption).then(res => {
+        let dictData = new staticDict.DictionaryBase('部门字典');
+        dictData.setList(res.data);
+        resolve(dictData);
+      }).catch(err => {
+        reject(err);
+      });
+    });
+  }
+  static dictSysDeptByParentId (sender, params, axiosOption, httpOption) {
+    return new Promise((resolve, reject) => {
+      sender.doUrl('/admin/upms/sysDept/listDictByParentId', 'get', params, axiosOption, httpOption).then(res => {
+        let dictData = new staticDict.DictionaryBase('部门字典');
+        dictData.setList(res.data);
+        resolve(dictData);
+      }).catch(err => {
+        reject(err);
+      });
+    });
+  }
+  static dictSysDataPermType () {
+    return new Promise((resolve) => {
+      resolve(staticDict.SysDataPermType);
+    });
+  }
 }

orange-demo-single/orange-demo-single-web/src/api/Controller/SchoolInfoController.js

@@ -1,25 +0,0 @@
-export default class SchoolInfoController {
-  static list (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/schoolInfo/list', 'post', params, axiosOption, httpOption);
-  }
-
-  static view (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/schoolInfo/view', 'get', params, axiosOption, httpOption);
-  }
-
-  static export (sender, params, fileName) {
-    return sender.download('/admin/app/schoolInfo/export', params, fileName);
-  }
-
-  static add (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/schoolInfo/add', 'post', params, axiosOption, httpOption);
-  }
-
-  static update (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/schoolInfo/update', 'post', params, axiosOption, httpOption);
-  }
-
-  static delete (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/schoolInfo/delete', 'post', params, axiosOption, httpOption);
-  }
-}

orange-demo-single/orange-demo-single-web/src/api/Controller/SysDataPermController.js

@@ -0,0 +1,61 @@
+export default class SysDataPermController {
+  /**
+   * @param params    {dataPermId, dataPermName, deptIdListString}
+   */
+  static add (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDataPerm/add', 'post', params, axiosOption, httpOption);
+  }
+
+  /**
+   * @param params    {dataPermId, dataPermName, deptIdListString}
+   */
+  static update (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDataPerm/update', 'post', params, axiosOption, httpOption);
+  }
+
+  /**
+   * @param params    {dataPermId}
+   */
+  static delete (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDataPerm/delete', 'post', params, axiosOption, httpOption);
+  }
+
+  /**
+   * @param params    {dataPermName}
+   */
+  static list (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDataPerm/list', 'post', params, axiosOption, httpOption);
+  }
+
+  /**
+   * @param params    {dataPermId}
+   */
+  static view (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDataPerm/view', 'get', params, axiosOption, httpOption);
+  }
+
+  /**
+   * @param params    {dataPermId, searchString}
+   */
+  static listDataPermUser (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDataPerm/listDataPermUser', 'post', params, axiosOption, httpOption);
+  }
+
+  /**
+   * @param params    {dataPermId, userIdListString}
+   */
+  static addDataPermUser (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDataPerm/addDataPermUser', 'post', params, axiosOption, httpOption);
+  }
+
+  /**
+   * @param params    {dataPermId, userId}
+   */
+  static deleteDataPermUser (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDataPerm/deleteDataPermUser', 'post', params, axiosOption, httpOption);
+  }
+
+  static listNotInDataPermUser (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDataPerm/listNotInDataPermUser', 'post', params, axiosOption, httpOption);
+  }
+}

orange-demo-single/orange-demo-single-web/src/api/Controller/SysDeptController.js

@@ -0,0 +1,25 @@
+export default class SysDeptController {
+  static list (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDept/list', 'post', params, axiosOption, httpOption);
+  }
+
+  static view (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDept/view', 'get', params, axiosOption, httpOption);
+  }
+
+  static export (sender, params, fileName) {
+    return sender.download('admin/upms/sysDept/export', params, fileName);
+  }
+
+  static add (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDept/add', 'post', params, axiosOption, httpOption);
+  }
+
+  static update (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDept/update', 'post', params, axiosOption, httpOption);
+  }
+
+  static delete (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDept/delete', 'post', params, axiosOption, httpOption);
+  }
+}

orange-demo-single/orange-demo-single-web/src/api/Controller/SystemController.js

@@ -63,6 +63,22 @@ export default class SystemController {
     return sender.doUrl('admin/upms/sysUser/update', 'post', params, axiosOption, httpOption);
   }
 
+  static addDepartment (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDept/add', 'post', params, axiosOption, httpOption);
+  }
+
+  static deleteDepartment (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDept/delete', 'post', params, axiosOption, httpOption);
+  }
+
+  static updateDepartment (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDept/update', 'post', params, axiosOption, httpOption);
+  }
+
+  static getDepartmentList (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysDept/list', 'post', params, axiosOption, httpOption);
+  }
+
   // 菜单接口
   static getMenuPermList (sender, params, axiosOption, httpOption) {
     return sender.doUrl('admin/upms/sysMenu/list', 'post', params, axiosOption, httpOption);
@@ -225,6 +241,10 @@ export default class SystemController {
   static listSysMenuByPermIdWithDetail (sender, params, axiosOption, httpOption) {
     return sender.doUrl('admin/upms/sysPerm/listSysMenuWithDetail', 'get', params, axiosOption, httpOption);
   }
+  // 操作日志
+  static listSysOperationLog (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('admin/upms/sysOperationLog/list', 'post', params, axiosOption, httpOption);
+  }
   // 在线用户
   static listSysLoginUser (sender, params, axiosOption, httpOption) {
     return sender.doUrl('admin/upms/loginUser/list', 'post', params, axiosOption, httpOption);

orange-demo-single/orange-demo-single-web/src/api/index.js

@@ -1,8 +1,9 @@
 import SystemController from './Controller/SystemController'
+import SysDataPermController from './Controller/SysDataPermController'
 import DictionaryController from './Controller/DictionaryController'
 import CourseController from './Controller/CourseController.js';
-import SchoolInfoController from './Controller/SchoolInfoController.js';
 import StudentController from './Controller/StudentController.js';
+import SysDeptController from './Controller/SysDeptController.js';
 import SysUserController from './Controller/SysUserController.js';
 import StudentClassController from './Controller/StudentClassController.js';
 import CourseTransStatsController from './Controller/CourseTransStatsController.js';
@@ -11,10 +12,11 @@ import StudentActionTransController from './Controller/StudentActionTransControl
 
 export {
   SystemController,
+  SysDataPermController,
   DictionaryController,
   CourseController,
-  SchoolInfoController,
   StudentController,
+  SysDeptController,
   SysUserController,
   StudentClassController,
   CourseTransStatsController,