采集首航数据添加

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/SofarRequestUtil.java

@@ -34,7 +34,14 @@ public class SofarRequestUtil {
         }
     };
 
+    public static final HashMap<String, String> alarmLevel = new HashMap<String, String>() {
+        {
+            put("2", "故障");
+            put("1", "警告");
+            put("0", "提示");
 
+        }
+    };
 
 
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/constant/SoFarConstant.java

@@ -34,6 +34,9 @@ public class SoFarConstant {
     public static String nbqlist = "/station/v1.0/device?language=zh";
     public static String historical = "/device/v1.0/historical";
 
+    public static String alert = "/station/v1.0/alert";
+    public static String equipComm   ="/device/v1.0/equipComm";
+    public static String alertDetail= "device/v1.0/alertDetail";
 
     public static String stationListStatusUrl = "/api/OpenApi/QueryPowerStationMonitor";
     public static String stationDetailUrl = "/api/OpenApi/GetPowerStationMonitorDetail";
@@ -54,6 +57,11 @@ public class SoFarConstant {
     public static String resovleRule_data = "stationList";
 
     public static String deviceListItems = "deviceListItems";
+
+    public static String communication="communication";
+
+
+    public static String stationAlertItems="stationAlertItems";
     public static String dataList = "dataList";
     public static String paramDataList = "paramDataList";
     public static String requestPost = "POST";

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

@@ -28,6 +28,6 @@ public class Device {
     private Integer  device_model_id;//设备型号 ID
     private String communication_dev_sn;//设备对应的通信设备的 SN
     private String device_model_code;//设备型号名称
-
+    private Integer getPs_fault_status;
 
 }

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+
+import fastjson.JSONArray;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/4/11
+ */
+@Data
+public class EquipComm {
+    private Object childList;			//	子设备
+    private Long  deviceId;			//	设备ID
+    private String  deviceSn;			//	设备S//
+    private Integer  deviceState	;		//	设备当前状态
+    private String  deviceType;			//	设备类型
+    private String parentSn	;		//	父设备S//
+    private String  timeZone;			//	设备时区
+    private Long   updateTime	;		//	设备更新时间
+    private String plantId;	   		//	设备所属电站ID
+
+}

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/4/11
+ */
+@Data
+public class SofarWarm {
+
+    private Long deviceId;//254292152459468801,
+    private String deviceSn;//SF4ES010M1R047,
+    private String deviceType;//INVERTER,
+    private String addr;//2701_yz_97,
+    private Long alertTime;//1663046926,
+    private String code;//2701_yz_97,
+    private String level;//0,
+    private Long ruleId;//289113052832604160,
+    private String showName;//002电网欠压,
+    private int influence;//1
+
+}

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

@@ -19,15 +19,15 @@ public interface SofarDataAcquisitionService {
     /**
      * @descrption 采集器列表数据入库
      */
-    void collectorList(SofarStationList jsonObject );
+    void collectorList();
     /**
      * @descrption 采集器详情数据入库
      */
-    void collectorDetail();
+    void collectorDetail(List<SofarInverter>  sofarInverter, JpStation jpStation);
     /**
      * @descrption 逆变器列表数据入库
      */
-    void inverterList(SofarInverter sofarInverter, JpStation jpStation, Map<String, String> maps);
+    void inverterList(List<SofarInverter>  sofarInverter, JpStation jpStation, Map<String, String> maps);
     /**
      * @descrption 逆变器详情数据入库
      */
@@ -35,5 +35,5 @@ public interface SofarDataAcquisitionService {
     /**
      * @descrption 采集器告警列表数据入库
      */
-    void inverAlramInfo();
+    void inverAlramInfo(JpStation jpStation);
 }

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

 package com.yeejoin.amos.api.householdapi.face.service;
 
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.SofarStationList;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.KsolarStationMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.SunlightMapper;
 import org.springframework.beans.factory.annotation.Autowired;