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

center-channel/app/base/api/impl/zzzd/diagnosisneedbus.js

@@ -62,7 +62,7 @@ class diagnosisNeedBus extends WEBBase {
         break;
         break;
 
 
       case 'licenseCompare':
       case 'licenseCompare':
-        opResult = await this.unSve.licenseCompare(pobj);
+        opResult = await this.unSve.licenseCompare(pobj.actionBody);
         break
         break
       default:
       default:
         opResult = system.getResult(null, "actionType参数错误");
         opResult = system.getResult(null, "actionType参数错误");

center-channel/app/base/service/impl/utilsSve/utilsNdbSve.js

@@ -7,6 +7,7 @@ class FblicenseService extends AppServiceBase {
     super();
     super();
     this.centerOrderUrl = settings.centerOrderUrl()
     this.centerOrderUrl = settings.centerOrderUrl()
     this.restClient = system.getObject("util.restClient")
     this.restClient = system.getObject("util.restClient")
+    this.redisClient = system.getObject("util.redisClient")
   };
   };
 
 
   //获取列表、检索
   //获取列表、检索
@@ -72,44 +73,34 @@ class FblicenseService extends AppServiceBase {
   }
   }
 
 
   async licenseCompare (pobj) {
   async licenseCompare (pobj) {
-    let res = {
-      "Message": "查询成功",
-      "OrderNumber": null,
-      "Result": {
-        "Data": {
-          "中央厨房": "否",
-          "主体业态": "单位食堂",
-          "住所": "新疆维吾尔自治区伊犁州伊宁县伊东工业园管委会",
-          "发证日期": "2018年07月19日",
-          "发证机关": "伊宁县市场监督管理局",
-          "散装熟食销售": "否",
-          "日常监督管理人员": "杜爱洪加拉斯",
-          "日常监督管理机构": "伊宁县市场监督管理局",
-          "有效期至": "2023年07月18日",
-          "法定代表人（负责人）": "霍庆华",
-          "监督举报电话": "",
-          "签发人": "马江平",
-          "经营场所": "新疆维吾尔自治区伊犁州伊宁县伊东工业园管委会",
-          "经营者名称": "新疆庆华能源集团有限公司",
-          "经营项目": "热食类食品制售,",
-          "网络经营": "否",
-          "许可证状态": "有效",
-          "许可证编号": "JY36540210003935",
-          "集体用餐配送单位": "否"
-        },
-        "Id": "85eb513de02c7ff8199bda197992888c",
-        "Schema": null
-      },
-      "Status": "200"
-    }
-    if (res.Status == 200) {
-      let result = res.Result.Data
-      let keys = Object.keys(result)
-      for (let i of keys) {
-        if (!result[i]) {
-          delete result[i]
-        }
+    let key = `${pobj.companyName}_${pobj.picName}`
+    let resCache = await this.redisClient.get(key)
+    if (resCache) {
+      return {
+        status: 0,
+        msg: "success",
+        data: JSON.parse(resCache)
       }
       }
+    } else {
+      let result = await this.restClient.execPost(pobj, 'http://106.13.228.212/gsb/api/qualificationsDetail')
+      result = JSON.parse(result.stdout)
+      if (result.status == 0) {
+        let result = res.data
+        result = this.ObjTrim(result)
+        result = {
+          许可名称: result.Name,
+          许可证编号: result.No,
+          有效期自: result.StartDate,
+          有效期至: result.EndDate
+        }
+        // result = {
+        //   许可证编号: result.许可证编号,
+        //   证照名称: result.证照名称,
+        //   有效期限: result.有效期限,
+        //   有效期限: result.有效期限,
+        //   发证机关: result.发证机关
+        // }
+        await this.redisClient.setWithEx(key, JSON.stringify(result), 3600);
         return {
         return {
           status: 0,
           status: 0,
           msg: "success",
           msg: "success",
@@ -118,9 +109,21 @@ class FblicenseService extends AppServiceBase {
       } else {
       } else {
         return {
         return {
           status: -1,
           status: -1,
-        msg: res.Message
+          msg: result.message
+        }
+      }
+    }
+  }
+
+  ObjTrim (data) {
+    let k = Object.keys(data)
+    for (let i of k) {
+      if (!data[i]) {
+        delete data[i]
       }
       }
     }
     }
+    console.log(data)
+    return data
   }
   }
 }
 }