d

taskexecutor/app/base/db/task/rpt/parseRptTask.js

@@ -3,7 +3,8 @@ const settings=require("../../../../config/settings");
 var excel = require('exceljs');
 var excel = require('exceljs');
 const system = require("../../../system");
 const system = require("../../../system");
 const fs = require('fs');
 const fs = require('fs');
-const uuid4=require("uuid4")
+const uuidv4 = require('uuid/v4');
+
 class ParseRptTask extends TaskBase{
 class ParseRptTask extends TaskBase{
   constructor(){
   constructor(){
     super(TaskBase.getServiceName(ParseRptTask));
     super(TaskBase.getServiceName(ParseRptTask));
@@ -11,6 +12,11 @@ class ParseRptTask extends TaskBase{
     this.restData=[];
     this.restData=[];
     this.ossC=system.getObject("util.ossClient");
     this.ossC=system.getObject("util.ossClient");
   }
   }
+  getUUID() {
+    var uuid = uuidv4();
+    var u = uuid.replace(/\-/g, "");
+    return u;
+  }
   async subBeforeTask(params){
   async subBeforeTask(params){
     console.log("前置操作......",this.serviceName);
     console.log("前置操作......",this.serviceName);
     //this.isThrough=true;
     //this.isThrough=true;
@@ -58,7 +64,8 @@ async  readxls(path) {
       //下载文件
       //下载文件
       var keyindex=urldownload.lastIndexOf("/");
       var keyindex=urldownload.lastIndexOf("/");
       var keystr=urldownload.substring(keyindex+1);
       var keystr=urldownload.substring(keyindex+1);
-      var destfile=keystr.replace(/\s/g, '')
+      var extfile=keystr.substring(keystr.lastIndexOf("."))
+      var destfile=this.getUUID()+extfile
       var result= await this.ossC.downfile(keystr,destfile);
       var result= await this.ossC.downfile(keystr,destfile);
       var localpath="/tmp/"+destfile
       var localpath="/tmp/"+destfile
       try{
       try{

taskexecutor/app/base/utils/test.js

@@ -13,16 +13,16 @@
 //   return promise;
 //   return promise;
 // }
 // }
 // (async ()=>{
 // (async ()=>{
-//   var wb= await readxls("./GT.xlsx");
+//   var wb= await readxls("/tmp/f2b9b12ea5bf4bc79568acc5aa907f83.xlsx");
 //   var sheet = wb.getWorksheet(1);
 //   var sheet = wb.getWorksheet(1);
-//   sheet.eachRow({ includeEmpty: true }, function(row, rowNumber) {
-//     if(rowNumber>=10 && rowNumber<=10){
-//       row.eachCell({ includeEmpty: true }, function(cell, colNumber) {
-//         if(colNumber==28){
-//           var sval=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
-//           console.log(sval);
-//         }
-//       });
-//     }
-//   });
+// //   sheet.eachRow({ includeEmpty: true }, function(row, rowNumber) {
+// //     if(rowNumber>=10 && rowNumber<=10){
+// //       row.eachCell({ includeEmpty: true }, function(cell, colNumber) {
+// //         if(colNumber==28){
+// //           var sval=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
+// //           console.log(sval);
+// //         }
+// //       });
+// //     }
+// //   });
 // })()
 // })()