Quellcode durchsuchen

统一请求类

tianyabing vor 2 Jahren
Ursprung
Commit
ebc86f537d

+ 7 - 23
src/main/java/com/sky/ioc/service/meeting/impl/MeetingRoomServiceImpl.java

@@ -1,13 +1,10 @@
 package com.sky.ioc.service.meeting.impl;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.entity.domain.meeting.MeetingRecord;
 import com.sky.ioc.entity.domain.meeting.MeetingRoom;
 import com.sky.ioc.entity.domain.space.BuildingFloor;
-import com.sky.ioc.entity.params.IocParam;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.mapper.meeting.MeetingRecordMapper;
 import com.sky.ioc.mapper.meeting.MeetingRoomMapper;
 import com.sky.ioc.mapper.space.BuildingFloorMapper;
@@ -15,9 +12,6 @@ import com.sky.ioc.service.meeting.MeetingRoomService;
 import com.sky.ioc.tool.ReturnMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -33,7 +27,7 @@ import java.util.regex.Pattern;
 public class MeetingRoomServiceImpl implements MeetingRoomService {
 
     @Resource
-    TokenMapper tokenMapper;
+    RestTemplateConfig restTemplateConfig;
 
     @Autowired
     MeetingRoomMapper meetingRoomMapper;
@@ -44,25 +38,15 @@ public class MeetingRoomServiceImpl implements MeetingRoomService {
     @Autowired
     BuildingFloorMapper buildingFloorMapper;
 
-    final static  String MEETTING_ROOM_URL="http://192.168.1.45:9001/api/meeting/MEETING/room/list?pageNum=1&pageSize=100";
+    final static  String MEETTING_ROOM_URL="/api/meeting/MEETING/room/list?pageNum=1&pageSize=100";
 
     @Override
     public ReturnMsg getMeetingRoomList() {
-        Map<String,String> tokenMap = tokenMapper.getNewToken();
-        String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
-        if(tokenMap!=null){
-            token = "Bearer "+tokenMap.get("token");
-        }
-        // 创建一个请求头对象
-        HttpHeaders httpHeaders = new HttpHeaders();
-        // 设置参数
-        httpHeaders.set("authorization", token);
-        // 创建一个响应体对象
-        HttpEntity<String> httpEntity = new HttpEntity(httpHeaders);
-        // 3.创建RestTemplate
-        RestTemplate restTemplate = new RestTemplate();
+        // 创建RestTemplate
+        RestTemplate restTemplate = restTemplateConfig.build();
         // 发送GET请求
-        ResponseEntity<Map> responseEntity = restTemplate.exchange(MEETTING_ROOM_URL, HttpMethod.GET, httpEntity, Map.class);
+        String url = restTemplateConfig.addBaseUrl(MEETTING_ROOM_URL);
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
         // 获取响应对象里的 body 对象
         Map<String, Object> body = responseEntity.getBody();
         // 获取状态码