diff --git a/src/main/java/com/njcn/syncdata/service/impl/HarmonicHistoryImpl.java b/src/main/java/com/njcn/syncdata/service/impl/HarmonicHistoryImpl.java index 6fe538d..2f7595b 100644 --- a/src/main/java/com/njcn/syncdata/service/impl/HarmonicHistoryImpl.java +++ b/src/main/java/com/njcn/syncdata/service/impl/HarmonicHistoryImpl.java @@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.cloud.apigateway.sdk.utils.Client; import com.cloud.apigateway.sdk.utils.Request; -import com.njcn.syncdata.pojo.po.AdsAstXbjcptGetFctgValueDi; import com.njcn.syncdata.pojo.zt.HarmonicHistoryC; import com.njcn.syncdata.pojo.zt.HarmonicHistoryP; import com.njcn.syncdata.pojo.zt.HarmonicHistoryV; @@ -37,30 +36,30 @@ public class HarmonicHistoryImpl implements HarmonicHistory { @Override public List listHarmonicHistoryV(String id, String starTime, String endTime) { - String key = "0e3bac160fd246f181ad4fd47da6929a"; - String secret = "383b4b2536234d84ac909cd605762061"; - String url = "http://8d051549520e423ab8dccf8b3d457c74.apigw.he-region-2.sgic.sgcc.com.cn/ast/ydxxcjxt/dws/get_e_mp_TGvol_zl_ds"; - String apiId = "46e61646481c0146e26ba79bb5c8fa05"; + String key = "a1a69c93c11e4910aa247087c261bec5"; + String secret = "038de3c27cc54489862d181470e3ad92"; + String url = "https://25.37.90.72/ast/ydxxcjxt/dws/get_e_mp_TGvol_zl_ds"; + String apiId = "0644f1c6abd65d3a3a81eb3314390e14"; String apiName = "get_电能质量谐波监测系统_分布式光伏台区日数据_e_mp_TGvol_zl_时间"; return adsDiList(HarmonicHistoryV.class,id,starTime,endTime,key,secret,url,apiId,apiName); } @Override public List listHarmonicHistoryP(String id, String starTime, String endTime) { - String key = "0e3bac160fd246f181ad4fd47da6929a"; - String secret = "383b4b2536234d84ac909cd605762061"; - String url = "http://8d051549520e423ab8dccf8b3d457c74.apigw.he-region-2.sgic.sgcc.com.cn/ast/ydxxcjxt/dws/get_e_mp_TGpower_zl_ds"; - String apiId = "9db49fdc30dbc3bf6fa4f5cce141416c"; + String key = "a1a69c93c11e4910aa247087c261bec5"; + String secret = "038de3c27cc54489862d181470e3ad92"; + String url = "https://25.37.90.72/ast/ydxxcjxt/dws/get_e_mp_TGpower_zl_ds"; + String apiId = "f9f0eb9627410c0ad4a66ae33a75e2c9"; String apiName = "get_电能质量谐波监测系统_分布式光伏台区日数据_e_mp_TGpower_zl_时间"; return adsDiList(HarmonicHistoryP.class,id,starTime,endTime,key,secret,url,apiId,apiName); } @Override public List listHarmonicHistoryC(String id, String starTime, String endTime) { - String key = "0e3bac160fd246f181ad4fd47da6929a"; - String secret = "383b4b2536234d84ac909cd605762061"; - String url = "http://8d051549520e423ab8dccf8b3d457c74.apigw.he-region-2.sgic.sgcc.com.cn/ast/ydxxcjxt/dws/get_e_mp_TGfactor_zl_ds"; - String apiId = "9c3ebd9c19dc0eb8e24385e40bd50a53"; + String key = "a1a69c93c11e4910aa247087c261bec5"; + String secret = "038de3c27cc54489862d181470e3ad92"; + String url = "https://25.37.90.72/ast/ydxxcjxt/dws/get_e_mp_TGfactor_zl_ds"; + String apiId = "bf6cc99505f93c355baad9926b61f17e"; String apiName = "get_电能质量谐波监测系统_分布式光伏台区日数据_e_mp_TGfactor_zl_时间"; return adsDiList(HarmonicHistoryC.class,id,starTime,endTime,key,secret,url,apiId,apiName); } diff --git a/src/main/java/com/njcn/syncdata/service/impl/PowerDistributionareaServiceImpl.java b/src/main/java/com/njcn/syncdata/service/impl/PowerDistributionareaServiceImpl.java index 0ed2978..ae0d4d7 100644 --- a/src/main/java/com/njcn/syncdata/service/impl/PowerDistributionareaServiceImpl.java +++ b/src/main/java/com/njcn/syncdata/service/impl/PowerDistributionareaServiceImpl.java @@ -91,10 +91,10 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp @Override public List adsList(Integer limitValue,Integer offsetValue) { List aas = new ArrayList<>(); - String key = "0e3bac160fd246f181ad4fd47da6929a"; - String secret = "383b4b2536234d84ac909cd605762061"; - String url = "http://0f92aaf3da9b4dd2ab80a337495ccf09.apigw.he-region-2.sgic.sgcc.com.cn/ast/yxywyyxt/dws/get_e_mp_fctg_zl"; - String apiId = "4e829410fea4513cd0fab51a12278760"; + String key = "a1a69c93c11e4910aa247087c261bec5"; + String secret = "038de3c27cc54489862d181470e3ad92"; + String url = "https://25.37.90.72/ast/yxywyyxt/dws/get_e_mp_fctg_zl"; + String apiId = "863167f6ebf31385e7f899c05b34a539"; String apiName = "get_电能质量谐波监测系统_分布式光伏台区台账_e_mp_fctg_zl_单位编码"; Request request = new Request();