xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "✨ feat(db): 修改role表数据库操作方式"

Browse Source 
This reverts commit e39af3649288cc5802739cfe862c818fe56e194e.
This commit is contained in:
luying
2023-05-08 10:01:05 +08:00
parent 2d45b2c66c
commit 7bc9e1fe49
79 changed files with 423 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gm-server/app/service/Mail.ts
View File

@@ -4,7 +4,7 @@ import { GMMailModel, } from '@db/GMMail';
import { STATUS } from '@consts';
import { SearchMailParam } from '@domain/backEndField/search';
import { UpdateMailParams } from '@domain/backEndField/params';
import Role, { RoleType } from '@db/Role';
import { RoleModel, RoleType } from '@db/Role';
export default class Mail extends Service {
@@ -20,10 +20,10 @@ export default class Mail extends Service {
public async findRoleByIdOrName(serverId: number, roleId: string, roleName: string) {
let role: RoleType;
if(roleId) {
role = await Role.findByRoleId(roleId);
role = await RoleModel.findByRoleId(roleId);
}
if(roleName) {
role = await Role.findByRoleName(roleName);
role = await RoleModel.findByRoleName(roleName);
}
if(!role || role.serverId != serverId) return this.ctx.service.utils.resResult(STATUS.WRONG_PARMS);
return this.ctx.service.utils.resResult(STATUS.SUCCESS, { env: this.ctx.app.config.realEnv, serverId, roleId: role.roleId, roleName: role.roleName })

30
gm-server/app/service/users.ts
View File

@@ -1,5 +1,5 @@
import { UserModel } from '@db/User';
import Role from '@db/Role';
import { RoleModel } from '@db/Role';
import { HeroModel } from '@db/Hero';
import { Service } from 'egg';
@@ -46,7 +46,7 @@ export default class GMUsers extends Service {
let list = [];
for (let user of users) {
let role = await Role.findAllByUid(user.uid);
let role = await RoleModel.findAllByUid(user.uid);
let sms = await smsModel.findByTel(user.tel);
list.push({ ...user, role, isFixed: sms ? sms.isFixed : false, code: sms ? sms.code : "", env: ctx.app.config.realEnv });
@@ -63,7 +63,7 @@ export default class GMUsers extends Service {
// const roleId = ctx.service.utils.genCode(10);
// const code = ctx.service.utils.genCode(6);
// const seqId = await Counter.getNewCounter(COUNTER.ROLE) || -1;
// const role = await Role.createRole(uid, serverId, { roleId, code, roleName, seqId });
// const role = await RoleModel.createRole(uid, serverId, { roleId, code, roleName, seqId });
// if (role) {
// return ctx.service.utils.resResult(STATUS.SUCCESS);
// } else {
@@ -133,8 +133,8 @@ export default class GMUsers extends Service {
form.uid = user.uid;
}
const roles = await Role.findByCondition(page, pageSize, sortField, sortOrder, form);
const total = await Role.countByCondition( form )
const roles = await RoleModel.findByCondition(page, pageSize, sortField, sortOrder, form);
const total = await RoleModel.countByCondition( form )
let list = [];
for (let role of roles) {
@@ -189,7 +189,7 @@ export default class GMUsers extends Service {
// }
// for (let roleId of uids) {
// let role = await Role.findByRoleId(roleId);
// let role = await RoleModel.findByRoleId(roleId);
// if (role) {
// let heroInfos = new Map();
// for (let hid of hids) {
@@ -235,7 +235,7 @@ export default class GMUsers extends Service {
// }
// if(flag == 0) {
// for (let roleId of uids) {
// let role = await Role.findByRoleId(roleId);
// let role = await RoleModel.findByRoleId(roleId);
// if (role) {
// await addBags(roleId, role.roleName, datas, ITEM_CHANGE_REASON.DEBUG);
// } else {
@@ -257,7 +257,7 @@ export default class GMUsers extends Service {
// let count = parseInt(_count);
// if (isNaN(count)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
// for (let roleId of uids) {
// await Role.addGoldFree(roleId, count);
// await RoleModel.addGoldFree(roleId, count);
// }
// return ctx.service.utils.resResult(STATUS.SUCCESS, { uids });
@@ -269,7 +269,7 @@ export default class GMUsers extends Service {
// let count = parseInt(_count);
// if (isNaN(count)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
// for (let roleId of uids) {
// await Role.addCoin(roleId, count);
// await RoleModel.addCoin(roleId, count);
// }
// return ctx.service.utils.resResult(STATUS.SUCCESS, { uids });
@@ -280,7 +280,7 @@ export default class GMUsers extends Service {
// let id = parseInt(_id);
// if (isNaN(id)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
// for (let roleId of uids) {
// let role = await Role.findByRoleId(roleId);
// let role = await RoleModel.findByRoleId(roleId);
// await addSkin(roleId, role.roleName, id, false);
// }
@@ -294,7 +294,7 @@ export default class GMUsers extends Service {
// if (isNaN(lv)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
// for (let roleId of uids) {
// let exp = getExpByLv(lv - 1);
// await Role.levelup(roleId, lv, exp ? exp.sum : 0);
// await RoleModel.levelup(roleId, lv, exp ? exp.sum : 0);
// }
// return ctx.service.utils.resResult(STATUS.SUCCESS, { uids });
@@ -634,7 +634,7 @@ export default class GMUsers extends Service {
towerLv = lv; break;
}
}
let role = await Role.updateRoleInfo(roleId, { towerLv });
let role = await RoleModel.updateRoleInfo(roleId, { towerLv });
await TowerRecordModel.deleteAccount(roleId);
await TowerRecordModel.insertTowerRec(roleId, towerLv);
await HangUpRecordModel.deleteAccount(roleId);
@@ -647,14 +647,14 @@ export default class GMUsers extends Service {
let createTime = nowSeconds() - (day - 1) * 86400;
let role = await Role.updateRoleInfo(roleId, { createTime });
let role = await RoleModel.updateRoleInfo(roleId, { createTime });
if(!role) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
return ctx.service.utils.resResult(STATUS.SUCCESS);
}
private async setWarStarAndScript(roleId: string, dicWar: DicWar) {
let { warStar } = await Role.findByRoleId(roleId);
let { warStar } = await RoleModel.findByRoleId(roleId);
let deleteIds: number[] = [], myMaxWarId = 0;
for(let i = 0; i < warStar.length; i++) {
let { id, warType } = warStar[i];
@@ -697,7 +697,7 @@ export default class GMUsers extends Service {
if(insertParams.length > 0) {
await RScriptRecordModel.insertScripts(roleId, insertParams);
}
let role = await Role.updateRoleInfo(roleId, { warStar: newWarStar });
let role = await RoleModel.updateRoleInfo(roleId, { warStar: newWarStar });
return role;
}
}