Merge branch 'main' of http://git.cc-lotus.info/Information/cxyy-service

package-lock.json

@@ -20,6 +20,7 @@
         "@midwayjs/redis": "^3.16.0",
         "@midwayjs/swagger": "^3.16.1",
         "@midwayjs/typeorm": "^3.16.0",
+        "@midwayjs/upload": "^3.16.8",
         "@midwayjs/validate": "^3.12.0",
         "amqp-connection-manager": "^4.1.14",
         "amqplib": "^0.10.4",
@@ -1496,6 +1497,18 @@
         "node": ">=12"
       }
     },
+    "node_modules/@midwayjs/upload": {
+      "version": "3.16.8",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/upload/-/upload-3.16.8.tgz",
+      "integrity": "sha512-OTxUg/QI40yyTKzxLt5dtlvryAN+aszVpbm7GbPt4fOPONEf2QG0zXXn697Yi7/kLKuZpbKlj7f+L6JMcuSesQ==",
+      "dependencies": {
+        "file-type": "16.5.4",
+        "raw-body": "2.5.2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@midwayjs/validate": {
       "version": "3.16.1",
       "resolved": "https://registry.npmmirror.com/@midwayjs/validate/-/validate-3.16.1.tgz",
@@ -1620,6 +1633,11 @@
         "node": ">=6"
       }
     },
+    "node_modules/@tokenizer/token": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/@tokenizer/token/-/token-0.3.0.tgz",
+      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
+    },
     "node_modules/@types/accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmmirror.com/@types/accepts/-/accepts-1.3.7.tgz",
@@ -4472,6 +4490,22 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/file-type": {
+      "version": "16.5.4",
+      "resolved": "https://registry.npmmirror.com/file-type/-/file-type-16.5.4.tgz",
+      "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+      "dependencies": {
+        "readable-web-to-node-stream": "^3.0.0",
+        "strtok3": "^6.2.4",
+        "token-types": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/file-type?sponsor=1"
+      }
+    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
@@ -7395,6 +7429,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/peek-readable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/peek-readable/-/peek-readable-4.1.0.tgz",
+      "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
     "node_modules/pg": {
       "version": "8.11.5",
       "resolved": "https://registry.npmmirror.com/pg/-/pg-8.11.5.tgz",
@@ -7913,6 +7959,21 @@
         "node": ">= 6"
       }
     },
+    "node_modules/readable-web-to-node-stream": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
+      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
+      "dependencies": {
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
     "node_modules/readdir-glob": {
       "version": "1.1.3",
       "resolved": "https://registry.npmmirror.com/readdir-glob/-/readdir-glob-1.1.3.tgz",
@@ -8584,6 +8645,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strtok3": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmmirror.com/strtok3/-/strtok3-6.3.0.tgz",
+      "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+      "dependencies": {
+        "@tokenizer/token": "^0.3.0",
+        "peek-readable": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
     "node_modules/superagent": {
       "version": "8.1.2",
       "resolved": "https://registry.npmmirror.com/superagent/-/superagent-8.1.2.tgz",
@@ -8814,6 +8891,22 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/token-types": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmmirror.com/token-types/-/token-types-4.2.1.tgz",
+      "integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
+      "dependencies": {
+        "@tokenizer/token": "^0.3.0",
+        "ieee754": "^1.2.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
     "node_modules/traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmmirror.com/traverse/-/traverse-0.3.9.tgz",
@@ -10712,6 +10805,15 @@
       "resolved": "https://registry.npmmirror.com/@midwayjs/typeorm/-/typeorm-3.16.0.tgz",
       "integrity": "sha512-EpBPuco5cBBAdgcLkAGQZGfppaK54Rc48URo5N0gw5PY024GwPOVd517S7PXTiY4v2ZVdlTT4nqnJPqwJmVCcQ=="
     },
+    "@midwayjs/upload": {
+      "version": "3.16.8",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/upload/-/upload-3.16.8.tgz",
+      "integrity": "sha512-OTxUg/QI40yyTKzxLt5dtlvryAN+aszVpbm7GbPt4fOPONEf2QG0zXXn697Yi7/kLKuZpbKlj7f+L6JMcuSesQ==",
+      "requires": {
+        "file-type": "16.5.4",
+        "raw-body": "2.5.2"
+      }
+    },
     "@midwayjs/validate": {
       "version": "3.16.1",
       "resolved": "https://registry.npmmirror.com/@midwayjs/validate/-/validate-3.16.1.tgz",
@@ -10815,6 +10917,11 @@
         "defer-to-connect": "^1.0.1"
       }
     },
+    "@tokenizer/token": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/@tokenizer/token/-/token-0.3.0.tgz",
+      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
+    },
     "@types/accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmmirror.com/@types/accepts/-/accepts-1.3.7.tgz",
@@ -12968,6 +13075,16 @@
         "flat-cache": "^3.0.4"
       }
     },
+    "file-type": {
+      "version": "16.5.4",
+      "resolved": "https://registry.npmmirror.com/file-type/-/file-type-16.5.4.tgz",
+      "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+      "requires": {
+        "readable-web-to-node-stream": "^3.0.0",
+        "strtok3": "^6.2.4",
+        "token-types": "^4.1.1"
+      }
+    },
     "fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
@@ -15196,6 +15313,11 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
+    "peek-readable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/peek-readable/-/peek-readable-4.1.0.tgz",
+      "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="
+    },
     "pg": {
       "version": "8.11.5",
       "resolved": "https://registry.npmmirror.com/pg/-/pg-8.11.5.tgz",
@@ -15569,6 +15691,14 @@
         "util-deprecate": "^1.0.1"
       }
     },
+    "readable-web-to-node-stream": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
+      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
+      "requires": {
+        "readable-stream": "^3.6.0"
+      }
+    },
     "readdir-glob": {
       "version": "1.1.3",
       "resolved": "https://registry.npmmirror.com/readdir-glob/-/readdir-glob-1.1.3.tgz",
@@ -16062,6 +16192,15 @@
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
+    "strtok3": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmmirror.com/strtok3/-/strtok3-6.3.0.tgz",
+      "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+      "requires": {
+        "@tokenizer/token": "^0.3.0",
+        "peek-readable": "^4.1.0"
+      }
+    },
     "superagent": {
       "version": "8.1.2",
       "resolved": "https://registry.npmmirror.com/superagent/-/superagent-8.1.2.tgz",
@@ -16243,6 +16382,15 @@
       "resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
+    "token-types": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmmirror.com/token-types/-/token-types-4.2.1.tgz",
+      "integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
+      "requires": {
+        "@tokenizer/token": "^0.3.0",
+        "ieee754": "^1.2.1"
+      }
+    },
     "traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmmirror.com/traverse/-/traverse-0.3.9.tgz",

package.json

@@ -15,6 +15,7 @@
     "@midwayjs/redis": "^3.16.0",
     "@midwayjs/swagger": "^3.16.1",
     "@midwayjs/typeorm": "^3.16.0",
+    "@midwayjs/upload": "^3.16.8",
     "@midwayjs/validate": "^3.12.0",
     "amqp-connection-manager": "^4.1.14",
     "amqplib": "^0.10.4",

src/config/config.default.ts

@@ -6,6 +6,9 @@ export default {
   koa: {
     port: 7001,
   },
+  upload: {
+    realdir: 'upload',
+  },
   qichacha: {
     key: 'd52e7d621b974b06a3f8a90645223c47',
     secretKey: '230A5D226DFBD80F3BE73E42971EF837',

src/configuration.ts

@@ -14,6 +14,7 @@ import { CheckTokenMiddleware } from './middleware/checkToken.middleware';
 import { ResponseMiddleware } from './middleware/response.middleware';
 import * as axios from '@midwayjs/axios';
 import * as rabbitmq from '@midwayjs/rabbitmq';
+import * as upload from '@midwayjs/upload';
 @Configuration({
   imports: [
     koa,
@@ -23,6 +24,7 @@ import * as rabbitmq from '@midwayjs/rabbitmq';
     orm,
     axios,
     rabbitmq,
+    upload,
     {
       component: info,
       enabledEnvironment: ['local'],

src/controller/platform/matchPath.controller.ts

@@ -0,0 +1,67 @@
+import { MatchPathService } from '../../service/platform/matchPath.service';
+import { CVO_matchPath, FVO_matchPath, QVO_matchPath, UVAO_matchPath } from '../../interface/platform/matchPath.interface';
+import { ApiResponse, ApiTags, ApiQuery } from '@midwayjs/swagger';
+import { Validate } from '@midwayjs/validate';
+import { Controller, Inject, Get, Param, Post, Body, Del, Query } from '@midwayjs/core';
+import { omit, pick } from 'lodash';
+import { ServiceError, ErrorCode } from '../../error/service.error';
+import { BaseController } from '../../frame/BaseController';
+import { ServiceUtilService } from '../../service/serviceUtil.service';
+const namePrefix = '赛事流程';
+@ApiTags(['赛事流程'])
+@Controller('/matchPath', { tagName: namePrefix })
+export class MatchPathController implements BaseController {
+  @Inject()
+  service: MatchPathService;
+  @Inject()
+  serviceUtil: ServiceUtilService;
+  @Get('/')
+  @ApiTags('列表查询')
+  @ApiQuery({ name: 'query' })
+  @ApiResponse({ type: QVO_matchPath })
+  async index(@Query() query: object) {
+    const qobj = omit(query, ['skip', 'limit']);
+    const others: any = pick(query, ['skip', 'limit']);
+    others.order = { order_num: 'ASC' };
+    const result = await this.service.query(qobj, others);
+    return result;
+  }
+
+  @Get('/:id')
+  @ApiTags('单查询')
+  @ApiResponse({ type: FVO_matchPath })
+  async fetch(@Param('id') id: number) {
+    const data = await this.service.fetch({ id });
+    const result = new FVO_matchPath(data);
+    return result;
+  }
+
+  @Post('/', { routerName: `创建${namePrefix}` })
+  @ApiTags('创建数据')
+  @Validate()
+  @ApiResponse({ type: CVO_matchPath })
+  async create(@Body() data: object) {
+    const dbData = await this.service.create(data);
+    const result = new CVO_matchPath(dbData);
+    return result;
+  }
+
+  @Post('/:id', { routerName: `修改${namePrefix}` })
+  @ApiTags('修改数据')
+  @Validate()
+  @ApiResponse({ type: UVAO_matchPath })
+  async update(@Param('id') id: number, @Body() data: object) {
+    if (!id) throw new ServiceError(ErrorCode.ID_NOT_FOUND);
+    const result = await this.service.update({ id }, data);
+    return result;
+  }
+
+  @Del('/:id', { routerName: `删除${namePrefix}` })
+  @ApiTags('删除数据')
+  @Validate()
+  async delete(@Param('id') id: number) {
+    if (!id) throw new ServiceError(ErrorCode.ID_NOT_FOUND);
+    const result = await this.service.delete({ id });
+    return result;
+  }
+}

src/controller/platform/score.controller.ts

@@ -0,0 +1,79 @@
+import { Controller, Inject, Get, Param, Post, Body, Del, Query } from '@midwayjs/core';
+import { ScoreService } from '../../service/platform/score.service';
+import { ApiResponse, ApiTags, ApiQuery } from '@midwayjs/swagger';
+import { Validate } from '@midwayjs/validate';
+import { omit, pick } from 'lodash';
+import { ServiceError, ErrorCode } from '../../error/service.error';
+import { BaseController } from '../../frame/BaseController';
+import { QVO_score, FVO_score, CVO_score, UVAO_score } from '../../interface/platform/score.interface';
+import { Context } from '@midwayjs/koa';
+const namePrefix = '分数';
+@ApiTags(['分数'])
+@Controller('/score', { tagName: namePrefix })
+export class ScoreController implements BaseController {
+  @Inject()
+  service: ScoreService;
+  @Inject()
+  ctx: Context;
+
+  @Get('/')
+  @ApiTags('列表查询')
+  @ApiQuery({ name: 'query' })
+  @ApiResponse({ type: QVO_score })
+  async index(@Query() query: object) {
+    const qobj = omit(query, ['skip', 'limit']);
+    const others = pick(query, ['skip', 'limit']);
+    const result = await this.service.query(qobj, others);
+    return result;
+  }
+
+  @Get('/:id')
+  @ApiTags('单查询')
+  @ApiResponse({ type: FVO_score })
+  async fetch(@Param('id') id: number) {
+    const data = await this.service.fetch({ id });
+    const result = new FVO_score(data);
+    return result;
+  }
+
+  @Post('/', { routerName: `创建${namePrefix}` })
+  @ApiTags('创建数据')
+  @Validate()
+  @ApiResponse({ type: CVO_score })
+  async create(@Body() data: object) {
+    const dbData = await this.service.create(data);
+    const result = new CVO_score(dbData);
+    return result;
+  }
+
+  @Post('/:id', { routerName: `修改${namePrefix}` })
+  @ApiTags('修改数据')
+  @Validate()
+  @ApiResponse({ type: UVAO_score })
+  async update(@Param('id') id: number, @Body() data: object) {
+    if (!id) throw new ServiceError(ErrorCode.ID_NOT_FOUND);
+    const result = await this.service.update({ id }, data);
+    return result;
+  }
+
+  @Del('/:id', { routerName: `删除${namePrefix}` })
+  @ApiTags('删除数据')
+  @Validate()
+  async delete(@Param('id') id: number) {
+    if (!id) throw new ServiceError(ErrorCode.ID_NOT_FOUND);
+    const result = await this.service.delete({ id });
+    return result;
+  }
+
+  @Get('/list')
+  async list(@Query() query: object) {
+    const qobj = omit(query, ['skip', 'limit']);
+    const others = pick(query, ['skip', 'limit']);
+    const { data, total } = await this.service.query(qobj, others);
+    const list = [];
+    for (const i of data) {
+      list.push(await this.service.fillName(i));
+    }
+    return { data: list, total };
+  }
+}

src/controller/users/cirelation.controller.ts

@@ -28,6 +28,18 @@ export class cirelationController implements BaseController {
     return result;
   }
 
+  @Get('/list')
+  async list(@Query() query: object) {
+    const qobj = omit(query, ['skip', 'limit']);
+    const others = pick(query, ['skip', 'limit']);
+    const { data, total } = await this.service.query(qobj, others);
+    const list = [];
+    for (const i of data) {
+      list.push(await this.service.fillName(i));
+    }
+    return { data: list, total };
+  }
+
   @Get('/:id')
   @ApiTags('单查询')
   @ApiResponse({ type: FVO_cirelation })
@@ -42,8 +54,8 @@ export class cirelationController implements BaseController {
   @Validate()
   @ApiResponse({ type: CVO_cirelation })
   async create(@Body() data: object) {
+    await this.service.createExamine(data);
     const dbData = await this.service.create(data);
-    this.serviceUtil.fillIdentity(data, 'cirelation');
     const result = new CVO_cirelation(dbData);
     return result;
   }

src/controller/users/company.controller.ts

@@ -83,6 +83,18 @@ export class CompanyController implements BaseController {
     return { data, total };
   }
 
+  @Get('/contact')
+  @ApiTags('列表查询')
+  @ApiQuery({ name: 'query' })
+  @ApiResponse({ type: QVO_company })
+  async contact(@Query() query: object) {
+    const qobj = omit(query, ['skip', 'limit']);
+    const others = pick(query, ['skip', 'limit']);
+    const { data, total } = await this.service.query(qobj, others);
+    const list = await this.service.fillMatch(data);
+    return { data: list, total };
+  }
+
   @Get('/detail/:id')
   @ApiResponse({ type: FVO_company })
   async detail(@Param('id') id: string) {

src/controller/util.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Post, Inject } from '@midwayjs/core';
+import { Controller, Body, Fields, Files, Post, Inject } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { ApiTags } from '@midwayjs/swagger';
 import { UtilService } from '../service/util.service';
@@ -12,11 +12,16 @@ export class UtilController {
   @Inject()
   ctx: Context;
 
+  @Post('/toExport')
+  async toExport(@Body() data: object) {
+    const result = await this.service.toExport(data);
+    return result;
+  }
+
   @Post('/toImport')
-  async toImport() {
-    const stream = await this.ctx.getFileStream();
+  async upload(@Files() files, @Fields() fields) {
     const workbook = new Excel.Workbook();
-    await workbook.xlsx.read(stream);
+    await workbook.xlsx.read(files);
     const result = [];
     const sheetList = [];
     workbook.eachSheet(sheet => {

src/entity/platform/matchPath.entity.ts

@@ -0,0 +1,20 @@
+import { Entity, Column } from 'typeorm';
+import { BaseModel } from '../../frame/BaseModel';
+//赛事流程
+@Entity('matchPath')
+export class MatchPath extends BaseModel {
+  @Column({ type: 'integer', nullable: true, comment: '赛事id' })
+  match: number;
+  @Column({ type: 'character varying', nullable: true, comment: '流程名称' })
+  name: string;
+  @Column({ type: 'jsonb', nullable: true, comment: '报名人员', default: {} })
+  signPerson: object;
+  @Column({ type: 'character varying', nullable: true, comment: '时间' })
+  time: string;
+  @Column({ type: 'integer', nullable: true, comment: '显示顺序' })
+  order_num: number;
+  @Column({ type: 'text', nullable: true, comment: '简介' })
+  brief: string;
+  @Column({ type: 'character varying', nullable: true, comment: '是否启用', default: '0' })
+  is_use: string;
+}

src/entity/platform/score.entity.ts

@@ -0,0 +1,18 @@
+import { Entity, Column } from 'typeorm';
+import { BaseModel } from '../../frame/BaseModel';
+//项目
+@Entity('score')
+export class Score extends BaseModel {
+  @Column({ type: 'integer', nullable: true, comment: '平台用户id' })
+  user: number;
+  @Column({ type: 'integer', nullable: true, comment: '赛事id' })
+  match: number;
+  @Column({ type: 'integer', nullable: true, comment: '流程id' })
+  matchPath: number;
+  @Column({ type: 'integer', nullable: true, comment: '选手id' })
+  sign: number;
+  @Column({ type: 'integer', nullable: true, comment: '分数' })
+  score: number;
+  @Column({ type: 'character varying', nullable: true, comment: '发布时间' })
+  time: string;
+}

src/entity/users/competition.entity.ts

@@ -11,6 +11,8 @@ export class Competition extends BaseModel {
   person: string;
   @Column({ type: 'character varying', nullable: true, comment: '负责人电话' })
   person_phone: string;
+  @Column({ type: 'character varying', nullable: true, comment: '盈利模式' })
+  mode: string;
   @Column({ type: 'text', nullable: true, comment: '简介' })
   brief: string;
   @Column({ type: 'character varying', nullable: true, comment: '地址' })

src/error/service.error.ts

@@ -12,6 +12,7 @@ export enum ErrorCode {
   USER_IS_DISABLED = 'USER_IS_DISABLED',
   ROLE_IS_DISABLED = 'ROLE_IS_DISABLED',
   SERVICE_REPEAT = 'SERVICE_REPEAT',
+  SERVICE_COPY = 'SERVICE_COPY',
   SERVICE_END = 'SERVICE_END',
   DUPLICATE_USERS_ACCOUNT = 'DUPLICATE_USERS_ACCOUNT',
   DUPLICATE_USERS_OPENID = 'DUPLICATE_USERS_OPENID',

src/interface/platform/matchPath.interface.ts

@@ -0,0 +1,89 @@
+import { Rule, RuleType } from '@midwayjs/validate';
+import { ApiProperty } from '@midwayjs/swagger';
+import { SearchBase } from '../../frame/SearchBase';
+import { dealVO } from '../../frame/VOBase';
+export class FVO_matchPath {
+  constructor(data: object) {
+    dealVO(this, data);
+  }
+  @ApiProperty({ description: '数据id' })
+  id: number = undefined;
+  @ApiProperty({ description: '赛事id' })
+  'match': number = undefined;
+  @ApiProperty({ description: '名称' })
+  'name': string = undefined;
+  @ApiProperty({ description: '时间' })
+  'time': string = undefined;
+  @ApiProperty({ description: '报名人员' })
+  'signPerson': object = undefined;
+  @ApiProperty({ description: '显示顺序' })
+  'order_num': number = undefined;
+  @ApiProperty({ description: '简介' })
+  'brief': string = undefined;
+  @ApiProperty({ description: '是否公开' })
+  'is_use': string = undefined;
+}
+
+export class QDTO_matchPath extends SearchBase {
+  @ApiProperty({ description: '赛事id' })
+  'match': number = undefined;
+  @ApiProperty({ description: '名称' })
+  'name': string = undefined;
+  @ApiProperty({ description: '时间' })
+  'time': string = undefined;
+  @ApiProperty({ description: '显示顺序' })
+  'order_num': number = undefined;
+  @ApiProperty({ description: '是否公开' })
+  'is_use': string = undefined;
+}
+
+export class QVO_matchPath extends FVO_matchPath {
+  constructor(data: object) {
+    super(data);
+    dealVO(this, data);
+  }
+}
+
+export class CDTO_matchPath {
+  @ApiProperty({ description: '赛事id' })
+  @Rule(RuleType['number']().empty(''))
+  'match': number = undefined;
+  @ApiProperty({ description: '名称' })
+  @Rule(RuleType['string']().empty(''))
+  'name': string = undefined;
+  @ApiProperty({ description: '时间' })
+  @Rule(RuleType['string']().empty(''))
+  'time': string = undefined;
+  @ApiProperty({ description: '报名人员' })
+  @Rule(RuleType['object']().empty(''))
+  'signPerson': object = undefined;
+  @ApiProperty({ description: '是否公开' })
+  @Rule(RuleType['string']().empty(''))
+  'is_use': string = undefined;
+  @ApiProperty({ description: '简介' })
+  @Rule(RuleType['string']().empty(''))
+  'brief': string = undefined;
+  @ApiProperty({ description: '显示顺序' })
+  @Rule(RuleType['number']().empty(''))
+  'order_num': number = undefined;
+}
+
+export class CVO_matchPath extends FVO_matchPath {
+  constructor(data: object) {
+    super(data);
+    dealVO(this, data);
+  }
+}
+
+export class UDTO_matchPath extends CDTO_matchPath {
+  @ApiProperty({ description: '数据id' })
+  @Rule(RuleType['number']().empty(''))
+  id: number = undefined;
+}
+
+export class UVAO_matchPath extends FVO_matchPath {
+  constructor(data: object) {
+    super(data);
+    dealVO(this, data);
+  }
+}

src/interface/platform/score.interface.ts

@@ -0,0 +1,86 @@
+import { Rule, RuleType } from '@midwayjs/validate';
+import { ApiProperty } from '@midwayjs/swagger';
+import { SearchBase } from '../../frame/SearchBase';
+import { dealVO } from '../../frame/VOBase';
+export class FVO_score {
+  constructor(data: object) {
+    dealVO(this, data);
+  }
+  @ApiProperty({ description: '数据id' })
+  id: number = undefined;
+  @ApiProperty({ description: '平台用户id' })
+  'user': number = undefined;
+  @ApiProperty({ description: '赛事id' })
+  'match': number = undefined;
+  @ApiProperty({ description: '流程id' })
+  'matchPath': number = undefined;
+  @ApiProperty({ description: '选手id' })
+  'sign': number = undefined;
+  @ApiProperty({ description: '分数' })
+  'score': number = undefined;
+  @ApiProperty({ description: '发布时间' })
+  'time': string = undefined;
+}
+
+export class QDTO_score extends SearchBase {
+  @ApiProperty({ description: '平台用户id' })
+  'user': number = undefined;
+  @ApiProperty({ description: '赛事id' })
+  'match': number = undefined;
+  @ApiProperty({ description: '流程id' })
+  'matchPath': number = undefined;
+  @ApiProperty({ description: '选手id' })
+  'sign': number = undefined;
+  @ApiProperty({ description: '分数' })
+  'score': number = undefined;
+  @ApiProperty({ description: '发布时间' })
+  'time': string = undefined;
+}
+
+export class QVO_score extends FVO_score {
+  constructor(data: object) {
+    super(data);
+    dealVO(this, data);
+  }
+}
+
+export class CDTO_score {
+  @ApiProperty({ description: '平台用户id' })
+  @Rule(RuleType['number']().empty(''))
+  'user': number = undefined;
+  @ApiProperty({ description: '赛事id' })
+  @Rule(RuleType['number']().empty(''))
+  'match': number = undefined;
+  @ApiProperty({ description: '流程id' })
+  @Rule(RuleType['number']().empty(''))
+  'matchPath': number = undefined;
+  @ApiProperty({ description: '选手id' })
+  @Rule(RuleType['number']().empty(''))
+  'sign': number = undefined;
+  @ApiProperty({ description: '分数' })
+  @Rule(RuleType['number']().empty(''))
+  'score': number = undefined;
+  @ApiProperty({ description: '发布时间' })
+  @Rule(RuleType['string']().empty(''))
+  'time': string = undefined;
+}
+
+export class CVO_score extends FVO_score {
+  constructor(data: object) {
+    super(data);
+    dealVO(this, data);
+  }
+}
+
+export class UDTO_score extends CDTO_score {
+  @ApiProperty({ description: '数据id' })
+  @Rule(RuleType['number']().empty(''))
+  id: number = undefined;
+}
+
+export class UVAO_score extends FVO_score {
+  constructor(data: object) {
+    super(data);
+    dealVO(this, data);
+  }
+}

src/interface/users/competition.interface.ts

@@ -15,6 +15,8 @@ export class FVO_competition {
   'person': string = undefined;
   @ApiProperty({ description: '负责人电话' })
   'person_phone': string = undefined;
+  @ApiProperty({ description: '盈利模式' })
+  'mode': string = undefined;
   @ApiProperty({ description: '简介' })
   'brief': string = undefined;
   @ApiProperty({ description: '地址' })
@@ -34,6 +36,8 @@ export class QDTO_competition {
   'person': string = undefined;
   @ApiProperty({ description: '负责人电话' })
   'person_phone': string = undefined;
+  @ApiProperty({ description: '盈利模式' })
+  'mode': string = undefined;
   @ApiProperty({ description: '是否公开' })
   'is_show': string = undefined;
   @ApiProperty({ description: '状态' })
@@ -60,6 +64,9 @@ export class CDTO_competition {
   @ApiProperty({ description: '负责人电话' })
   @Rule(RuleType['string']().empty(''))
   'person_phone': string = undefined;
+  @ApiProperty({ description: '盈利模式' })
+  @Rule(RuleType['string']().empty(''))
+  'mode': string = undefined;
   @ApiProperty({ description: '简介' })
   @Rule(RuleType['string']().empty(''))
   'brief': string = undefined;

src/service/elasticsearch/es.service.ts

@@ -1,4 +1,4 @@
-import { Config, Init, Provide } from '@midwayjs/core';
+import { Config, Provide } from '@midwayjs/core';
 import { get } from 'lodash';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Achievement } from '../../entity/platform/achievement.entity';

src/service/platform/matchPath.service.ts

@@ -0,0 +1,14 @@
+import { MatchPath } from '../../entity/platform/matchPath.entity';
+import { Provide } from '@midwayjs/core';
+import { InjectEntityModel } from '@midwayjs/typeorm';
+import { Repository } from 'typeorm';
+import { BaseServiceV2 } from '../../frame/BaseServiceV2';
+@Provide()
+export class MatchPathService extends BaseServiceV2 {
+  @InjectEntityModel(MatchPath)
+  model: Repository<MatchPath>;
+  getQueryColumnsOpera() {
+    const obj = {};
+    return obj;
+  }
+}

src/service/platform/score.service.ts

@@ -0,0 +1,35 @@
+import { Score } from '../../entity/platform/score.entity';
+import { Provide, Inject } from '@midwayjs/core';
+import { InjectEntityModel } from '@midwayjs/typeorm';
+import { Repository } from 'typeorm';
+import { BaseServiceV2 } from '../../frame/BaseServiceV2';
+import { get } from 'lodash';
+import { SignService } from './sign.service';
+import { MatchPathService } from './matchPath.service';
+@Provide()
+export class ScoreService extends BaseServiceV2 {
+  @InjectEntityModel(Score)
+  model: Repository<Score>;
+
+  @Inject()
+  matchPathService: MatchPathService;
+
+  @Inject()
+  signService: SignService;
+
+  /**
+   * 填充赛事信息
+   * @param {object} data 数据
+   */
+  async fillName(data) {
+    const { matchPath, sign } = data;
+    // 流程名称
+    const matchPathInfo = await this.matchPathService.fetch({ id: matchPath });
+    if (matchPathInfo) data = { ...data, matchPath_name: get(matchPathInfo, 'name') };
+    // 选手
+    const signInfo = await this.signService.fetch({ id: sign });
+    if (signInfo) data = { ...data, sign_name: get(signInfo, 'name') };
+
+    return data;
+  }
+}

src/service/platform/sign.service.ts

@@ -16,8 +16,8 @@ export class SignService extends BaseServiceV2 {
 
   // 报名检查
   async createExamine(data) {
-    const { user, match } = data;
-    const result = await this.model.findOne({ where: { user: Equal(user), match: Equal(match) } });
+    const { match, phone, card } = data;
+    const result = await this.model.findOne({ where: { phone: Equal(phone), card: Equal(card), match: Equal(match) } });
     if (result) throw new ServiceError(ErrorCode.SERVICE_REPEAT);
   }
 

src/service/users/cirelation.service.ts

@@ -1,8 +1,12 @@
-import { Provide } from '@midwayjs/core';
+import { Provide, Inject } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
-import { Repository } from 'typeorm';
+import { Repository, Equal } from 'typeorm';
 import { Cirelation } from '../../entity/users/cirelation.entity';
 import { BaseServiceV2 } from '../../frame/BaseServiceV2';
+import { CompanyService } from './company.service';
+import { IncubatorService } from './incubator.service';
+import { ErrorCode, ServiceError } from '../../error/service.error';
+import { get } from 'lodash';
 @Provide()
 export class CirelationService extends BaseServiceV2 {
   getQueryColumnsOpera(): object {
@@ -10,4 +14,33 @@ export class CirelationService extends BaseServiceV2 {
   }
   @InjectEntityModel(Cirelation)
   model: Repository<Cirelation>;
+
+  @Inject()
+  companyService: CompanyService;
+
+  @Inject()
+  incubatorService: IncubatorService;
+
+  // 添加企业检查
+  async createExamine(data) {
+    const { company, incubator } = data;
+    const result = await this.model.findOne({ where: { company: Equal(company), incubator: Equal(incubator) } });
+    if (result) throw new ServiceError(ErrorCode.SERVICE_COPY);
+  }
+
+  /**
+   * 填充赛事信息
+   * @param {object} data 数据
+   */
+  async fillName(data) {
+    const { company, incubator } = data;
+    // 企业名称
+    const companyInfo = await this.companyService.fetch({ id: company });
+    if (companyInfo) data = { ...data, company_name: get(companyInfo, 'name') };
+    // 孵化器名称
+    const incubatorInfo = await this.incubatorService.fetch({ id: incubator });
+    if (incubatorInfo) data = { ...data, incubator_name: get(incubatorInfo, 'name') };
+
+    return data;
+  }
 }

src/service/users/company.service.ts

@@ -1,13 +1,18 @@
 import { Provide } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
-import { Repository } from 'typeorm';
+import { Equal, Repository } from 'typeorm';
 import { Company } from '../../entity/users/company.entity';
 import { BaseServiceV2 } from '../../frame/BaseServiceV2';
+import { get } from 'lodash';
+import { MatchPath } from '../../entity/platform/matchPath.entity';
 @Provide()
 export class CompanyService extends BaseServiceV2 {
   @InjectEntityModel(Company)
   model: Repository<Company>;
 
+  @InjectEntityModel(MatchPath)
+  matchModel: Repository<MatchPath>;
+
   getQueryColumnsOpera() {
     const obj = {
       name: this.Opera.Like,
@@ -18,4 +23,19 @@ export class CompanyService extends BaseServiceV2 {
     };
     return obj;
   }
+
+  /**
+   * 查询企业是否已经与孵化器有关连信息
+   * @param {Array} data 数据
+   */
+  async fillMatch(data) {
+    let list;
+    for (const val of data) {
+      const match = get(data, 'id');
+      if (!match) return;
+      const matchInfo = await this.matchModel.findOne({ where: { match: Equal(match) } });
+      if (!matchInfo) list.push(val);
+    }
+    return list;
+  }
 }

src/service/util.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Provide } from '@midwayjs/core';
+import { Inject, Provide, Config } from '@midwayjs/core';
 import { get } from 'lodash';
 import { Context } from '@midwayjs/koa';
 import { InjectEntityModel } from '@midwayjs/typeorm';
@@ -11,7 +11,11 @@ import { Company } from '../entity/users/company.entity';
 import { Supply } from '../entity/platform/supply.entity';
 import { Project } from '../entity/platform/project.entity';
 import { Demand } from '../entity/platform/demand.entity';
+import { UserService } from './system/user.service';
 const mappings = require('../../public/importMapping');
+import * as Excel from 'exceljs';
+import * as Path from 'path';
+import * as fs from 'fs';
 /**
  * 工具类服务,为其他地方提供一些通用的函数
  */
@@ -19,6 +23,9 @@ const mappings = require('../../public/importMapping');
 export class UtilService {
   @Inject()
   ctx: Context;
+  @Inject()
+  userService: UserService;
+
   @InjectEntityModel(Achievement)
   achievementModel: Repository<Achievement>;
   @InjectEntityModel(Project)
@@ -32,6 +39,80 @@ export class UtilService {
   @Inject()
   dictDataService: DictDataService;
 
+  @Config('upload.realdir')
+  uploadDir;
+
+  // 导出
+  async toExport(query) {
+    const { table, config, user } = query;
+    const nowDate = new Date().getTime();
+    const filename = `产学研用导出-${table}-${nowDate}.xlsx`;
+    const path = 'D:\\temp\\cxyy\\';
+    if (!path) {
+      throw new ServiceError('服务端没有设置存储路径');
+    }
+    if (!fs.existsSync(path)) {
+      // 如果不存在文件夹,就创建
+      this.mkdir(path);
+    }
+    try {
+      let info = {};
+      if (user) info = { where: { user: Equal(user) } };
+      const targetModel = this[`${table}Model`];
+      const data = await targetModel.find(info);
+      const workbook = new Excel.Workbook();
+      const sheet = workbook.addWorksheet('sheet1');
+      // 根据前端传回来的设置和顺序,将表头先塞进去
+      const meta = config.map(i => i.label);
+      sheet.addRow(meta);
+      let arr = [];
+      for (const d of data) {
+        arr = [];
+        for (const c of config) {
+          const { mark, model, code } = c;
+          if (mark === 'tags') {
+            if (d[model]) d[model] = arr.push(d[model].join(','));
+            else arr.push(d[model]);
+          } else if (mark === 'area') {
+            if (d[model]) d[model] = arr.push(d[model].join('-'));
+            else arr.push(d[model]);
+          } else if (mark === 'dict') {
+            const req = await this.dictDataService.query({ code, is_use: '0' }, {});
+            if (req.data) {
+              const selected = req.data.find(f => f.value === d[model]);
+              if (selected) {
+                d[model] = get(selected, 'label');
+                arr.push(d[model]);
+              } else arr.push(d[model]);
+            } else arr.push(d[model]);
+          } else if (mark === 'time') {
+            if (d.start_time && d.end_time) {
+              arr.push((d[model] = `${d.start_time}-${d.end_time}`));
+            } else arr.push(d[model]);
+          } else arr.push(d[model]);
+        }
+        sheet.addRow(arr);
+      }
+      // 生成excel
+      const filepath = `${path}${filename}`;
+      if (data.length <= 0) return;
+      await workbook.xlsx.writeFile(filepath);
+      return `/files/cxyy/export/${filename}`;
+    } catch (error) {
+      console.log(error);
+    }
+  }
+  // 创建文件夹
+  mkdir(dirname) {
+    if (fs.existsSync(dirname)) {
+      return true;
+    }
+    if (this.mkdir(Path.dirname(dirname))) {
+      fs.mkdirSync(dirname);
+      return true;
+    }
+  }
+
   randomStr(len = 6) {
     return Math.random().toString(36).slice(-len);
   }