解决冲突

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

@@ -2,16 +2,12 @@ package com.yeejoin.amos.api.householdapi.Utils;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.api.householdapi.constant.GoLangConstant;
-import com.yeejoin.amos.api.householdapi.face.model.HouseholdPvApiDto;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HouseholdPvProducerInfo;
-import com.yeejoin.amos.api.householdapi.face.service.impl.HouseholdPvApiServiceImpl;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.GolangStationList;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.GolangStationMapper;
 import com.yeejoin.amos.api.householdapi.face.service.impl.HouseholdPvProducerInfoServiceImpl;
-import com.yeejoin.amos.component.influxdb.InfluxDbConnection;
-import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
@@ -26,7 +22,8 @@ public class GolangRequestUtil {
     @Autowired
     private HouseholdPvProducerInfoServiceImpl householdPvProducerInfoServiceImpl;
 
-
+    @Autowired
+    private GolangStationMapper golangStationMapper;
     /**
      * @return HashMap<String, Object>   发送请求前的准备 准备header信息
      * @deprecated 根据厂商编码获取厂商的hearer
@@ -48,7 +45,7 @@ public class GolangRequestUtil {
     /**
      * @return String 请求返回的response字符串
      */
-    public String getResPonse(String apiurl,String requestMethod,String requestParmInfo) {
+    public <T> String getResPonse(String apiurl,String requestMethod,String requestParmInfo,String ResultResolveRule,Class <T> tClass) {
         String respone = "";
         String params = "";
         JSONArray jsonArray = null;
@@ -60,6 +57,13 @@ public class GolangRequestUtil {
         String appsecret = (String) producerInfo.get("appsecret");
         JLYHeaderMapHandler(params, headMap, orginalAuthorization, appsecret,apiurl);
         respone = sendRequest(requestMethod, url,requestParmInfo, headMap);
+        jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
+        List<T> result = JSONArray.parseArray(jsonArray.toJSONString(),tClass);
+        for (int i = 0; i < result.size(); i++) {
+          GolangStationList golangStationList =(GolangStationList) result.get(i);
+          golangStationList.setCreatedTime(new Date());
+          golangStationMapper.insert(golangStationList);
+        }
         return respone;
     }
 

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

 package com.yeejoin.amos.api.householdapi.controller;
 
-import cn.hutool.http.HttpUtil;
 import com.yeejoin.amos.api.householdapi.Utils.GolangRequestUtil;
 import com.yeejoin.amos.api.householdapi.Utils.HouseholdPvUtils;
 import com.yeejoin.amos.api.householdapi.constant.GoLangConstant;
-import com.yeejoin.amos.api.householdapi.face.model.HouseholdPvApiDto;
-import com.yeejoin.amos.api.householdapi.face.model.HouseholdPvProducerInfoDto;
-import com.yeejoin.amos.api.householdapi.face.service.impl.HouseholdPvApiServiceImpl;
-import com.yeejoin.amos.api.householdapi.face.service.impl.HouseholdPvProducerInfoServiceImpl;
-import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.GolangStationList;
 import fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,7 +16,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Map;
 
 
 /**
@@ -63,6 +57,6 @@ public class HouseholdTestController {
         HashMap<String,Object> requestInfo= new HashMap<>();
         requestInfo.put("pageNo",1);
         requestInfo.put("pageSize",100);
-        return  golangRequestUtil.getResPonse(GoLangConstant.stationListUrl,"POST",JSON.toJSONString(requestInfo));
+        return  golangRequestUtil.getResPonse(GoLangConstant.stationListUrl,"POST",JSON.toJSONString(requestInfo),"data,page,records", GolangStationList.class);
     }
 }

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

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName(value = "golang_station_list" ,autoResultMap = true)
+public class GolangStationList implements Serializable {
+    private Date createdTime;
+    private String id;
+    private String stationName;
+    private String addr;
+    private String userId;
+    private String userName;
+    private String mobile;
+    private String capacity;
+    private String capacityStr;
+    private String capacity1;
+    private String fullHour;
+    private String picName;
+    private String latitude;
+    private String longitude;
+    private String installerId;
+    private String installer;
+    private String dataTimestamp;
+    private String installerMobile;
+    private String installerEmail;
+    private String userMobile;
+    private String userEmail;
+    private String email;
+    private String sno;
+    private String country;
+    private String countryStr;
+    private String region;
+    private String regionStr;
+    private String city;
+    private String cityStr;
+    private String county;
+    private String countyStr;
+    private String dip;
+    private String azimuth;
+    private String timeZone;
+    private String timeZoneName;
+    private String timeZoneStr;
+    private String timeZoneId;
+    private String daylight;
+    private String createDate;
+    private String price;
+    private String module;
+    private String pic1Url;
+    private String power;
+    private String powerStr;
+    private String dayEnergy;
+    private String dayEnergyStr;
+    private String dayIncome;
+    private String dayIncomeUnit;
+    private String monthEnergy;
+    private String monthEnergyStr;
+    private String yearEnergy;
+    private String yearEnergyStr;
+    private String allEnergy;
+    private String allEnergyStr;
+    private String allEnergy1;
+    private String allIncome;
+    private String allIncomeUnit;
+    private String synchronizationType;
+    private String stationTypeNew;
+    private String batteryTotalDischargeEnergy;
+    private String batteryTotalChargeEnergy;
+    private String gridPurchasedTotalEnergy;
+    private String gridSellTotalEnergy;
+    private String homeLoadTotalEnergy;
+    private String oneSelf;
+    private String batteryTodayDischargeEnergy;
+    private String batteryTodayChargeEnergy;
+    private String gridPurchasedTodayEnergy;
+    private String gridSellTodayEnergy;
+    private String homeLoadTodayEnergy;
+    private String money;
+    private String fisPowerTime;
+    private String fisGenerateTime;
+    private String remark1;
+    private String remark2;
+    private String remark3;
+    private String state;
+    private String inverterPower;
+}

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

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName(value = "td_hygf_jp_collector_history" ,autoResultMap = true)
+public class HYGFJPCollectorHistory implements Serializable {
+    private Date createdTime;
+    private String snCode;
+    private Date 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/HYGFJPInverterElecHistory.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName(value = "td_hygf_jp_invertor_elec_history" ,autoResultMap = true)
+public class HYGFJPInverterElecHistory implements Serializable {
+    private Date createdTime;
+    private String snCode;
+    private Double uAcVoltage;
+    private Double vAcVoltage;
+    private Double wAcVoltage;
+    private Double uAcCurrent;
+    private Double vAcCurrent;
+    private Double wAcCurrent;
+    private long time;
+    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

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName(value = "td_hygf_jp_inverter_history" ,autoResultMap = true)
+public class HYGFJPInverterHistory implements Serializable {
+    private Date createdTime;
+    private String snCode;
+    private String date;
+    private Double powerGeneration;
+    private Double dailyReturn;
+    private Double generationHours;
+    private Long inverterId;
+    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/HYGFJPInverterWarn.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName(value = "td_hygf_jp_inverter_history" ,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 String treatment;
+    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/HYGFJPStationPowerHistory.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName(value = "td_hygf_jp_invertor_elec_history" ,autoResultMap = true)
+public class HYGFJPStationPowerHistory implements Serializable {
+    private Date createdTime;
+    private Double power;
+    private long time;
+    private String thirdStationId;
+    private String thirdCode;
+}

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

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.GolangStationList;
+
+/**
+ * 户用光伏-厂商API haders Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-06-07
+ */
+public interface GolangStationMapper extends BaseMapper<GolangStationList> {
+
+}

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

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPCollectorHistory;
+
+public interface HYGFJPCollectorHistoryMapper extends BaseMapper<HYGFJPCollectorHistory> {
+}

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

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPInverterElecHistory;
+
+public interface HYGFJPInverterElecHistoryMapper extends BaseMapper<HYGFJPInverterElecHistory> {
+}

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

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPInverterHistory;
+
+public interface HYGFJPInverterHistoryMapper extends BaseMapper<HYGFJPInverterHistory> {
+}

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

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPInverterWarn;
+
+public interface HYGFJPInverterWarnMapper extends BaseMapper<HYGFJPInverterWarn> {
+}

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

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPStationPowerHistory;
+
+public interface HYGFJPStationPowerHistoryMapper extends BaseMapper<HYGFJPStationPowerHistory> {
+}