Skip to content

A
amos-boot-biz
Commit efcab82c authored by chenzhao's avatar chenzhao
Browse files
Options

修改代码

parent b9868355
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java
View file @ efcab82c
...@@ -461,7 +461,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe ...@@ -461,7 +461,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
if (ObjectUtils.isEmpty(jpInverter)) { if (ObjectUtils.isEmpty(jpInverter)) {
jpInverter = new JpInverter(); jpInverter = new JpInverter();
} }
jpInverter.setName(inverterDetailDto.getStationName()); jpInverter.setName(null == inverterDetailDto.getStationName()?null: inverterDetailDto.getStationName());
jpInverter.setSnCode(inverterDetailDto.getSn().trim()); jpInverter.setSnCode(inverterDetailDto.getSn().trim());
jpInverter.setState(golangRequestUtil.getInverterState(inverterDetailDto.getCurrentState(), inverterDetailDto.getDataTimestamp())); jpInverter.setState(golangRequestUtil.getInverterState(inverterDetailDto.getCurrentState(), inverterDetailDto.getDataTimestamp()));
jpInverter.setCollectorId(String.valueOf(inverterDetailDto.getCollectorId())); jpInverter.setCollectorId(String.valueOf(inverterDetailDto.getCollectorId()));
...@@ -681,7 +681,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe ...@@ -681,7 +681,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate(); tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate();
} }
tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId()); tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId());
tdHYGFInverterTotalGenerate.setName(jpInverter.getName()); tdHYGFInverterTotalGenerate.setName(null == jpInverter.getName()? null :jpInverter.getName());
tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode().trim()); tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode().trim());
tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy")); tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy")); tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java
View file @ efcab82c
...@@ -713,9 +713,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -713,9 +713,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
like("sn_code", ksolarStationCollectData.getInverterId().trim()) like("sn_code", ksolarStationCollectData.getInverterId().trim())
.isNotNull("sn_code") .isNotNull("sn_code")
.orderByDesc("update_time")); .orderByDesc("update_time"));
JpInverter jpInverter = new JpInverter(); JpInverter jpInverter =jpInverterList.get(0);
if (!ObjectUtils.isEmpty(jpInverterList)) { if (ObjectUtils.isEmpty(jpInverter)) {
jpInverter =jpInverterList.get(0); 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