Merge branch 'master' of http://39.105.126.192:3000/DR3_server/sky_ioc_server

 Conflicts:

	src/main/java/com/sky/ioc/controller/scene/MeetingRoomController.java

	src/main/java/com/sky/ioc/service/canteen/impl/RestaurantServiceImpl.java

src/main/java/com/sky/ioc/config/RestTemplateConfig.java

@@ -1,14 +1,70 @@
 package com.sky.ioc.config;
 
+import com.sky.ioc.mapper.job.TokenMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.Resource;
+import javax.net.ssl.HttpsURLConnection;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Map;
+
 @Configuration
 public class RestTemplateConfig {
+
+    @Resource
+    TokenMapper tokenMapper;
+
+    @Value("${sky.dataIp}")
+    private String dataIp;
+
+    private static RestTemplateBuilder builder = null;
+
+    static {
+        builder = new RestTemplateBuilder(restTemplate -> restTemplate.setRequestFactory(new SimpleClientHttpRequestFactory() {
+            @Override
+            protected void prepareConnection(HttpURLConnection connection, String httpMethod) throws IOException {
+                if (connection instanceof HttpsURLConnection) {
+                    ((HttpsURLConnection) connection).setHostnameVerifier((s, sslSession) -> true);
+                }
+                super.prepareConnection(connection, httpMethod);
+            }
+        }))
+                // 超时时间
+                .setConnectTimeout(Duration.of(5*60, ChronoUnit.SECONDS))
+                .setReadTimeout(Duration.of(5*60, ChronoUnit.SECONDS));
+    }
+
     @Bean
-    public RestTemplate restTemplate(RestTemplateBuilder builder){
+    public RestTemplate restTemplate(){
+        return build();
+    }
+
+    public RestTemplate build() {
+        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");
+        }
+        // 默认请求头
+        builder = builder.defaultHeader("authorization", token);
         return builder.build();
     }
+
+    public String addBaseUrl(String url) {
+        if (url.startsWith("http")) {
+            return url;
+        }
+        url = StringUtils.removeStart(url, "/");
+        String baseUrl = StringUtils.appendIfMissing(dataIp, "/");
+        return baseUrl + url;
+    }
 }

src/main/java/com/sky/ioc/controller/scene/MeetingRoomController.java

@@ -1,11 +1,22 @@
 package com.sky.ioc.controller.scene;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.params.IocParam;
+import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.service.meeting.MeetingRoomService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 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.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Map;
 
 @Api(tags ="智慧场景----配置会议")
 @Slf4j

src/main/java/com/sky/ioc/controller/scene/StrategyController.java

@@ -1,8 +1,5 @@
 package com.sky.ioc.controller.scene;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.sky.ioc.entity.QuartzJob;
 import com.sky.ioc.entity.domain.scene.Strategy;
@@ -13,13 +10,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @Api(tags ="智慧场景----智能策略")
 @Slf4j

src/main/java/com/sky/ioc/mapper/job/TokenMapper.java

@@ -1,12 +1,10 @@
 package com.sky.ioc.mapper.job;
 
-import com.sky.ioc.entity.domain.system.Menus;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
-import java.util.List;
 import java.util.Map;
 
 @Mapper

src/main/java/com/sky/ioc/service/canteen/impl/RestaurantServiceImpl.java

@@ -81,28 +81,28 @@ public class RestaurantServiceImpl implements RestaurantService {
     @Override
     public ReturnMsg getPaymentAnalysis(IocParam iocParam) {
         List<Cake> lists = new ArrayList<>();
-       // Double offline = cuisineOrderMapper.getTotalPriceByCompanyIdAndDeptId(iocParam,19);
-        Double scanningCode =cuisineOrderMapper.getTotalPriceByCompanyIdAndDeptId(iocParam,13);
-        Double payCard =cuisineOrderMapper.getTotalPriceByCompanyIdAndDeptId(iocParam,2);
-        Double face = cuisineOrderMapper.getTotalPriceByCompanyIdAndDeptId(iocParam,1);
-       // offline = offline==null?0:offline;
-        scanningCode = scanningCode==null?0:new BigDecimal(scanningCode).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).doubleValue();
-        payCard = payCard==null?0:new BigDecimal(payCard).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).doubleValue();
-        face = face==null?0:new BigDecimal(face).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).doubleValue();
-       // Cake cake1 = new Cake();
+        Double offline = cuisineOrderMapper.getTotalPriceByCompanyIdAndDeptId(iocParam,19);
+        Double scanningCode =cuisineOrderMapper.getTotalPriceByCompanyIdAndDeptId(iocParam,16);
+        Double payCard =cuisineOrderMapper.getTotalPriceByCompanyIdAndDeptId(iocParam,1);
+        Double face = cuisineOrderMapper.getTotalPriceByCompanyIdAndDeptId(iocParam,4);
+        offline = offline==null?0:offline;
+        scanningCode = scanningCode==null?0:scanningCode;
+        payCard = payCard==null?0:payCard;
+        face = face==null?0:face;
+        Cake cake1 = new Cake();
         Cake cake2 = new Cake();
         Cake cake3 = new Cake();
         Cake cake4 = new Cake();
-       // cake1.setName("线下");
+        cake1.setName("线下");
         cake2.setName("扫码");
         cake3.setName("人脸");
         cake4.setName("刷卡");
         cake4.setValue(payCard);
         cake3.setValue(face);
         cake2.setValue(scanningCode);
-        //cake1.setValue(offline);
+        cake1.setValue(offline);
         lists.add(cake3);
-       // lists.add(cake1);
+        lists.add(cake1);
         lists.add(cake2);
         lists.add(cake4);
         return ReturnMsg.ok(lists);
@@ -128,7 +128,6 @@ public class RestaurantServiceImpl implements RestaurantService {
         }
         double avgPrice = 0d;
         if (totalPrice > 0) {
-            bigDecimal = bigDecimal.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
             if (totalOrder > 0) {
                 BigDecimal avgPriceDec = bigDecimal.divide(new BigDecimal(totalOrder), 2, RoundingMode.HALF_UP);
                 avgPrice = avgPriceDec.doubleValue();
@@ -222,9 +221,9 @@ public class RestaurantServiceImpl implements RestaurantService {
             Double breakfastPrice = cuisineOrderMapper.getAvgPriceByCompanyIdAndDeptId(iocParam1);
             Double lunchPrice = cuisineOrderMapper.getAvgPriceByCompanyIdAndDeptId(iocParam2);
             Double dinnerPrice = cuisineOrderMapper.getAvgPriceByCompanyIdAndDeptId(iocParam3);
-            breakfastPrice = breakfastPrice==null?0:new BigDecimal(breakfastPrice).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).doubleValue();
-            lunchPrice = lunchPrice==null?0:new BigDecimal(lunchPrice).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).doubleValue();
-            dinnerPrice = dinnerPrice==null?0:new BigDecimal(dinnerPrice).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).doubleValue();
+            breakfastPrice = breakfastPrice==null?0:Double.valueOf(decimalFormat.format(breakfastPrice));
+            lunchPrice = lunchPrice==null?0:Double.valueOf(decimalFormat.format(lunchPrice));
+            dinnerPrice = dinnerPrice==null?0:Double.valueOf(decimalFormat.format(dinnerPrice));
             jsonObject.put(param[0],totalBreakfastPerson);
             jsonObject.put(param[1],totalLunchPerson);
             jsonObject.put(param[2],totalDinnerPerson);
@@ -285,10 +284,6 @@ public class RestaurantServiceImpl implements RestaurantService {
                     dinner += order.getOrderPrice();
                 }
             }
-            dinner = new BigDecimal(dinner).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).doubleValue();
-            lunch = new BigDecimal(lunch).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).doubleValue();
-            breakfast = new BigDecimal(breakfast).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).doubleValue();
-
         }
         cakeBreakfast.setValue(breakfast);
         cakeDinner.setValue(dinner);
@@ -427,12 +422,12 @@ public class RestaurantServiceImpl implements RestaurantService {
 
     @Override
     public ReturnMsg getOrderData() {
-      //  cuisineOrderMapper.delete(null);
-     //   cuisineOderItemMapper.delete(null);
-        int pageNum = 0;
-        for (int k =2;k<5;k++){
+        cuisineOrderMapper.delete(null);
+        cuisineOderItemMapper.delete(null);
+        int pageNum = 1;
+        for (int k =0;k<10;k++){
             pageNum = k+1;
-            String url =   String.format(CANTEEN_ORDER_URL,"http://"+dataIp)+"?pageNum="+pageNum+"&pageSize=2000";
+            String url =   String.format(CANTEEN_ORDER_URL,"http://"+dataIp)+"?pageNum="+pageNum+"&pageSize=1000";
             Map<String,String> tokenMap = tokenMapper.getNewToken();
             String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
             if(tokenMap!=null){
@@ -453,35 +448,27 @@ public class RestaurantServiceImpl implements RestaurantService {
                         LinkedHashMap json = (LinkedHashMap) list.get(i);
                         Order order = new Order();
                         order.setId((Integer) json.get("id"));
-                        Order order1 = cuisineOrderMapper.selectById(order.getId());
-                        if(order1==null){
-                            order.setOrderId(String.valueOf(json.get("oriId")));
-                            order.setOrderPrice(Double.parseDouble(String.valueOf(json.get("totalFee"))));
-                            order.setOrderTime(String.valueOf(json.get("orderTime")));
-                            order.setPaytype(Integer.parseInt(String.valueOf(json.get("oSource"))));
-                            //order.setUserId(Integer.parseInt(String.valueOf(json.get("phone"))));
-                            order.setPhone(String.valueOf(json.get("phone")));
-                            ArrayList products = (ArrayList) json.get("products");
-                            for(int j=0;j<products.size();j++){
-                                LinkedHashMap product = (LinkedHashMap) products.get(j);
-                                String name = String.valueOf(product.get("pName"));
-                                CuisineOrderItem oderItem = new CuisineOrderItem();
-                                Cuisine cuisine = cuisineMapper.getByName(name);
-                                //.selectOne(new LambdaQueryWrapper<Cuisine>().eq(Cuisine::getCuisineName,name));
-                                if(cuisine!=null){
-                                    oderItem.setId((Integer) product.get("id"));
-                                    oderItem.setPId(cuisine.getId());
-                                    oderItem.setOrderNum(order.getOrderId());
-                                    oderItem.setPName(name);
-                                    oderItem.setPPrice(Double.parseDouble(String.valueOf(product.get("pPrice"))));
-                                    cuisineOderItemMapper.insert(oderItem);
-
-                                }
+                        order.setOrderId(String.valueOf(json.get("oriId")));
+                        order.setOrderPrice(Double.parseDouble(String.valueOf(json.get("totalFee"))));
+                        order.setOrderTime(String.valueOf(json.get("orderTime")));
+                        order.setPaytype(Integer.parseInt(String.valueOf(json.get("oSource"))));
+                        ArrayList products = (ArrayList) json.get("products");
+                        for(int j=0;j<products.size();j++){
+                            LinkedHashMap product = (LinkedHashMap) products.get(j);
+                            String name = String.valueOf(product.get("name"));
+                            CuisineOrderItem oderItem = new CuisineOrderItem();
+                            Cuisine cuisine = cuisineMapper.getByName(name);
+                            //.selectOne(new LambdaQueryWrapper<Cuisine>().eq(Cuisine::getCuisineName,name));
+                            if(cuisine!=null){
+                                oderItem.setPId(cuisine.getId());
+                                oderItem.setOrderNum(order.getOrderId());
+                                oderItem.setPName(name);
+                                oderItem.setPPrice(Double.parseDouble(String.valueOf(product.get("price"))));
+                                cuisineOderItemMapper.insert(oderItem);
+
                             }
-                            cuisineOrderMapper.insert(order);
                         }
-
-
+                        cuisineOrderMapper.insert(order);
                     }
                 }
 

src/main/java/com/sky/ioc/service/carbon/impl/CarbonServiceImpl.java

@@ -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();
         // 获取状态码

src/main/java/com/sky/ioc/service/meeting/impl/MeetingRecordServiceImpl.java

@@ -1,19 +1,15 @@
 package com.sky.ioc.service.meeting.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.params.IocParam;
 import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.mapper.meeting.MeetingRecordMapper;
 import com.sky.ioc.service.meeting.MeetingRecordService;
 import com.sky.ioc.tool.ReturnMsg;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.el.parser.Token;
 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;
@@ -23,8 +19,6 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Service
@@ -37,7 +31,10 @@ public class MeetingRecordServiceImpl implements MeetingRecordService {
     @Autowired
     TokenMapper tokenMapper;
 
-    final static  String MEETTING_RECORD_URL="http://192.168.1.45:9001/api/meeting/MEETING/record/list?pageNum=1&pageSize=1000";
+    @Autowired
+    RestTemplateConfig restTemplateConfig;
+
+    final static  String MEETTING_RECORD_URL="/api/meeting/MEETING/record/list?pageNum=1&pageSize=1000";
 
     @Override
     public Map queryMeetingTreeList(IocParam iocParam) {
@@ -65,21 +62,11 @@ public class MeetingRecordServiceImpl implements MeetingRecordService {
 
     @Override
     public ReturnMsg getMeetingRecordList() {
-        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_RECORD_URL, HttpMethod.GET, httpEntity, Map.class);
+        String url = restTemplateConfig.addBaseUrl(MEETTING_RECORD_URL);
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
         // 获取响应对象里的 body 对象
         Map<String, Object> body = responseEntity.getBody();
         // 获取状态码

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();
         // 获取状态码

src/main/java/com/sky/ioc/service/parking/impl/IllegalParkingServiceImpl.java

@@ -1,16 +1,12 @@
 package com.sky.ioc.service.parking.impl;
 
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.entity.domain.parking.IllegalParking;
 import com.sky.ioc.mapper.IllegalParkingMapper;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.service.parking.IllegalParkingService;
 import com.sky.ioc.tool.ReturnMsg;
 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;
@@ -26,33 +22,18 @@ public class IllegalParkingServiceImpl implements IllegalParkingService {
 
 
     @Autowired
-    TokenMapper tokenMapper;
-
-    @Value("${sky.dataIp}")
-    private String dataIp;
+    RestTemplateConfig restTemplateConfig;
 
     @Autowired
     IllegalParkingMapper illegalParkingMapper;
 
-    final static  String ILLEGAL_PARKING_URL="%s/api/parking/PARKING/illegalParking/list";
+    final static  String ILLEGAL_PARKING_URL="/api/parking/PARKING/illegalParking/list";
     @Override
     public ReturnMsg getIllegalParkingData() {
-        String url =   String.format(ILLEGAL_PARKING_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(ILLEGAL_PARKING_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();
         // 获取状态码

src/main/java/com/sky/ioc/service/parking/impl/ParkServiceImpl.java

@@ -1,16 +1,12 @@
 package com.sky.ioc.service.parking.impl;
 
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.entity.domain.parking.Park;
 import com.sky.ioc.mapper.ParkMapper;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.service.parking.ParkService;
 import com.sky.ioc.tool.ReturnMsg;
 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;
@@ -25,34 +21,20 @@ import java.util.concurrent.ThreadLocalRandom;
 public class ParkServiceImpl implements ParkService {
 
     @Autowired
-    TokenMapper tokenMapper;
-
-    @Value("${sky.dataIp}")
-    private String dataIp;
+    RestTemplateConfig restTemplateConfig;
 
     @Autowired
     ParkMapper parkMapper;
 
-    final static  String PARK_URL="%s/api/parking/PARKING/parkingDuration/list";
+    final static  String PARK_URL="/api/parking/PARKING/parkingDuration/list";
 
     @Override
     public ReturnMsg getParkData() {
-        String url =   String.format(PARK_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(PARK_URL);
+
+        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();
         // 获取状态码

src/main/java/com/sky/ioc/service/parking/impl/ParkingServiceImpl.java

@@ -2,9 +2,10 @@ package com.sky.ioc.service.parking.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.domain.parking.IllegalParking;
 import com.sky.ioc.entity.domain.parking.Park;
 import com.sky.ioc.entity.domain.parking.Parking;
@@ -13,16 +14,11 @@ import com.sky.ioc.entity.params.IocTimeRange;
 import com.sky.ioc.mapper.IllegalParkingMapper;
 import com.sky.ioc.mapper.ParkMapper;
 import com.sky.ioc.mapper.ParkingMapper;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.service.parking.ParkingService;
 import com.sky.ioc.tool.DateUtil;
 import com.sky.ioc.tool.ReturnMsg;
 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;
@@ -53,15 +49,12 @@ public class ParkingServiceImpl implements ParkingService {
 
 
     @Autowired
-    TokenMapper tokenMapper;
+    RestTemplateConfig restTemplateConfig;
 
     @Autowired
     IllegalParkingMapper illegalParkingMapper;
 
-    @Value("${sky.dataIp}")
-    private String dataIp;
-
-    final static  String PARKING_URL="%s/api/parking/PARKING/parkingInfo/list";
+    final static  String PARKING_URL="/api/parking/PARKING/parkingInfo/list";
 
 
     @Override
@@ -193,22 +186,11 @@ public class ParkingServiceImpl implements ParkingService {
 
     @Override
     public ReturnMsg getParkingData() {
-        String url =   String.format(PARKING_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(PARKING_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();
         // 获取状态码

src/main/java/com/sky/ioc/service/security/impl/SecurityDeviceServiceImpl.java

@@ -1,15 +1,12 @@
 package com.sky.ioc.service.security.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.entity.domain.security.SecurityDevice;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.mapper.security.SecurityDeviceMapper;
 import com.sky.ioc.service.security.SecurityDeviceService;
 import com.sky.ioc.tool.ReturnMsg;
 import lombok.extern.slf4j.Slf4j;
-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;
@@ -25,31 +22,20 @@ import java.util.Map;
 public class SecurityDeviceServiceImpl implements SecurityDeviceService {
 
     @Resource
-    TokenMapper tokenMapper;
+    RestTemplateConfig restTemplateConfig;
 
     @Resource
     private SecurityDeviceMapper securityDeviceMapper;
 
-    final static String SECURITY_CAMERA_URL = "http://192.168.1.45:9001/api/safety/Hikvision/camera/list?pageNum=1&pageSize=1000";
-    final static String SECURITY_CAMERA_API_INFO_URL = "http://192.168.1.45:9001/api/safety/Hikvision/api/apiInfo";
+    final static String SECURITY_CAMERA_URL = "/api/safety/Hikvision/camera/list?pageNum=1&pageSize=1000";
+    final static String SECURITY_CAMERA_API_INFO_URL = "/api/safety/Hikvision/api/apiInfo";
 
     @Override
     public ReturnMsg syncAllCameras() {
-        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 = restTemplateConfig.build();
+        String url = restTemplateConfig.addBaseUrl(SECURITY_CAMERA_URL);
         // 发送GET请求
-        ResponseEntity<Map> responseEntity = restTemplate.exchange(SECURITY_CAMERA_URL, HttpMethod.GET, httpEntity, Map.class);
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
         // 获取响应对象里的 body 对象
         Map<String, Object> body = responseEntity.getBody();
         // 获取状态码
@@ -94,21 +80,10 @@ public class SecurityDeviceServiceImpl implements SecurityDeviceService {
 
     @Override
     public ReturnMsg getCameraApiInfo() {
-        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 = restTemplateConfig.build();
+        String url = restTemplateConfig.addBaseUrl(SECURITY_CAMERA_API_INFO_URL);
         // 发送GET请求
-        ResponseEntity<Map> responseEntity = restTemplate.exchange(SECURITY_CAMERA_API_INFO_URL, HttpMethod.GET, httpEntity, Map.class);
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
         // 获取响应对象里的 body 对象
         Map<String, Object> body = responseEntity.getBody();
         // 获取状态码

src/main/java/com/sky/ioc/service/security/impl/SecurityDoorRecordServiceImpl.java

@@ -1,18 +1,12 @@
 package com.sky.ioc.service.security.impl;
 
-import com.sky.ioc.entity.domain.security.SecurityDoor;
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.entity.domain.security.SecurityDoorRecord;
-import com.sky.ioc.mapper.job.TokenMapper;
-import com.sky.ioc.mapper.security.SecurityDoorMapper;
 import com.sky.ioc.mapper.security.SecurityDoorRecordMapper;
 import com.sky.ioc.service.security.SecurityDoorRecordService;
 import com.sky.ioc.tool.ReturnMsg;
 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;
@@ -26,28 +20,17 @@ import java.util.concurrent.ThreadLocalRandom;
 @Slf4j
 public class SecurityDoorRecordServiceImpl implements SecurityDoorRecordService {
     @Autowired
-    TokenMapper tokenMapper;
-
-    @Value("${sky.dataIp}")
-    private String dataIp;
+    RestTemplateConfig restTemplateConfig;
 
     @Autowired
     SecurityDoorRecordMapper securityDoorRecordMapper;
 
-    final static  String SECURITY_DOOR_RECORD_URL="%s/api/safety/Hikvision/record/list";
+    final static  String SECURITY_DOOR_RECORD_URL="/api/safety/Hikvision/record/list";
     @Override
     public ReturnMsg getSecurityDoorRecordData() {
-        String url =   String.format(SECURITY_DOOR_RECORD_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);
-        RestTemplate restTemplate = new RestTemplate();
-        ResponseEntity<Map> responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, Map.class);
+        String url = restTemplateConfig.addBaseUrl(SECURITY_DOOR_RECORD_URL)+"?pageNum=1&pageSize=1000";;
+        RestTemplate restTemplate = restTemplateConfig.build();
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
         Map<String, Object> body = responseEntity.getBody();
         Integer code = (Integer)body.get("code");
         String message = (String)body.get("msg");

src/main/java/com/sky/ioc/service/security/impl/SecurityDoorServiceImpl.java

@@ -1,18 +1,12 @@
 package com.sky.ioc.service.security.impl;
 
-import com.sky.ioc.entity.domain.parking.IllegalParking;
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.entity.domain.security.SecurityDoor;
-import com.sky.ioc.mapper.IllegalParkingMapper;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.mapper.security.SecurityDoorMapper;
 import com.sky.ioc.service.security.SecurityDoorService;
 import com.sky.ioc.tool.ReturnMsg;
 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;
@@ -26,28 +20,17 @@ import java.util.concurrent.ThreadLocalRandom;
 @Slf4j
 public class SecurityDoorServiceImpl implements SecurityDoorService {
     @Autowired
-    TokenMapper tokenMapper;
-
-    @Value("${sky.dataIp}")
-    private String dataIp;
+    RestTemplateConfig restTemplateConfig;
 
     @Autowired
     SecurityDoorMapper securityDoorMapper;
 
-    final static  String SECURITY_DOOR_URL="%s/api/safety/Hikvision/door/list";
+    final static  String SECURITY_DOOR_URL="/api/safety/Hikvision/door/list";
     @Override
     public ReturnMsg getSecurityDoorData() {
-        String url =   String.format(SECURITY_DOOR_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);
-        RestTemplate restTemplate = new RestTemplate();
-        ResponseEntity<Map> responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, Map.class);
+        String url = restTemplateConfig.addBaseUrl(SECURITY_DOOR_URL)+"?pageNum=1&pageSize=1000";
+        RestTemplate restTemplate = restTemplateConfig.build();
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
         Map<String, Object> body = responseEntity.getBody();
         Integer code = (Integer)body.get("code");
         String message = (String)body.get("msg");

src/main/java/com/sky/ioc/service/space/impl/BuildingFloorServiceImpl.java

@@ -1,15 +1,12 @@
 package com.sky.ioc.service.space.impl;
 
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.entity.domain.space.BuildingFloor;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.mapper.space.BuildingFloorMapper;
 import com.sky.ioc.service.space.BuildingFloorService;
 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;
@@ -25,28 +22,18 @@ public class BuildingFloorServiceImpl implements BuildingFloorService {
     BuildingFloorMapper buildingFloorMapper;
 
     @Autowired
-    TokenMapper tokenMapper;
+    RestTemplateConfig restTemplateConfig;
 
-    final static  String BUILDING_FLOOR_URL="http://192.168.1.45:9001/api/space/SPACE/floorArea/list?pageNum=1&pageSize=90000";
+    final static  String BUILDING_FLOOR_URL="/api/space/SPACE/floorArea/list?pageNum=1&pageSize=90000";
 
 
     @Override
     public ReturnMsg getBuildingFloorList() {
-        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(BUILDING_FLOOR_URL, HttpMethod.GET, httpEntity, Map.class);
+        String url = restTemplateConfig.addBaseUrl(BUILDING_FLOOR_URL);
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
         // 获取响应对象里的 body 对象
         Map<String, Object> body = responseEntity.getBody();
         // 获取状态码

src/main/java/com/sky/ioc/service/space/impl/BuildingRoomServiceImpl.java

@@ -1,16 +1,12 @@
 package com.sky.ioc.service.space.impl;
 
-import com.sky.ioc.entity.domain.meeting.MeetingRoom;
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.entity.domain.space.BuildingRoom;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.mapper.space.BuildingRoomMapper;
 import com.sky.ioc.service.space.BuildingRoomService;
 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;
@@ -18,8 +14,6 @@ import org.springframework.web.client.RestTemplate;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @Service
 @Slf4j
@@ -29,28 +23,18 @@ public class BuildingRoomServiceImpl implements BuildingRoomService {
     BuildingRoomMapper buildingRoomMapper;
 
     @Autowired
-    TokenMapper tokenMapper;
+    RestTemplateConfig restTemplateConfig;
 
-    final static  String BUILDING_ROOM_URL="http://192.168.1.45:9001/api/space/SPACE/roomArea/list?pageNum=1&pageSize=90000";
+    final static  String BUILDING_ROOM_URL="/api/space/SPACE/roomArea/list?pageNum=1&pageSize=90000";
 
 
     @Override
     public ReturnMsg getBuildingRoomList() {
-        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(BUILDING_ROOM_URL, HttpMethod.GET, httpEntity, Map.class);
+        String url = restTemplateConfig.addBaseUrl(BUILDING_ROOM_URL);
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
         // 获取响应对象里的 body 对象
         Map<String, Object> body = responseEntity.getBody();
         // 获取状态码

src/main/java/com/sky/ioc/service/space/impl/BuildingServiceImpl.java

@@ -1,19 +1,12 @@
 package com.sky.ioc.service.space.impl;
 
-import com.sky.ioc.entity.domain.carbon.CarbonQuota;
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.entity.domain.space.Building;
-import com.sky.ioc.mapper.CuisineMapper;
-import com.sky.ioc.mapper.CuisineOderItemMapper;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.mapper.space.BuildingMapper;
 import com.sky.ioc.service.space.BuildingService;
 import com.sky.ioc.tool.ReturnMsg;
 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;
@@ -29,34 +22,20 @@ import java.util.concurrent.ThreadLocalRandom;
 public class BuildingServiceImpl implements BuildingService {
 
     @Autowired
-    TokenMapper tokenMapper;
-
-    @Value("${sky.dataIp}")
-    private String dataIp;
+    RestTemplateConfig restTemplateConfig;
 
     @Autowired
     BuildingMapper buildingMapper;
 
-    final static  String BUILDING_URL="%s/api/space/SPACE/buildingArea/list";
+    final static  String BUILDING_URL="/api/space/SPACE/buildingArea/list";
 
     @Override
     public ReturnMsg getBuildigData() {
-        String url =   String.format(BUILDING_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(BUILDING_URL)+"?pageNum=1&pageSize=1000";
+        // 创建RestTemplate
+        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();
         // 获取状态码

src/main/java/com/sky/ioc/service/space/impl/BuildingStationServiceImpl.java

@@ -1,15 +1,12 @@
 package com.sky.ioc.service.space.impl;
 
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.entity.domain.space.BuildingStation;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.mapper.space.BuildingStationMapper;
 import com.sky.ioc.service.space.BuildingStationService;
 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;
@@ -26,28 +23,18 @@ public class BuildingStationServiceImpl implements BuildingStationService {
     BuildingStationMapper buildingStationMapper;
 
     @Autowired
-    TokenMapper tokenMapper;
+    RestTemplateConfig restTemplateConfig;
 
-    final static  String BUILDING_STATION_URL="http://192.168.1.45:9001/api/space/SPACE/cellArea/list?pageNum=1&pageSize=90000";
+    final static  String BUILDING_STATION_URL="/api/space/SPACE/cellArea/list?pageNum=1&pageSize=90000";
 
 
     @Override
     public ReturnMsg getBuildingStationList() {
-        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(BUILDING_STATION_URL, HttpMethod.GET, httpEntity, Map.class);
+        String url = restTemplateConfig.addBaseUrl(BUILDING_STATION_URL);
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
         // 获取响应对象里的 body 对象
         Map<String, Object> body = responseEntity.getBody();
         // 获取状态码

src/main/java/com/sky/ioc/service/system/impl/UserServiceImpl.java

@@ -2,12 +2,11 @@ package com.sky.ioc.service.system.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.constant.Constant;
-import com.sky.ioc.entity.domain.carbon.CarbonNotice;
 import com.sky.ioc.entity.domain.system.Menus;
 import com.sky.ioc.entity.domain.system.Users;
 import com.sky.ioc.entity.result.system.LoginUserVo;
-import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.mapper.system.MenuMapper;
 import com.sky.ioc.mapper.system.UserMapper;
 import com.sky.ioc.service.system.UserService;
@@ -18,10 +17,6 @@ import com.sky.ioc.tool.ReturnMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 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;
@@ -30,7 +25,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
 
 @Service
 @Slf4j
@@ -46,12 +40,9 @@ public class UserServiceImpl implements UserService {
     MenuMapper menuMapper;
 
     @Autowired
-    TokenMapper tokenMapper;
+    RestTemplateConfig restTemplateConfig;
 
-    @Value("${sky.dataIp}")
-    private String dataIp;
-
-    final static  String USER_URL="%s/api/hr/HR/staff/list";
+    final static  String USER_URL="/api/hr/HR/staff/list";
 
     @Override
     public ReturnMsg updateCommonMenusByUserIdAndMenuId(long userId, String menuIDs) {
@@ -159,22 +150,11 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public ReturnMsg getUserData() {
-        String url =   String.format(USER_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(USER_URL)+"?pageNum=1&pageSize=1000";
+        // 创建RestTemplate
+        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();
         // 获取状态码