Skip to content

Z
zhichan
Commit ad1c1cb7 by 蒋勇
Options

d

parent b6598efd
Showing with 21 additions and 30 deletions
taskexecutor/app/base/db/task.base.js
...@@ -89,6 +89,7 @@ class TaskBase{ ...@@ -89,6 +89,7 @@ class TaskBase{
//按照访问token //按照访问token
var restResult=await this.restS.execPostWithAK(params,url,acck); var restResult=await this.restS.execPostWithAK(params,url,acck);
console.log("restResultrestResultrestResultrestResultrestResultrestResultrestResultrestResult"); console.log("restResultrestResultrestResultrestResultrestResultrestResultrestResultrestResult");
console.log(restResult);
if(restResult){ if(restResult){
return restResult; return restResult;
} }
......
taskexecutor/app/base/db/task/rpt/parseRptTask.js
...@@ -7,6 +7,7 @@ class ParseRptTask extends TaskBase{ ...@@ -7,6 +7,7 @@ class ParseRptTask extends TaskBase{
constructor(){ constructor(){
super(TaskBase.getServiceName(ParseRptTask)); super(TaskBase.getServiceName(ParseRptTask));
this.cacheData=[]; this.cacheData=[];
this.restData=[];
this.ossC=system.getObject("util.ossClient"); this.ossC=system.getObject("util.ossClient");
} }
async subBeforeTask(params){ async subBeforeTask(params){
...@@ -41,6 +42,7 @@ async readxls(path) { ...@@ -41,6 +42,7 @@ async readxls(path) {
async parseXls(){ async parseXls(){
var pv=this.cacheData.pop(); var pv=this.cacheData.pop();
if(pv){ if(pv){
console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>.",pv);
var tohandleurls=pv.split("~"); var tohandleurls=pv.split("~");
var rptid=tohandleurls[0]; var rptid=tohandleurls[0];
var bid=tohandleurls[1]; var bid=tohandleurls[1];
...@@ -64,21 +66,21 @@ async readxls(path) { ...@@ -64,21 +66,21 @@ async readxls(path) {
} }
var parserByCode=require("./rptHandler/"+parsefunc); var parserByCode=require("./rptHandler/"+parsefunc);
var rows=await parserByCode(wb); var rows=await parserByCode(wb);
this.apiCallWithAk(settings.fkweb(),{ console.log();
this.restData.push({
rptid:rptid, rptid:rptid,
batchid:bid, batchid:bid,
rptdate:rptDate, rptdate:rptDate,
rptcode:rptCode, rptcode:rptCode,
hisdata:rows hisdata:rows
}).then(()=>{
fs.unlink(localpath,(err)=>{
(err) => {
if (err) throw err;
console.log('文件已删除');
}
});
}); });
this.parseXls(); this.parseXls();
}else{
if(this.restData && this.restData .length>0){
this.apiCallWithAk(settings.fkweb(),this.restData);
this.restData.length=0;
this.restData=[];
}
} }
} }
async subDoTask(params){ async subDoTask(params){
......
taskexecutor/app/base/db/task/rpt/rptHandler/GT.js
...@@ -3,7 +3,6 @@ module.exports =(async (wb)=>{ ...@@ -3,7 +3,6 @@ module.exports =(async (wb)=>{
var insertrows=[]; var insertrows=[];
sheet.eachRow({ includeEmpty: true }, function(row, rowNumber) { sheet.eachRow({ includeEmpty: true }, function(row, rowNumber) {
if(rowNumber>=10 && rowNumber<=47){ if(rowNumber>=10 && rowNumber<=47){
console.log(rowNumber,">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>..");
var rowDesc=""; var rowDesc="";
var cacheStr=""; var cacheStr="";
row.eachCell({ includeEmpty: true }, function(cell, colNumber) { row.eachCell({ includeEmpty: true }, function(cell, colNumber) {
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITQ.js
...@@ -13,7 +13,6 @@ module.exports = (async (wb) => { ...@@ -13,7 +13,6 @@ module.exports = (async (wb) => {
} else { } else {
desc = cell.value; desc = cell.value;
} }
console.log(desc, ">>>>>>>>>>>>>>>");
} }
if (colNumber == 11) { if (colNumber == 11) {
var buildRow = {}; var buildRow = {};
...@@ -36,7 +35,6 @@ module.exports = (async (wb) => { ...@@ -36,7 +35,6 @@ module.exports = (async (wb) => {
} else { } else {
desc = cell.value; desc = cell.value;
} }
console.log(desc, ">>>>>>>>>>>>>>>");
} }
if (colNumber == 11) { if (colNumber == 11) {
var buildRow = {}; var buildRow = {};
...@@ -60,7 +58,6 @@ module.exports = (async (wb) => { ...@@ -60,7 +58,6 @@ module.exports = (async (wb) => {
} else { } else {
desc = cell.value; desc = cell.value;
} }
console.log(desc, ">>>>>>>>>>>>>>>");
} }
if (colNumber == 5) { if (colNumber == 5) {
var buildRow = {}; var buildRow = {};
...@@ -79,7 +76,6 @@ module.exports = (async (wb) => { ...@@ -79,7 +76,6 @@ module.exports = (async (wb) => {
} else { } else {
desc = cell.value; desc = cell.value;
} }
console.log(desc, ">>>>>>>>>>>>>>>");
} }
if (colNumber == 11) { if (colNumber == 11) {
var buildRow = {}; var buildRow = {};
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY.js
...@@ -13,7 +13,7 @@ module.exports=(async (wb) => { ...@@ -13,7 +13,7 @@ module.exports=(async (wb) => {
} else { } else {
desc = cell.value; desc = cell.value;
} }
console.log(desc, ">>>>>>>>>>>>>>>");
} }
if (colNumber == 4) { if (colNumber == 4) {
var buildRow = {}; var buildRow = {};
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_ADV.js
...@@ -13,7 +13,6 @@ module.exports=(async (wb) => { ...@@ -13,7 +13,6 @@ module.exports=(async (wb) => {
} else { } else {
desc = cell.value; desc = cell.value;
} }
console.log(desc, ">>>>>>>>>>>>>>>");
} }
if (colNumber == 3) { if (colNumber == 3) {
var buildRow = {}; var buildRow = {};
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_COST.js
...@@ -13,7 +13,6 @@ module.exports=(async (wb) => { ...@@ -13,7 +13,6 @@ module.exports=(async (wb) => {
} else { } else {
desc = cell.value; desc = cell.value;
} }
console.log(desc, ">>>>>>>>>>>>>>>");
} }
if (colNumber == 3) { if (colNumber == 3) {
var buildRow = {}; var buildRow = {};
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_DISCOUNT_ADJUST.js
...@@ -14,12 +14,10 @@ module.exports=(async (wb) => { ...@@ -14,12 +14,10 @@ module.exports=(async (wb) => {
desc = cell.value; desc = cell.value;
} }
cachetmp=desc; cachetmp=desc;
console.log(desc, ">>>>>>>>>>>>>>>");
} }
if (colNumber == 4) { if (colNumber == 4) {
desc=cachetmp+"/资产原值"; desc=cachetmp+"/资产原值";
console.log(desc,">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
} }
if (colNumber == 5) { if (colNumber == 5) {
desc=cachetmp+"/本年折旧、摊销额"; desc=cachetmp+"/本年折旧、摊销额";
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_FILL_LOST.js
...@@ -14,12 +14,11 @@ module.exports=(async (wb) => { ...@@ -14,12 +14,11 @@ module.exports=(async (wb) => {
desc = cell.value; desc = cell.value;
} }
cachetmp=desc; cachetmp=desc;
console.log(desc, ">>>>>>>>>>>>>>>");
} }
if (colNumber == 3) { if (colNumber == 3) {
desc=cachetmp+"/年度"; desc=cachetmp+"/年度";
console.log(desc,">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
} }
if (colNumber == 4) { if (colNumber == 4) {
desc=cachetmp+"/当年境内所得额"; desc=cachetmp+"/当年境内所得额";
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_PERIOD.js
...@@ -14,12 +14,12 @@ module.exports=(async (wb) => { ...@@ -14,12 +14,12 @@ module.exports=(async (wb) => {
desc = cell.value; desc = cell.value;
} }
cachetmp=desc; cachetmp=desc;
console.log(desc, ">>>>>>>>>>>>>>>");
} }
if (colNumber == 3) { if (colNumber == 3) {
desc=cachetmp+"/销售费用"; desc=cachetmp+"/销售费用";
console.log(desc,">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
} }
if (colNumber == 4) { if (colNumber == 4) {
desc=cachetmp+"/其中：境外支付"; desc=cachetmp+"/其中：境外支付";
......
taskexecutor/app/base/db/task/rpt/rptHandler/NP.js
...@@ -14,7 +14,7 @@ module.exports=(async (wb)=>{ ...@@ -14,7 +14,7 @@ module.exports=(async (wb)=>{
}else{ }else{
desc=cell.value; desc=cell.value;
} }
console.log(desc,">>>>>>>>>>>>>>>");
} }
if(colNumber==3 || colNumber==4){ if(colNumber==3 || colNumber==4){
var buildRow={}; var buildRow={};
......
taskexecutor/app/base/db/task/rpt/rptHandler/SA.js
...@@ -10,7 +10,7 @@ module.exports=(async (wb)=>{ ...@@ -10,7 +10,7 @@ module.exports=(async (wb)=>{
if(colNumber==1){ if(colNumber==1){
desc="资产/"+cell.value; desc="资产/"+cell.value;
console.log(desc,">>>>>>>>>>>>>>>");
} }
if(colNumber==3 || colNumber==4){ if(colNumber==3 || colNumber==4){
if(desc!="资产/"){ if(desc!="资产/"){
......
taskexecutor/app/base/db/task/rpt/rptHandler/SP.js
...@@ -13,7 +13,7 @@ module.exports=(async (wb)=>{ ...@@ -13,7 +13,7 @@ module.exports=(async (wb)=>{
}else{ }else{
desc=cell.value; desc=cell.value;
} }
console.log(desc,">>>>>>>>>>>>>>>");
} }
if(colNumber==3 || colNumber==4){ if(colNumber==3 || colNumber==4){
var buildRow={}; var buildRow={};
......
taskexecutor/app/base/db/task/rpt/rptHandler/ST.js
...@@ -3,7 +3,7 @@ module.exports=(async (wb)=>{ ...@@ -3,7 +3,7 @@ module.exports=(async (wb)=>{
var insertrows=[]; var insertrows=[];
sheet.eachRow({ includeEmpty: true }, function(row, rowNumber) { sheet.eachRow({ includeEmpty: true }, function(row, rowNumber) {
if(rowNumber>=9 && rowNumber<=33){ if(rowNumber>=9 && rowNumber<=33){
console.log(rowNumber,">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>..");
var rowDesc=""; var rowDesc="";
var cacheStr=""; var cacheStr="";
row.eachCell({ includeEmpty: true }, function(cell, colNumber) { row.eachCell({ includeEmpty: true }, function(cell, colNumber) {
...@@ -15,7 +15,6 @@ module.exports=(async (wb)=>{ ...@@ -15,7 +15,6 @@ module.exports=(async (wb)=>{
}else{ }else{
rowDesc+=cell.value; rowDesc+=cell.value;
} }
console.log(rowDesc);
cacheStr=rowDesc; cacheStr=rowDesc;
} }
if(colNumber==5 || colNumber==6 || colNumber==7 || colNumber==8){ if(colNumber==5 || colNumber==6 || colNumber==7 || colNumber==8){
......
taskexecutor/app/base/utils/restClient.js
...@@ -8,7 +8,7 @@ class RestClient{ ...@@ -8,7 +8,7 @@ class RestClient{
this.cmdGetPattern = "curl {-G} -k -d '{data}' {url}"; this.cmdGetPattern = "curl {-G} -k -d '{data}' {url}";
this.cmdPostPattern="curl -k -H 'Content-type: application/json' -d '{data}' '{url}'"; this.cmdPostPattern="curl -k -H 'Content-type: application/json' -d '{data}' '{url}'";
this.cmdPostPatternWithAK="curl -k -H 'Content-type: application/json' -H 'AccessKey:{ak}' -d '{data}' {url}"; this.cmdPostPatternWithAK="curl -k -H 'Content-type: application/json' -H 'AccessKey:{ak}' -d '{data}' {url} -m 20000";
this.cmdDownLoadFilePattern="curl -G -o {fileName} {url}"; this.cmdDownLoadFilePattern="curl -G -o {fileName} {url}";
this.cmdPostPattern2="curl -k -H 'Content-type: application/x-www-form-urlencoded' -d '{data}' {url}"; this.cmdPostPattern2="curl -k -H 'Content-type: application/x-www-form-urlencoded' -d '{data}' {url}";
...@@ -104,9 +104,8 @@ class RestClient{ ...@@ -104,9 +104,8 @@ 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*100
}); });
var rtn=result.stdout; var rtn=result.stdout;
if(rtn){ if(rtn){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment