Skip to content

Z
zhichan
Commit 84f2c680 by 蒋勇
Options

Merge branch 'taskexecutor' of gitlab.gongsibao.com:jiangyong/zhichan into taskexecutor

parents 173a931d 9bb24a08
Showing with 297 additions and 99 deletions
taskexecutor/app/base/db/task/alichannel/aliicapiTask.js 0 → 100644
const TaskBase = require("../../task.base");
const system = require("../../../system");
var settings = require("../../../../config/settings");
class AliicapiTask extends TaskBase {
constructor() {
super(TaskBase.getServiceName(AliicapiTask));
this.restclient = system.getObject("util.restClient");
}
async beforeTask(params) {
console.log("前置操作......", this.serviceName);
//this.isThrough=true;
//console.log(this.cacheManager);
}
async subDoTask() {
console.log("--------------");
console.log("TestTask1.....");
var obj = {
"actionType": "taskpolicyneed2fq",
"actionBody": {
"limit": 100 //推送数据条数 默认100条
}
}
try {
var url = settings.centerChannelUrl() + "api/auth/taskapi/taskAliIcapi";
var icinfo = await this.restclient.execPost(obj, url);
console.log(icinfo);
return icinfo;
} catch (error) {
console.log(error);
return null;
}
}
}
module.exports = AliicapiTask;
// var a=new AliicapiTask();
// a.subDoTask();
\ No newline at end of file
taskexecutor/app/base/db/task/businesschance/zcbusinessTask.js 0 → 100644
const TaskBase = require("../../task.base");
const system = require("../../../system");
var settings = require("../../../../config/settings");
class ZcbusinessTask extends TaskBase {
constructor() {
super(TaskBase.getServiceName(ZcbusinessTask));
this.restclient = system.getObject("util.restClient");
this.centerOrderUrl = settings.centerOrderUrl();
}
async beforeTask(params) {
console.log("前置操作......", this.serviceName);
//this.isThrough=true;
//console.log(this.cacheManager);
}
async subDoTask() {
console.log("--------------");
console.log("TestTask1.....");
var obj = {
"actionType": "taskpolicyneed2fq",
"actionBody": {
"limit": 100 //推送数据条数 默认100条
}
}
try {
var url = this.centerOrderUrl + "action/policy/springBoard";
var zcinfo = await this.restclient.execPost(obj, url);
console.log(zcinfo);
var result = JSON.parse(zcinfo.stdout);
console.log(result);
return result;
} catch (error) {
console.log(error);
return null;
}
}
}
module.exports = ZcbusinessTask;
\ No newline at end of file
taskexecutor/app/base/db/task/rpt/parseRptTask.js
......@@ -49,6 +49,11 @@ async readxls(path) {
var rptDate=tohandleurls[2];
var rptCode=tohandleurls[3];
var urldownload=tohandleurls[4];
//如果是pdf,那么就调用pdf 解析接口
if(urldownload.indexOf(".pdf")>=0){
return;
}
//下载文件
var keyindex=urldownload.lastIndexOf("/");
var keystr=urldownload.substring(keyindex+1);
......
taskexecutor/app/base/db/task/rpt/rptHandler/GT.js
......@@ -19,10 +19,10 @@ module.exports =(async (wb,toparsedate)=>{
if(colNumber==2){
if(typeof cell.value=="object"){
cell.value.richText.forEach(element => {
rowDesc+=element.text;
rowDesc+=element.text.replace(" ","");
});
}else{
rowDesc+=cell.value;
rowDesc+=cell.value.replace(" ","");
}
cacheStr=rowDesc;
}
......@@ -53,7 +53,7 @@ module.exports =(async (wb,toparsedate)=>{
}
buildRow.rpttypecode="GT";
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";
insertrows.push(buildRow);
rowDesc=cacheStr;
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITQ.js
......@@ -18,10 +18,10 @@ module.exports = (async (wb,toparsedate) => {
if (typeof cell.value == "object") {
desc = "";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
}
if (colNumber == 11) {
......@@ -40,10 +40,10 @@ module.exports = (async (wb,toparsedate) => {
if (typeof cell.value == "object") {
desc = "";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
}
if (colNumber == 11) {
......@@ -63,10 +63,10 @@ module.exports = (async (wb,toparsedate) => {
if (typeof cell.value == "object") {
desc = "";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
}
if (colNumber == 5) {
......@@ -81,10 +81,10 @@ module.exports = (async (wb,toparsedate) => {
if (typeof cell.value == "object") {
desc = "";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
}
if (colNumber == 11) {
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY.js
......@@ -8,10 +8,10 @@ module.exports=(async (wb) => {
if (typeof cell.value == "object") {
desc = "";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
}
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_ADV.js
......@@ -8,10 +8,10 @@ module.exports=(async (wb) => {
if (typeof cell.value == "object") {
desc = "";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
}
if (colNumber == 3) {
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_COST.js
......@@ -8,10 +8,10 @@ module.exports=(async (wb) => {
if (typeof cell.value == "object") {
desc = "";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
}
if (colNumber == 3) {
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_DISCOUNT_ADJUST.js
......@@ -8,10 +8,10 @@ module.exports=(async (wb) => {
if (typeof cell.value == "object") {
desc="";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
cachetmp=desc;
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_FILL_LOST.js
......@@ -8,10 +8,10 @@ module.exports=(async (wb) => {
if (typeof cell.value == "object") {
desc="";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
cachetmp=desc;
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_INCOME_DESC.js
......@@ -8,10 +8,10 @@ module.exports=(async (wb) => {
if (typeof cell.value == "object") {
desc="";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
cachetmp=desc;
}
......
taskexecutor/app/base/db/task/rpt/rptHandler/ITY_PERIOD.js
......@@ -8,10 +8,10 @@ module.exports=(async (wb) => {
if (typeof cell.value == "object") {
desc="";
cell.value.richText.forEach(element => {
desc += element.text;
desc += element.text.replace(" ","");
});
} else {
desc = cell.value;
desc = cell.value.replace(" ","");
}
cachetmp=desc;
......
taskexecutor/app/base/db/task/rpt/rptHandler/NA.js
......@@ -18,8 +18,14 @@ module.exports=(async (wb,toparsedate)=>{
if(rowNumber>=5 && rowNumber<=45){
row.eachCell({ includeEmpty: true }, function(cell, colNumber) {
if(colNumber==1){
console.log(">>>>><<<<<",cell.value);
if(cell.value){
desc="资产/"+cell.value.replace(" ","");
}else{
desc="资产/"+cell.value;
}
}
if(colNumber==3 || colNumber==4){
if(desc!="资产/"){
var buildRow={};
......@@ -36,7 +42,7 @@ module.exports=(async (wb,toparsedate)=>{
}
}
if(colNumber==5){
desc="负债和所有者权益/"+cell.value;
desc="负债和所有者权益/"+cell.value.replace(" ","");
}
if(colNumber==7 || colNumber==8){
if(desc!="负债和所有者权益/"){
......
taskexecutor/app/base/db/task/rpt/rptHandler/NP.js
......@@ -24,10 +24,10 @@ module.exports=(async (wb,toparsedate)=>{
if(typeof cell.value=="object"){
desc="";
cell.value.richText.forEach(element => {
desc+=element.text;
desc+=element.text.replace(" ","");
});
}else{
desc=cell.value;
desc=cell.value.replace(" ","");
}
}
......
taskexecutor/app/base/db/task/rpt/rptHandler/SA.js
......@@ -19,7 +19,7 @@ module.exports=(async (wb,toparsedate)=>{
row.eachCell({ includeEmpty: true }, function(cell, colNumber) {
if(colNumber==1){
desc="资产/"+cell.value;
desc="资产/"+cell.value.replace(" ","");
}
if(colNumber==3 || colNumber==4){
......@@ -38,7 +38,7 @@ module.exports=(async (wb,toparsedate)=>{
}
}
if(colNumber==5){
desc="负债和所有者权益/"+cell.value;
desc="负债和所有者权益/"+cell.value.replace(" ","");
}
if(colNumber==7 || colNumber==8){
if(desc!="负债和所有者权益/"){
......
taskexecutor/app/base/db/task/rpt/rptHandler/SP.js
......@@ -20,10 +20,10 @@ module.exports=(async (wb,toparsedate)=>{
if(typeof cell.value=="object"){
desc="";
cell.value.richText.forEach(element => {
desc+=element.text;
desc+=element.text.replace(" ","");
});
}else{
desc=cell.value;
desc=cell.value.replace(" ","");
}
}
......
taskexecutor/app/base/db/task/rpt/rptHandler/ST.js
......@@ -23,10 +23,10 @@ module.exports=(async (wb,toparsedate)=>{
if(colNumber==2){
if(typeof cell.value=="object"){
cell.value.richText.forEach(element => {
rowDesc+=element.text;
rowDesc+=element.text.replace(" ","");
});
}else{
rowDesc+=cell.value;
rowDesc+=cell.value.replace(" ","");
}
cacheStr=rowDesc;
}
......
taskexecutor/app/base/db/task/rpt/test.js
// var http = require('http');
var http = require('http');
// var server = http.createServer((req,res) => {
// //设置 HTTP 头部，状态码是 200，文件类型是 html，字符集是 utf-8
// res.writeHead(200,{"Content-Type":"text/html;charset='utf-8'"});
......@@ -20,69 +20,69 @@
// }
// }
var excel = require('exceljs');
function getMonth(type,text){
var qs=["一","二","三","四"];
var qmap={
"一":"03","二":"06","三":"09","四":"12"
};
//ITQ
if(type=="ITQ" || type=="ST" || type=="GT"){
var p1=/\d{4}[-|-]\d{2}[-|-]\d{2}/gm;
var ms=text.match(p1);
var lstDate=ms[1];
var ds=lstDate.split("-");
var rtnDate=ds[0]+ds[1];
return rtnDate;
}else{
var testbool=false;
var p2=/(\d{4})|([一|二|三|四])/gm;
var ms=text.match(p2);
console.log(ms);
for(var q of qs){
var jstr=ms.join(",");
var re = new RegExp(q);
if(re.test(jstr)){
console.log("======");
testbool=true;
break;
}
}
if(!testbool){//如果不是季
var p3=/\d{4}[-|-]\d{2}/gm;
var ms=text.match(p3);
return ms[0].split("-").join("");
}else{//如果是季
var qstr=ms[1];
var rtndate=ms[0]+qmap[qstr];
return rtndate;
}
}
}
async function readxls(path) {
var promise = new Promise((resv, rej) => {
var workbook = new excel.Workbook();
workbook.properties.date1904 = true;
workbook.xlsx.readFile(path)
.then(function () {
return resv(workbook);
}).catch(function (e) {
return rej(e);
});
});
return promise;
}
// var excel = require('exceljs');
// function getMonth(type,text){
// var qs=["一","二","三","四"];
// var qmap={
// "一":"03","二":"06","三":"09","四":"12"
// };
// //ITQ
// if(type=="ITQ" || type=="ST" || type=="GT"){
// var p1=/\d{4}[-|-]\d{2}[-|-]\d{2}/gm;
// var ms=text.match(p1);
// var lstDate=ms[1];
// var ds=lstDate.split("-");
// var rtnDate=ds[0]+ds[1];
// return rtnDate;
// }else{
// var testbool=false;
// var p2=/(\d{4})|([一|二|三|四])/gm;
// var ms=text.match(p2);
// console.log(ms);
// for(var q of qs){
// var jstr=ms.join(",");
// var re = new RegExp(q);
// if(re.test(jstr)){
// console.log("======");
// testbool=true;
// break;
// }
// }
// if(!testbool){//如果不是季
// var p3=/\d{4}[-|-]\d{2}/gm;
// var ms=text.match(p3);
// return ms[0].split("-").join("");
// }else{//如果是季
// var qstr=ms[1];
// var rtndate=ms[0]+qmap[qstr];
// return rtndate;
// }
// }
// }
// async function readxls(path) {
// var promise = new Promise((resv, rej) => {
// var workbook = new excel.Workbook();
// workbook.properties.date1904 = true;
// workbook.xlsx.readFile(path)
// .then(function () {
// return resv(workbook);
// }).catch(function (e) {
// return rej(e);
// });
// });
// return promise;
// }
(async ()=>{
var toparsedate={isparsedate:false,rptDate:'notparse'};
toparsedate.isparsedate=true;
var parserByCode=null;
// NA
var wb=await readxls("./tmpl/fi/NA3.xlsx");
parserByCode=require("./rptHandler/NA.js");
var rows=await parserByCode(wb,toparsedate);
console.log(toparsedate.rptDate);
// var toparsedate={isparsedate:false,rptDate:'notparse'};
// toparsedate.isparsedate=true;
// var parserByCode=null;
// // NA
// var wb=await readxls("./tmpl/fi/NA3.xlsx");
// parserByCode=require("./rptHandler/NA.js");
// var rows=await parserByCode(wb,toparsedate);
// console.log(toparsedate.rptDate);
// // NP
// wb=await readxls("./tmpl/fi/NP.xlsx");
......@@ -163,4 +163,9 @@ async function readxls(path) {
// console.log(g);
var s=" dddd ";
var d="dddd";
console.log(s==d);
s=s.trim()
console.log(s==d);
taskexecutor/app/base/db/task/tm/taskalirpcagainpush.js 0 → 100644
const TaskBase = require("../../task.base");
const system = require("../../../system");
var settings = require("../../../../config/settings");
class Taskalirpcagainpush extends TaskBase {
constructor() {
super(TaskBase.getServiceName(Taskalirpcagainpush));
this.restclient = system.getObject("util.restClient");
this.centerChannelUrl = settings.centerChannelUrl();
}
async beforeTask(params) {
console.log("前置操作......", this.serviceName);
//this.isThrough=true;
//console.log(this.cacheManager);
}
async subDoTask() {
console.log("--------------");
console.log("TestTask1.....");
var obj = {
"actionType": "Taskalirpcagainpush",
"actionBody": {
"limit": 100 //推送数据条数 默认100条
}
}
try {
var url = this.centerChannelUrl + "api/auth/taskapi/taskAliRpcAgainPush";
var rtn = await this.restclient.execPost(obj, url);
console.log(rtn);
return rtn;
} catch (error) {
console.log(error);
return null;
}
}
}
module.exports = Taskalirpcagainpush;
\ No newline at end of file
taskexecutor/app/base/db/task/tm/taskalitmupdate.js 0 → 100644
const TaskBase = require("../../task.base");
const system = require("../../../system");
var settings = require("../../../../config/settings");
class Taskalitmupdate extends TaskBase {
constructor() {
super(TaskBase.getServiceName(Taskalitmupdate));
this.restclient = system.getObject("util.restClient");
this.centerChannelUrl = settings.centerChannelUrl();
}
async beforeTask(params) {
console.log("前置操作......", this.serviceName);
//this.isThrough=true;
//console.log(this.cacheManager);
}
async subDoTask() {
console.log("--------------");
console.log("TestTask1.....");
var obj = {
"actionType": "Taskalitmupdate",
"actionBody": {
"limit": 100 //推送数据条数 默认100条
}
}
try {
var url = this.centerChannelUrl + "api/auth/taskapi/taskAliTmUpdate";
var rtn = await this.restclient.execPost(obj, url);
console.log(rtn);
return rtn;
} catch (error) {
console.log(error);
return null;
}
}
}
module.exports = Taskalitmupdate;
\ No newline at end of file
taskexecutor/app/base/utils/ossClient.js
......@@ -38,10 +38,20 @@ class OSSClient{
}
module.exports=OSSClient;
// var oss=new OSSClient();
// var key="tmpl2.zip"
// oss.upfile(key,"./tmpl2.zip").then(function(result){
// var key="GT.pdf"
// oss.upfile(key,"./GT.pdf").then(function(result){
// console.log(result);
// });
// oss.downfile(key).then(function(result){
// key="ST.pdf"
// oss.upfile(key,"./ST.pdf").then(function(result){
// console.log(result);
// });
// key="ITQ.pdf"
// oss.upfile(key,"./ITQ.pdf").then(function(result){
// console.log(result);
// });
// key="ITY.pdf"
// oss.upfile(key,"./ITY.pdf").then(function(result){
// console.log(result);
// });
taskexecutor/app/config/settings.js
......@@ -28,6 +28,28 @@ var settings = {
return "http://igirl-service.chaolai/";
}
},
aliTmurl: function(){
if (this.env == "dev") {
return "http://alitm.qifu.gongsibao.com/";
} else {
return "http://igirl-service.chaolai/";
}
},
centerOrderUrl: function () {
if (this.env == "dev") {
return "http://gsb.qifu.gongsibao.com:4011/";
} else {
return "http://center-order-service.chaolai/";
}
},
centerChannelUrl: function () {
if (this.env == "dev") {
return "http://192.168.0.106:4012/";
} else {
return "http://center-channel-service.chaolai/";
}
},
reqTransferurl: function () {
if (this.env == "dev") {
return "http://192.168.18.61:3003/";
......
taskexecutor/main.js
......@@ -6,6 +6,7 @@ const fs=require("fs");
var taskName = process.env.TASK_NAME;
var params= process.env.TASK_PARAM?process.env.TASK_PARAM:"";
var port=process.env.TASK_PORT;
console.log(taskName);
if(taskName){
var task=system.getObject("task."+taskName);
(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