From d1e65a28fc73b543b8f34fe118712573682ff2fc Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 17 一月 2024 02:54:28 +0800
Subject: [PATCH] 优化吴家协议
---
src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
index a2b54d3..302fc5e 100644
--- a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
+++ b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
@@ -1,12 +1,7 @@
package com.fzzy.gateway;
import com.alibaba.fastjson.JSON;
-import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.GatewayDeviceProtocol;
-import com.fzzy.api.entity.ApiConfs;
-import com.fzzy.api.service.*;
-import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.utils.RedisUtil;
import com.fzzy.data.ConfigData;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.data.BaseReqData;
@@ -15,18 +10,16 @@
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.service.GatewayConfService;
import com.fzzy.gateway.util.GatewayHttpUtil;
-import jdk.nashorn.internal.runtime.regexp.joni.Config;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Collection;
-import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 缃戝叧鐩稿叧鐨勫畾鏃跺櫒
@@ -55,7 +48,7 @@
* <p>
* 鍥哄畾鏃堕棿锛氭瘡闂撮殧10鍒嗛挓鎵ц涓�娆�
*/
- @Scheduled(cron = "0 0/1 * * * ?")
+ @Scheduled(cron = "0 0/10 * * * ?")
public void scheduled() {
//缃戝叧鐨勫績璺虫墽琛�
@@ -88,13 +81,29 @@
public void doWeatherExe() {
try {
- String url = configData.getWeatherUrl();
+ String url = configData.getWeatherPath();
+ if (null == url) {
+ url = DEFAULT_URL;
+ }
+ Map<String ,String> parameMap = new HashMap<>();
+ parameMap.put("unescape","1");
+ parameMap.put("version","v61");
+ parameMap.put("appid",DEFAULT_APP_ID);
+ parameMap.put("appsecret",DEFAULT_APP_SECRET);
+ parameMap.put("cityid",DEFAULT_CITYID);
url = url.replace("{appId}", DEFAULT_APP_ID).replace("{appsecret}", DEFAULT_APP_SECRET).replace("{cityid}", DEFAULT_CITYID);
+ url = url.replace("{appId}", DEFAULT_APP_ID).replace("{appsecret}", DEFAULT_APP_SECRET);
+
+ if (StringUtils.isNotEmpty(configData.getCityId())) {
+ url = url.replace("{cityid}", configData.getCityId());
+ } else {
+ url = url.replace("{cityid}", DEFAULT_CITYID);
+ }
log.debug("------姘旇薄璇锋眰淇℃伅URL---{}", url);
- String result = GatewayHttpUtil.doGet(url);
+ String result = GatewayHttpUtil.doGet(url,parameMap);
if (null == result) {
log.error("褰撳墠澶栫綉鑾峰彇姘旇薄淇℃伅澶辫触鈥︹��");
@@ -112,7 +121,7 @@
log.info("===========================绯荤粺瀹氭椂鑾疯幏鍙栨皵璞′俊鎭�===={}==================", dto);
} catch (Exception e) {
-
+ log.error(e.getMessage(),e);
}
}
@@ -160,4 +169,22 @@
gatewayRemoteManager.getSyncWeightService(device.getSyncProtocol()).syncWeightInfo(reqData);
}
}
+
+ public static void main(String[] args) {
+ try {
+ Map<String ,String> parameMap = new HashMap<>();
+ parameMap.put("unescape","1");
+ parameMap.put("version","v61");
+ parameMap.put("appid","49421971");
+ parameMap.put("appsecret","JmJE48Fv");
+ parameMap.put("cityid","101270101");
+ String result = GatewayHttpUtil.doGet("https://v1.yiketianqi.com/api?unescape=1&version=v61&appid=49421971&appsecret=JmJE48Fv&cityid=101270101", parameMap);
+
+
+ System.out.println(result);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+
+ }
}
--
Gitblit v1.9.3