户用光伏未入库数据补充

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

@@ -62,6 +62,21 @@ public class GolangRequestUtil {
         return result;
     }
 
+//    public JSONArray getResPonse(String apiurl,String requestMethod,String requestParmInfo,String ResultResolveRule) {
+//        String respone = "";
+//        String params = "";
+//        JSONArray jsonArray = null;
+//        HashMap<String, Object> producerInfo = getHeaderOfGolang();
+//        String baseurl = (String) producerInfo.get("apiurl");
+//        HashMap<String, String> headMap = (HashMap<String, String>) producerInfo.get("header");
+//        String orginalAuthorization = headMap.get("Authorization") + ":";
+//        String url = baseurl + apiurl;
+//        String appsecret = (String) producerInfo.get("appsecret");
+//        JLYHeaderMapHandler(params, headMap, orginalAuthorization, appsecret,apiurl);
+//        respone = sendRequest(requestMethod, url,requestParmInfo, headMap);
+//        jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
+//        return jsonArray;
+//    }
     /**
      * @param resultResovle 请求返回的解析规则 来源与数据库
      * @param response      请求返回的字符串

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.api.householdapi.constant;
 
 import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 
 public class GoLangConstant {
@@ -22,6 +23,22 @@ public class GoLangConstant {
             put("5", "外置电表");
         }
     };
+
+    public static final HashMap<String, String> alarmLevel = new HashMap<String, String>() {
+        {
+            put("1", "提示");
+            put("2", "一般");
+            put("3", "紧急");
+        }
+    };
+
+    public static final HashMap<String, String> alarmstatus = new HashMap<String, String>() {
+        {
+            put("0", "未处理");
+            put("1", "已处理");
+            put("2", "已恢复");
+        }
+    };
     public static String baseurl = "https://api.ginlong.com:13333";
     public static String tokenurl = "";
     public static String prodcerappid = "1300386381676732593";
@@ -32,7 +49,11 @@ public class GoLangConstant {
     public static String collectorDetailUrl = "/v1/api/collectorDetail";
     public static String inverterListUrl = "/v1/api/inverterList";
     public static String inverterDetailUrl = "/v1/api/inverterDetail";
+    public static String alarmListUrl = "/v1/api/alarmList";
     public static String resovleRule_data_page_records = "data,page,records";
+    public static String resovleRule_data_records = "data,records";
     public static String resovleRule_data = "data";
     public static String requestPost = "POST";
+    public static String datePattern = "yyyy-MM-dd HH:mm:ss.SSS";
+    public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern(datePattern);
 }

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

@@ -57,6 +57,9 @@ public class HouseholdTestController {
     public void golangnew() throws IOException {
 //        goLangDataAcquisitionService.stationList();
 //        goLangDataAcquisitionService.collectorList();
-        goLangDataAcquisitionService.inverterList();
+////        goLangDataAcquisitionService.inverterList();
+//        goLangDataAcquisitionService.collectorDetail();
+//        goLangDataAcquisitionService.inverterDetail();
+        goLangDataAcquisitionService.inverAlramInfo();
     }
 }

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+
+import lombok.Data;
+
+@Data
+public class AlarmDto {
+    private Long stationId;
+    private String stationName;
+    private String alarmDeviceSn;
+    private String alarmCode;
+    private String alarmLevel;
+    private Long alarmBeginTime;
+    private Long alarmEndTime;
+    private String alarmMsg;
+    private String advice;
+    private String state;
+}

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+
+import lombok.Data;
+
+@Data
+public class CollectorDetailDto {
+    private String sn;
+    private String state;
+    private Long factoryTime;
+    private Double  dataUploadCycle;
+    private Long currentWorkingTime;
+    private Long totalWorkingTime;
+    private String stationId;
+    private String rssiLevel;
+    private String model;
+}

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+
+import lombok.Data;
+
+import java.awt.print.PrinterGraphics;
+
+@Data
+public class InverterDetailDto {
+    private Long id;
+    private String sn;
+    private Long stationId;
+    private String stationName;
+    private Long collectorId;
+    private String collectorsn;
+    private String currentState;
+    private Double pac;
+    private Double eToday;
+    private Double eMonth;
+    private Double eYear;
+    private String name;
+    private String productModel;
+    private String nationalStandards;
+    private String version;
+    private Double fullHour;
+    private Double power;
+    private Double eTotal;
+    private Double iAc1;
+    private Double iAc2;
+    private Double iAc3;
+    private Double uAc1;
+    private Double uAc2;
+    private Double uAc3;
+}

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -34,164 +33,146 @@ public class JpInverter implements Serializable {
     protected String recUserName;
 
     /**
-     * 是否删除
-     */
-    @TableField(value = "is_delete")
-    public Boolean isDelete=false;
-
-    /**
      * sn编码
      */
-	@TableField("sn_code")
+    @TableField("sn_code")
     private String snCode;
+
     /**
      * 状态
      */
-	@TableField("state")
+    @TableField("state")
     private String state;
 
     /**
      * 额定功率
      */
-	@TableField("rated_power")
+    @TableField("rated_power")
     private Double ratedPower;
 
     /**
      * 采集器id
      */
-	@TableField("collector_id")
+    @TableField("collector_id")
     private Long collectorId;
 
     /**
      * 采集器sn编码
      */
-	@TableField("collector_sn_code")
+    @TableField("collector_sn_code")
     private String collectorSnCode;
 
     /**
      * 更新时间
      */
-	@TableField("update_time")
+    @TableField("update_time")
     private Date updateTime;
 
     /**
      * 实时功率
      */
-	@TableField("current_power")
+    @TableField("current_power")
     private Double currentPower;
 
     /**
      * 日发电量
      */
-	@TableField("day_power_generation")
+    @TableField("day_power_generation")
     private Double dayPowerGeneration;
 
     /**
      * 月发电量
      */
-	@TableField("month_power_generation")
+    @TableField("month_power_generation")
     private Double monthPowerGeneration;
 
     /**
      * 年发电量
      */
-	@TableField("year_power_generation")
+    @TableField("year_power_generation")
     private Double yearPowerGeneration;
 
     /**
      * 品牌
      */
-	@TableField("brand")
+    @TableField("brand")
     private String brand;
 
     /**
      * 型号
      */
-	@TableField("model")
+    @TableField("model")
     private String model;
 
     /**
      * 国标
      */
-	@TableField("national_standard")
+    @TableField("national_standard")
     private String nationalStandard;
 
     /**
      * 版本号
      */
-	@TableField("version")
+    @TableField("version")
     private String version;
 
     /**
      * 满发小时数
      */
-	@TableField("generation_hours")
+    @TableField("generation_hours")
     private String generationHours;
 
     /**
      * 质保期
      */
-	@TableField("warranty_period")
+    @TableField("warranty_period")
     private String warrantyPeriod;
 
     /**
      * IGBT温度
      */
-	@TableField("IGBT_temperature")
+    @TableField("IGBT_temperature")
     private String igbtTemperature;
 
     /**
      * AFCI方案
      */
-	@TableField("AFCI_programme")
+    @TableField("AFCI_programme")
     private String afciProgramme;
 
     /**
      * AFCI版本
      */
-	@TableField("AFCI_version")
+    @TableField("AFCI_version")
     private String afciVersion;
 
     /**
      * ID
      */
-	@TableField("ID")
+    @TableField("ID")
     private Long id;
 
     /**
      * 第三方电站id
      */
-	@TableField("third_station_id")
+    @TableField("third_station_id")
     private String thirdStationId;
 
     /**
+     * 第三方电站id
+     */
+    @TableField("third_code")
+    private String thirdCode;
+    /**
      * 装机容量
      */
-	@TableField("capacity")
+    @TableField("capacity")
     private Integer capacity;
 
     /**
      * 累计发电量
      */
-	@TableField("total_power_generation")
+    @TableField("total_power_generation")
     private Double totalPowerGeneration;
 
-    /**
-     * 日用电量
-     */
-	@TableField("day_power_use")
-    private Double dayPowerUse;
-
-    /**
-     * 月用电量
-     */
-	@TableField("month_power_use")
-    private Double monthPowerUse;
-
-    /**
-     * 年用电量
-     */
-	@TableField("year_power_use")
-    private Double yearPowerUse;
-
 }

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

@@ -11,7 +11,7 @@ import java.util.Date;
 public class HYGFJPCollectorHistory implements Serializable {
     private Date createdTime;
     private String snCode;
-    private Date time;
+    private Long time;
     private Double signalStrength;
     private String thirdStationId;
     private String thirdCode;

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

@@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.util.Date;
 
 @Data
 @TableName(value = "td_hygf_jp_inverter_history" ,autoResultMap = true)
 public class HYGFJPInverterHistory implements Serializable {
-    private Date createdTime;
+    private Timestamp 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

@@ -7,17 +7,18 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
-@TableName(value = "td_hygf_jp_inverter_history" ,autoResultMap = true)
+@TableName(value = "td_hygf_jp_inverter_warn" ,autoResultMap = true)
 public class HYGFJPInverterWarn implements Serializable {
     private Date createdTime;
     private long time;
     private String snCode;
     private String content;
     private String level;
-    private Long time_long;
-    private Long start_time;
-    private Long recover_time;
+    private Long timeLong;
+    private Long startTime;
+    private Long recoverTime;
     private String treatment;
     private String thirdStationId;
     private String thirdCode;
+    private String state;
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/GolangInverterListMapper.java

@@ -9,4 +9,6 @@ import java.util.List;
 public interface GolangInverterListMapper extends BaseMapper<GolangInverterList> {
     @Select("select id from golang_inveter_list  group by id")
     List<Long> getInverterIds();
+    @Select("select sn from golang_inveter_list  group by sn")
+    List<String> getInverterSns();
 }

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

-package com.yeejoin.amos.api.householdapi.face.service;
-
-public interface GoLangDataAcquisition {
-}

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

@@ -7,4 +7,5 @@ public interface GoLangDataAcquisitionService {
     void collectorDetail();
     void inverterList();
     void inverterDetail();
+    void inverAlramInfo();
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-dev.properties

@@ -17,7 +17,7 @@ spring.db2.datasource.password=Yeejoin@2020
 spring.db2.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 ## db3-taosiData
 spring.db3.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db3.datasource.url=jdbc:TAOS-RS://139.9.170.47:6041/house_pv_data?user=root&password=taosdata&timezone=GMT%2B8&characterEncoding=utf8
+spring.db3.datasource.url=jdbc:TAOS-RS://139.9.170.47:6041/house_pv_data?user=root&password=taosdata&characterEncoding=utf8
 spring.db3.datasource.username=root
 spring.db3.datasource.password=taosdata
 spring.db3.datasource.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver