接口测试调整

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/PtServiceServiceImpl.java

@@ -3,25 +3,26 @@ package com.ruoyi.interfaces.service.impl;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.*;
-import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.interfaces.domain.*;
+import com.ruoyi.interfaces.domain.GatewayRoutes;
+import com.ruoyi.interfaces.domain.PtService;
+import com.ruoyi.interfaces.domain.PtServiceParam;
 import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
 import com.ruoyi.interfaces.mapper.PtServiceMapper;
 import com.ruoyi.interfaces.mapper.PtServiceParamMapper;
 import com.ruoyi.interfaces.service.GatewayRoutesService;
 import com.ruoyi.interfaces.service.IMdModelInfoService;
-import com.ruoyi.interfaces.service.PtAppService;
 import com.ruoyi.interfaces.service.PtServiceService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author LinQiLong
@@ -114,7 +115,7 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
     @Override
     public MdModelInfoVo modelService(MdModelInfoVo par) {
         MdModelInfoVo mdModelInfoVo = ptServiceMapper.selectModelService(par);
-        if (StringUtils.isNotNull(mdModelInfoVo)){
+        if (StringUtils.isNotNull(mdModelInfoVo)) {
             mdModelInfoVo.setMdContact(sm4Util.decrypt(mdModelInfoVo.getMdContact()));
             mdModelInfoVo.setEnname(sm4Util.decrypt(mdModelInfoVo.getEnname()));
             mdModelInfoVo.setDevUnit(sm4Util.decrypt(mdModelInfoVo.getDevUnit()));
@@ -150,6 +151,7 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
 
     @Autowired
     private GatewayRoutesService gatewayRoutesService;
+
     @Override
     public HashMap<String, String> testRun(PtService ptService) throws IOException {
 
@@ -157,25 +159,26 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
         String url = RuoYiConfig.getGatewayUrl() + gatewayRoutes.getPredicates() + ptService.getUrl();
         System.out.println(url);
         //String url = ptService.getUrl();
-        HashMap<String, String> headers = new HashMap<>();
+        HashMap<String, Object> headers = new HashMap<>();
         List<PtServiceParam> params = ptService.getParams();
-        HttpUtils.setGatewayHeaders(headers);
+//        HttpUtils.setGatewayHeaders(headers);
         String paramString = "";
-        switch (ptService.getRqtype()) {
-            case "POST":
-                HashMap<String, Object> parMap = new HashMap<>();
-                for (PtServiceParam param : params) {
-                    parMap.put(param.getParamCode(), param.getParamObject());
-                }
-                return HttpUtils.sendBodyPost(url, parMap, headers);
-            case "GET":
-
-                for (PtServiceParam param : params) {
-                    paramString += (param.getParamCode() + "=" + param.getParamValue()) + "&";
-                }
-                return HttpUtils.sendHttpGet(url, paramString, headers);
+        HashMap<String, Object> parMap = new HashMap<>();
+        for (PtServiceParam param : params) {
+            parMap.put(param.getParamCode(), param.getParamObject());
         }
-        return null;
+
+        String responseString = OkHttpUtils.executeRequest(
+                url,
+                ptService.getRqtype(),
+                parMap,
+                JsonUtils.objectToJson(parMap),
+                null,
+                headers
+        );
+        HashMap<String, String> result = new HashMap<>();
+        result.put("result", responseString);
+        return result;
     }
 
     @Override