Skip to content

Z
zhichan
Commit 76215eb8 by 蒋勇
Options

d

parent 6ebf6cf6
Showing with 81 additions and 64 deletions
taskexecutor/app/base/db/task/rpt/parseRptTask.js
...@@ -49,6 +49,11 @@ async readxls(path) { ...@@ -49,6 +49,11 @@ async readxls(path) {
var rptDate=tohandleurls[2]; var rptDate=tohandleurls[2];
var rptCode=tohandleurls[3]; var rptCode=tohandleurls[3];
var urldownload=tohandleurls[4]; var urldownload=tohandleurls[4];
//如果是pdf,那么就调用pdf 解析接口
if(urldownload.indexOf(".pdf")>=0){
return;
}
//下载文件 //下载文件
var keyindex=urldownload.lastIndexOf("/"); var keyindex=urldownload.lastIndexOf("/");
var keystr=urldownload.substring(keyindex+1); var keystr=urldownload.substring(keyindex+1);
......
taskexecutor/app/base/db/task/rpt/rptHandler/GT.js
...@@ -53,7 +53,7 @@ module.exports =(async (wb,toparsedate)=>{ ...@@ -53,7 +53,7 @@ module.exports =(async (wb,toparsedate)=>{
} }
buildRow.rpttypecode="GT"; buildRow.rpttypecode="GT";
buildRow.position=rowNumber+"-"+colPos; buildRow.position=rowNumber+"-"+colPos;
buildRow.desc=rowDesc; buildRow.desc=rowDesc.trim();
buildRow.valstr=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0"; buildRow.valstr=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
insertrows.push(buildRow); insertrows.push(buildRow);
rowDesc=cacheStr; rowDesc=cacheStr;
......
taskexecutor/app/base/db/task/rpt/rptHandler/NA.js
...@@ -18,7 +18,13 @@ module.exports=(async (wb,toparsedate)=>{ ...@@ -18,7 +18,13 @@ module.exports=(async (wb,toparsedate)=>{
if(rowNumber>=5 && rowNumber<=45){ if(rowNumber>=5 && rowNumber<=45){
row.eachCell({ includeEmpty: true }, function(cell, colNumber) { row.eachCell({ includeEmpty: true }, function(cell, colNumber) {
if(colNumber==1){ if(colNumber==1){
desc="资产/"+cell.value.replace(" ",""); console.log(">>>>><<<<<",cell.value);
if(cell.value){
desc="资产/"+cell.value.replace(" ","");
}else{
desc="资产/"+cell.value;
}
} }
if(colNumber==3 || colNumber==4){ if(colNumber==3 || colNumber==4){
if(desc!="资产/"){ if(desc!="资产/"){
......
taskexecutor/app/base/db/task/rpt/test.js
// var http = require('http'); var http = require('http');
// var server = http.createServer((req,res) => { // var server = http.createServer((req,res) => {
// //设置 HTTP 头部，状态码是 200，文件类型是 html，字符集是 utf-8 // //设置 HTTP 头部，状态码是 200，文件类型是 html，字符集是 utf-8
// res.writeHead(200,{"Content-Type":"text/html;charset='utf-8'"}); // res.writeHead(200,{"Content-Type":"text/html;charset='utf-8'"});
...@@ -20,69 +20,69 @@ ...@@ -20,69 +20,69 @@
// } // }
// } // }
var excel = require('exceljs'); // var excel = require('exceljs');
function getMonth(type,text){ // function getMonth(type,text){
var qs=["一","二","三","四"]; // var qs=["一","二","三","四"];
var qmap={ // var qmap={
"一":"03","二":"06","三":"09","四":"12" // "一":"03","二":"06","三":"09","四":"12"
}; // };
//ITQ // //ITQ
if(type=="ITQ" || type=="ST" || type=="GT"){ // if(type=="ITQ" || type=="ST" || type=="GT"){
var p1=/\d{4}[-|-]\d{2}[-|-]\d{2}/gm; // var p1=/\d{4}[-|-]\d{2}[-|-]\d{2}/gm;
var ms=text.match(p1); // var ms=text.match(p1);
var lstDate=ms[1]; // var lstDate=ms[1];
var ds=lstDate.split("-"); // var ds=lstDate.split("-");
var rtnDate=ds[0]+ds[1]; // var rtnDate=ds[0]+ds[1];
return rtnDate; // return rtnDate;
}else{ // }else{
var testbool=false; // var testbool=false;
var p2=/(\d{4})|([一|二|三|四])/gm; // var p2=/(\d{4})|([一|二|三|四])/gm;
var ms=text.match(p2); // var ms=text.match(p2);
console.log(ms); // console.log(ms);
for(var q of qs){ // for(var q of qs){
var jstr=ms.join(","); // var jstr=ms.join(",");
var re = new RegExp(q); // var re = new RegExp(q);
if(re.test(jstr)){ // if(re.test(jstr)){
console.log("======"); // console.log("======");
testbool=true; // testbool=true;
break; // break;
} // }
} // }
if(!testbool){//如果不是季 // if(!testbool){//如果不是季
var p3=/\d{4}[-|-]\d{2}/gm; // var p3=/\d{4}[-|-]\d{2}/gm;
var ms=text.match(p3); // var ms=text.match(p3);
return ms[0].split("-").join(""); // return ms[0].split("-").join("");
}else{//如果是季 // }else{//如果是季
var qstr=ms[1]; // var qstr=ms[1];
var rtndate=ms[0]+qmap[qstr]; // var rtndate=ms[0]+qmap[qstr];
return rtndate; // return rtndate;
} // }
} // }
} // }
async function readxls(path) { // async function readxls(path) {
var promise = new Promise((resv, rej) => { // var promise = new Promise((resv, rej) => {
var workbook = new excel.Workbook(); // var workbook = new excel.Workbook();
workbook.properties.date1904 = true; // workbook.properties.date1904 = true;
workbook.xlsx.readFile(path) // workbook.xlsx.readFile(path)
.then(function () { // .then(function () {
return resv(workbook); // return resv(workbook);
}).catch(function (e) { // }).catch(function (e) {
return rej(e); // return rej(e);
}); // });
}); // });
return promise; // return promise;
} // }
(async ()=>{ (async ()=>{
var toparsedate={isparsedate:false,rptDate:'notparse'}; // var toparsedate={isparsedate:false,rptDate:'notparse'};
toparsedate.isparsedate=true; // toparsedate.isparsedate=true;
var parserByCode=null; // var parserByCode=null;
// NA // // NA
var wb=await readxls("./tmpl/fi/NA3.xlsx"); // var wb=await readxls("./tmpl/fi/NA3.xlsx");
parserByCode=require("./rptHandler/NA.js"); // parserByCode=require("./rptHandler/NA.js");
var rows=await parserByCode(wb,toparsedate); // var rows=await parserByCode(wb,toparsedate);
console.log(toparsedate.rptDate); // console.log(toparsedate.rptDate);
// // NP // // NP
// wb=await readxls("./tmpl/fi/NP.xlsx"); // wb=await readxls("./tmpl/fi/NP.xlsx");
...@@ -163,4 +163,9 @@ async function readxls(path) { ...@@ -163,4 +163,9 @@ async function readxls(path) {
// console.log(g); // console.log(g);
var s=" dddd ";
var d="dddd";
console.log(s==d);
s=s.trim()
console.log(s==d);
taskexecutor/main.js
...@@ -6,6 +6,7 @@ const fs=require("fs"); ...@@ -6,6 +6,7 @@ const fs=require("fs");
var taskName = process.env.TASK_NAME; var taskName = process.env.TASK_NAME;
var params= process.env.TASK_PARAM?process.env.TASK_PARAM:""; var params= process.env.TASK_PARAM?process.env.TASK_PARAM:"";
var port=process.env.TASK_PORT; var port=process.env.TASK_PORT;
console.log(taskName);
if(taskName){ if(taskName){
var task=system.getObject("task."+taskName); var task=system.getObject("task."+taskName);
(async()=>{ (async()=>{
......
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