d

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

@@ -2,6 +2,7 @@ const system=require("../system")
 class TaskBase{
 class TaskBase{
   constructor(className){
   constructor(className){
      this.redisClient=system.getObject("util.redisClient");
      this.redisClient=system.getObject("util.redisClient");
+     this.restS=system.getObject("util.restClient");
      this.serviceName=className;
      this.serviceName=className;
      this.isThrough=false;
      this.isThrough=false;
      this.isDaemon=false;
      this.isDaemon=false;
@@ -76,10 +77,10 @@ class TaskBase{
     return ClassObj["name"];
     return ClassObj["name"];
   }
   }
   async apiCallWithAk(url,params){
   async apiCallWithAk(url,params){
-    var acckapp=await this.cacheManager["ApiAccessKeyCache"].cache(settings.appKey);
-    var acck=acckapp.accessKey;
+    var acck="task";
     //按照访问token
     //按照访问token
     var restResult=await this.restS.execPostWithAK(params,url,acck);
     var restResult=await this.restS.execPostWithAK(params,url,acck);
+    console.log("restResultrestResultrestResultrestResultrestResultrestResultrestResultrestResult");
     if(restResult){
     if(restResult){
       if(restResult.status==0){
       if(restResult.status==0){
         var resultRtn=restResult.data;
         var resultRtn=restResult.data;

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

@@ -40,9 +40,10 @@ async  readxls(path) {
     var pv=this.cacheData.pop();
     var pv=this.cacheData.pop();
     if(pv){
     if(pv){
       var tohandleurls=pv.split("~");
       var tohandleurls=pv.split("~");
-      var rptDate=tohandleurls[0];
-      var rptCode=tohandleurls[1];
-      var urldownload=tohandleurls[2];
+      var bid=tohandleurls[0];
+      var rptDate=tohandleurls[1];
+      var rptCode=tohandleurls[2];
+      var urldownload=tohandleurls[3];
       //下载文件
       //下载文件
       var keyindex=urldownload.lastIndexOf("/");
       var keyindex=urldownload.lastIndexOf("/");
       var keystr=urldownload.substring(keyindex+1);
       var keystr=urldownload.substring(keyindex+1);
@@ -52,7 +53,12 @@ async  readxls(path) {
       var parserByCode=require("./rptHandler/"+rptCode);
       var parserByCode=require("./rptHandler/"+rptCode);
       var rows=await parserByCode(wb);
       var rows=await parserByCode(wb);
       console.log(JSON.stringify(rows));
       console.log(JSON.stringify(rows));
-
+      this.apiCallWithAk("http://localhost:3003/api/rpt/rptApi/saveRptHistory",{
+        batchid:bid,
+        rptdate:rptDate,
+        rptcode:rptCode,
+        hisdata:rows
+      });
       this.parseXls();
       this.parseXls();
     }
     }
   }
   }

taskexecutor/app/base/utils/restClient.js

@@ -104,6 +104,7 @@ class RestClient{
     }
     }
     async execPostWithAK(subData, url,ak){
     async execPostWithAK(subData, url,ak){
       let cmd=this.FetchPostCmdWithAK(subData,url,ak);
       let cmd=this.FetchPostCmdWithAK(subData,url,ak);
+      console.log(cmd);
       var result=await this.exec(cmd,{
       var result=await this.exec(cmd,{
         maxBuffer:1024*1024*15
         maxBuffer:1024*1024*15
       });
       });

taskexecutor/app/base/utils/test.js

@@ -5,7 +5,7 @@ var client=new RC();
       // var rptDate=tohandleurls[0];
       // var rptDate=tohandleurls[0];
       // var rptCode=tohandleurls[1];
       // var rptCode=tohandleurls[1];
       // var urldownload=tohandleurls[2];
       // var urldownload=tohandleurls[2];
-    var mm="2019~GT~https://gsb-zc.oss-cn-beijing.aliyuncs.com/GT.xlsx";
+    var mm="1~2019~GT~https://gsb-zc.oss-cn-beijing.aliyuncs.com/GT.xlsx";
     await client.notifyConsume("k8stask","docurls",mm);
     await client.notifyConsume("k8stask","docurls",mm);
   
   
 })()
 })()
\ No newline at end of file