新增请求记录表

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

@@ -7,6 +7,10 @@ import cn.hutool.http.HttpUtil;
 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.orm.houseapi.entity.houseapi.HousepvapiRecords;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HousepvapiRecordsMapper;
+import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
@@ -16,6 +20,8 @@ import java.util.*;
 
 public class GolangRequestUtil {
 
+    @Autowired
+    HousepvapiRecordsMapper housepvapiRecordsMapper;
 
     /**
      * @return HashMap<String, Object>   发送请求前的准备 准备header信息
@@ -100,6 +106,13 @@ public class GolangRequestUtil {
     }
 
     public String sendRequest(String requestMethod, String url, String params, HashMap<String, String> headMap) {
+        HousepvapiRecords housepvapiRecords = new HousepvapiRecords();
+        housepvapiRecords.setRecDate(new Date());
+        housepvapiRecords.setRequestUrl(url);
+        housepvapiRecords.setRequestMothed(requestMethod);
+        housepvapiRecords.setRequestHeaders(JSONObject.toJSONString(headMap));
+        housepvapiRecords.setRequestParams(params);
+        housepvapiRecords.setThridCode(PVProducerInfoEnum.JLY.getCode());
         String respone = "";
         if (requestMethod.equals("POST")) {
             respone = HttpUtil.createPost(url).headerMap(headMap, false).
@@ -109,6 +122,8 @@ public class GolangRequestUtil {
             respone = HttpUtil.createGet(url).headerMap(headMap, true).
                     body(params).execute().body();
         }
+        housepvapiRecords.setResponse(respone);
+        housepvapiRecordsMapper.insert(housepvapiRecords);
         return respone;
     }
 

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

@@ -9,6 +9,9 @@ import com.alibaba.fastjson.JSONObject;
 
 import com.yeejoin.amos.api.householdapi.constant.ImasterConstant;
 
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HousepvapiRecords;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HousepvapiRecordsMapper;
+import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
@@ -22,6 +25,8 @@ public class ImasterUtils {
     private String redisKey = "XSRF-TOKEN";
 
     @Autowired
+    HousepvapiRecordsMapper housepvapiRecordsMapper;
+    @Autowired
     RedisUtils redisUtils;
     /**
      * @return HashMap<String, Object>   发送请求前的准备 准备header信息
@@ -228,7 +233,14 @@ public class ImasterUtils {
         return jsonArrayRet;
     }
 
-    public static String sendRequest(String requestMethod, String url, String params, HashMap<String, String> headMap) {
+    public  String sendRequest(String requestMethod, String url, String params, HashMap<String, String> headMap) {
+        HousepvapiRecords housepvapiRecords = new HousepvapiRecords();
+        housepvapiRecords.setRecDate(new Date());
+        housepvapiRecords.setRequestUrl(url);
+        housepvapiRecords.setRequestMothed(requestMethod);
+        housepvapiRecords.setRequestHeaders(JSONObject.toJSONString(headMap));
+        housepvapiRecords.setRequestParams(params);
+        housepvapiRecords.setThridCode(PVProducerInfoEnum.HUAWEI.getCode());
         String respone = "";
         if (requestMethod.equals("POST")) {
             respone = HttpUtil.createPost(url).headerMap(headMap, false).
@@ -238,6 +250,8 @@ public class ImasterUtils {
             respone = HttpUtil.createGet(url).headerMap(headMap, true).
                     body(params).execute().body();
         }
+        housepvapiRecords.setResponse(respone);
+        housepvapiRecordsMapper.insert(housepvapiRecords);
         return respone;
     }
 

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

@@ -7,6 +7,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.api.householdapi.constant.GoLangConstant;
 import com.yeejoin.amos.api.householdapi.constant.KSolarConstant;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HousepvapiRecords;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HousepvapiRecordsMapper;
+import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.jcajce.provider.symmetric.AES;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,16 +17,15 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 @Component
-
 @Slf4j
 public class KsolarRequestUtil {
 
+    @Autowired
+    HousepvapiRecordsMapper housepvapiRecordsMapper;
+
     /**
      * @return HashMap<String, Object>   发送请求前的准备 准备header信息
      * @deprecated 根据厂商编码获取厂商的hearer
@@ -114,6 +116,13 @@ public class KsolarRequestUtil {
     }
 
     public String sendRequest(String requestMethod, String url, String params, HashMap<String, String> headMap) {
+        HousepvapiRecords housepvapiRecords = new HousepvapiRecords();
+        housepvapiRecords.setRecDate(new Date());
+        housepvapiRecords.setRequestUrl(url);
+        housepvapiRecords.setRequestMothed(requestMethod);
+        housepvapiRecords.setRequestHeaders(JSONObject.toJSONString(headMap));
+        housepvapiRecords.setRequestParams(params);
+        housepvapiRecords.setThridCode(PVProducerInfoEnum.KSOLAR.getCode());
         String respone = "";
         if (requestMethod.equals("POST")) {
             respone = HttpUtil.createPost(url).headerMap(headMap, false).
@@ -123,6 +132,8 @@ public class KsolarRequestUtil {
             respone = HttpUtil.createGet(url).headerMap(headMap, true).
                     body(params).execute().body();
         }
+        housepvapiRecords.setResponse(respone);
+        housepvapiRecordsMapper.insert(housepvapiRecords);
         return respone;
     }
 

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

@@ -139,7 +139,7 @@ public class HouseholdTestController {
     public void imasterNew() throws IOException {
 //        imasterDataService.stationList();
 //        imasterDataService.stationDetail();
-//        imasterDataService.collectorList();
+        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/houseapi/HousepvapiRecords.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
+/**
+ * 请求记录url
+ *
+ * @author system_generator
+ * @date 2023-06-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("housepvapi_records")
+public class HousepvapiRecords extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 请求url
+     */
+	@TableField("request_url")
+    private String requestUrl;
+
+    /**
+     * 请求参数
+     */
+    @TableField("request_params")
+    private String requestParams;
+
+    /**
+     * 请求方式
+     */
+    @TableField("request_mothed")
+    private String requestMothed;
+
+    /**
+     * 请求返回
+     */
+    @TableField("response")
+    private String response;
+
+    /**
+     * 请求厂商
+     */
+    @TableField("thrid_code")
+    private String thridCode;
+
+    /**
+     * 请求厂商
+     */
+    @TableField("request_headers")
+    private String requestHeaders;
+}

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

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

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

@@ -169,7 +169,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 jpStation.setUserName(golangStationDetail.getUsername());
                 jpStation.setUserPhone(String.valueOf(golangStationDetail.getUsermobile()));
                 jpStation.setStationContact(String.valueOf(golangStationDetail.getMobile()).toLowerCase().replace("null", ""));
-                if(!ObjectUtils.isEmpty(golangStationDetail.getModule())) {
+                if (!ObjectUtils.isEmpty(golangStationDetail.getModule())) {
                     jpStation.setModuleCount(ObjectUtils.isEmpty(Math.toIntExact(golangStationDetail.getModule())) ? 0 : Math.toIntExact(golangStationDetail.getModule()));
                 }//并网类型
                 jpStation.setState(GoLangConstant.stationStaus.get(String.valueOf(golangStationDetail.getState())));
@@ -299,27 +299,27 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
     public void collectorList() {
 //        List<String> stationIds = golangStationMapper.getStationIds();
 //        for (int i = 0; i < stationIds.size(); i++) {
-            try {
-                TimeUnit.SECONDS.sleep(1);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-            HashMap<String, Object> requestInfo = new HashMap<>();
+        try {
+            TimeUnit.SECONDS.sleep(1);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        HashMap<String, Object> requestInfo = new HashMap<>();
 //            requestInfo.put("stationId", Long.valueOf(stationIds.get(i)));
-            requestInfo.put("pageNo", 1);
-            requestInfo.put("pageSize", 100);
-            String requestParaminfo = JSON.toJSONString(requestInfo);
-            List<GolangCollectorList> result = golangRequestUtil.getResPonse(GoLangConstant.collectorListUrl,
-                    GoLangConstant.requestPost,
-                    requestParaminfo,
-                    GoLangConstant.resovleRule_data_page_records,
-                    GolangCollectorList.class
-            );
-            for (int j = 0; j < result.size(); j++) {
-                GolangCollectorList golangCollectorList = result.get(j);
-                golangCollectorList.setCreatedTime(System.currentTimeMillis());
-                golangCollectorListMapper.insert(golangCollectorList);
-            }
+        requestInfo.put("pageNo", 1);
+        requestInfo.put("pageSize", 100);
+        String requestParaminfo = JSON.toJSONString(requestInfo);
+        List<GolangCollectorList> result = golangRequestUtil.getResPonse(GoLangConstant.collectorListUrl,
+                GoLangConstant.requestPost,
+                requestParaminfo,
+                GoLangConstant.resovleRule_data_page_records,
+                GolangCollectorList.class
+        );
+        for (int j = 0; j < result.size(); j++) {
+            GolangCollectorList golangCollectorList = result.get(j);
+            golangCollectorList.setCreatedTime(System.currentTimeMillis());
+            golangCollectorListMapper.insert(golangCollectorList);
+        }
 //        }
     }
 
@@ -403,27 +403,27 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
     public void inverterList() {
 //        List<String> stationIds = golangStationMapper.getStationIds();
 //        for (int i = 0; i < stationIds.size(); i++) {
-            try {
-                TimeUnit.SECONDS.sleep(1);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-            HashMap<String, Object> requestInfo = new HashMap<>();
+        try {
+            TimeUnit.SECONDS.sleep(1);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        HashMap<String, Object> requestInfo = new HashMap<>();
 //            requestInfo.put("stationId", Long.valueOf(stationIds.get(i)));
-            requestInfo.put("pageNo", 1);
-            requestInfo.put("pageSize", 100);
-            String requestParaminfo = JSON.toJSONString(requestInfo);
-            List<GolangInverterList> result = golangRequestUtil.getResPonse(GoLangConstant.inverterListUrl,
-                    GoLangConstant.requestPost,
-                    requestParaminfo,
-                    GoLangConstant.resovleRule_data_page_records,
-                    GolangInverterList.class
-            );
-            for (int j = 0; j < result.size(); j++) {
-                GolangInverterList golangInverterList = result.get(j);
-                golangInverterList.setCreatedTime(System.currentTimeMillis());
-                golangInverterListMapper.insert(golangInverterList);
-            }
+        requestInfo.put("pageNo", 1);
+        requestInfo.put("pageSize", 100);
+        String requestParaminfo = JSON.toJSONString(requestInfo);
+        List<GolangInverterList> result = golangRequestUtil.getResPonse(GoLangConstant.inverterListUrl,
+                GoLangConstant.requestPost,
+                requestParaminfo,
+                GoLangConstant.resovleRule_data_page_records,
+                GolangInverterList.class
+        );
+        for (int j = 0; j < result.size(); j++) {
+            GolangInverterList golangInverterList = result.get(j);
+            golangInverterList.setCreatedTime(System.currentTimeMillis());
+            golangInverterListMapper.insert(golangInverterList);
+        }
 //        }
     }
 
@@ -456,21 +456,23 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     jpInverter = new JpInverter();
                 }
                 jpInverter.setSnCode(inverterDetailDto.getSn().trim());
-                jpInverter.setState(golangRequestUtil.getInverterState(inverterDetailDto.getCurrentState(),inverterDetailDto.getDataTimestamp()));
+                jpInverter.setState(golangRequestUtil.getInverterState(inverterDetailDto.getCurrentState(), inverterDetailDto.getDataTimestamp()));
                 jpInverter.setCollectorId(String.valueOf(inverterDetailDto.getCollectorId()));
                 jpInverter.setCollectorSnCode(inverterDetailDto.getCollectorsn());
                 jpInverter.setUpdateTime(new Date());
                 jpInverter.setCurrentPower(inverterDetailDto.getPac());
                 jpInverter.setDayPowerGeneration(inverterDetailDto.getEToday());
                 jpInverter.setMonthPowerGeneration(inverterDetailDto.getEMonth());
-                if(inverterDetailDto.getEMonthStr().toLowerCase().equals("mwh")){
-                jpInverter.setMonthPowerGeneration(inverterDetailDto.getEMonth() * GoLangConstant.mwhTokwh);
+                if (inverterDetailDto.getEMonthStr().toLowerCase().equals("mwh")) {
+                    jpInverter.setMonthPowerGeneration(inverterDetailDto.getEMonth() * GoLangConstant.mwhTokwh);
                 }
-                if(inverterDetailDto.getEYearStr().toLowerCase().equals("mwh")) {
+                jpInverter.setYearPowerGeneration(inverterDetailDto.getEYear());
+                if (inverterDetailDto.getEYearStr().toLowerCase().equals("mwh")) {
                     jpInverter.setYearPowerGeneration(inverterDetailDto.getEYear() * GoLangConstant.mwhTokwh);
                 }
-                if(inverterDetailDto.getETotalStr().toLowerCase().equals("mwh")){
-                jpInverter.setTotalPowerGeneration(inverterDetailDto.getETotal() * GoLangConstant.mwhTokwh);
+                jpInverter.setTotalPowerGeneration(inverterDetailDto.getETotal());
+                if (inverterDetailDto.getETotalStr().toLowerCase().equals("mwh")) {
+                    jpInverter.setTotalPowerGeneration(inverterDetailDto.getETotal() * GoLangConstant.mwhTokwh);
                 }
                 jpInverter.setBrand(inverterDetailDto.getName());
                 jpInverter.setModel(inverterDetailDto.getProductModel());