Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -59,7 +59,7 @@ public class HouseholdTestController {
 //        goLangDataAcquisitionService.collectorList();
 ////        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
-//        goLangDataAcquisitionService.inverterDetail();
-        goLangDataAcquisitionService.inverAlramInfo();
+        goLangDataAcquisitionService.inverterDetail();
+//        goLangDataAcquisitionService.inverAlramInfo();
     }
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/dto/InverterDetailDto.java

@@ -30,4 +30,100 @@ public class InverterDetailDto {
     private Double uAc1;
     private Double uAc2;
     private Double uAc3;
+    private Double iPv1;
+    private Double iPv2;
+    private Double iPv3;
+    private Double iPv4;
+    private Double iPv5;
+    private Double iPv6;
+    private Double iPv7;
+    private Double iPv8;
+    private Double iPv9;
+    private Double iPv10;
+    private Double iPv11;
+    private Double iPv12;
+    private Double iPv13;
+    private Double iPv14;
+    private Double iPv15;
+    private Double iPv16;
+    private Double iPv17;
+    private Double iPv18;
+    private Double iPv19;
+    private Double iPv20;
+    private Double iPv21;
+    private Double iPv22;
+    private Double iPv23;
+    private Double iPv24;
+    private Double iPv25;
+    private Double iPv26;
+    private Double iPv27;
+    private Double iPv28;
+    private Double iPv29;
+    private Double iPv30;
+    private Double iPv31;
+    private Double iPv32;
+    private Double uPv1;
+    private Double uPv2;
+    private Double uPv3;
+    private Double uPv4;
+    private Double uPv5;
+    private Double uPv6;
+    private Double uPv7;
+    private Double uPv8;
+    private Double uPv9;
+    private Double uPv10;
+    private Double uPv11;
+    private Double uPv12;
+    private Double uPv13;
+    private Double uPv14;
+    private Double uPv15;
+    private Double uPv16;
+    private Double uPv17;
+    private Double uPv18;
+    private Double uPv19;
+    private Double uPv20;
+    private Double uPv21;
+    private Double uPv22;
+    private Double uPv23;
+    private Double uPv24;
+    private Double uPv25;
+    private Double uPv26;
+    private Double uPv27;
+    private Double uPv28;
+    private Double uPv29;
+    private Double uPv30;
+    private Double uPv31;
+    private Double uPv32;
+    private Double pow1;
+    private Double pow2;
+    private Double pow3;
+    private Double pow4;
+    private Double pow5;
+    private Double pow6;
+    private Double pow7;
+    private Double pow8;
+    private Double pow9;
+    private Double pow10;
+    private Double pow11;
+    private Double pow12;
+    private Double pow13;
+    private Double pow14;
+    private Double pow15;
+    private Double pow16;
+    private Double pow17;
+    private Double pow18;
+    private Double pow19;
+    private Double pow20;
+    private Double pow21;
+    private Double pow22;
+    private Double pow23;
+    private Double pow24;
+    private Double pow25;
+    private Double pow26;
+    private Double pow27;
+    private Double pow28;
+    private Double pow29;
+    private Double pow30;
+    private Double pow31;
+    private Double pow32;
 }

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

 package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -97,5 +98,4 @@ public class JpInverterElectricity implements Serializable {
      */
 	@TableField("third_code")
     private String thirdCode;
-
 }

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_collector_detail", autoResultMap = true)
 public class GolangCollectorDetail {
-    private Date createdTime;
+    private Long createdTime;
     private Long id;
     private String sn;
     private Long stationid;

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_collector_list", autoResultMap = true)
 public class GolangCollectorList {
-    private Date createdTime;
+    private Long createdTime;
     private Long id;
     private String stationname;
     private Long stationid;

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_inveter_detail", autoResultMap = true)
 public class GolangInverterDetail {
-    private Date createdTime;
+    private Long createdTime;
     private String gridSellYearEnergy;
     private String batteryAlarm;
     private String storageBatteryVoltageStr;

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_inveter_list", autoResultMap = true)
 public class GolangInverterList {
-    private Date createdTime;
+    private Long createdTime;
     private Long id;
     private String sn;
     private Long stationid;

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

@@ -10,7 +10,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_station_detail", autoResultMap = true)
 public class GolangStationDetail implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private Long id;
     private String stationname;
     private String addr;

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

@@ -7,7 +7,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_station_list" ,autoResultMap = true)
 public class GolangStationList implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private String id;
     private String stationName;
     private String addr;

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

@@ -9,7 +9,7 @@ import java.util.Date;
 @Data
 @TableName(value = "td_hygf_jp_collector_history" ,autoResultMap = true)
 public class HYGFJPCollectorHistory implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private String snCode;
     private Long time;
     private Double signalStrength;

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

@@ -9,7 +9,7 @@ import java.util.Date;
 @Data
 @TableName(value = "td_hygf_jp_invertor_elec_history" ,autoResultMap = true)
 public class HYGFJPInverterElecHistory implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private String snCode;
     private Double uAcVoltage;
     private Double vAcVoltage;

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

@@ -10,7 +10,7 @@ import java.util.Date;
 @Data
 @TableName(value = "td_hygf_jp_inverter_history" ,autoResultMap = true)
 public class HYGFJPInverterHistory implements Serializable {
-    private Timestamp createdTime;
+    private Long createdTime;
     private String snCode;
     private String date;
     private Double powerGeneration;

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

@@ -9,7 +9,7 @@ import java.util.Date;
 @Data
 @TableName(value = "td_hygf_jp_inverter_warn" ,autoResultMap = true)
 public class HYGFJPInverterWarn implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private long time;
     private String snCode;
     private String content;

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

@@ -9,7 +9,7 @@ import java.util.Date;
 @Data
 @TableName(value = "td_hygf_jp_invertor_elec_history" ,autoResultMap = true)
 public class HYGFJPStationPowerHistory implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private Double power;
     private long time;
     private String thirdStationId;

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

-package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
-
-import fastjson.JSON;
-import fastjson.JSONObject;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-
-public class Test {
-    public static void main(String[] args) {
-        String JsonString = "{\"id\":\"1299184088035566532\",\"userId\":\"1300386381676732593\",\"sn\":\"2805435232050486\",\"inverterMeterModel\":1,\"collectorsn\":\"404231046E215B4B\",\"collectorId\":\"1301093458381870472\",\"contractTime\":1838563200000,\"state\":1,\"stateExceptionFlag\":0,\"simFlowState\":-1,\"fullHour\":2.27,\"fullHourStr\":\"h\",\"currentState\":\"3\",\"warningInfoData\":0,\"timeZone\":8,\"timeZoneStr\":\"UTC+08:00\",\"daylight\":0,\"daylightSwitch\":0,\"model\":\"543\",\"productModel\":\"543\",\"ctrlCommand\":1,\"nationalStandardstr\":\"GN-380L\",\"inverterTemperature\":63.1,\"inverterTemperatureUnit\":\"℃\",\"temp\":150,\"tempName\":\"IGBT温度\",\"stationName\":\"陈益庆\",\"sno\":\"1A4C24\",\"stationId\":\"1299184320438728736\",\"version\":\"81003A\",\"acOutputType\":1,\"dcInputtype\":3,\"rs485ComAddr\":\"101\",\"dataTimestamp\":\"1684996442378\",\"timeStr\":\"2023-05-25 14:34:02\",\"reactivePower\":10,\"apparentPower\":8.3,\"dcPac\":9.128,\"uInitGnd\":0,\"uInitGndStr\":\"V\",\"dcBus\":706.6,\"dcBusStr\":\"V\",\"dcBusHalf\":351.9,\"dcBusHalfStr\":\"V\",\"power\":25,\"powerStr\":\"kWp\",\"powerPec\":\"1\",\"porwerPercent\":0.332,\"pac\":8.31,\"pacStr\":\"kW\",\"pacPec\":\"1\",\"oneSelf\":0,\"eToday\":56.8,\"eTodayStr\":\"kWh\",\"eMonth\":2.266,\"eMonthStr\":\"MWh\",\"eYear\":3.635,\"eYearStr\":\"MWh\",\"eTotal\":3.635,\"eTotalStr\":\"MWh\",\"uPv1\":674.3,\"uPv1Str\":\"V\",\"iPv1\":6.9,\"iPv1Str\":\"A\",\"uPv2\":668,\"uPv2Str\":\"V\",\"iPv2\":6.6,\"iPv2Str\":\"A\",\"uPv3\":0,\"uPv3Str\":\"V\",\"iPv3\":0,\"iPv3Str\":\"A\",\"uPv4\":0,\"uPv4Str\":\"V\",\"iPv4\":0,\"iPv4Str\":\"A\",\"uPv5\":0,\"uPv5Str\":\"V\",\"iPv5\":0,\"iPv5Str\":\"A\",\"uPv6\":0,\"uPv6Str\":\"V\",\"iPv6\":0,\"iPv6Str\":\"A\",\"uPv7\":0,\"uPv7Str\":\"V\",\"iPv7\":0,\"iPv7Str\":\"A\",\"uPv8\":0,\"uPv8Str\":\"V\",\"iPv8\":0,\"iPv8Str\":\"A\",\"uPv9\":0,\"uPv9Str\":\"V\",\"iPv9\":0,\"iPv9Str\":\"A\",\"uPv10\":0,\"uPv10Str\":\"V\",\"iPv10\":0,\"iPv10Str\":\"A\",\"uPv11\":0,\"uPv11Str\":\"V\",\"iPv11\":0,\"iPv11Str\":\"A\",\"uPv12\":0,\"uPv12Str\":\"V\",\"iPv12\":0,\"iPv12Str\":\"A\",\"uPv13\":0,\"uPv13Str\":\"V\",\"iPv13\":0,\"iPv13Str\":\"A\",\"uPv14\":0,\"uPv14Str\":\"V\",\"iPv14\":0,\"iPv14Str\":\"A\",\"uPv15\":0,\"uPv15Str\":\"V\",\"iPv15\":0,\"iPv15Str\":\"A\",\"uPv16\":0,\"uPv16Str\":\"V\",\"iPv16\":0,\"iPv16Str\":\"A\",\"uPv17\":0,\"uPv17Str\":\"V\",\"iPv17\":0,\"iPv17Str\":\"A\",\"uPv18\":0,\"uPv18Str\":\"V\",\"iPv18\":0,\"iPv18Str\":\"A\",\"uPv19\":0,\"uPv19Str\":\"V\",\"iPv19\":0,\"iPv19Str\":\"A\",\"uPv20\":0,\"uPv20Str\":\"V\",\"iPv20\":0,\"iPv20Str\":\"A\",\"uPv21\":0,\"uPv21Str\":\"V\",\"iPv21\":0,\"iPv21Str\":\"A\",\"uPv22\":0,\"uPv22Str\":\"V\",\"iPv22\":0,\"iPv22Str\":\"A\",\"uPv23\":0,\"uPv23Str\":\"V\",\"iPv23\":0,\"iPv23Str\":\"A\",\"uPv24\":0,\"uPv24Str\":\"V\",\"iPv24\":0,\"iPv24Str\":\"A\",\"uPv25\":0,\"uPv25Str\":\"V\",\"iPv25\":0,\"iPv25Str\":\"A\",\"uPv26\":0,\"uPv26Str\":\"V\",\"iPv26\":0,\"iPv26Str\":\"A\",\"uPv27\":0,\"uPv27Str\":\"V\",\"iPv27\":0,\"iPv27Str\":\"A\",\"uPv28\":0,\"uPv28Str\":\"V\",\"iPv28\":0,\"iPv28Str\":\"A\",\"uPv29\":0,\"uPv29Str\":\"V\",\"iPv29\":0,\"iPv29Str\":\"A\",\"uPv30\":0,\"uPv30Str\":\"V\",\"iPv30\":0,\"iPv30Str\":\"A\",\"uPv31\":0,\"uPv31Str\":\"V\",\"iPv31\":0,\"iPv31Str\":\"A\",\"uPv32\":0,\"uPv32Str\":\"V\",\"iPv32\":0,\"iPv32Str\":\"A\",\"pow1\":4653,\"pow1Str\":\"W\",\"pow2\":4409,\"pow2Str\":\"W\",\"pow3\":0,\"pow3Str\":\"W\",\"pow4\":0,\"pow4Str\":\"W\",\"pow5\":0,\"pow5Str\":\"W\",\"pow6\":0,\"pow6Str\":\"W\",\"pow7\":0,\"pow7Str\":\"W\",\"pow8\":0,\"pow8Str\":\"W\",\"pow9\":0,\"pow9Str\":\"W\",\"pow10\":0,\"pow10Str\":\"W\",\"pow11\":0,\"pow11Str\":\"W\",\"pow12\":0,\"pow12Str\":\"W\",\"pow13\":0,\"pow13Str\":\"W\",\"pow14\":0,\"pow14Str\":\"W\",\"pow15\":0,\"pow15Str\":\"W\",\"pow16\":0,\"pow16Str\":\"W\",\"pow17\":0,\"pow17Str\":\"W\",\"pow18\":0,\"pow18Str\":\"W\",\"pow19\":0,\"pow19Str\":\"W\",\"pow20\":0,\"pow20Str\":\"W\",\"pow21\":0,\"pow21Str\":\"W\",\"pow22\":0,\"pow22Str\":\"W\",\"pow23\":0,\"pow23Str\":\"W\",\"pow24\":0,\"pow24Str\":\"W\",\"pow25\":0,\"pow25Str\":\"W\",\"pow26\":0,\"pow26Str\":\"W\",\"pow27\":0,\"pow27Str\":\"W\",\"pow28\":0,\"pow28Str\":\"W\",\"pow29\":0,\"pow29Str\":\"W\",\"pow30\":0,\"pow30Str\":\"W\",\"pow31\":0,\"pow31Str\":\"W\",\"pow32\":0,\"pow32Str\":\"W\",\"uAc1\":229.9,\"uAc1Str\":\"V\",\"iAc1\":12,\"iAc1Str\":\"A\",\"uAc2\":229.8,\"uAc2Str\":\"V\",\"iAc2\":11.8,\"iAc2Str\":\"A\",\"uAc3\":229,\"uAc3Str\":\"V\",\"iAc3\":11.9,\"iAc3Str\":\"A\",\"powerFactor\":1,\"batteryDischargeEnergy\":0,\"batteryDischargeEnergyStr\":\"kWh\",\"batteryChargeEnergy\":0,\"batteryChargeEnergyStr\":\"kWh\",\"homeLoadEnergy\":0,\"homeLoadEnergyStr\":\"kWh\",\"gridPurchasedEnergy\":0,\"gridPurchasedEnergyStr\":\"kWh\",\"gridSellEnergy\":0,\"gridSellEnergyStr\":\"kWh\",\"fac\":49.96,\"facStr\":\"Hz\",\"batteryPower\":0,\"batteryPowerStr\":\"kW\",\"batteryPowerPec\":\"1\",\"batteryPowerZheng\":0,\"batteryPowerFu\":0,\"storageBatteryVoltage\":0,\"storageBatteryVoltageStr\":\"V\",\"storageBatteryCurrent\":0,\"storageBatteryCurrentStr\":\"A\",\"batteryCapacitySoc\":0,\"batteryHealthSoh\":0,\"batteryVoltage\":0,\"batteryVoltageStr\":\"V\",\"bstteryCurrent\":0,\"bstteryCurrentStr\":\"A\",\"batteryPowerBms\":0,\"batteryPowerBmsStr\":\"kW\",\"internalBatteryI\":0,\"batteryChargingCurrent\":0,\"batteryChargingCurrentStr\":\"A\",\"batteryDischargeLimiting\":0,\"batteryDischargeLimitingStr\":\"A\",\"batteryFailureInformation01\":\"0\",\"batteryFailureInformation02\":\"0\",\"batteryTotalChargeEnergy\":0,\"batteryTotalChargeEnergyStr\":\"kWh\",\"batteryTodayChargeEnergy\":0,\"batteryTodayChargeEnergyStr\":\"kWh\",\"batteryMonthChargeEnergy\":0,\"batteryMonthChargeEnergyStr\":\"kWh\",\"batteryYearChargeEnergy\":0,\"batteryYearChargeEnergyStr\":\"kWh\",\"batteryYesterdayChargeEnergy\":0,\"batteryYesterdayChargeEnergyStr\":\"kWh\",\"batteryTotalDischargeEnergy\":0,\"batteryTotalDischargeEnergyStr\":\"kWh\",\"batteryTodayDischargeEnergy\":0,\"batteryTodayDischargeEnergyStr\":\"kWh\",\"batteryMonthDischargeEnergy\":0,\"batteryMonthDischargeEnergyStr\":\"kWh\",\"batteryYearDischargeEnergy\":0,\"batteryYearDischargeEnergyStr\":\"kWh\",\"batteryYesterdayDischargeEnergy\":0,\"batteryYesterdayDischargeEnergyStr\":\"kWh\",\"gridPurchasedTotalEnergy\":0,\"gridPurchasedTotalEnergyStr\":\"kWh\",\"gridPurchasedYearEnergy\":0,\"gridPurchasedYearEnergyStr\":\"kWh\",\"gridPurchasedMonthEnergy\":0,\"gridPurchasedMonthEnergyStr\":\"kWh\",\"gridPurchasedTodayEnergy\":0,\"gridPurchasedTodayEnergyStr\":\"kWh\",\"gridPurchasedYesterdayEnergy\":0,\"gridPurchasedYesterdayEnergyStr\":\"kWh\",\"gridSellTotalEnergy\":0,\"gridSellTotalEnergyStr\":\"kWh\",\"gridSellYearEnergy\":0,\"gridSellYearEnergyStr\":\"kWh\",\"gridSellMonthEnergy\":0,\"gridSellMonthEnergyStr\":\"kWh\",\"gridSellTodayEnergy\":0,\"gridSellTodayEnergyStr\":\"kWh\",\"gridSellYesterdayEnergy\":0,\"gridSellYesterdayEnergyStr\":\"kWh\",\"homeLoadTotalEnergy\":0,\"homeLoadTotalEnergyStr\":\"kWh\",\"homeLoadTodayEnergy\":0,\"homeLoadTodayEnergyStr\":\"kWh\",\"totalLoadPower\":0,\"totalLoadPowerStr\":\"kW\",\"homeLoadYesterdayEnergy\":0,\"homeLoadYesterdayEnergyStr\":\"kWh\",\"familyLoadPower\":0,\"familyLoadPowerStr\":\"kW\",\"familyLoadPercent\":0,\"homeGridYesterdayEnergy\":0,\"homeGridYesterdayEnergyStr\":\"kWh\",\"homeGridTodayEnergy\":0,\"homeGridTodayEnergyStr\":\"kWh\",\"homeGridMonthEnergy\":0,\"homeGridMonthEnergyStr\":\"kWh\",\"homeGridYearEnergy\":0,\"homeGridYearEnergyStr\":\"kWh\",\"homeGridTotalEnergy\":0,\"homeGridTotalEnergyStr\":\"kWh\",\"bypassLoadPower\":0,\"bypassLoadPowerStr\":\"kW\",\"backupYesterdayEnergy\":0,\"backupYesterdayEnergyStr\":\"kWh\",\"backupTodayEnergy\":0,\"backupTodayEnergyStr\":\"kWh\",\"backupMonthEnergy\":0,\"backupMonthEnergyStr\":\"kWh\",\"backupYearEnergy\":0,\"backupYearEnergyStr\":\"kWh\",\"backupTotalEnergy\":0,\"backupTotalEnergyStr\":\"kWh\",\"bypassAcVoltage\":0,\"bypassAcVoltageB\":0,\"bypassAcVoltageC\":0,\"bypassAcCurrent\":0,\"bypassAcCurrentB\":0,\"bypassAcCurrentC\":0,\"pLimitSet\":110,\"pFactorLimitSet\":10,\"pReactiveLimitSet\":0,\"batteryType\":\"0.0\",\"socDischargeSet\":0,\"socChargingSet\":0,\"pEpmSet\":0,\"pEpmSetStr\":\"kW\",\"epmFailSafe\":0,\"epmSafe\":0,\"pEpm\":0,\"pEpmStr\":\"kW\",\"psumCalPec\":\"1\",\"insulationResistance\":0,\"dispersionRate\":0,\"sirRealtime\":1176,\"iLeakLimt\":0,\"upvTotal\":0,\"upvTotalStr\":\"V\",\"ipvTotal\":0,\"ipvTotalStr\":\"A\",\"powTotal\":0,\"powTotalStr\":\"W\",\"parallelStatus\":0,\"parallelAddr\":0,\"parallelPhase\":0,\"parallelBattery\":0,\"batteryAlarm\":\"0\",\"bypassAcOnoffSet\":0,\"bypassAcVoltageSet\":0,\"bypassAcCurrentSet\":0,\"batteryCDEnableSet\":0,\"batteryCDSet\":0,\"batteryCDISet\":0,\"batteryCMaxiSet\":0,\"batteryDMaxiSet\":0,\"batteryUvpSet\":0,\"batteryFcvSet\":0,\"batteryAcvSet\":0,\"batteryOvpSet\":0,\"batteryOlvEnableSet\":0,\"batteryLaTemp\":0,\"offGridDDepth\":0,\"epsDDepth\":0,\"epsSwitchTime\":\"0\",\"acInType\":0,\"energyStorageControl\":\"0\",\"meter1Type\":0,\"meter2Type\":0,\"meter1SiteHigh\":0,\"meter2SiteHigh\":0,\"meter1TypeLow\":0,\"meter2TypeLow\":0,\"psum\":0,\"dcPacStr\":\"kVA\",\"reactivePowerStr\":\"Var\",\"apparentPowerStr\":\"kVA\",\"psumCal\":8.31,\"familyLoadPowerPec\":\"1\",\"psumStr\":\"kW\",\"psumCalStr\":\"kW\"}";
-        Map<String, Object> map = JSON.parseObject(JsonString, Map.class);
-        map.keySet().forEach(s -> System.out.println(s.toLowerCase(Locale.ROOT)+" varchar(100),"));
-    }
-}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java

+package com.yeejoin.amos.boot.module.jxiop.biz.constants;
+
+import java.util.HashMap;
+
+public class CommonConstans {
+    //光伏发电量系数
+    public static final Double pvGenPoweActor = 0.000001;
+    //    风电站：
+//            （日/月/年）发电量=场站所有风机（日/月/年）发电量总和
+//            装机容量=场站所有风机装机容量总和
+//
+//    光伏站：
+//            （日/月/年）发电量=场站所有逆变器（日/月/年）发电量总和
+//            装机容量=场站所有逆变器装机容量总和
+//
+//    通用：
+//    发电量完成率=（月/年）发电量/（月/年）发电量指标
+//    小时数完成率=（月/年）可利用小时/（月/年）可利用小时数指标
+//    可利用小时(h)=（日/月/年）发电量（万kW·h）/装机容量（万kW）
+//    二氧化碳减排量（万t）=发电量（万kW·h）*0.997 * 10 / 10000
+    public static final Double carbonDioxide = 0.997 * 10 / 10000;
+    //    节约标准煤（万t）=发电量（万kW·h）*0.29
+    public static final Double standardCoal = 0.29;
+    //    炭粉尘减排量（t）=发电量（万kW·h）*0.30
+    public static final Double toner = 0.30;
+    //    二氧化硫减排量（t）=发电量（万kW·h）*1.51
+    public static final Double sulfurDioxide = 1.51;
+    //    氮氧化物减排量（t）=发电量（万kW·h）*1.69
+    public static final Double oxynitride = 1.69;
+    //吨转万吨
+    public static final Double tToWT = 0.0001;
+    //万Kwh转MV
+    public static final Integer wkwhToMv = 10;
+//    正常运行	发电状态=1
+//    告警运行	报警状态=1
+//    正常停机	停机状态=1
+//    故障停机	故障状态=1
+//    限功率
+//    待机状态	待机状态=1
+//    维护状态	维护状态=1
+//    通讯中断
+
+    public static final HashMap<String, String> fanStatus = new HashMap<String, String>() {
+        {
+            put("发电状态", "正常运行");
+            put("报警状态", "报警运行");
+            put("停机状态", "停机状态");
+            put("故障状态", "故障状态");
+            put("待机状态", "待机状态");
+            put("维护状态", "维护状态");
+            put("限功率",   "限功率");
+            put("通讯中断", "通讯中断");
+        }
+    };
+//    正常运行	运行=1
+//    正常停机	停机=1
+//    限功率	限额运行=1
+//    限电停机	降额运行=1
+//    告警运行	告警运行=1
+//    故障停机	故障停机=1
+//    待机状态	待机=1
+//    通讯中断	通讯故障=1
+
+    public static final HashMap<String, String> pvStatus = new HashMap<String, String>() {
+
+        {
+            put("运行", "正常运行");
+            put("停机", "正常停机");
+            put("限额运行", "限功率");
+            put("降额运行", "限电停机");
+            put("告警运行", "告警运行");
+            put("故障停机", "故障停机");
+            put("待机", "待机状态");
+            put("通讯故障", "通讯中断");
+        }
+
+    };
+    //es EquipIndexName 查绚关键字
+    public static final String QueryStringEquipmentIndexName = "equipmentIndexName.keyword";
+    //es EquipIndexName 查绚关键字
+    public static final String QueryStringEquipmentIndexNameNotKeyword = "equipmentIndexName";
+    //es gatewayId 查绚关键字
+    public static final String QueryStringGateWayId = "gatewayId.keyword";
+    public static final String QueryStringFrontMoudle = "frontModule.keyword";
+    public static final String QueryStringSystemType = "systemType";
+    public static final String QueryStringSystemTypeKeyword = "systemType.keyword";
+    public static final String QueryStringEquipmentNumber = "equipmentNumber";
+    public static final String QueryStringEquipmentNumberKeyword = "equipmentNumber.keyword";
+    public static final String QueryStringValue = "value";
+    public static final String QueryStringValueKeyword = "value.keyword";
+
+    public static final String QueryStringValueLabel = "valueLabel";
+    public static final String QueryStringValueLabelKeyword = "valueLabel.keyword";
+    public static final String QueryStringDataType = "dataType";
+    public static final String QueryStringDisplayName = "displayName";
+    public static final String QueryStringDisplayNameKeyword = "displayName.keyword";
+    public static final String QueryStringIsAlarm = "isAlarm";
+    public static final String QueryStringIsAlarmKeyword = "isAlarm.keyword";
+    public static final String  Twodecimalplaces= "%.2f";
+    public static final String Fourdecimalplaces = "%.4f";
+    public static final String QueryStringFrontMoudleNotKeyWord = "frontModule";
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/ESEquipmentsDTO.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ESEquipmentsDTO {
+    private String  id;
+    private String  address;
+    private String  dataType;
+    private String  equipmentSpecificName;
+    private String  gatewayId;
+    private String  isAlarm;
+    private Date createdTime;
+    private String  unit;
+    private String  value;
+    private Float   valueF;
+    private String  valueLabel;
+    private String  traceId;
+    private String  equipmentIndexName;
+    private String  equipmentNumber;
+    private String  frontModule;
+    private String  systemType;
+    private String  pictureName;
+    private String  displayName;
+    private String state;
+    private String color;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanHealthIndex.java

@@ -153,4 +153,10 @@ public class IdxBizFanHealthIndex {
     @TableField("ANOMALY")
     private Double ANOMALY;
 
+    /**
+     * 分析变量名称
+     */
+    @TableField("POINT_NAME")
+    private String pointName;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvHealthIndex.java

@@ -162,4 +162,11 @@ public class IdxBizPvHealthIndex{
 	@TableField("ANOMALY")
     private Double ANOMALY;
 
+
+    /**
+     * 分析变量名称
+     */
+    @TableField("POINT_NAME")
+    private String pointName;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthIndexMapper.java

@@ -37,4 +37,39 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 
     List<Map<String, Object>> getAllEquipAlarmInfoAnalysisByArea(@Param("areaCode") String areaCode);
 
+    List<Map<String, Object>> getSubSystemInfo(@Param("equipmentName") String equipmentName, @Param("gatewayId") String gatewayId);
+
+    List<Map<String, Object>> getFanInfoByPage(@Param("gatewayId") String gatewayId);
+
+    List<Map<String, Object>> getFanHealthInfoList(@Param("gatewayId") String gatewayId);
+
+    List<Map<String, Object>> getSumSystemListByEquipment(@Param("gatewayId") String gatewayId, @Param("equipmentName") String equipmentName);
+
+    List<Map<String, Object>> getPointNameListBySumSystem(@Param("gatewayId") String gatewayId, @Param("subSystem") String subSystem);
+
+
+    List<Map<String, Object>> getHealthInfoBySubSystem(@Param("subSystem") String subSystem, @Param("gatewayId") String gatewayId);
+
+
+
+
+
+    List<Map<String, Object>> getPvInfoByPage(@Param("gatewayId") String gatewayId);
+
+    List<Map<String, Object>> getPvHealthInfoList(@Param("gatewayId") String gatewayId);
+
+
+
+    List<Map<String, Object>> getPvSubSystemInfo(@Param("subarray") String subarray, @Param("gatewayId") String gatewayId);
+
+    List<Map<String, Object>> getPvSumSystemListByEquipment(@Param("gatewayId") String gatewayId, @Param("subarray") String subarray);
+
+
+
+
+
+    List<Map<String, Object>> getPvHealthInfoBySubSystem(@Param("equipmentName") String equipmentName, @Param("gatewayId") String gatewayId);
+
+    List<Map<String, Object>> getPvPointNameListBySumSystem(@Param("gatewayId") String gatewayId, @Param("equipmentName") String equipmentName);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -1225,4 +1226,41 @@ public class CommonServiceImpl {
             }
         }
     }
+
+    /**
+     * 根据查询条件获取列表信息
+     *
+     * @param mustQuerCondtion
+     * @param shouldQuerCondtion
+     * @param tClass
+     * @param <T>
+     * @return
+     */
+    public <T> List<T> getListDataByCondtions(Map<String, List<String>> mustQuerCondtion, Map<String, String> shouldQuerCondtion, Class<T> tClass) {
+        BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
+        if (!ObjectUtils.isEmpty(mustQuerCondtion)) {
+            for (String key : mustQuerCondtion.keySet()) {
+                List<String> va = mustQuerCondtion.get(key);
+                queryBuilder.must(QueryBuilders.termsQuery(key, va));
+            }
+        }
+        if (!ObjectUtils.isEmpty(shouldQuerCondtion)) {
+            for (String key : shouldQuerCondtion.keySet()) {
+                queryBuilder.should(QueryBuilders.wildcardQuery(key, shouldQuerCondtion.get(key)));
+            }
+        }
+        Query query = new NativeSearchQueryBuilder()
+                .withQuery(queryBuilder)
+                .build();
+        query.setTrackTotalHits(true);
+        SearchHits search = elasticsearchTemplate.search(query, tClass);
+        if (search.hasSearchHits()) {
+            List<SearchHit<T>> searchHitList = search.getSearchHits();
+            List<T> list = searchHitList.stream().map(hit -> hit.getContent()).collect(Collectors.toList());
+            return list;
+        }
+        return null;
+    }
+
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanWarningRecordMapper.xml

@@ -78,7 +78,7 @@
     ) a
     <where>
         <if test="arae != '' and arae != null">
-            AND a.arae = #{arae}
+            AND a.arae like concat('%', #{areaCode}, '%')
         </if>
         <if test="station != '' and station != null">
             AND a.station = #{station}