修改科士达逆变器采集

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java

@@ -66,6 +66,7 @@ public class HouseholdTestController {
 //        goLangDataAcquisitionService.collectorDetail();
         goLangDataAcquisitionService.inverterDetail();
 //        goLangDataAcquisitionService.inverAlramInfo();
+
     }
 
     /**
@@ -120,8 +121,9 @@ public class HouseholdTestController {
 //        kSolarDataAcquisitionService.collectorDetail();
 ////        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
-        goLangDataAcquisitionService.inverterDetail();
+       // goLangDataAcquisitionService.inverterDetail();
 //        goLangDataAcquisitionService.inverAlramInfo();
+        kSolarDataAcquisitionService.collectorList();
 
     }
 
@@ -135,10 +137,11 @@ public class HouseholdTestController {
     @PostMapping(value = "/imasterNew")
     @ApiOperation(httpMethod = "POST", value = "北向", notes = "北向")
     public void imasterNew() throws IOException {
-        imasterDataService.stationList();
-        imasterDataService.stationDetail();
-        imasterDataService.collectorList();
-        imasterDataService.inverterList(null);
+//        imasterDataService.stationList();
+//        imasterDataService.stationDetail();
+//        imasterDataService.collectorList();
+//        imasterDataService.inverterList(null);
        // imasterDataService.inverterDetail(null);
+        kSolarDataAcquisitionService.collectorDetail();
     }
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/hygf/JpInverter.java

@@ -71,7 +71,7 @@ public class    JpInverter implements Serializable {
     /**
      * 实时功率
      */
-    @TableField("current_power")
+    @TableField(value="current_power",updateStrategy =FieldStrategy.IGNORED)
     private Double currentPower;
 
     /**

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java

@@ -563,13 +563,16 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                             if (!ObjectUtils.isEmpty(jpInverter.getSequenceNbr())) {
                                 jpInverterMapper.updateById(jpInverter);
                             } else {
+                                if(StringUtils.isNotEmpty(jpInverter.getSnCode())){
                                     jpInverterMapper.insert(jpInverter);
                                 }
 
+                            }
+
 
                             for (int k1 = 1; k1 < 13; k1++) {
                                 JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                        like("sn_code", jpInverter.getSnCode().trim()).
+                                        eq("sn_code", jpInverter.getSnCode().trim()).
                                         eq("type", "直流").
                                         eq("name", "PV" + k1)
                                 );
@@ -593,7 +596,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                             }
 
                             JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                    like("sn_code", jpInverter.getSnCode().trim()).
+                                    eq("sn_code", jpInverter.getSnCode().trim()).
                                     eq("type", "交流").
                                     eq("name", "RS")
                             );
@@ -616,7 +619,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                             }
 
                             JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                    like("sn_code", jpInverter.getSnCode().trim()).
+                                    eq("sn_code", jpInverter.getSnCode().trim()).
                                     eq("type", "交流").
                                     eq("name", "ST")
                             );
@@ -639,7 +642,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
 
                             JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                    like("sn_code", jpInverter.getSnCode().trim()).
+                                    eq("sn_code", jpInverter.getSnCode().trim()).
                                     eq("type", "交流").
                                     eq("name", "TR")
                             );
@@ -679,7 +682,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                             // 逆变器历史
                             String today = DateUtil.today();
                             HYGFJPInverterHistory hygfjpInverterHistory = hygfjpInverterHistoryMapper.selectOne(
-                                    new QueryWrapper<HYGFJPInverterHistory>().eq("sn_code", jpInverter.getSnCode()).eq("date", today));
+                                    new QueryWrapper<HYGFJPInverterHistory>().eq("sn_code", jpInverter.getSnCode().trim()).eq("date", today));
                             if (ObjectUtils.isEmpty(hygfjpInverterHistory)) {
                                 hygfjpInverterHistory = new HYGFJPInverterHistory();
                             }
@@ -751,8 +754,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     if (!ObjectUtils.isEmpty(jpInverter.getSequenceNbr())) {
                                         jpInverterMapper.updateById(jpInverter);
                                     } else {
+                                        if(StringUtils.isNotEmpty(jpInverter.getSnCode())){
                                             jpInverterMapper.insert(jpInverter);
                                         }
+                                    }
 
 
                                     String jsonString = JSON.toJSONString(ksolarStationCollectData);
@@ -760,7 +765,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
                                     for (int k1 = 1; k1 < 13; k1++) {
                                         JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                                like("sn_code", ksolarStationCollectData.getInverterId().trim()).
+                                                eq("sn_code", ksolarStationCollectData.getInverterId().trim()).
                                                 eq("type", "直流").
                                                 eq("name", "PV" + k1)
                                         );
@@ -784,7 +789,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     }
 
                                     JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                            like("sn_code", ksolarStationCollectData.getInverterId().trim()).
+                                            eq("sn_code", ksolarStationCollectData.getInverterId().trim()).
                                             eq("type", "交流").
                                             eq("name", "RS")
                                     );
@@ -807,7 +812,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     }
 
                                     JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                            like("sn_code", ksolarStationCollectData.getInverterId().trim()).
+                                            eq("sn_code", ksolarStationCollectData.getInverterId().trim()).
                                             eq("type", "交流").
                                             eq("name", "ST")
                                     );
@@ -830,7 +835,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
 
                                     JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                            like("sn_code", ksolarStationCollectData.getInverterId().trim()).
+                                            eq("sn_code", ksolarStationCollectData.getInverterId().trim()).
                                             eq("type", "交流").
                                             eq("name", "TR")
                                     );