Commit 9bfb81c7 authored by wujiang's avatar wujiang

修改采集问题

parent 8f3f8ec6
...@@ -70,7 +70,7 @@ public class KsolarRequestUtil { ...@@ -70,7 +70,7 @@ public class KsolarRequestUtil {
String url = KSolarConstant.baseurl + apiurl; String url = KSolarConstant.baseurl + apiurl;
respone = sendRequest(requestMethod, url, requestParmInfo, headMap); respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone); jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
log.info("原始数据:{}", jsonArray); //log.info("原始数据:{}", jsonArray);
if (!ObjectUtils.isEmpty(jsonArray)) { if (!ObjectUtils.isEmpty(jsonArray)) {
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass); result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
} }
......
...@@ -320,7 +320,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -320,7 +320,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
@Async @Async
public void stationDetail() { public void stationDetail() {
long ts = System.currentTimeMillis(); long ts = System.currentTimeMillis();
logger.info("-------固德威同步场站和告警开始" + ts + "------- " + sdf.format(new Date())); logger.info("-------固德威同步场站详情开始" + ts + "------- " + sdf.format(new Date()));
List<String> stationIds = goodWeStationMonitorListMapper.getStationIds(); List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
stationIds.forEach(stationId -> { stationIds.forEach(stationId -> {
HashMap<String, Object> requestInfo = new HashMap<>(); HashMap<String, Object> requestInfo = new HashMap<>();
...@@ -349,7 +349,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -349,7 +349,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
}); });
} }
}); });
logger.info("-------固德威同步场站和告警结束" + ts + "------- " + sdf.format(new Date())); logger.info("-------固德威同步场站详情结束" + ts + "------- " + sdf.format(new Date()));
} }
@Override @Override
......
...@@ -495,10 +495,8 @@ public class SunlightServiceImpl implements SunlightService { ...@@ -495,10 +495,8 @@ public class SunlightServiceImpl implements SunlightService {
if (device != null) { if (device != null) {
// 获取逆变器信息存库 // 获取逆变器信息存库
JpInverter jpInverter = jpInverterMapper.selectOne( JpInverter jpInverter = jpInverterMapper.selectOne(
new QueryWrapper<JpInverter>().eq("third_station_id", device.getPs_id().toString()) new QueryWrapper<JpInverter>().eq("sn_code", device.getDevice_sn().toString())
.eq("third_code", PVProducerInfoEnum.YG.getCode()) .eq("third_code", PVProducerInfoEnum.YG.getCode()));
.eq("ID", device.getUuid().toString()));
if (ObjectUtils.isEmpty(jpInverter)) { if (ObjectUtils.isEmpty(jpInverter)) {
jpInverter = new JpInverter(); jpInverter = new JpInverter();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment