Skip to content

Z
zhichan
Commit 0d060841 by wangyong
Options

feat: (icbcSve) 抖音接口封装商标列表

parent 19a0001c
Showing with 320 additions and 316 deletions
center-channel/app/base/service/impl/trademark/icbcSve.js
...@@ -75,10 +75,10 @@ class IcbcService extends AppServiceBase { ...@@ -75,10 +75,10 @@ class IcbcService extends AppServiceBase {
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 = {
...@@ -112,9 +112,9 @@ class IcbcService extends AppServiceBase { ...@@ -112,9 +112,9 @@ class IcbcService extends AppServiceBase {
return system.getResult(null, "restPostWithHAuthorizationUrl data is empty"); return system.getResult(null, "restPostWithHAuthorizationUrl data is empty");
}; };
let tmArray = []; let tmArray = [];
if (tmrtn.status == 1 && tmrtn.data) { var tmResult = JSON.parse(tmrtn.stdout);
var tmResult = JSON.parse(tmrtn.data); if (tmResult.status == 1 && tmResult.data) {
tmArray = this.utilsResultSve.formulaContinued(tmResult); tmArray = this.utilsResultSve.formulaContinued(tmResult.data);
} }
var result = JSON.parse(rtn.stdout); var result = JSON.parse(rtn.stdout);
...@@ -129,13 +129,13 @@ class IcbcService extends AppServiceBase { ...@@ -129,13 +129,13 @@ class IcbcService extends AppServiceBase {
//对结果处理 //对结果处理
// "Tag": 1为qichacha,0为gsb // "Tag": 1为qichacha,0为gsb
var setValue = {}; var setValue = {};
setValue[queryobj.companyName] = JSON.stringify(item); // setValue[queryobj.companyName] = JSON.stringify(item);
setValue[tm] = JSON.stringify(tmArray); // setValue["trademarks"] = JSON.stringify(tmArray);
// 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(item); return system.getResult({ "certificates": item, "trademarks": tmArray });
} }
......
center-channel/app/base/service/impl/utilsSve/utilsResultSve.js
...@@ -24,13 +24,17 @@ class utilsTlBankSve extends AppServiceBase { ...@@ -24,13 +24,17 @@ class utilsTlBankSve extends AppServiceBase {
for (let i = 0; i < tms.length; i++) { for (let i = 0; i < tms.length; i++) {
let tmInfo = tms[i]; let tmInfo = tms[i];
if (!tmInfo.REGDATE) { //注册公告日期 let tm_expiry = '';
if (!tmInfo.MARKNAME) { //REGDATE注册公告日期
continue; continue;
} }
let zcrqFormat = new Date(tmInfo.REGDATE * 1000); //注册日期 if (tmInfo.REGDATE) {
zcrqFormat.setFullYear(zcrqFormat.getFullYear() + 10); //专用起始日期计算 let zcrqFormat = new Date(tmInfo.REGDATE * 1000); //注册日期
zcrqFormat.setMonth(zcrqFormat.getMonth()); //专用起始日期计算 zcrqFormat.setFullYear(zcrqFormat.getFullYear() + 10); //专用起始日期计算
zcrqFormat.setDate(zcrqFormat.getDate()); //专用起始日期计算 zcrqFormat.setMonth(zcrqFormat.getMonth()); //专用起始日期计算
zcrqFormat.setDate(zcrqFormat.getDate()); //专用起始日期计算
tm_expiry = this.convertDate(zcrqFormat); //计算商标到期日
}
let tmObject = { let tmObject = {
"tm_comName": tmInfo.AGENTNAME, //代理机构 "tm_comName": tmInfo.AGENTNAME, //代理机构
...@@ -38,7 +42,7 @@ class utilsTlBankSve extends AppServiceBase { ...@@ -38,7 +42,7 @@ class utilsTlBankSve extends AppServiceBase {
"tm_name": tmInfo.MARKNAME, //商标名称 "tm_name": tmInfo.MARKNAME, //商标名称
"tm_appDate": tmInfo.APPDATE, //申请日期 "tm_appDate": tmInfo.APPDATE, //申请日期
"tm_isInvalid": tmInfo.ISINVALID, //状态 "tm_isInvalid": tmInfo.ISINVALID, //状态
"tm_expiry": this.convertDate(zcrqFormat) //商标到期日 "tm_expiry": tm_expiry //商标到期日
} }
result.push(tmObject); result.push(tmObject);
} }
......
center-channel/app/base/system.js
...@@ -2,318 +2,318 @@ var fs = require("fs"); ...@@ -2,318 +2,318 @@ var fs = require("fs");
var objsettings = require("../config/objsettings"); var objsettings = require("../config/objsettings");
var settings = require("../config/settings"); var settings = require("../config/settings");
class System { class System {
static declare(ns) { static declare(ns) {
var ar = ns.split('.'); var ar = ns.split('.');
var root = System; var root = System;
for (var i = 0, len = ar.length; i < len; ++i) { for (var i = 0, len = ar.length; i < len; ++i) {
var n = ar[i]; var n = ar[i];
if (!root[n]) { if (!root[n]) {
root[n] = {}; root[n] = {};
root = root[n]; root = root[n];
} else { } else {
root = root[n]; root = root[n];
} }
} }
} }
static register(key, ClassObj) { static register(key, ClassObj) {
if (System.objTable[key] != null) { if (System.objTable[key] != null) {
throw new Error("相同key的对象已经存在"); throw new Error("相同key的对象已经存在");
} else { } else {
let obj = new ClassObj(); let obj = new ClassObj();
System.objTable[key] = obj; System.objTable[key] = obj;
} }
return System.objTable[key]; return System.objTable[key];
} }
static getResult(data, opmsg = "操作成功", req) { static getResult(data, opmsg = "操作成功", req) {
return { return {
status: !data ? -1 : 0, status: !data ? -1 : 0,
msg: opmsg, msg: opmsg,
data: data || "", data: data || "",
bizmsg: req && req.session && req.session.bizmsg ? req.session.bizmsg : "empty" bizmsg: req && req.session && req.session.bizmsg ? req.session.bizmsg : "empty"
}; };
} }
static getErrResult2(errmsg) { static getErrResult2(errmsg) {
return this.getResult2(null, null, null, errmsg); return this.getResult2(null, null, null, errmsg);
} }
static getResult2(data, req, okmsg = "操作成功", errmsg = "操作失败") { static getResult2(data, req, okmsg = "操作成功", errmsg = "操作失败") {
var result = { var result = {
status: 0, status: 0,
msg: okmsg, msg: okmsg,
data: data, data: data,
}; };
if (req && req.session && req.session.bizmsg) { if (req && req.session && req.session.bizmsg) {
result.bizmsg = req.session.bizmsg; result.bizmsg = req.session.bizmsg;
req.session.bizmsg = null; req.session.bizmsg = null;
} else { } else {
result.bizmsg = "empty"; result.bizmsg = "empty";
} }
if (!data) { if (!data) {
result.status = -1; result.status = -1;
result.msg = errmsg; result.msg = errmsg;
} }
return result; return result;
} }
static getResult3(data, req, okmsg = "操作成功", errmsg = "操作失败") { static getResult3(data, req, okmsg = "操作成功", errmsg = "操作失败") {
var total = data.total; var total = data.total;
data = data.hits; data = data.hits;
var sources = []; var sources = [];
data.forEach(function (d) { data.forEach(function(d) {
sources.push(d._source); sources.push(d._source);
}) })
var result = { var result = {
status: 0, status: 0,
msg: okmsg, msg: okmsg,
total: total, total: total,
data: sources, data: sources,
}; };
if (req && req.session && req.session.bizmsg) { if (req && req.session && req.session.bizmsg) {
result.bizmsg = req.session.bizmsg; result.bizmsg = req.session.bizmsg;
req.session.bizmsg = null; req.session.bizmsg = null;
} else { } else {
result.bizmsg = "empty"; result.bizmsg = "empty";
} }
if (!data) { if (!data) {
result.status = -1; result.status = -1;
result.msg = errmsg; result.msg = errmsg;
} }
return result; return result;
} }
static getResult4(j, req, okmsg = "操作成功", errmsg = "操作失败") { static getResult4(j, req, okmsg = "操作成功", errmsg = "操作失败") {
var aggs = j.aggregations; var aggs = j.aggregations;
var codes_count = aggs.ncl_one_codes_count; var codes_count = aggs.ncl_one_codes_count;
var bucketlist = codes_count.buckets; var bucketlist = codes_count.buckets;
var bucklist = []; var bucklist = [];
bucketlist.forEach(function (d) { bucketlist.forEach(function(d) {
bucklist.push(d); bucklist.push(d);
}) })
var data = j.hits; var data = j.hits;
var total = data.total; var total = data.total;
var hit = data.hits; var hit = data.hits;
var sources = []; var sources = [];
hit.forEach(function (d) { hit.forEach(function(d) {
sources.push(d._source); sources.push(d._source);
}) })
var result = { var result = {
status: 0, status: 0,
msg: okmsg, msg: okmsg,
total: total, total: total,
data: sources, data: sources,
buckets: bucklist, buckets: bucklist,
}; };
if (req && req.session && req.session.bizmsg) { if (req && req.session && req.session.bizmsg) {
result.bizmsg = req.session.bizmsg; result.bizmsg = req.session.bizmsg;
req.session.bizmsg = null; req.session.bizmsg = null;
} else { } else {
result.bizmsg = "empty"; result.bizmsg = "empty";
} }
if (!hit) { if (!hit) {
result.status = -1; result.status = -1;
result.msg = errmsg; result.msg = errmsg;
} }
return result; return result;
} }
static getResultjuhe4(j, req, okmsg = "操作成功", errmsg = "操作失败") { static getResultjuhe4(j, req, okmsg = "操作成功", errmsg = "操作失败") {
var aggs = j.aggregations; var aggs = j.aggregations;
var codes_count = aggs.ncl_one_codes_count; var codes_count = aggs.ncl_one_codes_count;
var bucketlist = codes_count.buckets; var bucketlist = codes_count.buckets;
var bucklist = []; var bucklist = [];
bucketlist.forEach(function (d) { bucketlist.forEach(function(d) {
bucklist.push(d); bucklist.push(d);
}) })
var result = { var result = {
status: 0, status: 0,
msg: okmsg, msg: okmsg,
buckets: bucklist, buckets: bucklist,
}; };
if (!bucklist) { if (!bucklist) {
result.status = -1; result.status = -1;
result.msg = errmsg; result.msg = errmsg;
} }
return result; return result;
} }
static getResultjuhetwo(j, req, okmsg = "操作成功", errmsg = "操作失败") { static getResultjuhetwo(j, req, okmsg = "操作成功", errmsg = "操作失败") {
var aggs = j.aggregations; var aggs = j.aggregations;
var notice_count = aggs.notice_count; var notice_count = aggs.notice_count;
var bucketlist = notice_count.buckets; var bucketlist = notice_count.buckets;
var bucklist = []; var bucklist = [];
bucketlist.forEach(function (d) { bucketlist.forEach(function(d) {
var notice_issue = d.key; var notice_issue = d.key;
var date = d.date_max.value; var date = d.date_max.value;
var data = { var data = {
notice_issue: notice_issue, notice_issue: notice_issue,
date: date date: date
} }
bucklist.push(data); bucklist.push(data);
}) })
var result = { var result = {
status: 0, status: 0,
msg: okmsg, msg: okmsg,
buckets: bucklist, buckets: bucklist,
}; };
if (!bucklist) { if (!bucklist) {
result.status = -1; result.status = -1;
result.msg = errmsg; result.msg = errmsg;
} }
return result; return result;
} }
/** /**
* 请求返回成功 * 请求返回成功
* @param {*} data 操作成功返回的数据 * @param {*} data 操作成功返回的数据
* @param {*} okmsg 操作成功的描述 * @param {*} okmsg 操作成功的描述
*/ */
static getResultSuccess(data, okmsg = "success") { static getResultSuccess(data, okmsg = "success") {
return { return {
status: 0, status: 0,
msg: okmsg, msg: okmsg,
data: data || "成功" data: data || "成功"
}; };
} }
// 2020 0916 lin 新增返回格式 成功status为1 // 2020 0916 lin 新增返回格式 成功status为1
static getResultRedisQueueSuccess(data, okmsg = "success") { static getResultRedisQueueSuccess(data, okmsg = "success") {
return { return {
status: 1, status: 1,
msg: okmsg, msg: okmsg,
data: data || null, data: data || null,
}; };
} }
/**
* 请求返回成功 自定义
* @param {*} data 操作成功返回的数据
* @param {*} okmsg 操作成功的描述
*/
static getResultCustomSuccess(data, okmsg = "success") {
return {
status: 0,
msg: okmsg,
...data
};
}
/** /**
* 请求返回失败 * 请求返回成功 自定义
* @param {*} status 操作失败状态，默认为-1 * @param {*} data 操作成功返回的数据
* @param {*} errmsg 操作失败的描述，默认为fail * @param {*} okmsg 操作成功的描述
* @param {*} data 操作失败返回的数据 */
*/ static getResultCustomSuccess(data, okmsg = "success") {
static getResultFail(status = -1, errmsg = "fail", data = "") { return {
return { status: 0,
status: status, msg: okmsg,
msg: errmsg, ...data
data: data, };
}; }
}
static getObject(objpath) {
var pathArray = objpath.split(".");
var packageName = pathArray[0];
var groupName = pathArray[1];
var filename = pathArray[2];
var classpath = "";
if (filename) {
classpath = objsettings[packageName] + "/" + groupName;
} else {
classpath = objsettings[packageName];
filename = groupName;
}
var objabspath = classpath + "/" + filename + ".js"; /**
if (System.objTable[objabspath] != null) { * 请求返回失败
console.log(objabspath, "get cached obj...."); * @param {*} status 操作失败状态，默认为-1
return System.objTable[objabspath]; * @param {*} errmsg 操作失败的描述，默认为fail
} else { * @param {*} data 操作失败返回的数据
console.log("no cached..."); */
var ClassObj = require(objabspath); static getResultFail(status = -1, errmsg = "fail", data = "") {
return System.register(objabspath, ClassObj); return {
} status: status,
} msg: errmsg,
static getUiConfig(appid) { data: data,
var configPath = settings.basepath + "/app/base/db/metadata/" + appid + "/index.js"; };
if (settings.env == "dev") { }
delete require.cache[configPath]; static getObject(objpath) {
} var pathArray = objpath.split(".");
var configValue = require(configPath); var packageName = pathArray[0];
return configValue; var groupName = pathArray[1];
} var filename = pathArray[2];
static getUiConfig2(appid) { var classpath = "";
var configPath = settings.basepath + "/app/base/db/metadata/index.js"; if (filename) {
// if(settings.env=="dev"){ classpath = objsettings[packageName] + "/" + groupName;
// console.log("delete "+configPath+"cache config"); } else {
// delete require.cache[configPath]; classpath = objsettings[packageName];
// } filename = groupName;
delete require.cache[configPath]; }
var configValue = require(configPath);
return configValue[appid];
}
static get_client_ip(req) {
var ip = req.headers['x-forwarded-for'] ||
req.ip ||
req.connection.remoteAddress ||
req.socket.remoteAddress ||
(req.connection.socket && req.connection.socket.remoteAddress) || '';
var x = ip.match(/(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])$/);
if (x) {
return x[0];
} else {
return "localhost";
}
}; var objabspath = classpath + "/" + filename + ".js";
if (System.objTable[objabspath] != null) {
console.log(objabspath, "get cached obj....");
return System.objTable[objabspath];
} else {
console.log("no cached...");
var ClassObj = require(objabspath);
return System.register(objabspath, ClassObj);
}
}
static getUiConfig(appid) {
var configPath = settings.basepath + "/app/base/db/metadata/" + appid + "/index.js";
if (settings.env == "dev") {
delete require.cache[configPath];
}
var configValue = require(configPath);
return configValue;
}
static getUiConfig2(appid) {
var configPath = settings.basepath + "/app/base/db/metadata/index.js";
// if(settings.env=="dev"){
// console.log("delete "+configPath+"cache config");
// delete require.cache[configPath];
// }
delete require.cache[configPath];
var configValue = require(configPath);
return configValue[appid];
}
static get_client_ip(req) {
var ip = req.headers['x-forwarded-for'] ||
req.ip ||
req.connection.remoteAddress ||
req.socket.remoteAddress ||
(req.connection.socket && req.connection.socket.remoteAddress) || '';
var x = ip.match(/(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])$/);
if (x) {
return x[0];
} else {
return "localhost";
}
static y2f(y) { };
if (!y) {
return 0;
}
return (Number(y) * 100).toFixed(0);
}
static f2y(f) { static y2f(y) {
if (!f) { if (!y) {
return 0; return 0;
} }
return parseFloat((Number(f) / 100).toFixed(2)); return (Number(y) * 100).toFixed(0);
} }
static f2y4list(list, fields, prev) { static f2y(f) {
if (!list || list.length == 0 || !fields || fields.length == 0) { if (!f) {
return; return 0;
} }
prev = prev || ""; return parseFloat((Number(f) / 100).toFixed(2));
for (var item of list) { }
for (var f of fields) {
var v = item[f]; static f2y4list(list, fields, prev) {
if (v) { if (!list || list.length == 0 || !fields || fields.length == 0) {
try { return;
item[f + "_y"] = prev + parseFloat((Number(v) / 100).toFixed(2)); }
} catch (error) { prev = prev || "";
console.log(error); for (var item of list) {
} for (var f of fields) {
} var v = item[f];
} if (v) {
} try {
} item[f + "_y"] = prev + parseFloat((Number(v) / 100).toFixed(2));
} catch (error) {
console.log(error);
}
}
}
}
}
} }
Date.prototype.Format = function (fmt) { //author: meizz Date.prototype.Format = function(fmt) { //author: meizz
var o = { var o = {
"M+": this.getMonth() + 1, //月份 "M+": this.getMonth() + 1, //月份
"d+": this.getDate(), //日 "d+": this.getDate(), //日
"h+": this.getHours(), //小时 "h+": this.getHours(), //小时
"m+": this.getMinutes(), //分 "m+": this.getMinutes(), //分
"s+": this.getSeconds(), //秒 "s+": this.getSeconds(), //秒
"q+": Math.floor((this.getMonth() + 3) / 3), //季度 "q+": Math.floor((this.getMonth() + 3) / 3), //季度
"S": this.getMilliseconds() //毫秒 "S": this.getMilliseconds() //毫秒
}; };
if (/(y+)/.test(fmt)) if (/(y+)/.test(fmt))
fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length)); fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
for (var k in o) for (var k in o)
if (new RegExp("(" + k + ")").test(fmt)) if (new RegExp("(" + k + ")").test(fmt))
fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length))); fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
return fmt; return fmt;
} }
System.exTime = 4 * 3600;//缓存过期时间，4小时 System.exTime = 4 * 3600; //缓存过期时间，4小时
System.objTable = {}; System.objTable = {};
......
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