Merge pull request #6 from graywenn/fix/getCurInform_addType

addType
greywen · Jun 8, 2022 · 843eec7 · 843eec7
2 parents 10a9604 + 22c48ec
commit 843eec7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/src/controllers/inform.controller.ts b/src/controllers/inform.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Post } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Post, Put } from '@nestjs/common';
 import { InformService } from '@services/inform.service';
 
 @Controller('inform')
@@ -10,22 +10,22 @@ export class InformController {
     return await this.informService.getInforms();
   }
 
-  @Get('/getCur')
+  @Get('/getCurrent')
   async getCurInform() {
-    return await this.informService.getCurInform();
+    return await this.informService.getCurrentInform();
   }
 
   @Post('/add')
   async addInform(@Body() body) {
     return await this.informService.addInform(body);
   }
 
-  @Post('/del')
-  async delInform(@Body() body) {
-    return await this.informService.delInform(body);
+  @Delete('/delete/:id')
+  async delInform(@Param('id') id: string) {
+    return await this.informService.deleteInform(id);
   }
 
-  @Post('/modify')
+  @Put('/modify')
   async modifyInform(@Body() body) {
     return await this.informService.modifyInform(body);
   }

diff --git a/src/core/files.data.ts b/src/core/files.data.ts
@@ -158,7 +158,7 @@ export default class FileData {
     return <IInfromData[]>JSON.parse(data);
   };
 
-  static writeInfromFile = async (data: any) => {
+  static writeInfromFile = async (data: IInfromData) => {
     const datas = await FileData.readInfromFile();
     datas.push(data);
     return await FileData.tryCatchWriteFile(
@@ -168,10 +168,10 @@ export default class FileData {
     );
   };
 
-  static delInfromFile = async (data: any) => {
+  static deleteInfromFile = async (id: string) => {
     const datas = await FileData.readInfromFile();
     const resultData = datas.filter((item) => {
-      if (item.id !== data.id) {
+      if (item.id !== id) {
         return item;
       }
     });
@@ -182,7 +182,7 @@ export default class FileData {
     );
   };
 
-  static modifyInform = async (data: any) => {
+  static modifyInform = async (data: IInfromData) => {
     const datas = await FileData.readInfromFile();
     const index = datas.findIndex((item) => {
       return item.id === data.id;
@@ -195,7 +195,7 @@ export default class FileData {
     );
   };
 
-  static getCurInform = async () => {
+  static getCurrentInform = async () => {
     const datas = await FileData.readInfromFile();
     const today = moment().format('YYYY-MM-DD');
     const resultData = datas.filter((item) => {
@@ -204,7 +204,7 @@ export default class FileData {
       }
     });
     resultData.sort((a, b) => {
-      return a.weight - b.weight;
+      return b.weight - a.weight;
     });
     return resultData;
   };

diff --git a/src/services/inform.service.ts b/src/services/inform.service.ts
@@ -14,8 +14,8 @@ export class InformService {
   /**
    * 获取当前通知
    */
-  async getCurInform() {
-    const informs = await FileData.getCurInform();
+  async getCurrentInform() {
+    const informs = await FileData.getCurrentInform();
     return informs;
   }
 
@@ -32,8 +32,8 @@ export class InformService {
   /**
    * 删除通知
    */
-  async delInform(data: any) {
-    const informs = await FileData.delInfromFile(data);
+  async deleteInform(id: string) {
+    const informs = await FileData.deleteInfromFile(id);
     return informs;
   }