Skip to content

A
amos-boot-biz
Commit 15811d9e authored by caotao's avatar caotao
Browse files
Options

科士达电量值重复问题修复。

parent d4de3201
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java
View file @ 15811d9e
...@@ -569,7 +569,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -569,7 +569,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
for (int k1 = 1; k1 < 13; k1++) { for (int k1 = 1; k1 < 13; k1++) {
JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>(). JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", jpInverter.getSnCode()). like("sn_code", jpInverter.getSnCode().trim()).
eq("type", "直流"). eq("type", "直流").
eq("name", "PV" + k1) eq("name", "PV" + k1)
); );
...@@ -593,7 +593,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -593,7 +593,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
} }
JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>(). JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", jpInverter.getSnCode()). like("sn_code", jpInverter.getSnCode().trim()).
eq("type", "交流"). eq("type", "交流").
eq("name", "RS") eq("name", "RS")
); );
...@@ -616,7 +616,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -616,7 +616,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
} }
JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>(). JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", jpInverter.getSnCode()). like("sn_code", jpInverter.getSnCode().trim()).
eq("type", "交流"). eq("type", "交流").
eq("name", "ST") eq("name", "ST")
); );
...@@ -639,7 +639,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -639,7 +639,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>(). JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", jpInverter.getSnCode()). like("sn_code", jpInverter.getSnCode().trim()).
eq("type", "交流"). eq("type", "交流").
eq("name", "TR") eq("name", "TR")
); );
...@@ -760,7 +760,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -760,7 +760,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
for (int k1 = 1; k1 < 13; k1++) { for (int k1 = 1; k1 < 13; k1++) {
JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>(). JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", ksolarStationCollectData.getInverterId()). like("sn_code", ksolarStationCollectData.getInverterId().trim()).
eq("type", "直流"). eq("type", "直流").
eq("name", "PV" + k1) eq("name", "PV" + k1)
); );
...@@ -784,7 +784,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -784,7 +784,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
} }
JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>(). JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", ksolarStationCollectData.getInverterId()). like("sn_code", ksolarStationCollectData.getInverterId().trim()).
eq("type", "交流"). eq("type", "交流").
eq("name", "RS") eq("name", "RS")
); );
...@@ -807,7 +807,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -807,7 +807,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
} }
JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>(). JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", ksolarStationCollectData.getInverterId().trim()). like("sn_code", ksolarStationCollectData.getInverterId().trim()).
eq("type", "交流"). eq("type", "交流").
eq("name", "ST") eq("name", "ST")
); );
...@@ -830,7 +830,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -830,7 +830,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>(). JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", ksolarStationCollectData.getInverterId()). like("sn_code", ksolarStationCollectData.getInverterId().trim()).
eq("type", "交流"). eq("type", "交流").
eq("name", "TR") eq("name", "TR")
); );
......
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