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

后台：修复修改活动字段后的报错

Browse Source
This commit is contained in:
luying
2021-12-20 14:10:03 +08:00
parent f02161701c
commit 151ac33b91
5 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gm-server/app/controller/activity.ts
View File

@@ -14,13 +14,13 @@ export default class ActivityController extends Controller {
ctx.body = await ctx.service.activity.getAllActivities(); ctx.body = await ctx.service.activity.getAllActivities();
} }
public async updateActivity() { // public async updateActivity() {
const { ctx } = this; // const { ctx } = this;
const { activityId, groupId, beginTime, endTime, type, data } = ctx.request.body; // const { activityId, groupId, beginTime, endTime, type, data } = ctx.request.body;
let checkActivity = await ctx.service.activity.checkActivityEditable(activityId); // let checkActivity = await ctx.service.activity.checkActivityEditable(activityId);
if(checkActivity) return ctx.body = checkActivity; // if(checkActivity) return ctx.body = checkActivity;
return ctx.body = await ctx.service.activity.updateActivity(activityId, groupId, beginTime, endTime, type, data); // return ctx.body = await ctx.service.activity.updateActivity(activityId, groupId, beginTime, endTime, type, data);
} // }
public async deleteActivity() { public async deleteActivity() {
const { ctx } = this; const { ctx } = this;

2
gm-server/app/controller/login.ts
View File

@@ -11,7 +11,7 @@ export default class LoginController extends Controller {
public async currentUser() { public async currentUser() {
const { ctx } = this; const { ctx } = this;
ctx.body = ctx.service.gmUser.currentUser(); ctx.body = await ctx.service.gmUser.currentUser();
} }
public async changeMyPass() { public async changeMyPass() {

2
gm-server/app/router.ts
View File

@@ -88,7 +88,7 @@ export default (app: Application) => {
router.post('/api/activity/getactivitylist', tokenParser, controller.activity.getActivityList); router.post('/api/activity/getactivitylist', tokenParser, controller.activity.getActivityList);
router.post('/api/activity/getallactivities', controller.activity.getAllActivities); router.post('/api/activity/getallactivities', controller.activity.getAllActivities);
router.post('/api/activity/updateactivity', tokenParser, controller.activity.updateActivity); // router.post('/api/activity/updateactivity', tokenParser, controller.activity.updateActivity);
router.post('/api/activity/deleteactivity', tokenParser, controller.activity.deleteActivity); router.post('/api/activity/deleteactivity', tokenParser, controller.activity.deleteActivity);
router.post('/api/activity/getactivitygrouplist', tokenParser, controller.activity.getActivityGroupList); router.post('/api/activity/getactivitygrouplist', tokenParser, controller.activity.getActivityGroupList);
router.post('/api/activity/getallactivitygroups', controller.activity.getAllActivityGroups); router.post('/api/activity/getallactivitygroups', controller.activity.getAllActivityGroups);

56
gm-server/app/service/Activity.ts
View File

@@ -3,7 +3,7 @@ import { STATUS, ACTIVITY_TYPE } from '@consts';
import { ActivityModel } from '@db/Activity'; import { ActivityModel } from '@db/Activity';
import { ActivityGroupModel } from '@db/ActivityGroup'; import { ActivityGroupModel } from '@db/ActivityGroup';
import { ServerlistModel } from '@db/Serverlist'; import { ServerlistModel } from '@db/Serverlist';
import { GMUserType } from '@db/GMUser'; // import { GMUserType } from '@db/GMUser';
import { SignInData } from '@domain/activityField/signInField'; import { SignInData } from '@domain/activityField/signInField';
import { ActivityGroupTypeModel } from '@db/ActivityGroupType'; import { ActivityGroupTypeModel } from '@db/ActivityGroupType';
import { ActivityTaskPointModel } from '@db/ActivityTaskPoint'; import { ActivityTaskPointModel } from '@db/ActivityTaskPoint';
@@ -94,36 +94,36 @@ export default class Activity extends Service {
return 0 return 0
} }
public async updateActivity(activityId: number | string, groupId: number, beginTime: number, endTime: number, type: number, data: string) { // public async updateActivity(activityId: number | string, groupId: number, beginTime: number, endTime: number, type: number, data: string) {
const { ctx } = this; // const { ctx } = this;
let gmuser: GMUserType = ctx.user; // let gmuser: GMUserType = ctx.user;
if (!type || !data) { // if (!type || !data) {
return ctx.service.utils.resResult(STATUS.WRONG_PARMS); // return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
} // }
try { // try {
let result = JSON.parse(data); // let result = JSON.parse(data);
ctx.service.utils.checkActivityData(result, type); // ctx.service.utils.checkActivityData(result, type);
let aids: number[] = []; // let aids: number[] = [];
if (typeof activityId == 'number') { // if (typeof activityId == 'number') {
aids.push(activityId); // aids.push(activityId);
} else { // } else {
activityId.split(',').forEach(aidStr => { // activityId.split(',').forEach(aidStr => {
aids.push(parseInt(aidStr)); // aids.push(parseInt(aidStr));
}); // });
} // }
let checkResult = await this.checkActivityGroupType(groupId, aids, ctx); // let checkResult = await this.checkActivityGroupType(groupId, aids, ctx);
if(checkResult) return checkResult; // if(checkResult) return checkResult;
let activities = await ActivityModel.addActivity(aids, groupId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data, gmuser.uid); // let activities = await ActivityModel.addActivity(aids, groupId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data, gmuser.uid);
return ctx.service.utils.resResult(STATUS.SUCCESS, { // return ctx.service.utils.resResult(STATUS.SUCCESS, {
activity: activities // activity: activities
}) // })
} catch (e) { // } catch (e) {
return ctx.service.utils.resResult(STATUS.INTERNAL_ERR, null, (<Error>e).stack); // return ctx.service.utils.resResult(STATUS.INTERNAL_ERR, null, (<Error>e).stack);
} // }
} // }
public async deleteActivity(activityId: number) { public async deleteActivity(activityId: number) {
const { ctx } = this; const { ctx } = this;

3
gm-server/app/service/GmUser.ts
View File

@@ -42,7 +42,8 @@ export default class GMUsers extends Service {
public async currentUser() { public async currentUser() {
const {ctx} = this; const {ctx} = this;
console.log('*****', ctx.user)
return ctx.service.utils.resResult(STATUS.SUCCESS, {user: ctx.user});
} }
/** /**