Skip to content

Z
zhichan
Commit 9f81e528 by 宋毅
Options

Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

parents ec7185a7 2a04c537
Showing with 228 additions and 128 deletions
center-channel/app/base/api/impl/auth/taskapi.js
...@@ -116,5 +116,10 @@ class AccessAuthAPI extends APIBase { ...@@ -116,5 +116,10 @@ class AccessAuthAPI extends APIBase {
return system.getResultSuccess(); return system.getResultSuccess();
} }
async taskSyncNeedBusiness(pobj,qobj,req){
let result = await this.utilsNeedSve.syncNeedBusiness();
return result;
}
} }
module.exports = AccessAuthAPI; module.exports = AccessAuthAPI;
\ No newline at end of file
center-channel/app/base/service/impl/common/signSve.js
...@@ -177,17 +177,18 @@ module.exports = SignService; ...@@ -177,17 +177,18 @@ module.exports = SignService;
// } // }
// var obj={ // var obj={
// "bizId": "yiming_solution_test_0001", // "isDirectBuy":"1",
// "isDirectBuy": 0, // "orderNo":"CR-9T8MhbouU8J-test0001",
// "orderNo": "yiming_order_test_0001", // "phone":"15732031337",
// "phone": "18506015665", // "area":"110100",
// "userName": "张三", // "companyProperties":"有限公司",
// "companyName": "测试有限公司2", // "taxpayerType":"一般纳税人",
// "description": "测试11111111", // "consultType":"GSREG",
// "area": "1", // "companyName":"公司名称",
// "price": "1100", // "engagedIndustry":"从事行业",
// "consultType": "5" // "bizScope":"经营范围",
// "hasAddress":true
// }; // };
// task.createSign(obj,"5cdd926122894160o1q1e34us4738v76").then(d=>{ // task.createSign(obj,"7cbb892450174167b5c7e01we4716t51").then(d=>{
// console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!"); // console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!");
// }); // });
\ No newline at end of file
center-channel/app/base/service/impl/trademark/icbcSve.js
...@@ -3,129 +3,149 @@ var settings = require("../../../../config/settings"); ...@@ -3,129 +3,149 @@ var settings = require("../../../../config/settings");
const AppServiceBase = require("../../app.base"); const AppServiceBase = require("../../app.base");
class IcbcService extends AppServiceBase { class IcbcService extends AppServiceBase {
constructor() { constructor() {
super(); super();
this.zcApiUrl = settings.reqZcApi(); this.zcApiUrl = settings.reqZcApi();
this.certificationUrl = settings.certificationUrl(); this.certificationUrl = settings.certificationUrl();
this.restClient = system.getObject("util.redisClient"); this.restClient = system.getObject("util.redisClient");
//处理企业资质证书数据 //处理企业资质证书数据
this.disposeCertificationData = "disposeCertificationData"; this.disposeCertificationData = "disposeCertificationData";
//企业资质证书查询 //企业资质证书查询
this.searchCertificationData = "searchCertificationData"; this.searchCertificationData = "searchCertificationData";
} //result工具类
//企业模糊查询 this.utilsResultSve = system.getObject("service.utilsSve.utilsResultSve");
async getCompanyListByVague(obj, req) { }
var url = this.zcApiUrl + "api/tool/toolApi/getCompanyListByVague"; //企业模糊查询
return await this.opReqResult(url, obj, req); async getCompanyListByVague(obj, req) {
} var url = this.zcApiUrl + "api/tool/toolApi/getCompanyListByVague";
//企业详情 return await this.opReqResult(url, obj, req);
async getDetailByCompanyName(queryobj, req) { }
var url = this.zcApiUrl + "api/tool/toolApi/getDetailByCompanyName"; //企业详情
return await this.opReqResult(url, queryobj, req); async getDetailByCompanyName(queryobj, req) {
} var url = this.zcApiUrl + "api/tool/toolApi/getDetailByCompanyName";
//企业变更记录查询 return await this.opReqResult(url, queryobj, req);
async getCompanyChangeByName(queryobj, req) { }
var url = this.zcApiUrl + "api/tool/toolApi/getCompanyChangeByName"; //企业变更记录查询
return await this.opReqResult(url, queryobj, req); async getCompanyChangeByName(queryobj, req) {
} var url = this.zcApiUrl + "api/tool/toolApi/getCompanyChangeByName";
//工商icp证照查询 return await this.opReqResult(url, queryobj, req);
async getCompanyIcpByName(queryobj, req) { }
var url = this.zcApiUrl + "api/tool/toolApi/getCompanyIcpByName"; //工商icp证照查询
return await this.opReqResult(url, queryobj, req); async getCompanyIcpByName(queryobj, req) {
} var url = this.zcApiUrl + "api/tool/toolApi/getCompanyIcpByName";
return await this.opReqResult(url, queryobj, req);
}
//企业证书查询 //企业证书查询
// async searchCertification(queryobj, req) { // async searchCertification(queryobj, req) {
// if (!queryobj.companyName) { // if (!queryobj.companyName) {
// return system.getResultFail(-1, 'companyName can not be empty'); // return system.getResultFail(-1, 'companyName can not be empty');
// } // }
// var hashValue = await this.restClient.hget(this.searchCertificationData, queryobj.companyName); // var hashValue = await this.restClient.hget(this.searchCertificationData, queryobj.companyName);
// if (hashValue) { // if (hashValue) {
// return system.getResultSuccess(JSON.parse(hashValue)); // return system.getResultSuccess(JSON.parse(hashValue));
// } // }
// let url = this.certificationUrl + "gsb/SearchCertification"; // let url = this.certificationUrl + "gsb/SearchCertification";
// let data = { // let data = {
// "company_name": queryobj.companyName, // "company_name": queryobj.companyName,
// "pageSize": 20, // "pageSize": 20,
// "pageIndex": 1, // "pageIndex": 1,
// "isExactlySame": "True" // "isExactlySame": "True"
// } // }
// let result = await this.opReqResult(url, data, req); // let result = await this.opReqResult(url, data, req);
// if (!result) { // if (!result) {
// return system.getResultFail(-1, '查询失败！！！'); // return system.getResultFail(-1, '查询失败！！！');
// } // }
// if (result.Status != 200) { // if (result.Status != 200) {
// return system.getResultFail(-1, '查询失败'); // return system.getResultFail(-1, '查询失败');
// } // }
// //对结果处理 // //对结果处理
// // "Tag": 1为qichacha,0为gsb // // "Tag": 1为qichacha,0为gsb
// var setValue = {}; // var setValue = {};
// setValue[queryobj.companyName] = JSON.stringify(result.Result); // setValue[queryobj.companyName] = JSON.stringify(result.Result);
// if (result.Tag == 1) { // if (result.Tag == 1) {
// this.restClient.hmset(this.disposeCertificationData, setValue); // this.restClient.hmset(this.disposeCertificationData, setValue);
// } // }
// this.restClient.hmset(this.searchCertificationData, setValue); // this.restClient.hmset(this.searchCertificationData, setValue);
// return system.getResult(result.Result); // return system.getResult(result.Result);
// } // }
//企业证书查询 用友数据源 //企业证书查询 用友数据源
async searchCertification(queryobj, req) { async searchCertification(queryobj, req) {
if (!queryobj.companyName) { if (!queryobj.companyName) {
return system.getResultFail(-1, 'companyName can not be empty'); return system.getResultFail(-1, 'companyName can not be empty');
} }
var hashValue = await this.restClient.hget(this.searchCertificationData, queryobj.companyName); var hashValue = await this.restClient.hget(this.searchCertificationData, queryobj.companyName);
if (hashValue) { if (hashValue) {
return system.getResultSuccess(JSON.parse(hashValue)); return system.getResultSuccess(JSON.parse(hashValue));
} }
//获取token //获取token
let url = settings.icNameUrl() + 'openPlatform/platform/getToken'; let url = settings.icNameUrl() + 'openPlatform/platform/getToken';
let params = { let params = {
"accessKey":"111", "accessKey": "111",
"accessSecret":"222" "accessSecret": "222"
} }
let ret = await this.opReqResult(url,params,req); let ret = await this.opReqResult(url, params, req);
if(ret.status != 1){ if (ret.status != 1) {
system.getResultFail(-1,'获取开放平台token失败'); system.getResultFail(-1, '获取开放平台token失败');
} }
let token = ret.data; let token = ret.data;
url = settings.icNameUrl() + "openPlatform/busenterprise/cloudapi"; url = settings.icNameUrl() + "openPlatform/busenterprise/cloudapi";
let data = { let tmUrl = settings.icNameUrl() + "openPlatform/busservices/cloudApi"
"path":"/apis/dst/patents/certificate", //资质查询
"name": queryobj.companyName let data = {
} "path": "/apis/dst/patents/certificate",
let rtn = await this.execClient.restGetWithHAuthorizationUrl(token,url, data); "name": queryobj.companyName
if (!rtn || !rtn.stdout) { };
return system.getResult(null, "restPostWithHAuthorizationUrl data is empty"); //商标查询
} let tmData = {
var result = JSON.parse(rtn.stdout); "path": "getTrademarkInfo",
if (!result) { "entName": queryobj.companyName,
return system.getResultFail(-1, '查询失败！！！'); "pageNo": 1, //页码
} "pageSize": 10 //每页显示最大数量，最大100
if (result.error_code != 0) { };
return system.getResultFail(-1, '查询失败'); let rtn = await this.execClient.restGetWithHAuthorizationUrl(token, url, data);
let tmrtn = await this.execClient.restGetWithHAuthorizationUrl(token, tmUrl, tmData);
if (!rtn || !rtn.stdout) {
return system.getResult(null, "restPostWithHAuthorizationUrl data is empty");
};
let tmArray = [];
if (tmrtn.status == 1 && tmrtn.data) {
var tmResult = JSON.parse(tmrtn.data);
tmArray = this.utilsResultSve.formulaContinued(tmResult);
}
var result = JSON.parse(rtn.stdout);
if (!result) {
return system.getResultFail(-1, '查询失败！！！');
}
if (result.error_code != 0) {
return system.getResultFail(-1, '查询失败');
}
let item = result.result.items;
//对结果处理
// "Tag": 1为qichacha,0为gsb
var setValue = {};
setValue[queryobj.companyName] = JSON.stringify(item);
setValue[tm] = JSON.stringify(tmArray);
// if (result.Tag == 1) {
// this.restClient.hmset(this.disposeCertificationData, setValue);
// }
this.restClient.hmset(this.searchCertificationData, setValue);
return system.getResult(item);
} }
let item = result.result.items;
//对结果处理
// "Tag": 1为qichacha,0为gsb
var setValue = {};
setValue[queryobj.companyName] = JSON.stringify(item);
// if (result.Tag == 1) {
// this.restClient.hmset(this.disposeCertificationData, setValue);
// }
this.restClient.hmset(this.searchCertificationData, setValue);
return system.getResult(item);
}
async opReqResult(reqUrl, queryobj, req) { async opReqResult(reqUrl, queryobj, req) {
var rtn = await this.execClient.execPushDataPost(queryobj, reqUrl, req.headers["token"], req.headers["request-id"]); var rtn = await this.execClient.execPushDataPost(queryobj, reqUrl, req.headers["token"], req.headers["request-id"]);
var data = JSON.parse(rtn.stdout); var data = JSON.parse(rtn.stdout);
return data; return data;
} }
} }
module.exports = IcbcService; module.exports = IcbcService;
\ No newline at end of file
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
...@@ -1581,6 +1581,7 @@ class UtilsNeedService extends AppServiceBase { ...@@ -1581,6 +1581,7 @@ class UtilsNeedService extends AppServiceBase {
} }
//-----------接入百度ICP------end---------------------------------- //-----------接入百度ICP------end----------------------------------
//需求导入
async importNeeds(pobj,req){ async importNeeds(pobj,req){
let url = this.centerOrderUrl + 'action/need/springBoard'; let url = this.centerOrderUrl + 'action/need/springBoard';
if(!pobj.actionBody.needsArr){ if(!pobj.actionBody.needsArr){
...@@ -1599,6 +1600,26 @@ class UtilsNeedService extends AppServiceBase { ...@@ -1599,6 +1600,26 @@ class UtilsNeedService extends AppServiceBase {
} }
return system.getResult(result.data.data); return system.getResult(result.data.data);
} }
/**
* 同步需求商机
* @param pobj
* @param qobj
* @param req
* @returns {Promise<{msg: *, data, bizmsg: *|string, status: number}>}
*/
async syncNeedBusiness(pobj,qobj,req){
let url = this.centerOrderUrl + 'task/taskAction/taskNeed';
let data = {identifyCode : 'sync'}
let result = await this.execPostByTimeOut(req,data,url,"json",null,60)
if (!result || result.status != 0) {
return system.getResult(null, result.msg);
}
if (!result.data || result.data.status != 0) {
return system.getResult(null, result.data.msg);
}
return system.getResult(result.data.data);
}
} }
module.exports = UtilsNeedService; module.exports = UtilsNeedService;
......
center-channel/app/base/service/impl/utilsSve/utilsResultSve.js 0 → 100644
var system = require("../../../system");
const AppServiceBase = require("../../app.base");
//外部请求结果校验以及相应工具处理类
class utilsTlBankSve extends AppServiceBase {
constructor() {
super();
}
//格式化时间
convertDate(time) {
if (time == null) {
return "";
}
var date = new Date(Number(time * 1000));
var y = 1900 + date.getYear();
var m = "0" + (date.getMonth() + 1);
var d = "0" + date.getDate();
return y + "-" + m.substring(m.length - 2, m.length) + "-" + d.substring(d.length - 2, d.length);
}
//计算并返回指定字段
formulaContinued(tms) {
let result = [];
for (let i = 0; i < tms.length; i++) {
let tmInfo = tms[i];
if (!tmInfo.REGDATE) { //注册公告日期
continue;
}
let zcrqFormat = new Date(tmInfo.REGDATE * 1000); //注册日期
zcrqFormat.setFullYear(zcrqFormat.getFullYear() + 10); //专用起始日期计算
zcrqFormat.setMonth(zcrqFormat.getMonth()); //专用起始日期计算
zcrqFormat.setDate(zcrqFormat.getDate()); //专用起始日期计算
let tmObject = {
"tm_comName": tmInfo.AGENTNAME, //代理机构
"tm_img": tmInfo.MARKIMAGE, //商标图片
"tm_name": tmInfo.MARKNAME, //商标名称
"tm_appDate": tmInfo.APPDATE, //申请日期
"tm_isInvalid": tmInfo.ISINVALID, //状态
"tm_expiry": this.convertDate(zcrqFormat) //商标到期日
}
result.push(tmObject);
}
return result;
}
}
module.exports = utilsTlBankSve;
\ No newline at end of file
center-channel/app/base/service/impl/utilsSve/utilsTmAliyunSve.js
...@@ -613,7 +613,7 @@ class UtilsTmAliyunService extends AppServiceBase { ...@@ -613,7 +613,7 @@ class UtilsTmAliyunService extends AppServiceBase {
return result; return result;
} }
async taskAliTmUpdate() {//操作阿里商标更新任务---外部调用 async taskAliTmUpdate() {//操作阿里商标(钉钉自主注册，没有上线)更新任务---外部调用
var pobj = { actionBody: {} }; var pobj = { actionBody: {} };
var dbAliAllTmListResult = await this.getAllAliChannelTmDelivery(pobj); var dbAliAllTmListResult = await this.getAllAliChannelTmDelivery(pobj);
if (dbAliAllTmListResult.status != 0) { if (dbAliAllTmListResult.status != 0) {
......
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