Skip to content

Z
zhichan
Commit 81ae37dd by 王悦
Options

fix

parent bebbf222
Showing with 55 additions and 46 deletions
zhiquanquan/app/base/controller/impl/trademark/searchCtl.js
...@@ -25,51 +25,53 @@ class searchCtl extends CtlBase { ...@@ -25,51 +25,53 @@ class searchCtl extends CtlBase {
* {"error": ""} * {"error": ""}
*/ */
async findAndCountAll(p, q, req) { async findAndCountAll(p, q, req) {
let query = { try {
"actionType": "", let query = {
"actionBody": { "actionType": "",
pageSize: p.pageInfo.pageSize, "actionBody": {
currentPage: p.pageInfo.pageNo, pageSize: p.pageInfo.pageSize,
"tmName": "",//商标名称 currentPage: p.pageInfo.pageNo,
"regMan": "", "tmName": "",//商标名称
"regNum": "", "regMan": "",
"sqlbtabkey": "",//商标类别 "regNum": "",
"flzttabkey": "",//法律状态 "sqlbtabkey": "",//商标类别
"sqnftabkey": "",//申请年份 "flzttabkey": "",//法律状态
"ncl": [],//尼斯大类 "sqnftabkey": "",//申请年份
"xcl": [],//尼斯群组 "ncl": [],//尼斯大类
"nclNum": [],//尼斯大类 "xcl": [],//尼斯群组
} "nclNum": [],//尼斯大类
}; }
if (Object.keys(p.search).length > 0) { };
if (p.search.sbzch) {//注册号查询 if (Object.keys(p.search).length > 0) {
query.actionType = "findTrademarkzchAccurate"; if (p.search.sbzch) {//注册号查询
query.actionBody.regNum = p.search.sbzch query.actionType = "findTrademarkzchAccurate";
} else if (p.search.zcren) {//申请人查询 query.actionBody.regNum = p.search.sbzch
query.actionType = "findTrademarkzcr"; } else if (p.search.zcren) {//申请人查询
query.actionBody.regMan = p.search.zcren query.actionType = "findTrademarkzcr";
} else if (p.search.sbmc) {//商标名称查询 query.actionBody.regMan = p.search.zcren
query.actionType = "findTrademarkNameAccurate"; } else if (p.search.sbmc) {//商标名称查询
query.actionBody.tmName = p.search.sbmc query.actionType = "findTrademarkNameAccurate";
} query.actionBody.tmName = p.search.sbmc
} else return; }
let tokenInfo = await this.service.getToken(); } else return;
if (tokenInfo && tokenInfo.data && tokenInfo.data.token) { }catch (e) {
try { return system.getResultFail(-8,e)
let rtn = await this.execClient.execPostTK(query, tmurl, tokenInfo.data.token); }
let data = rtn.data; try {
let published = await this.service.findAll({company_id: p.company_id}); let tokenInfo = await this.service.getToken();
data.rows.forEach(item => { let rtn = await this.execClient.execPostTK(query, tmurl, tokenInfo.data.token);
for (let t of published) { let data = rtn.data;
if (t.tm_code == item.sbzch) let published = await this.service.findAll({company_id: p.company_id});
item._disabled = true; data.rows.forEach(item => {
} for (let t of published) {
}); if (t.tm_code == item.sbzch)
}catch (e) { item._disabled = true;
return system.getResultFail(-1,e) }
} });
return system.getResultList(data.count, data.rows) return system.getResultList(data.count, data.rows)
} else return system.getResultFail(-1, "token获取失败") }catch (e) {
return system.getResultFail(-9,e)
}
} }
} }
......
zhiquanquan/app/base/service/sve.base.js
...@@ -13,14 +13,13 @@ class ServiceBase { ...@@ -13,14 +13,13 @@ class ServiceBase {
this.restS = system.getObject("util.restClient"); this.restS = system.getObject("util.restClient");
this.md5 = require("MD5"); this.md5 = require("MD5");
this.execClient = system.getObject("util.execClient"); this.execClient = system.getObject("util.execClient");
this.channelApiUrl = settings.channelApiUrl();
this.appInfo = { this.appInfo = {
aliyuntmtransfer: { appkey: "202003231118", secret: "7cbb846246874167b5c7e01cd0016c99" } aliyuntmtransfer: { appkey: "202003231118", secret: "7cbb846246874167b5c7e01cd0016c99" }
}; };
} }
async getToken() { async getToken() {
var self = this; var self = this;
var reqTokenUrl = settings.channelApiUrl() + "/api/opreceive/accessAuth/getAppTokenByAppKey"; var reqTokenUrl = settings.centerChannelUrl() + "/api/opreceive/accessAuth/getAppTokenByAppKey";
var reqParam = self.appInfo["aliyuntmtransfer"]; var reqParam = self.appInfo["aliyuntmtransfer"];
if (!reqParam.appkey || !reqParam.secret) { if (!reqParam.appkey || !reqParam.secret) {
return system.getResult(null, "reqType类型有误，请求失败"); return system.getResult(null, "reqType类型有误，请求失败");
......
zhiquanquan/app/config/settings.js
...@@ -48,6 +48,14 @@ var settings = { ...@@ -48,6 +48,14 @@ var settings = {
return "http://zcapi-service.chaolai"; return "http://zcapi-service.chaolai";
} }
}, },
centerChannelUrl: function () {//---------center-channel
if (this.env == "dev") {
// return "http://gsbweb.qifu-dev.gongsibao.com";//localsettings.reqEsDevUrl;
return "http://gsbweb.qifu-dev.gongsibao.com:4012";
} else {
return "http://center-channel-service";
}
},
uploadfileossurl: function () { uploadfileossurl: function () {
if (this.env == "dev") { if (this.env == "dev") {
return "http://192.168.49.170:8080"; return "http://192.168.49.170:8080";
......
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