Skip to content

A
amos-boot-zx-biz
Commit 9bfb81c7 authored by wujiang's avatar wujiang
Browse files
Options

修改采集问题

parent 8f3f8ec6
Hide whitespace changes
Inline Side-by-side
Showing with 284 additions and 272 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/ImasterUtils.java
View file @ 9bfb81c7
...@@ -11,293 +11,307 @@ import com.yeejoin.amos.api.householdapi.constant.ImasterConstant; ...@@ -11,293 +11,307 @@ import com.yeejoin.amos.api.householdapi.constant.ImasterConstant;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HousepvapiRecords; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HousepvapiRecords;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HousepvapiRecordsMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HousepvapiRecordsMapper;
import com.yeejoin.amos.api.householdapi.face.service.impl.GoodWeDataAcquisitionServiceImpl;
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum; import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.*; import java.util.*;
@Component @Component
@Slf4j @Slf4j
public class ImasterUtils { public class ImasterUtils {
private String redisKey = "XSRF-TOKEN"; private String redisKey = "XSRF-TOKEN";
@Autowired
HousepvapiRecordsMapper housepvapiRecordsMapper;
@Autowired
RedisUtils redisUtils;
final static Logger logger = LoggerFactory.getLogger(ImasterUtils.class);
@Autowired /**
HousepvapiRecordsMapper housepvapiRecordsMapper; * @return HashMap<String, Object> 发送请求前的准备 准备header信息
@Autowired * @deprecated 根据厂商编码获取厂商的hearer
RedisUtils redisUtils; */
/** public static HashMap<String, String> getHeader() {
* @return HashMap<String, Object> 发送请求前的准备 准备header信息 HashMap<String, String> hashMap = new HashMap<>();
* @deprecated 根据厂商编码获取厂商的hearer String requestParam = "";
*/ HashMap<String, String> hashMaphead = new HashMap<>();
public static HashMap<String, String> getHeader() { try {
HashMap<String, String> hashMap = new HashMap<>(); requestParam = "{ \"userName\": \"" + ImasterConstant.account + "\", \"systemCode\": \""
String requestParam=""; + ImasterConstant.password + "\"}";
HashMap<String, String> hashMaphead = new HashMap<>(); } catch (Exception e) {
try { throw new RuntimeException(e);
requestParam = "{ \"userName\": \""+ImasterConstant.account+"\", \"systemCode\": \""+ImasterConstant.password+"\"}"; }
} catch (Exception e) { String url = ImasterConstant.baseurl + ImasterConstant.tokenUrl;
throw new RuntimeException(e); HttpResponse execute = HttpUtil.createRequest(Method.POST, url).body(requestParam).execute();
} String token = execute.header("xsrf-token");
String url = ImasterConstant.baseurl + ImasterConstant.tokenUrl;
HttpResponse execute = HttpUtil.createRequest(Method.POST, url).body(requestParam).execute();
String token = execute.header("xsrf-token");
hashMap.put("XSRF-TOKEN", token); hashMap.put("XSRF-TOKEN", token);
return hashMap; return hashMap;
} }
/** /**
* @param apiurl 请求url * @param apiurl 请求url
* @param requestMethod 请求方式 * @param requestMethod 请求方式
* @param requestParmInfo 请求参数mapper * @param requestParmInfo 请求参数mapper
* @param ResultResolveRule 请求的解析 * @param ResultResolveRule 请求的解析
* @param tClass 需要转换成的bean * @param tClass 需要转换成的bean
* @param <T> 泛型数据 * @param <T> 泛型数据
* @return List<T> list<Result> * @return List<T> list<Result>
* @desc 根据请求参数发送http请求并且对于返回的数据进行处理 * @desc 根据请求参数发送http请求并且对于返回的数据进行处理
*/ */
public <T> List<T> getResPonse(String apiurl, String requestMethod, String requestParmInfo, String ResultResolveRule, Class<T> tClass) { public <T> List<T> getResPonse(String apiurl, String requestMethod, String requestParmInfo,
String respone = ""; String ResultResolveRule, Class<T> tClass) {
String params = ""; String respone = "";
JSONArray jsonArray = null; String params = "";
List<T> result = new ArrayList<>(); JSONArray jsonArray = null;
try { List<T> result = new ArrayList<>();
Object o = redisUtils.get(redisKey); try {
if(o != null) { Object o = redisUtils.get(redisKey);
HashMap<String, String> headMap = new HashMap<>(); if (o != null) {
headMap.put("XSRF-TOKEN", o.toString()); HashMap<String, String> headMap = new HashMap<>();
String url = ImasterConstant.baseurl + apiurl; headMap.put("XSRF-TOKEN", o.toString());
respone = sendRequest(requestMethod, url, requestParmInfo, headMap); String url = ImasterConstant.baseurl + apiurl;
JSONObject jsonObject = JSONObject.parseObject(respone); respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
if(jsonObject.get("failCode").toString().equals("305")) { JSONObject jsonObject = JSONObject.parseObject(respone);
headMap = getHeader(); if (jsonObject.get("failCode").toString().equals("305")) {
respone = sendRequest(requestMethod, url, requestParmInfo, headMap); headMap = getHeader();
jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone); respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
if (!ObjectUtils.isEmpty(jsonArray)) { jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass); if (!ObjectUtils.isEmpty(jsonArray)) {
redisUtils.set(redisKey,headMap.get("XSRF-TOKEN")); result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
} redisUtils.set(redisKey, headMap.get("XSRF-TOKEN"));
} else { }
jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone); } else {
if (!ObjectUtils.isEmpty(jsonArray)) { jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass); if (!ObjectUtils.isEmpty(jsonArray)) {
} result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
} }
} else { }
HashMap<String, String> headMap = getHeader(); } else {
String url = ImasterConstant.baseurl + apiurl; HashMap<String, String> headMap = getHeader();
respone = sendRequest(requestMethod, url, requestParmInfo, headMap); String url = ImasterConstant.baseurl + apiurl;
jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone); respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
if (!ObjectUtils.isEmpty(jsonArray)) { jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass); if (!ObjectUtils.isEmpty(jsonArray)) {
redisUtils.set(redisKey,headMap.get("XSRF-TOKEN")); result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
} redisUtils.set(redisKey, headMap.get("XSRF-TOKEN"));
} }
} catch (Exception exception) { }
return result; } catch (Exception exception) {
} return result;
return result; }
} return result;
}
/** /**
* @param apiurl 请求url * @param apiurl 请求url
* @param requestMethod 请求方式 * @param requestMethod 请求方式
* @param requestParmInfo 请求参数mapper * @param requestParmInfo 请求参数mapper
* @param ResultResolveRule 请求的解析 * @param ResultResolveRule 请求的解析
* @param tClass 需要转换成的bean * @param tClass 需要转换成的bean
* @param <T> 泛型数据 * @param <T> 泛型数据
* @return List<T> list<Result> * @return List<T> list<Result>
* @desc 根据请求参数发送http请求并且对于返回的数据进行处理 * @desc 根据请求参数发送http请求并且对于返回的数据进行处理
*/ */
public <T> List<T> getResPonseOther(String apiurl, String requestMethod, String requestParmInfo, String ResultResolveRule, Class<T> tClass) { public <T> List<T> getResPonseOther(String apiurl, String requestMethod, String requestParmInfo,
String respone = ""; String ResultResolveRule, Class<T> tClass) {
String params = ""; String respone = "";
JSONArray jsonArray = null; String params = "";
List<T> result = new ArrayList<>(); JSONArray jsonArray = null;
try { List<T> result = new ArrayList<>();
Object o = redisUtils.get(redisKey); try {
if(o != null) { Object o = redisUtils.get(redisKey);
HashMap<String, String> headMap = new HashMap<>(); if (o != null) {
headMap.put("XSRF-TOKEN", o.toString()); HashMap<String, String> headMap = new HashMap<>();
String url = ImasterConstant.baseurl + apiurl; headMap.put("XSRF-TOKEN", o.toString());
respone = sendRequest(requestMethod, url, requestParmInfo, headMap); String url = ImasterConstant.baseurl + apiurl;
JSONObject jsonObject = JSONObject.parseObject(respone); respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
if(jsonObject.get("failCode").toString().equals("305")) { JSONObject jsonObject = JSONObject.parseObject(respone);
headMap = getHeader(); if (jsonObject.get("failCode").toString().equals("305")) {
respone = sendRequest(requestMethod, url, requestParmInfo, headMap); headMap = getHeader();
jsonArray = handlerResponseByResultResolveruleOther(ResultResolveRule, respone); respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
if (!ObjectUtils.isEmpty(jsonArray)) { jsonArray = handlerResponseByResultResolveruleOther(ResultResolveRule, respone);
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass); if (!ObjectUtils.isEmpty(jsonArray)) {
redisUtils.set(redisKey,headMap.get("XSRF-TOKEN")); result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
} redisUtils.set(redisKey, headMap.get("XSRF-TOKEN"));
} else { }
jsonArray = handlerResponseByResultResolveruleOther(ResultResolveRule, respone); } else {
if (!ObjectUtils.isEmpty(jsonArray)) { jsonArray = handlerResponseByResultResolveruleOther(ResultResolveRule, respone);
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass); if (!ObjectUtils.isEmpty(jsonArray)) {
} result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
} }
} else { }
HashMap<String, String> headMap = getHeader(); } else {
String url = ImasterConstant.baseurl + apiurl; HashMap<String, String> headMap = getHeader();
respone = sendRequest(requestMethod, url, requestParmInfo, headMap); String url = ImasterConstant.baseurl + apiurl;
jsonArray = handlerResponseByResultResolveruleOther(ResultResolveRule, respone); respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
if (!ObjectUtils.isEmpty(jsonArray)) { jsonArray = handlerResponseByResultResolveruleOther(ResultResolveRule, respone);
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass); if (!ObjectUtils.isEmpty(jsonArray)) {
redisUtils.set(redisKey,headMap.get("XSRF-TOKEN")); result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
} redisUtils.set(redisKey, headMap.get("XSRF-TOKEN"));
} }
} catch (Exception exception) { }
exception.printStackTrace(); } catch (Exception exception) {
return result; exception.printStackTrace();
} return result;
return result; }
} return result;
}
/** /**
* @param resultResovle 请求返回的解析规则 来源与数据库 * @param resultResovle 请求返回的解析规则 来源与数据库
* @param response 请求返回的字符串 * @param response 请求返回的字符串
* @return 解析后的数据 * @return 解析后的数据
* @desc 根据解析规则解析请求返回数据 * @desc 根据解析规则解析请求返回数据
*/ */
public static JSONArray handlerResponseByResultResolverule(String resultResovle, String response) { public static JSONArray handlerResponseByResultResolverule(String resultResovle, String response) {
JSONObject jsonObject = JSONObject.parseObject(response); JSONObject jsonObject = JSONObject.parseObject(response);
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
if (ObjectUtil.isNotEmpty(resultResovle)) { if (ObjectUtil.isNotEmpty(resultResovle)) {
String[] rules = resultResovle.split(","); String[] rules = resultResovle.split(",");
if (rules.length > 0) { if (rules.length > 0) {
for (int i = 0; i < rules.length; i++) { for (int i = 0; i < rules.length; i++) {
try { try {
jsonObject = (JSONObject) jsonObject.get(rules[i]); jsonObject = (JSONObject) jsonObject.get(rules[i]);
if (jsonObject == null) { if (jsonObject == null) {
jsonArray = (JSONArray) jsonObject.get(rules[i]); jsonArray = (JSONArray) jsonObject.get(rules[i]);
} }
} catch (Exception exception) { } catch (Exception exception) {
jsonArray = (JSONArray) jsonObject.get(rules[i]); jsonArray = (JSONArray) jsonObject.get(rules[i]);
} }
} }
} }
if (jsonArray.size() == 0) { if (jsonArray.size() == 0) {
jsonArray.addAll((JSONArray)jsonObject.get("list")); jsonArray.addAll((JSONArray) jsonObject.get("list"));
} }
} }
return jsonArray; return jsonArray;
} }
/** /**
* @param resultResovle 请求返回的解析规则 来源与数据库 * @param resultResovle 请求返回的解析规则 来源与数据库
* @param response 请求返回的字符串 * @param response 请求返回的字符串
* @return 解析后的数据 * @return 解析后的数据
* @desc 根据解析规则解析请求返回数据 * @desc 根据解析规则解析请求返回数据
*/ */
public static JSONArray handlerResponseByResultResolveruleOther(String resultResovle, String response) { public static JSONArray handlerResponseByResultResolveruleOther(String resultResovle, String response) {
JSONObject jsonObject = JSONObject.parseObject(response); JSONObject jsonObject = JSONObject.parseObject(response);
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
JSONArray jsonArrayRet = new JSONArray(); JSONArray jsonArrayRet = new JSONArray();
if (ObjectUtil.isNotEmpty(resultResovle)) { if (ObjectUtil.isNotEmpty(resultResovle)) {
String[] rules = resultResovle.split(","); String[] rules = resultResovle.split(",");
if (rules.length > 0) { if (rules.length > 0) {
for (int i = 0; i < rules.length; i++) { for (int i = 0; i < rules.length; i++) {
try { try {
jsonObject = (JSONObject) jsonObject.get(rules[i]); jsonObject = (JSONObject) jsonObject.get(rules[i]);
if (jsonObject == null) { if (jsonObject == null) {
jsonArray = (JSONArray) jsonObject.get(rules[i]); jsonArray = (JSONArray) jsonObject.get(rules[i]);
} }
} catch (Exception exception) { } catch (Exception exception) {
jsonArray = (JSONArray) jsonObject.get(rules[i]); try {
} jsonArray = (JSONArray) jsonObject.get(rules[i]);
} } catch (Exception e) {
} e.printStackTrace();
if (jsonArray.size() != 0) { logger.error("华为数据解析错误:" + jsonObject.get(rules[i]));
for( int i=0; i<jsonArray.size();i++ ) { }
JSONObject jsonObject1 = (JSONObject) jsonArray.get(i); }
if(jsonObject1.get("dataItemMap") != null) { }
JSONObject jsonObject2 = (JSONObject)jsonObject1.get("dataItemMap"); }
if(jsonObject1.get("sn") != null) { if (jsonArray.size() != 0) {
jsonObject2.put("inverterId", jsonObject1.get("sn").toString()); for (int i = 0; i < jsonArray.size(); i++) {
} JSONObject jsonObject1 = (JSONObject) jsonArray.get(i);
if(jsonObject1.get("stationCode") != null) { if (jsonObject1.get("dataItemMap") != null) {
jsonObject2.put("stationCode", jsonObject1.get("stationCode").toString()); JSONObject jsonObject2 = (JSONObject) jsonObject1.get("dataItemMap");
} if (jsonObject1.get("sn") != null) {
if(jsonObject1.get("collectTime") != null) { jsonObject2.put("inverterId", jsonObject1.get("sn").toString());
jsonObject2.put("collectTime", jsonObject1.get("collectTime").toString()); }
} if (jsonObject1.get("stationCode") != null) {
jsonObject2.put("stationCode", jsonObject1.get("stationCode").toString());
}
if (jsonObject1.get("collectTime") != null) {
jsonObject2.put("collectTime", jsonObject1.get("collectTime").toString());
}
jsonArrayRet.add(jsonObject2); jsonArrayRet.add(jsonObject2);
} }
} }
} }
} }
return jsonArrayRet; return jsonArrayRet;
} }
public String sendRequest(String requestMethod, String url, String params, HashMap<String, String> headMap) { public String sendRequest(String requestMethod, String url, String params, HashMap<String, String> headMap) {
HousepvapiRecords housepvapiRecords = new HousepvapiRecords(); HousepvapiRecords housepvapiRecords = new HousepvapiRecords();
housepvapiRecords.setRecDate(new Date()); housepvapiRecords.setRecDate(new Date());
housepvapiRecords.setRequestUrl(url); housepvapiRecords.setRequestUrl(url);
housepvapiRecords.setRequestMothed(requestMethod); housepvapiRecords.setRequestMothed(requestMethod);
housepvapiRecords.setRequestHeaders(JSONObject.toJSONString(headMap)); housepvapiRecords.setRequestHeaders(JSONObject.toJSONString(headMap));
housepvapiRecords.setRequestParams(params); housepvapiRecords.setRequestParams(params);
housepvapiRecords.setThridCode(PVProducerInfoEnum.HUAWEI.getCode()); housepvapiRecords.setThridCode(PVProducerInfoEnum.HUAWEI.getCode());
String respone = ""; String respone = "";
if (requestMethod.equals("POST")) { if (requestMethod.equals("POST")) {
respone = HttpUtil.createPost(url).headerMap(headMap, false). respone = HttpUtil.createPost(url).headerMap(headMap, false).body(params).execute().body();
body(params).execute().body(); }
} if (requestMethod.equals("GET")) {
if (requestMethod.equals("GET")) { respone = HttpUtil.createGet(url).headerMap(headMap, true).body(params).execute().body();
respone = HttpUtil.createGet(url).headerMap(headMap, true). }
body(params).execute().body(); housepvapiRecords.setResponse(respone);
} // housepvapiRecordsMapper.insert(housepvapiRecords);
housepvapiRecords.setResponse(respone); // log.info("华为数据请求详情："+JSONObject.toJSONString(housepvapiRecords));
// housepvapiRecordsMapper.insert(housepvapiRecords); return respone;
//log.info("华为数据请求详情："+JSONObject.toJSONString(housepvapiRecords)); }
return respone;
}
/*** /***
* *
* @param params 参数字符窜 * @param params 参数字符窜
* @param headMap header头 * @param headMap header头
* @param orginalAuthorization 原始的orginalAuthorization * @param orginalAuthorization 原始的orginalAuthorization
* @param appsecret appsecret * @param appsecret appsecret
* @desc 锦浪云请求参数及head头处理 * @desc 锦浪云请求参数及head头处理
*/ */
public void JLYHeaderMapHandler(String params, HashMap<String, String> headMap, String orginalAuthorization, String appsecret, String apiurl) { public void JLYHeaderMapHandler(String params, HashMap<String, String> headMap, String orginalAuthorization,
String contentMD5 = GoLangHeaderUtils.getDigest(params); String appsecret, String apiurl) {
headMap.put("Date", GoLangHeaderUtils.getGMTTime()); String contentMD5 = GoLangHeaderUtils.getDigest(params);
String param = "POST" + "\n" + contentMD5 + "\n" + "application/json" + "\n" + headMap.get("Date") + "\n" + apiurl; headMap.put("Date", GoLangHeaderUtils.getGMTTime());
String sign = ""; String param = "POST" + "\n" + contentMD5 + "\n" + "application/json" + "\n" + headMap.get("Date") + "\n"
try { + apiurl;
sign = GoLangHeaderUtils.HmacSHA1Encrypt(param, appsecret); String sign = "";
} catch (Exception e) { try {
throw new RuntimeException(e); sign = GoLangHeaderUtils.HmacSHA1Encrypt(param, appsecret);
} } catch (Exception e) {
headMap.put("Content-MD5", contentMD5); throw new RuntimeException(e);
headMap.put("Authorization", orginalAuthorization + sign); }
} headMap.put("Content-MD5", contentMD5);
headMap.put("Authorization", orginalAuthorization + sign);
}
/** /**
* @param pageSizeResovle * @param pageSizeResovle
* @param response * @param response
* @return * @return
* @desc 根据分页规则 获取分页数 * @desc 根据分页规则 获取分页数
*/ */
public Integer getPagesize(String pageSizeResovle, String response) { public Integer getPagesize(String pageSizeResovle, String response) {
Integer pageSize = 0; Integer pageSize = 0;
String[] rules = pageSizeResovle.split(","); String[] rules = pageSizeResovle.split(",");
JSONObject jsonObject = JSONObject.parseObject(response); JSONObject jsonObject = JSONObject.parseObject(response);
if (rules.length > 0) { if (rules.length > 0) {
for (int i = 0; i < rules.length - 1; i++) { for (int i = 0; i < rules.length - 1; i++) {
jsonObject = (JSONObject) jsonObject.get(rules[i]); jsonObject = (JSONObject) jsonObject.get(rules[i]);
} }
} }
pageSize = (Integer) jsonObject.get(rules[rules.length - 1]); pageSize = (Integer) jsonObject.get(rules[rules.length - 1]);
return pageSize; return pageSize;
} }
// public static void main(String[] args) { // public static void main(String[] args) {
// HashMap<String, Object> requestInfo = new HashMap<>(); // HashMap<String, Object> requestInfo = new HashMap<>();
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/KsolarRequestUtil.java
View file @ 9bfb81c7
...@@ -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);
} }
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java
View file @ 9bfb81c7
...@@ -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
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SunlightServiceImpl.java
View file @ 9bfb81c7
...@@ -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