|
@@ -2,31 +2,25 @@ package com.sky.ioc.service.carbon.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.sky.ioc.config.RestTemplateConfig;
|
|
|
+import com.sky.ioc.entity.Cake;
|
|
|
import com.sky.ioc.entity.Indeicator;
|
|
|
import com.sky.ioc.entity.Label;
|
|
|
-import com.sky.ioc.entity.Cake;
|
|
|
import com.sky.ioc.entity.News;
|
|
|
import com.sky.ioc.entity.domain.carbon.CarbonNotice;
|
|
|
import com.sky.ioc.entity.domain.carbon.CarbonQuota;
|
|
|
-import com.sky.ioc.entity.domain.meeting.MeetingRecord;
|
|
|
import com.sky.ioc.entity.params.IocParam;
|
|
|
import com.sky.ioc.entity.params.IocTimeRange;
|
|
|
import com.sky.ioc.mapper.BusMapper;
|
|
|
import com.sky.ioc.mapper.PrintMapper;
|
|
|
import com.sky.ioc.mapper.carbon.CarbonNoticeMapper;
|
|
|
import com.sky.ioc.mapper.carbon.CarbonQuotaMapper;
|
|
|
-import com.sky.ioc.mapper.job.TokenMapper;
|
|
|
import com.sky.ioc.service.carbon.CarbonService;
|
|
|
import com.sky.ioc.tool.DateUtil;
|
|
|
import com.sky.ioc.tool.GeneralMethod;
|
|
|
import com.sky.ioc.tool.ReturnMsg;
|
|
|
-import io.swagger.models.auth.In;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
-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;
|
|
@@ -59,13 +53,10 @@ public class CarbonServiceImpl implements CarbonService {
|
|
|
PrintMapper printMapper;
|
|
|
|
|
|
@Autowired
|
|
|
- TokenMapper tokenMapper;
|
|
|
-
|
|
|
- @Value("${sky.dataIp}")
|
|
|
- private String dataIp;
|
|
|
+ private RestTemplateConfig restTemplateConfig;
|
|
|
|
|
|
- final static String CARBON_QUOTA_URL="%s/api/carbon/CARBON/quota/list";
|
|
|
- final static String CARBON_NOTICE_URL="%s/api/carbon/CARBON/notice/list";
|
|
|
+ final static String CARBON_QUOTA_URL="/api/carbon/CARBON/quota/list";
|
|
|
+ final static String CARBON_NOTICE_URL="/api/carbon/CARBON/notice/list";
|
|
|
|
|
|
@Autowired
|
|
|
CarbonQuotaMapper carbonQuotaMapper;
|
|
@@ -886,22 +877,10 @@ public class CarbonServiceImpl implements CarbonService {
|
|
|
|
|
|
@Override
|
|
|
public ReturnMsg getCarbonQuotaData() {
|
|
|
- String url = String.format(CARBON_QUOTA_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
|
|
|
- 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();
|
|
|
+ String url = restTemplateConfig.addBaseUrl(CARBON_QUOTA_URL)+"?pageNum=1&pageSize=1000";
|
|
|
+ RestTemplate restTemplate = restTemplateConfig.build();
|
|
|
// 发送GET请求
|
|
|
- ResponseEntity<Map> responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, Map.class);
|
|
|
+ ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
|
|
|
// 获取响应对象里的 body 对象
|
|
|
Map<String, Object> body = responseEntity.getBody();
|
|
|
// 获取状态码
|
|
@@ -937,22 +916,10 @@ public class CarbonServiceImpl implements CarbonService {
|
|
|
}
|
|
|
@Override
|
|
|
public ReturnMsg getCarbonNoticeData() {
|
|
|
- String url = String.format(CARBON_NOTICE_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
|
|
|
- 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();
|
|
|
+ String url = restTemplateConfig.addBaseUrl(CARBON_NOTICE_URL) + "?pageNum=1&pageSize=1000";
|
|
|
+ RestTemplate restTemplate = restTemplateConfig.build();
|
|
|
// 发送GET请求
|
|
|
- ResponseEntity<Map> responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, Map.class);
|
|
|
+ ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
|
|
|
// 获取响应对象里的 body 对象
|
|
|
Map<String, Object> body = responseEntity.getBody();
|
|
|
// 获取状态码
|