gyq

ipop-web/app/base/api/impl/chinapatentsearch.js

@@ -1049,7 +1049,7 @@ class ChinaPatentSearchApi extends ApiBase {
         }
         }
       },
       },
       "from": 0,
       "from": 0,
-      "size": 200
+      "size": 50
     };
     };
     for (var x in obj) {
     for (var x in obj) {
       params.query.bool.must.push(obj[x]);
       params.query.bool.must.push(obj[x]);

ipop-web/app/base/controller/impl/patentycCtl.js

@@ -39,7 +39,7 @@ class PatentycCtl extends CtlBase {
     try{
     try{
       var result = await this.service.ezReportUploadData(obj);
       var result = await this.service.ezReportUploadData(obj);
       if (result){
       if (result){
-        return System.getResult2(result);
+        return System.getResult2(result);//"result":true,"uid":"735f9cd0-c103-11ea-9ecd-1d1c3e85a974"}
       }
       }
       else{
       else{
         return System.getErrResult2("返回结果为空");
         return System.getErrResult2("返回结果为空");
@@ -54,9 +54,15 @@ class PatentycCtl extends CtlBase {
   async ReadyReport(pobj,obj,req){
   async ReadyReport(pobj,obj,req){
     if (obj.uid && obj.uid != 'undefined'){
     if (obj.uid && obj.uid != 'undefined'){
       try{
       try{
-        var result = await this.service.ReadyReport(obj);
+        var result = await this.service.ezReadyReport(obj);
+        if (result == 1){
           return System.getResult2(result);
           return System.getResult2(result);
         }
         }
+        else{
+          return System.getResult2("报告尚未生成");
+        }
+        
+      }
       catch(error){
       catch(error){
         return System.getErrResult2(error);
         return System.getErrResult2(error);
       }
       }

ipop-web/app/base/utils/execClient.js

@@ -11,7 +11,9 @@ class ExecClient {
     async exec(cmd) {
     async exec(cmd) {
         //await后面表达式返回的promise对象，是then的语法糖，await返回then函数的返回值
         //await后面表达式返回的promise对象，是then的语法糖，await返回then函数的返回值
         //异常需要try/catch自己捕获或外部catch捕获
         //异常需要try/catch自己捕获或外部catch捕获
-        const {stdout, stderr} = await exec(cmd);
+        const {stdout, stderr} = await exec(cmd,{
+            maxBuffer: 40960 * 1024
+          });
         return {stdout, stderr};
         return {stdout, stderr};
     }
     }
 
 
@@ -49,7 +51,9 @@ class ExecClient {
 
 
     async execGet(subData, url) {
     async execGet(subData, url) {
         let cmd = this.FetchGetCmd(subData, url);
         let cmd = this.FetchGetCmd(subData, url);
+        console.log("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
         console.log(cmd);
         console.log(cmd);
+        console.log("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
         var result = await this.exec(cmd);
         var result = await this.exec(cmd);
         return result;
         return result;
     }
     }