gsb

xgg-admin/app/base/controller/impl/uc/authCtl.js

@@ -6,6 +6,96 @@ class AuthCtl extends CtlBase {
     this.authSve = system.getObject("service.uc.authSve");
   }
 
+  /**
+   * 菜单  添加 
+   * @param {*} params 
+   */
+  async addAuth(params, pobj2, req) {
+    try {
+      var auth = {
+        pid: Number(params.pid || 0),
+        saas_id: req.loginUser.saas_id,
+        menuType: Number(params.menuType || 0),
+        name: this.trim(params.name),
+        icon: this.trim(params.icon),
+        path: this.trim(params.path),
+        sort: 99,
+      };
+      return await this.authSve.addAuth(auth);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 菜单  更新
+   * @param {*} params 
+   */
+  async updAuth(params, pobj2, req) {
+    var auth = {
+      id: Number(params.id),
+      pid: Number(params.pid || 0),
+      saas_id: req.loginUser.saas_id,
+      menuType: Number(params.menuType || 0),
+      name: this.trim(params.name),
+      icon: this.trim(params.icon),
+      path: this.trim(params.path),
+    };
+
+    try {
+      return await this.authSve.updAuth(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 菜单 删除 
+   * @param {*} params 
+   */
+  async delAuth(params, pobj2, req) {
+    try {
+      return await this.authSve.delAuth(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 菜单  查询明细
+   * @param {*} params 
+   */
+  async queryById(params, pobj2, req) {
+    try {
+      return await this.authSve.queryById(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 根据pid查出子目录
+   * @param {*} params 
+   */
+  async byPid(params, pobj2, req) {
+    try {
+      return await this.authSve.byPid(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 查询整个树结构
+   * @param {*} params 
+   */
+  async tree(params, pobj2, req) {
+    try {
+      return await this.authSve.tree(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
 
 }
 module.exports = AuthCtl;
\ No newline at end of file

xgg-admin/app/base/controller/impl/uc/userCtl.js

@@ -6,6 +6,138 @@ class UserCtl extends CtlBase {
     this.userSve = system.getObject("service.uc.userSve");
   }
 
+  /**
+   *   添加 
+   * @param {*} params 
+   */
+  async addUser(params, pobj2, req) {
+    try {
+      var user = {
+        saas_id: req.loginUser.saas_id,
+        org_id: Number(params.org_id || 0),
+        ucname: this.trim(params.ucname),
+        password: this.trim(params.password),
+        uctype: Number(params.uctype || 1),
+        mobile: this.trim(params.mobile),
+        realName: this.trim(params.realName),
+        roles: params.roles || [],
+      };
+      if (!user.ucname) {
+        return system.getResult(null, "请填写用户名");
+      }
+      if (!user.password) {
+        return system.getResult(null, "请填写密码");
+      }
+      if (!user.mobile) {
+        return system.getResult(null, "请填写手机号");
+      }
+      if (!user.realName) {
+        return system.getResult(null, "请填写姓名");
+      }
+      if (user.uctype == 1 && !user.org_id) {
+        return system.getResult(null, "请选择用户组织机构");
+      }
 
+      if(user.uctype != 1) {
+        user.org_id = null;
+        user.roles = [];
+      }
+      return await this.userSve.addUser(user);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   *   更新
+   * @param {*} params 
+   */
+  async updUser(params, pobj2, req) {
+    var user = {
+      id: Number(params.id || 0),
+      saas_id: req.loginUser.saas_id,
+      org_id: Number(params.org_id || 0),
+      uctype: Number(params.uctype || 1),
+      mobile: this.trim(params.mobile),
+      realName: this.trim(params.realName),
+      roles: params.roles || [],
+    };
+
+    if (!user.id) {
+      return system.getResult(null, "用户不存在");
+    }
+
+    if (!user.mobile) {
+      return system.getResult(null, "请填写手机号");
+    }
+
+    if (!user.realName) {
+      return system.getResult(null, "请填写姓名");
+    }
+
+    if (user.uctype == 1 && !user.org_id) {
+      return system.getResult(null, "请选择用户组织机构");
+    }
+
+    if(user.uctype != 1) {
+      user.org_id = null;
+      user.roles = [];
+    }
+
+    try {
+      return await this.userSve.updUser(user);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 启用禁用
+   * @param {*} params 
+   * @param {*} pobj2 
+   * @param {*} req 
+   */
+  async enabled(params, pobj2, req) {
+    try {
+      params.id = Number(params.id || 0);
+      params.enabled = Number(params.enabled || 0);
+      return await this.userSve.enabled(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  async delUser(params, pobj2, req) {
+    try {
+      return system.getResult(null, `暂未提供`);
+      // return await this.userSve.delUser(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   *   查询明细
+   * @param {*} params 
+   */
+  async queryById(params, pobj2, req) {
+    try {
+      return await this.userSve.queryById(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 根据pid查出子目录
+   * @param {*} params 
+   */
+  async page(params, pobj2, req) {
+    try {
+      return await this.userSve.page(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
 }
 module.exports = UserCtl;
\ No newline at end of file

xgg-admin/app/base/service/impl/uc/authSve.js

@@ -5,6 +5,77 @@ class authService extends ServiceBase {
     super();
   }
 
+  /**
+   * 菜单  添加 
+   * @param {*} params 
+   */
+  async addAuth(params) {
+    try {
+      return await this.callms("uc", "addAuth", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 菜单  更新
+   * @param {*} params 
+   */
+  async updAuth(params) {
+    try {
+      return await this.callms("uc", "updAuth", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 菜单 删除 
+   * @param {*} params 
+   */
+  async delAuth(params) {
+    try {
+      return await this.callms("uc", "delAuth", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 菜单  查询明细
+   * @param {*} params 
+   */
+  async queryById(params) {
+    try {
+      return await this.callms("uc", "authInfo", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 根据pid查出子菜单
+   * @param {*} params 
+   */
+  async byPid(params) {
+    try {
+      return await this.callms("uc", "authByPid", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 查询整个树结构
+   * @param {*} params 
+   */
+  async tree(params) {
+    try {
+      return await this.callms("uc", "authTree", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
 
 }
 module.exports = authService;
\ No newline at end of file

xgg-admin/app/base/service/impl/uc/orgSve.js

@@ -69,7 +69,7 @@ class OrgService extends ServiceBase {
    */
   async byPid(params) {
     try {
-      return await this.callms("uc", "byPid", params);
+      return await this.callms("uc", "orgByPid", params);
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
@@ -81,7 +81,7 @@ class OrgService extends ServiceBase {
    */
   async tree(params) {
     try {
-      return await this.callms("uc", "tree", params);
+      return await this.callms("uc", "orgTree", params);
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }

xgg-admin/app/base/service/impl/uc/userSve.js

@@ -3,7 +3,92 @@ const ServiceBase = require("../../svems.base")
 class UserService extends ServiceBase {
   constructor() {
     super();
+    this.platformUtils = system.getObject("util.businessManager.opPlatformUtils");
+
   }
-  
+
+  /**
+   *   添加 
+   * @param {*} params 
+   */
+  async addUser(params) {
+    try {
+      // TODO 处理平台用户
+      // var puser = await this.platformUtils.userInfo(params.ucname, params.password);
+      params.ucid = await this.getBusUid("test");
+      return await this.callms("uc", "addUser", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   *   更新
+   * @param {*} params 
+   */
+  async updUser(params) {
+    try {
+      return await this.callms("uc", "updUser", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  async enabled(params) {
+    try {
+      return await this.callms("uc", "enabled", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   *  删除 
+   * @param {*} params 
+   */
+  async delUser(params) {
+    try {
+      return await this.callms("uc", "delUser", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   *   查询明细
+   * @param {*} params 
+   */
+  async queryById(params) {
+    try {
+      return await this.callms("uc", "userInfo", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 根据pid查出子
+   * @param {*} params 
+   */
+  async page(params) {
+    try {
+      return await this.callms("uc", "userPage", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * 查询整个树结构
+   * @param {*} params 
+   */
+  async tree(params) {
+    try {
+      return await this.callms("uc", "authTree", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
 }
 module.exports = UserService;
\ No newline at end of file

xgg-admin/app/base/utils/businessManager/opPlatformUtils.js

@@ -152,7 +152,7 @@ class OpPlatformUtils {
      * @param {*} userName 
      * @param {*} password 
      */
-    async loginInfo(userName, password) {
+    async userInfo(userName, password) {
         var loginrs = await this.login(userName, password);
         if (loginrs.status !== 0) {
             return loginrs;

xgg-admin/app/config/routes/web.js

@@ -17,6 +17,11 @@ module.exports = function (app) {
 			}
 		}
 
+		// TODO 本次改版测试时候使用
+		if(jsonUser) {
+			jsonUser.saas_id = 1;
+		}
+
 		if (req.url.indexOf("auth/userCtl/login") > 0 ||
 			req.url.indexOf("auth/userCtl/smsCode") > 0 ||
 			req.url.indexOf("common/metaCtl/getApiDoc") > 0 ||