更新正式环境接口

gis_common/src/main/java/com/gis/common/deyuan/util/ResultUtils.java

@@ -19,8 +19,11 @@ import java.util.Map;
 @Log4j2
 public class ResultUtils {
 
-    /** 德源ip*/
-    private static final String host = "https://testlife.eshimin.com";
+    /** 德源ip-测试*/
+//    private static final String host = "https://testlife.eshimin.com";
+
+    /** 德源ip-正式*/
+    private static final String host = "https://life.eshimin.com";
 
     private static final String publicKyeSign = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCTlOGDZQo9rkignZqZMN8JFC9OcnhiYOigLCVTrXhl6Z0ZD5bncnl9FRPPzgJBwf/3vl4LuWxcDzOK9w/pJ+v2D7uP/RPt3770Cv/dcG5vrUewV+IJ4qSkxwVkxeCS7r4c47kz22avMPo97OIdy6jed+/DDrbOIXbjQ7rl/AAs8QIDAQAB";
 
@@ -66,6 +69,7 @@ public class ResultUtils {
         try {
             HttpResponse httpResponse = HttpUtils.doGet(host, path, headers, querys);
             String restResult = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
+            log.info("restResult: {}", restResult);
             if (StringUtils.isNotEmpty(restResult)) {
                 JSONObject jsonObject = JSONObject.parseObject(restResult, Feature.IgnoreNotMatch);
                 String code = jsonObject.getString("code");
@@ -76,12 +80,16 @@ public class ResultUtils {
                     String s = RSAUtils.decryptByPrivateKey(result, RSAUtils.getPrivateKey(privateKyeRes));
                     resultData = URLDecoder.decode(s, "utf-8");
                 }
+//                else {
+//
+//                    return Result.failure(msg);
+//                }
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
 
-
+        log.info("result: {}", resultData);
         return Result.success(JSONObject.parseObject(resultData));
     }
 
@@ -137,7 +145,7 @@ public class ResultUtils {
             e.printStackTrace();
         }
 
-
+        log.info("result: {}", resultData);
         return JSONObject.parseObject(resultData);
     }
 

gis_web/src/main/java/com/gis/web/controller/DoorController.java

@@ -27,7 +27,10 @@ import java.util.TreeMap;
 public class DoorController  {
 
     // 测试环境请求域名
-    private static String BASE_URL = "https://cdpre.tfsmy.com/intelligence-access-control-api";
+//    private static String BASE_URL = "https://cdpre.tfsmy.com/intelligence-access-control-api";
+
+    // 正式环境请求域名
+    private static String BASE_URL = "https://tfsmy.chengdu.gov.cn/intelligence-access-control-api";
 
     @ApiOperation("访客总数、近7天每日统计数(测试：510124112006001)")
     @GetMapping("getVisitorCount/{code}")

gis_web/src/main/java/com/gis/web/controller/ScreenController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
 
@@ -96,14 +97,14 @@ public class ScreenController  {
         return ResultUtils.doGetResult(apiUrl, param);
     }
 
-    /** 无数据*/
     @ApiOperationSupport(order=2)
-    @ApiOperation("场景营造-可信生活圈")
+    @ApiOperation("场景营造-可信生活圈：5f3de3d925892e0001e10312")
     @GetMapping("businessData/{code}")
     public Result businessData(@PathVariable String code) {
         String apiUrl = "/open/api/v1/community/business-data";
         HashMap<String, Object> param = new HashMap<>();
-        param.put("code", code);
+        param.put("group", code);
+
         return ResultUtils.doGetResult(apiUrl, param);
     }
 

remark.md

@@ -35,4 +35,16 @@ http://192.168.0.115:3000/wuweihao/cms_chengdu_screen.git
 
 
 #################################### 2020-11-11 ####################################
- 服务器变更：47.112.166.173
+ 1. 服务器变更：47.112.166.173
+ 
+ 
+#################################### 2020-12-02 ####################################
+ 1. 更新门禁接口域名为正式环境
+ 2. 更换大屏接口域名为正式环境
+ 
+ 
+ 接口名称	测试参数	是否有数据
+ 
+ 场景营造-可信生活圈	5f3de3d925892e0001e10312	有
+
+