@nger/fk-upload 1.0.211 → 1.0.215

package/dist/entities/check-task.d.ts

@@ -1,3 +1,4 @@
+import { FkJiQun } from "./fk-jiqun";
 import { FkW7Account } from "./w7-account";
 export declare class FkCheckTask {
     id: number;
@@ -9,5 +10,7 @@ export declare class FkCheckTask {
     time: string;
     w7AccountId: number;
     w7Account: FkW7Account;
+    jiqunId: number;
+    jiqun: FkJiQun;
     deleteDate: Date;
 }

package/dist/entities/check-task.js

@@ -7,6 +7,7 @@ const rest_1 = require("@nger/rest");
 const typeorm_1 = require("@nger/typeorm");
 const typeorm_2 = require("typeorm");
 const check_service_1 = require("../services/check.service");
+const fk_jiqun_1 = require("./fk-jiqun");
 const w7_account_1 = require("./w7-account");
 let FkCheckTask = FkCheckTask_1 = class FkCheckTask {
     id;
@@ -18,6 +19,8 @@ let FkCheckTask = FkCheckTask_1 = class FkCheckTask {
     time;
     w7AccountId;
     w7Account;
+    jiqunId;
+    jiqun;
     deleteDate;
 };
 tslib_1.__decorate([
@@ -160,6 +163,41 @@ tslib_1.__decorate([
     }),
     tslib_1.__metadata("design:type", w7_account_1.FkW7Account)
 ], FkCheckTask.prototype, "w7Account", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `执行者`,
+        path: 'jiqun.clientId',
+        width: '180px',
+        span: 24,
+        required: true,
+        widget: {
+            type: 'selector',
+            from: 'fk_ji_qun',
+            config: {
+                label: 'clientId',
+                value: 'id'
+            }
+        }
+    }),
+    (0, typeorm_2.Column)({
+        name: 'jiqun_id',
+        nullable: true
+    }),
+    tslib_1.__metadata("design:type", Number)
+], FkCheckTask.prototype, "jiqunId", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        hideInAdd: true,
+        hideInEdit: true,
+        hideInSearch: true,
+        hideInTable: true
+    }),
+    (0, typeorm_2.ManyToOne)(() => fk_jiqun_1.FkJiQun),
+    (0, typeorm_2.JoinColumn)({
+        name: 'jiqun_id'
+    }),
+    tslib_1.__metadata("design:type", fk_jiqun_1.FkJiQun)
+], FkCheckTask.prototype, "jiqun", void 0);
 tslib_1.__decorate([
     (0, rest_1.Widget)({
         hideInAdd: true,

package/dist/main.js

@@ -7,25 +7,13 @@ require("reflect-metadata");
 require('dotenv').config();
 const main_1 = require("@nger/main");
 const core_1 = require("@nger/core");
-const sirv_1 = require("@nger/sirv");
-const rest_1 = require("@nger/rest");
-const upload_1 = require("@nger/upload");
-const rabbitmq_1 = require("@nger/rabbitmq");
 const fk_upload_module_1 = require("./fk-upload.module");
-const menu_1 = require("@nger/menu");
-const setting_1 = require("@nger/setting");
 let AppModule = class AppModule {
 };
 AppModule = tslib_1.__decorate([
     (0, core_1.Module)({
         imports: [
-            rabbitmq_1.RabbitMqModule.forEnv(),
-            sirv_1.SirvModule.forRoot(),
-            rest_1.RestModule,
-            upload_1.UploadModule,
-            fk_upload_module_1.FkUploadModule,
-            menu_1.MenuModule,
-            setting_1.SettingModule
+            fk_upload_module_1.FkUploadModule
         ]
     })
 ], AppModule);

package/dist/tasks/check-task.js

@@ -33,6 +33,7 @@ class CheckTask extends rabbitmq_1.Task {
             complete();
             return next && next();
         }
+        console.log(`receive mq message: ${new Date()}-${check.status}-${check.type}`);
         const manager = injector.get(rabbitmq_1.TaskManager);
         if (this.ids.has(id)) {
             complete();
@@ -104,7 +105,7 @@ class CheckTask extends rabbitmq_1.Task {
                     await finish(`人为关闭`);
                     return;
                 }
-                console.log(`${time}-${runtimeCheck.status}-${runtimeCheck.type}`);
+                console.log(`run in schedule: ${time}-${runtimeCheck.status}-${runtimeCheck.type}`);
                 if (type === 'create_download') {
                     const now = new Date().getTime() - 1000 * 60 * 60 * 24 * 8;
                     (0, date_fns_1.format)(now, 'yyyy');
@@ -126,7 +127,7 @@ class CheckTask extends rabbitmq_1.Task {
                         await db.manager.save(download_task_1.FkDownloadTask, downloadTask);
                     });
                     // start download
-                    const one = await db.manager.findOne(download_task_1.FkDownloadTask, { where: { status: `1` } });
+                    const one = await db.manager.findOne(download_task_1.FkDownloadTask, { where: { status: `1` }, order: { id: "desc" } });
                     if (one) {
                         const downloadService = injector.get(download_service_1.DownloadService);
                         await downloadService.startDownload(one.id);
@@ -147,10 +148,10 @@ class CheckTask extends rabbitmq_1.Task {
                         });
                     });
                     // start upload
-                    const waitUploads = await db.manager.find(upload_task_1.FkUploadTask, { where: { status: '1' } });
+                    const waitUploads = await db.manager.findOne(upload_task_1.FkUploadTask, { where: { status: '1' }, order: { id: 'desc' } });
                     const uploadService = injector.get(upload_service_1.UploadService);
-                    if (waitUploads.length > 0) {
-                        await uploadService.starts(waitUploads.map(it => it.id));
+                    if (waitUploads) {
+                        await uploadService.startUpload(waitUploads.id);
                     }
                     // downloadService.startDownload()
                     await db.manager.update(check_task_1.FkCheckTask, id, { count: count + 1 });
@@ -168,10 +169,10 @@ class CheckTask extends rabbitmq_1.Task {
                         });
                     });
                     // start effect
-                    const waitEffects = await db.manager.find(effect_task_1.FkEffectTask, { where: { status: '1' } });
+                    const waitEffects = await db.manager.findOne(effect_task_1.FkEffectTask, { where: { status: '1' } });
                     const effectService = injector.get(effect_service_1.EffectService);
-                    if (waitEffects.length > 0) {
-                        await effectService.starts(waitEffects.map(it => it.id));
+                    if (waitEffects) {
+                        await effectService.start(waitEffects.id);
                     }
                     await db.manager.update(check_task_1.FkCheckTask, id, { count: count + 1 });
                     // await finish(`执行完成`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.211",
+  "version": "1.0.215",
   "description": "nger fk upload",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",