优化主库协议，支持路由

vince

2024-01-16 5f92b2034f84caeab9cb6efc61ecbe22407935b4

 src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java

@@ -1,12 +1,8 @@
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;
import com.fzzy.gateway.data.WeatherWebDto;
@@ -16,15 +12,14 @@
import com.fzzy.gateway.util.GatewayHttpUtil;
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;

/**
 * 网关相关的定时器
@@ -33,7 +28,7 @@
@Component(GatewayTimerScheduled.BEAN_ID)
public class GatewayTimerScheduled {

        public static String DEFAULT_URL = "https://v1.yiketianqi.com/api?unescape=1&version=v61&appid={appId}&appsecret={appsecret}&cityid={cityid}";
    public static String DEFAULT_URL = "https://v1.yiketianqi.com/api?unescape=1&version=v61&appid={appId}&appsecret={appsecret}&cityid={cityid}";
    public static String DEFAULT_APP_ID = "49421971";
    public static String DEFAULT_APP_SECRET = "JmJE48Fv";
    public static String DEFAULT_CITYID = "101270101";//成都
@@ -45,6 +40,8 @@
    private GatewayConfService confService;
    @Resource
    private GatewayRemoteManager gatewayRemoteManager;
    @Resource
    private ConfigData configData;


    /**
@@ -84,12 +81,29 @@
    public void doWeatherExe() {

        try {
            String url = DEFAULT_URL;
            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);

            log.debug("------气象URL---{}", url);
            String result = GatewayHttpUtil.doGet(url, null);
            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,parameMap);

            if (null == result) {
                log.error("当前外网获取气象信息失败……");
@@ -107,7 +121,7 @@
            log.info("===========================系统定时获获取气象信息===={}==================", dto);

        } catch (Exception e) {

            log.error(e.getMessage(),e);
        }
    }

@@ -155,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();
        }

    }
}