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

center-channel/app/base/api/impl/action/tmQuery.js

@@ -103,22 +103,28 @@ class TmQueryAPI extends WEBBase {
                 opResult = await this.toolSve.getNclByCode(pobj,req);
                 break;
             case "tmstatistics": //商标统计接口总量、有效、申请
-                opResult = await this.tmquerySve.tmstatistics(pobj,req);
+                opResult = await this.tmquerySve.tmstatistics(action_body,req);
                 break;
             case "tmcompanystatistics": //商标统计接口公司总量
-                opResult = await this.tmquerySve.tmcompanystatistics(pobj,req);
+                opResult = await this.tmquerySve.tmcompanystatistics(action_body,req);
                 break;
             case "tmaddrstatisticsrank"://商标地区分布统计排名
-                opResult = await this.tmquerySve.tmaddrstatisticsrank(pobj,req);
+                opResult = await this.tmquerySve.tmaddrstatisticsrank(action_body,req);
                 break;
             case "tmcompanystatisticsrank": //商标企业分布统计排名
-                opResult = await this.tmquerySve.tmcompanystatisticsrank(pobj,req);
+                opResult = await this.tmquerySve.tmcompanystatisticsrank(action_body,req);
                 break;
             case "tmnclstatisticsrank": //商标类别申请排名
-                opResult = await this.tmquerySve.tmnclstatisticsrank(pobj,req);
+                opResult = await this.tmquerySve.tmnclstatisticsrank(action_body,req);
                 break;
             case "tmtrend": //商标申请及注册趋势
-                opResult = await this.tmquerySve.tmtrend(pobj,req);
+                opResult = await this.tmquerySve.tmtrend(action_body,req);
+                break;
+            case "findTrademarkNameAccuratejuhe": //通过商标名来进行精准查询,商标注册地域/大类分布
+                opResult = await this.tmquerySve.findTrademarkNameAccuratejuhe(action_body,req);
+                break;
+            case "findTrademarkNamejuhe": //根据商标名称模糊查询,商标注册地域/大类分布
+                opResult = await this.tmquerySve.findTrademarkNamejuhe(action_body,req);
                 break;
             default:
                 opResult = system.getResult(null, "action_type参数错误");

center-channel/app/base/service/impl/trademark/tmquerySve.js

@@ -110,6 +110,18 @@ class TmqueryService {
     return await this.opReqResult(url, queryobj, req);
   }
 
+  //通过商标名来进行精准查询,商标注册地域/大类分布
+  async findTrademarkNameAccuratejuhe(queryobj,req){
+    var url = this.zcApiUrl + "api/trademark/tmqueryApi/findTrademarkNameAccuratejuhe";
+    return await this.opReqResult(url, queryobj, req);
+  }
+
+  //根据商标名称模糊查询,商标注册地域/大类分布
+  async findTrademarkNamejuhe(queryobj,req){
+    var url = this.zcApiUrl + "api/trademark/tmqueryApi/findTrademarkNamejuhe";
+    return await this.opReqResult(url, queryobj, req);
+  }
+
   async tmreport(queryobj, pobj,req) {
     if (!queryobj.type) {
       return { code: -102, msg: "参数错误" }