@gingkoo/base-server 0.0.4-alpha.13 → 0.0.4-alpha.14

package/backend/common/services/task.js

@@ -9,6 +9,7 @@ const {
   deleteSqlBuilder,
   pageQuery,
 } = require('@gingkoo/node-tools');
+const { formatDate } = require('../../utils/date');
 
 const entity = require('../entity');
 
@@ -256,4 +257,43 @@ module.exports = {
     }
     return results;
   },
+
+  // 开始
+  onStart(TASK_ID, REC_NUM, params = {}) {
+    this.updateTask({
+      REC_NUM,
+      STATUS: 'Loaded',
+      TASK_ID,
+      ...params,
+    });
+  },
+
+  // 成功
+  onSuccess(TASK_ID, params = {}) {
+    let curTime = formatDate(new Date(), 'yyyyMMddHHmmss');
+    let curDate = formatDate(new Date(), 'yyyyMMdd');
+    this.updateTask({
+      STATUS: 'Success',
+      TASK_ID,
+      notupdate: true,
+      DATA_UPD_TIME: curTime,
+      DATA_UPD_DATE: curDate,
+      ...params,
+    });
+  },
+
+  // 失败
+  onError(TASK_ID, message = '', params = {}) {
+    let curTime = formatDate(new Date(), 'yyyyMMddHHmmss');
+    let curDate = formatDate(new Date(), 'yyyyMMdd');
+    this.updateTask({
+      STATUS: 'Error',
+      TASK_ID,
+      EXT_INFO_1: message,
+      notupdate: true,
+      DATA_UPD_TIME: curTime,
+      DATA_UPD_DATE: curDate,
+      ...params,
+    });
+  },
 };

package/backend/common/sse/index.js

@@ -1,13 +1,15 @@
+const { formatDate } = require('../../utils/date');
+
 const bgTaskEnum = {
   taskProgressStatus: {
     dataLoading: 'DataLoading',
-    importIntoData: 'ImportIntoData',
+    importIntoData: 'ImportIntoData', // 好像是导入初始化
 
     exportOutData: 'ExportOutData',
-    fileBuilding: 'FileBuilding',
+    fileBuilding: 'FileBuilding', // 好像是导出初始化
 
-    taskComplete: 'TaskComplete',
-    taskError: 'TaskError',
+    taskComplete: 'TaskComplete', // 任务完成
+    taskError: 'TaskError', // 任务失败完成
   },
 
   eventType: {
@@ -71,6 +73,69 @@ class Sse {
       this.users[userId].cancelTasks.push(taskId);
     }
   }
+
+  // 开始
+  onStart(TASK_ID, USER_ID, REC_NUM, params = {}) {
+    this.changeBgTaskSatus(
+      {
+        TASK_ID,
+        taskProgressStatus: bgTaskEnum.taskProgressStatus.importIntoData,
+        REC_NUM, // 总共条数
+        OPER_NUM: 0, // 当前在处理的条数
+        ...params,
+      },
+      USER_ID,
+    );
+  }
+
+  // 进行中
+  onProgress(TASK_ID, USER_ID, REC_NUM, OPER_NUM, params = {}) {
+    this.changeBgTaskSatus(
+      {
+        TASK_ID,
+        taskProgressStatus: bgTaskEnum.taskProgressStatus.importIntoData,
+        OPER_NUM,
+        REC_NUM,
+        ...params,
+      },
+      USER_ID,
+    );
+  }
+
+  // 成功
+  onSuccess(TASK_ID, USER_ID, params = {}) {
+    let curTime = formatDate(new Date(), 'yyyyMMddHHmmss');
+    let curDate = formatDate(new Date(), 'yyyyMMdd');
+    this.overBgTaskStatus(
+      {
+        TASK_ID,
+        taskProgressStatus: bgTaskEnum.taskProgressStatus.taskComplete,
+        STATUS: 'Success',
+        DATA_UPD_TIME: curTime,
+        DATA_UPD_DATE: curDate,
+        ...params,
+      },
+      USER_ID,
+    );
+  }
+
+  // 失败
+  onError(TASK_ID, USER_ID, message = '', params = {}) {
+    let curTime = formatDate(new Date(), 'yyyyMMddHHmmss');
+    let curDate = formatDate(new Date(), 'yyyyMMdd');
+    this.overBgTaskStatus(
+      {
+        TASK_ID,
+        taskProgressStatus: bgTaskEnum.taskProgressStatus.taskError,
+        errorMessage: message,
+        STATUS: 'Error',
+        DATA_UPD_TIME: curTime,
+        DATA_UPD_DATE: curDate,
+        ...params,
+      },
+      USER_ID,
+    );
+  }
 }
 
 const sse = new Sse();

package/backend/utils/date.js

@@ -1,4 +1,4 @@
-const moment = require('moment');
+// const moment = require('moment');
 const { format } = require('date-fns');
 
 /**
@@ -40,26 +40,26 @@ exports.dateFormatTime2 = (dateStr) => {
  * @param {string} time
  * @returns
  */
-exports.timeDiff = (time) => {
-  // weeks、years、months、days、hours、minutes、 seconds
-  let endTime = moment(); //获取当前时间
-  let startTime = time; //设置之前时间
-  let d = endTime.diff(startTime, 'days');
-  let h = endTime.diff(startTime, 'hours') % 24;
-  let m = endTime.diff(startTime, 'minutes') % 60;
-  let str = '';
-  if (d) {
-    str += `${d}天`;
-  }
-  if (!str && h) {
-    str += `${h}小时`;
-  }
-  if (!str && m) {
-    str += `${m}分钟`;
-  }
+// exports.timeDiff = (time) => {
+//   // weeks、years、months、days、hours、minutes、 seconds
+//   let endTime = moment(); //获取当前时间
+//   let startTime = time; //设置之前时间
+//   let d = endTime.diff(startTime, 'days');
+//   let h = endTime.diff(startTime, 'hours') % 24;
+//   let m = endTime.diff(startTime, 'minutes') % 60;
+//   let str = '';
+//   if (d) {
+//     str += `${d}天`;
+//   }
+//   if (!str && h) {
+//     str += `${h}小时`;
+//   }
+//   if (!str && m) {
+//     str += `${m}分钟`;
+//   }
 
-  return str;
-};
+//   return str;
+// };
 
 exports.formatDate = (date = new Date(), formatStr = 'yyyy-MM-dd HH:mm:ss') => {
   return format(date, formatStr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/base-server",
-  "version": "0.0.4-alpha.13",
+  "version": "0.0.4-alpha.14",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -8,8 +8,7 @@
     "build": "npm run clean && vite build --mode production",
     "serve": "nodemon serve -p 1000",
     "check": "node scripts/check_publish.js",
-    "clean": "rimraf dist",
-    "prepublishOnly": "npm run check && npm run build"
+    "clean": "rimraf dist"
   },
   "files": [
     "dist",