户用光伏数据增加静态方法调用

amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/HouseholdPvUtils.java

@@ -4,18 +4,22 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.orm.entity.HouseholdPvProducerInfo;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.HashMap;
 
 @Component
 public class HouseholdPvUtils {
     private static HouseholdPvProducerInfoServiceImpl householdPvProducerInfoServiceImpl;
+    private static HouseholdPvApiServiceImpl householdPvApiServiceImpl;
 
     public HouseholdPvUtils(HouseholdPvProducerInfoServiceImpl householdPvProducerInfoServiceImpl) {
         this.householdPvProducerInfoServiceImpl = householdPvProducerInfoServiceImpl;
@@ -54,4 +58,19 @@ public class HouseholdPvUtils {
         }
         return hashMap;
     }
+    public static  String gerResponseByAPiID(Long seq){
+        HouseholdPvApiDto householdPvApiDto = householdPvApiServiceImpl.queryBySeq(seq);
+        HashMap<String,Object> producerInfo  = HouseholdPvUtils.getHeaderByProducerCode(householdPvApiDto.getProducerId());
+        HashMap<String,String> headMap = (HashMap<String, String>) producerInfo.get("header");
+        String respone="";
+        if(householdPvApiDto.getRequestMethod().equals("POST")){
+            respone = HttpUtil.createPost(producerInfo.get("apiurl")+householdPvApiDto.getApiUrl()).headerMap(headMap,true).
+                    body(householdPvApiDto.getParamInfo()).execute().body();
+        }
+        if(householdPvApiDto.getRequestMethod().equals("GET")){
+            respone = HttpUtil.createGet(producerInfo.get("apiurl")+householdPvApiDto.getApiUrl()).headerMap(headMap,true).
+                    body(householdPvApiDto.getParamInfo()).execute().body();
+        }
+        return respone;
+    }
 }

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

@@ -49,8 +49,15 @@ public class HouseholdTestController {
         HouseholdPvApiDto householdPvApiDto = householdPvApiServiceImpl.queryBySeq(seq);
         HashMap<String,Object> producerInfo  = HouseholdPvUtils.getHeaderByProducerCode(householdPvApiDto.getProducerId());
         HashMap<String,String> headMap = (HashMap<String, String>) producerInfo.get("header");
-        String respone = HttpUtil.createPost(producerInfo.get("apiurl")+householdPvApiDto.getApiUrl()).headerMap(headMap,true).
-                body(householdPvApiDto.getParamInfo()).execute().body();
+        String respone="";
+        if(householdPvApiDto.getRequestMethod().equals("POST")){
+            respone = HttpUtil.createPost(producerInfo.get("apiurl")+householdPvApiDto.getApiUrl()).headerMap(headMap,true).
+                    body(householdPvApiDto.getParamInfo()).execute().body();
+        }
+        if(householdPvApiDto.getRequestMethod().equals("GET")){
+            respone = HttpUtil.createGet(producerInfo.get("apiurl")+householdPvApiDto.getApiUrl()).headerMap(headMap,true).
+                    body(householdPvApiDto.getParamInfo()).execute().body();
+        }
         return respone;
     }
 }