合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -610,6 +610,27 @@ public class HKOpenApi {
     }
     
     public static void main(String[] args) {
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + "/openapi/service/eps/subscribeEventsFromMQEx";
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("eventTypes","198914,199941,983309,983299");
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        String params =  JSON.toJSONString(parMap);
+        log.info("分页获取门禁点信息请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("分页获取门禁点信息 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取失败!",e);
+            throw new RuntimeException("获取失败!");
+        }
+    
+        System.out.println(data);
     }
 
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/BannerServiceImpl.java

@@ -40,7 +40,7 @@ public class BannerServiceImpl implements BannerServiceI {
         List<ToBanner> bannersList = toBannerMapper.selectAllByNum(nowTime, bannerNum, bannerPosition);
         bannersList.stream().forEach(banner -> {
             if (banner.getBannerType().equals(Constant.BANNER_TYPE_ARTICLE)){
-                banner.setExternalLink("http://192.168.0.124:8080/#/bannerDetail?form=index&id="+banner.getId());
+                banner.setExternalLink("http://101.132.102.231:8011/#/bannerDetail?from=index&id="+banner.getId());
             }
         });
         return bannersList;