Merge remote-tracking branch 'remotes/origin/develop'

src/main/java/com/syc/slm/slmbi/config/DataCenterConfig.java

 package com.syc.slm.slmbi.config;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
 /**
@@ -11,17 +9,56 @@ import org.springframework.context.annotation.Configuration;
  * @date: 2021/5/7
  */
 @Configuration
-@Getter
-@Setter
+@Data
 public class DataCenterConfig {
 
     @Value("${dc_client.host}")
-    private String host;
+    private  String dcClientHost;
 
     @Value("${dc_client.interfaces.permissionCodeUrl}")
-    private String permissionCodeUrl;
+    private  String permissionCodeUrl;
 
     @Value("${dc_client.interfaces.companyAppId}")
-    private String companyAppId;
+    private  String companyAppId;
+
+    @Value("${dc_client.interfaces.positionListUrl}")
+    private  String positionListUrl;
+    @Value("${dc_client.interfaces.deptListUrl}")
+    private  String deptListUrl;
+    @Value("${dc_client.interfaces.userTree}")
+    private  String userTree;
+    @Value("${dc_client.interfaces.variableList}")
+    private  String variableList;
+    @Value("${dc_client.interfaces.deviceList}")
+    private  String deviceList;
+
+    @Value("${dc_client.interfaces.deptsRoles}")
+    private  String deptsRoles;
+
+    @Value("${dc_client.interfaces.businessFiledData}")
+    private  String businessFiledData;
+
+    @Value("${dc_client.interfaces.businessDataFieldStatistics}")
+    private  String businessDataFieldStatistics;
+
+    @Value("${dc_client.interfaces.variableCodeHistoryList}")
+    private  String variableHistoryDataList;
+    @Value("${dc_client.interfaces.variableAllDataList}")
+    private  String variableRealTimeDataList;
+    @Value("${dc_client.interfaces.filedValue}")
+    private  String filedValue;
+    @Value("${dc_client.interfaces.send}")
+    private  String send;
+    @Value("${dc_client.interfaces.variableStatus}")
+    private  String variableStatus;
+
+    @Value("${dc_client.interfaces.variableHistoryStatus}")
+    private  String variableHistoryStatus;
+
+    @Value("${dc_client.interfaces.realTimeVariableDataList}")
+    private  String realTimeVariableDataList;
+
+    @Value("${dc_client.interfaces.variableStatusRealTimeDataList}")
+    private  String variableStatusRealTimeDataList;
 
 }

src/main/java/com/syc/slm/slmbi/controller/BaseRestController.java

@@ -6,12 +6,13 @@ import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.common.core.util.NetResponseUtils;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
+import com.syc.slm.slmbi.config.DataCenterConfig;
 import com.syc.slm.slmbi.entity.CurrentUser;
 import com.syc.slm.slmbi.exception.SysException;
 import com.syc.slm.slmbi.function.Action0;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.RequestAttributes;
@@ -33,53 +34,8 @@ import java.util.function.Supplier;
 @Slf4j
 public class BaseRestController {
 
-    @Value("${dc_client.host}")
-    protected String dcClientHost;
-    @Value("${dc_client.interfaces.positionListUrl}")
-    protected String positionListUrl;
-    @Value("${dc_client.interfaces.deptListUrl}")
-    protected String deptListUrl;
-    @Value("${dc_client.interfaces.userTree}")
-    protected String userTree;
-    @Value("${dc_client.interfaces.variableList}")
-    protected String variableList;
-    @Value("${dc_client.interfaces.deviceList}")
-    protected String deviceList;
-
-    @Value("${dc_client.interfaces.deptsRoles}")
-    protected String deptsRoles;
-
-    @Value("${dc_client.interfaces.businessFiledData}")
-    protected String businessFiledData;
-
-    @Value("${dc_client.interfaces.businessDataFieldStatistics}")
-    protected String businessDataFieldStatistics;
-
-    @Value("${dc_client.interfaces.variableCodeHistoryList}")
-    protected String variableHistoryDataList;
-    @Value("${dc_client.interfaces.variableAllDataList}")
-    protected String variableRealTimeDataList;
-    @Value("${dc_client.interfaces.filedValue}")
-    protected String filedValue;
-    @Value("${dc_client.interfaces.send}")
-    protected String send;
-    @Value("${dc_client.interfaces.variableStatus}")
-    protected String variableStatus;
-
-    @Value("${dc_client.interfaces.variableHistoryStatus}")
-    protected String variableHistoryStatus;
-
-    @Value("${dc_client.interfaces.realTimeVariableDataList}")
-    protected String realTimeVariableDataList;
-
-//    @Value("${dc_client.interfaces.historyCurve}")
-//    protected String historyCurve;
-
-    @Value("${dc_client.interfaces.variableStatusRealTimeDataList}")
-    protected String variableStatusRealTimeDataList;
-
-
-
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
 
     @ModelAttribute
     public void onInit(HttpServletRequest request) {
@@ -107,7 +63,7 @@ public class BaseRestController {
             Map<String, String> map = (Map<String, String>) webRequest.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, RequestAttributes.SCOPE_REQUEST);
             Map<String,String> uriVariables =Maps.newHashMap();
             uriVariables.put("appId",map.get("appId")+"");
-            String getUrl =dcClientHost+"/{appId}/users/user-info";
+            String getUrl = dataCenterConfig.getDcClientHost() + "/{appId}/users/user-info";
             R<CurrentUser> result = RestTemplateUtils.get(getUrl, new TypeToken<R<CurrentUser>>() {
             }.getType(), uriVariables);
             request.setAttribute(token,SlmConstants.gson.toJson(result.detach()));

src/main/java/com/syc/slm/slmbi/controller/BusinessConfigController.java

@@ -56,7 +56,7 @@ public class BusinessConfigController extends BaseRestController{
     public R<Map<String,List<Object>>> getBusinessData(HttpServletRequest request, @PathVariable String appId,@RequestBody BusinessDTO dto) {
         return  call(()->{
             CurrentUser currentUser = getCurrentUser(request);
-            return businessConfigService.getBusinessData(dto,dcClientHost+businessFiledData,currentUser);
+            return businessConfigService.getBusinessData(dto, currentUser);
         });
     }
 
@@ -68,7 +68,7 @@ public class BusinessConfigController extends BaseRestController{
         @RequestBody BusinessStatisticsDTO dto) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return businessConfigService.listBusinessFieldStatistics(dcClientHost+businessDataFieldStatistics,dto, currentUser);
+            return businessConfigService.listBusinessFieldStatistics(dto, currentUser);
         });
     }
 
@@ -79,7 +79,7 @@ public class BusinessConfigController extends BaseRestController{
         @PathVariable String appId, @PathVariable String tableName, @PathVariable String filed, @RequestParam(value = "current", defaultValue = "1") Integer current, @RequestParam(value = "size",defaultValue = "100") Integer size, @RequestParam(value = "name", required = false) String name) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return businessConfigService.filedValue(currentUser,tableName, filed,current,size,name,dcClientHost+filedValue);
+            return businessConfigService.filedValue(currentUser,tableName, filed,current,size,name);
         });
     }
 }

src/main/java/com/syc/slm/slmbi/controller/DeptController.java

@@ -4,6 +4,7 @@ import com.google.common.collect.Maps;
 import com.google.gson.reflect.TypeToken;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
+import com.syc.slm.slmbi.config.DataCenterConfig;
 import com.syc.slm.slmbi.entity.CurrentUser;
 import com.syc.slm.slmbi.service.DeptService;
 import com.syc.slm.slmbi.vo.DeptVo;
@@ -33,6 +34,9 @@ public class DeptController extends BaseRestController{
     @Autowired
     private DeptService deptService;
 
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
+
     @GetMapping
     @ApiOperation("部门查询")
     @ApiImplicitParams({@ApiImplicitParam(name = "deptName", value = "部门名称",dataTypeClass = String.class),
@@ -41,19 +45,7 @@ public class DeptController extends BaseRestController{
         @RequestParam(value = "deptName", required = false) String deptName) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return deptService.selectPositionList(dcClientHost + deptListUrl, currentUser.getToken(), appId, deptName);
-        });
-    }
-
-    @GetMapping("/base")
-    @ApiOperation("部门查询")
-    public R<List<DeptVo>> base(HttpServletRequest request, @PathVariable String appId) {
-        return call(() -> {
-            Map<String,String> uriVariables = Maps.newHashMap();
-            uriVariables.put("appId",appId);
-            String uri = dcClientHost+"/{appId}/base";
-            RestTemplateUtils.get(uri, new TypeToken<R<List<DeptVo>>>() {}.getType(),uriVariables );
-            return null;
+            return deptService.selectPositionList( currentUser.getToken(), appId, deptName);
         });
     }
 }

src/main/java/com/syc/slm/slmbi/controller/InstrumentPanelTreeController.java

@@ -38,7 +38,7 @@ public class InstrumentPanelTreeController extends BaseRestController {
     public R<List<PanelTreeNodeVo>> loadTrees(HttpServletRequest request,@PathVariable String appId) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return treeService.loadTrees(appId,dcClientHost+deptsRoles,currentUser);
+            return treeService.loadTrees(appId,currentUser);
         });
     }
 
@@ -53,7 +53,7 @@ public class InstrumentPanelTreeController extends BaseRestController {
         @RequestParam(value = "name", required = false) String name) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return treeService.loadTrees(appId, name, dcClientHost + deptsRoles, currentUser);
+            return treeService.loadTrees(appId, name,  currentUser);
         });
     }
 
@@ -70,7 +70,7 @@ public class InstrumentPanelTreeController extends BaseRestController {
         @RequestParam(value = "name", required = false) String name) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return treeService.children(nodeId, name,dcClientHost+deptsRoles,currentUser);
+            return treeService.children(nodeId, name,currentUser);
         });
     }
 

src/main/java/com/syc/slm/slmbi/controller/PositionController.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.catalina.Host;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,7 +37,7 @@ public class PositionController extends BaseRestController{
         @RequestParam(value = "positionName", required = false) String positionName) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return positionWorkService.selectPositionList(dcClientHost+positionListUrl,currentUser.getToken(), appId, positionName);
+            return positionWorkService.selectPositionList(currentUser.getToken(), appId, positionName);
         });
     }
 }

src/main/java/com/syc/slm/slmbi/controller/TokenController.java

@@ -4,18 +4,18 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.google.common.collect.Maps;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
+import com.syc.slm.slmbi.config.DataCenterConfig;
 import com.syc.slm.slmbi.exception.SysException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.sound.midi.SysexMessage;
-import java.lang.reflect.Type;
 import java.util.Map;
 
 /**
@@ -28,6 +28,9 @@ import java.util.Map;
 @RequestMapping("/tokens")
 @Api(value ="获取token",tags = "获取token")
 public class TokenController extends BaseRestController{
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
+
     @PostMapping
     @ApiOperation("获取token")
     @ApiImplicitParams({
@@ -38,7 +41,7 @@ public class TokenController extends BaseRestController{
     public R<Map<String,Object>> token(String account,String password,Integer origin){
         return  call(()->{
             Map<String ,Object> maps = Maps.newHashMap();
-            String uri =dcClientHost+"/user/token?account="+account+"&password="+password+"&origin="+origin;
+            String uri = dataCenterConfig.getDcClientHost() + "/user/token?account=" + account + "&password=" + password + "&origin=" + origin;
             ResponseEntity<Map> post = RestTemplateUtils.post(uri, Map.class);
             if(ObjectUtils.isNotEmpty(post)){
                 Integer code = (int)post.getBody().get("code");

src/main/java/com/syc/slm/slmbi/controller/UserController.java

@@ -6,13 +6,15 @@ import com.syc.slm.slmbi.service.PermissionService;
 import com.syc.slm.slmbi.service.UserService;
 import com.syc.slm.slmbi.vo.PermissionCodeVo;
 import com.syc.slm.slmbi.vo.UserTreeVo;
-import com.syc.slm.slmbi.vo.UserVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -41,7 +43,7 @@ public class UserController extends BaseRestController{
     public R<List<UserTreeVo>> selectUserList(HttpServletRequest request,@PathVariable String appId) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return userService.selectUserList(appId,dcClientHost+userTree,currentUser.getToken(),null);
+            return userService.selectUserList(appId,currentUser.getToken(),null);
         });
     }
 

src/main/java/com/syc/slm/slmbi/controller/VariableController.java

@@ -82,7 +82,7 @@ public class VariableController extends BaseRestController{
     public R<IPage<VariableVo>> getVariableList(HttpServletRequest request,@PathVariable String appId, VariableDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return variableService.getVariableList(variableDTO,appId,currentUser.getToken(),dcClientHost+variableList);
+            return variableService.getVariableList(variableDTO,appId,currentUser.getToken());
         });
     }
 
@@ -93,9 +93,7 @@ public class VariableController extends BaseRestController{
         @RequestBody VariableAllDataDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return variableService.listVariableAllDataListByTimeInterval(dcClientHost + variableRealTimeDataList,
-                                                                         variableDTO,
-                                                                         currentUser);
+            return variableService.listVariableAllDataListByTimeInterval(variableDTO,currentUser);
         });
     }
 
@@ -112,7 +110,7 @@ public class VariableController extends BaseRestController{
     public R<IPage<VariableDeviceVo>> getVariableDeviceList(HttpServletRequest request,@PathVariable String appId, QueryPageDTO query) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return variableService.getVariableDeviceList(currentUser.getToken(),appId,dcClientHost+deviceList,query);
+            return variableService.getVariableDeviceList(currentUser.getToken(),appId,query);
         });
     }
 
@@ -123,9 +121,7 @@ public class VariableController extends BaseRestController{
         @RequestBody VariableHistoryDataDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return variableService.listVariableHistoryDataListByCode(dcClientHost + variableHistoryDataList,
-                                                                     variableDTO,
-                                                                     currentUser);
+            return variableService.listVariableHistoryDataListByCode(variableDTO,currentUser);
         });
     }
 
@@ -147,7 +143,7 @@ public class VariableController extends BaseRestController{
     public R<Object> send(HttpServletRequest request,@PathVariable String appId,@RequestBody VariableSendDTO sendDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            variableService.send(sendDTO, currentUser,dcClientHost + send);
+            variableService.send(sendDTO, currentUser);
         });
     }
 
@@ -162,7 +158,7 @@ public class VariableController extends BaseRestController{
     public R<Map<String, Object>> status(HttpServletRequest request,@PathVariable String appId,@PathVariable  String deviceId ,@PathVariable  String variableId,@PathVariable  String variableCode) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return variableService.status(dcClientHost + variableStatus, deviceId,variableId, variableCode, currentUser);
+            return variableService.status( deviceId,variableId, variableCode, currentUser);
         });
     }
 
@@ -179,7 +175,7 @@ public class VariableController extends BaseRestController{
     public R<Map<String, Object>> historyStatus(HttpServletRequest request,@PathVariable String appId,@PathVariable  String deviceId ,@PathVariable  String variableCode,@RequestParam String startTime,@RequestParam String endTime) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return variableService.historyStatus(dcClientHost+variableHistoryStatus,deviceId,variableCode,startTime,endTime,currentUser);
+            return variableService.historyStatus(deviceId,variableCode,startTime,endTime,currentUser);
         });
     }
 
@@ -190,7 +186,7 @@ public class VariableController extends BaseRestController{
         @RequestBody RealTimeVariableDataDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return variableService.listRealTimeVariableData(dcClientHost+realTimeVariableDataList,variableDTO, currentUser);
+            return variableService.listRealTimeVariableData(variableDTO, currentUser);
         });
     }
 
@@ -200,7 +196,7 @@ public class VariableController extends BaseRestController{
         @RequestBody List<VariableStatusRealTimeDataDTO> statusRealTimeDataList) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return variableService.listVariableStatusRealTimeData(dcClientHost+variableStatusRealTimeDataList,statusRealTimeDataList,currentUser);
+            return variableService.listVariableStatusRealTimeData(statusRealTimeDataList,currentUser);
         });
     }
 }

src/main/java/com/syc/slm/slmbi/service/BusinessConfigService.java

@@ -34,20 +34,18 @@ public interface BusinessConfigService extends IService<BusinessConfig> {
     /**
      * 字段数据
      * @param dto
-     * @param uri
      * @param user
      * @return
      */
-    Map<String,List<Object>> getBusinessData(BusinessDTO dto,String uri, CurrentUser user);
+    Map<String,List<Object>> getBusinessData(BusinessDTO dto, CurrentUser user);
 
     /**
      * 查询业务字段的统计数据
-     * @param uri url
      * @param dto 参数
      * @param user 当前用
      * @return 统计数据
      */
-    Map<String,Object> listBusinessFieldStatistics(String uri, BusinessStatisticsDTO dto,CurrentUser user);
+    Map<String,Object> listBusinessFieldStatistics (BusinessStatisticsDTO dto,CurrentUser user);
 
     /**
      * 根据字段以及表名查询对应的字段
@@ -57,9 +55,8 @@ public interface BusinessConfigService extends IService<BusinessConfig> {
      * @param current
      * @param size
      * @param name
-     * @param uri
      * @return
      */
 
-    IPage<String> filedValue(CurrentUser currentUser,String tableName, String filed, Integer current, Integer size,String name,String uri);
+    IPage<String> filedValue(CurrentUser currentUser,String tableName, String filed, Integer current, Integer size,String name);
 }

src/main/java/com/syc/slm/slmbi/service/DeptService.java

@@ -13,12 +13,11 @@ import java.util.List;
 public interface DeptService {
     /**
      * 获取部门列表
-     * @param uri
      * @param token
      * @param appId
      * @param deptName
      * @return
      */
-    List<DeptVo> selectPositionList(String uri, String token, String appId, String deptName);
+    List<DeptVo> selectPositionList(String token, String appId, String deptName);
 
 }

src/main/java/com/syc/slm/slmbi/service/InstrumentPanelTreeService.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.syc.slm.slmbi.dto.InstrumentPanelAssemblyDTO;
 import com.syc.slm.slmbi.entity.CurrentUser;
 import com.syc.slm.slmbi.entity.InstrumentPanelTree;
-import com.syc.slm.slmbi.vo.InstrumentPanelConfigVo;
 import com.syc.slm.slmbi.vo.PanelTreeNodeVo;
 
 import java.util.List;
@@ -67,14 +66,14 @@ public interface InstrumentPanelTreeService extends IService<InstrumentPanelTree
      * @param name
      * @return
      */
-    List<PanelTreeNodeVo> loadTrees(String appId, String name, String uri,CurrentUser user);
+    List<PanelTreeNodeVo> loadTrees(String appId, String name,CurrentUser user);
 
     /**
      * 加载树
      * @param appId
      * @return
      */
-    List<PanelTreeNodeVo> loadTrees(String appId,String uri,CurrentUser user);
+    List<PanelTreeNodeVo> loadTrees(String appId,CurrentUser user);
 
     /**
      * 加载树节点下一节点
@@ -82,7 +81,7 @@ public interface InstrumentPanelTreeService extends IService<InstrumentPanelTree
      * @param name
      * @return
      */
-    List<PanelTreeNodeVo> children(String groupId, String name,String uri,CurrentUser user);
+    List<PanelTreeNodeVo> children(String groupId, String name,CurrentUser user);
 
     /**
      * 根据仪表板分组id更新 fullId fullName

src/main/java/com/syc/slm/slmbi/service/PositionService.java

@@ -18,5 +18,5 @@ public interface PositionService {
      * @param name
      * @return
      */
-    List<PositionVo> selectPositionList(String uri ,String token,String appId,String name);
+    List<PositionVo> selectPositionList(String token,String appId,String name);
 }

src/main/java/com/syc/slm/slmbi/service/UserService.java

@@ -15,10 +15,9 @@ public interface UserService {
     /**
      * 获取用户
      * @param appId
-     * @param uri
      * @param token
      * @param userName
      * @return
      */
-    List<UserTreeVo> selectUserList(String appId,String uri,String token,String userName);
+    List<UserTreeVo> selectUserList(String appId,String token,String userName);
 }

src/main/java/com/syc/slm/slmbi/service/VariableService.java

@@ -3,8 +3,9 @@ package com.syc.slm.slmbi.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.syc.slm.slmbi.dto.*;
 import com.syc.slm.slmbi.entity.CurrentUser;
-import com.syc.slm.slmbi.vo.*;
-import lombok.NonNull;
+import com.syc.slm.slmbi.vo.VariableDeviceVo;
+import com.syc.slm.slmbi.vo.VariableSourceVo;
+import com.syc.slm.slmbi.vo.VariableVo;
 
 import java.util.List;
 import java.util.Map;
@@ -22,7 +23,7 @@ public interface VariableService {
      * @param variableDTO
      * @return
      */
-    IPage<VariableVo> getVariableList(VariableDTO variableDTO,String appId,String token,String uri);
+    IPage<VariableVo> getVariableList(VariableDTO variableDTO,String appId,String token);
 
     /**
      * 获取变量来源
@@ -34,51 +35,44 @@ public interface VariableService {
      * 获取变量所属设备
      * @param token
      * @param appId
-     * @param uri
      * @param queryPageDTO
      * @return
      */
-    IPage<VariableDeviceVo> getVariableDeviceList(String token,String appId,String uri, QueryPageDTO queryPageDTO);
+    IPage<VariableDeviceVo> getVariableDeviceList(String token,String appId , QueryPageDTO queryPageDTO);
 
     /**
      * 获取实时数据
-     * @param uri
      * @param variableDTO
      * @param user
      * @return
      */
-    Map<String,List<Object>> listVariableAllDataListByTimeInterval(@NonNull String uri, VariableAllDataDTO variableDTO,CurrentUser user);
+    Map<String,List<Object>> listVariableAllDataListByTimeInterval(VariableAllDataDTO variableDTO,CurrentUser user);
 
     /**
      * 获取历史数据
-     * @param uri
      * @param variableDTO
      * @param currentUser
      * @return
      */
-    Map<String,Object> listVariableHistoryDataListByCode(@NonNull String uri,
-        VariableHistoryDataDTO variableDTO,CurrentUser currentUser);
+    Map<String,Object> listVariableHistoryDataListByCode(VariableHistoryDataDTO variableDTO,CurrentUser currentUser);
 
     /**
      * 下发
      * @param sendDTO
      * @param currentUser
-     * @param uri
      */
-    void send(VariableSendDTO sendDTO, CurrentUser currentUser,String uri);
+    void send(VariableSendDTO sendDTO, CurrentUser currentUser);
 
     /**
      * 状态点实时数据
-     * @param uri
      * @param deviceId
      * @param variableCode
      * @return
      */
-    Map<String,Object> status(String uri,String deviceId,String variableId,String variableCode,CurrentUser user);
+    Map<String,Object> status(String deviceId,String variableId,String variableCode,CurrentUser user);
 
     /**
      * 状态点历史数据
-     * @param uri
      * @param deviceId
      * @param variableCode
      * @param startTime
@@ -86,7 +80,7 @@ public interface VariableService {
      * @param currentUser
      * @return
      */
-    Map<String,Object> historyStatus(String uri, String deviceId, String variableCode, String startTime, String endTime, CurrentUser currentUser);
+    Map<String,Object> historyStatus( String deviceId, String variableCode, String startTime, String endTime, CurrentUser currentUser);
 
     /**
      * 获取历史双曲线
@@ -98,20 +92,18 @@ public interface VariableService {
 
     /**
      * 查询实时数据
-     * @param uri 请求url
      * @param variableDTO 请求参数
      * @param user 当前用户
      * @return 返回值
      */
-    Map<String,List<Object>> listRealTimeVariableData(@NonNull String uri, RealTimeVariableDataDTO variableDTO,CurrentUser user);
+    Map<String,List<Object>> listRealTimeVariableData( RealTimeVariableDataDTO variableDTO,CurrentUser user);
 
     /**
      * 批量查询实时状态数据
-     * @param uri 请求uri
      * @param statusRealTimeDataList 请求条件
      * @param user 当前用户
      * @return key为设备ID,value中key为变量名称，vlaue是数据
      */
-    Map<String,Map<String,Object>> listVariableStatusRealTimeData(@NonNull String uri, List<VariableStatusRealTimeDataDTO> statusRealTimeDataList,CurrentUser user);
+    Map<String,Map<String,Object>> listVariableStatusRealTimeData( List<VariableStatusRealTimeDataDTO> statusRealTimeDataList,CurrentUser user);
 
 }

src/main/java/com/syc/slm/slmbi/service/impl/BusinessConfigServiceImpl.java

@@ -13,6 +13,7 @@ import com.google.gson.reflect.TypeToken;
 import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
+import com.syc.slm.slmbi.config.DataCenterConfig;
 import com.syc.slm.slmbi.dao.BusinessConfigMapper;
 import com.syc.slm.slmbi.dto.BusinessConditionDTO;
 import com.syc.slm.slmbi.dto.BusinessDTO;
@@ -24,13 +25,13 @@ import com.syc.slm.slmbi.enums.Condition;
 import com.syc.slm.slmbi.exception.SysException;
 import com.syc.slm.slmbi.service.BusinessConfigService;
 import com.syc.slm.slmbi.vo.BusinessConfigVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -43,6 +44,10 @@ import java.util.stream.Collectors;
  **/
 @Service
 public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper, BusinessConfig> implements BusinessConfigService {
+
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
+
     @Override
     @Transactional(readOnly = true)
     public List<BusinessConfigVo> selectConfigList() {
@@ -86,7 +91,7 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
 
     @Override
     @Transactional(readOnly = true)
-    public Map<String,List<Object>> getBusinessData(BusinessDTO dto,String uri, CurrentUser user) {
+    public Map<String,List<Object>> getBusinessData(BusinessDTO dto, CurrentUser user) {
         if(StringUtils.isBlank(dto.getTable())){
             throw new SysException("请传入对应的表名");
         }
@@ -125,12 +130,13 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
         dto.setWhere(this.filterWhereNoLimit(dto.getWhere()));
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId", user.getAppId());
+        String uri= dataCenterConfig.getDcClientHost() + dataCenterConfig.getBusinessFiledData();
         R<Map<String,List<Object>>> result = RestTemplateUtils.post(uri, null,dto, new TypeToken<R<Map<String,List<Object>>>>() {}.getType(), uriVariables);
         return result.detach();
     }
 
     @Override
-    public Map<String,Object> listBusinessFieldStatistics(String uri, BusinessStatisticsDTO dto, CurrentUser user) {
+    public Map<String,Object> listBusinessFieldStatistics(BusinessStatisticsDTO dto, CurrentUser user) {
         if(StringUtils.isBlank(dto.getTable())){
             throw new SysException("请传入对应的表名");
         }
@@ -165,13 +171,14 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
         dto.setWhere(this.filterWhereNoLimit(dto.getWhere()));
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId", user.getAppId());
+        String uri =dataCenterConfig.getDcClientHost()+dataCenterConfig.getBusinessDataFieldStatistics();
         R<Map<String,Object>> result = RestTemplateUtils.post(uri, null,dto, new TypeToken<R<Map<String,Object>>>() {}.getType(), uriVariables);
         return result.detach();
     }
 
     @Override
     @Transactional(readOnly = true)
-    public IPage<String> filedValue(CurrentUser currentUser,String tableName, String filed, Integer current, Integer size,String name,String uri) {
+    public IPage<String> filedValue(CurrentUser currentUser,String tableName, String filed, Integer current, Integer size,String name) {
         if(StringUtils.isBlank(tableName)){
             throw new SysException("表名必填");
         }
@@ -186,6 +193,7 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
         uriVariables.put("size", size);
         uriVariables.put("name", name);
         IPage<String> page = new Page<>(current,size);
+        String uri = dataCenterConfig.getDcClientHost()+dataCenterConfig.getFiledValue();
         R<Map<String,Object>> result = RestTemplateUtils.get(uri, new TypeToken<R<Map<String,Object>>>() {}.getType(), uriVariables);
         Map<String, Object> resultMaps = result.detach();
         if(CollectionUtils.isNotEmpty(resultMaps)){

src/main/java/com/syc/slm/slmbi/service/impl/CompanyServiceImpl.java

@@ -29,15 +29,15 @@ import java.util.UUID;
 @Service
 public class CompanyServiceImpl implements CompanyService {
 
-    @Autowired
-    private DataCenterConfig centerConfig;
-
     @Autowired
     private InstrumentPanelGroupInitMapper groupInitMapper;
 
     @Autowired
     private InstrumentPanelTreeInitMapper treeInitMapper;
 
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
+
     @Override
     public Set<String> findAll(String appId) {
         return this.findAllAppId(appId);
@@ -65,7 +65,7 @@ public class CompanyServiceImpl implements CompanyService {
     private Set<String> findAllAppId(String appId){
         Map<String,String> map = Maps.newHashMap();
         map.put("appId",appId);
-        R<Set<String>> result = RestTemplateUtils.get(centerConfig.getHost()+centerConfig.getCompanyAppId(), new TypeToken<R<Set<String>>>() {}.getType(),map);
+        R<Set<String>> result = RestTemplateUtils.get(dataCenterConfig.getDcClientHost()+dataCenterConfig.getCompanyAppId(), new TypeToken<R<Set<String>>>() {}.getType(),map);
         return result.detach();
     }
 

src/main/java/com/syc/slm/slmbi/service/impl/DeptServiceImpl.java

@@ -2,12 +2,13 @@ package com.syc.slm.slmbi.service.impl;
 
 import com.google.common.collect.Maps;
 import com.google.gson.reflect.TypeToken;
-import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
+import com.syc.slm.slmbi.config.DataCenterConfig;
 import com.syc.slm.slmbi.service.DeptService;
 import com.syc.slm.slmbi.vo.DeptVo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -24,15 +25,17 @@ import java.util.Map;
 @Slf4j
 public class DeptServiceImpl implements DeptService {
 
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
 
     @Override
-    public List<DeptVo> selectPositionList(String uri, String token, String appId, String deptName) {
-        log.info("部门查询uri:---------------->"+uri);
+    public List<DeptVo> selectPositionList(String token, String appId, String deptName) {
         log.info("部门查询token:---------------->"+token);
         Map<String,String> uriVariables =Maps.newHashMap();
         uriVariables.put("deptName",deptName);
         uriVariables.put("appId",appId);
 
+        String uri = dataCenterConfig.getDcClientHost() + dataCenterConfig.getDeptListUrl();
         R<List<DeptVo>> result = RestTemplateUtils.get(uri, new TypeToken<R<List<DeptVo>>>() {}.getType(), uriVariables);
         return result.detach();
     }

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelTreeServiceImpl.java

@@ -13,6 +13,7 @@ import com.google.gson.reflect.TypeToken;
 import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
+import com.syc.slm.slmbi.config.DataCenterConfig;
 import com.syc.slm.slmbi.dao.InstrumentPanelTreeMapper;
 import com.syc.slm.slmbi.dto.InstrumentPanelAssemblyDTO;
 import com.syc.slm.slmbi.entity.BaseEntity;
@@ -51,6 +52,10 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
 
     @Autowired
     private InstrumentPanelService panelService;
+
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
+
     @Override
     public void batchUpdateTreeByIds(Set<String> treeIds, Integer recordStatus) {
         if (CollectionUtils.isNotEmpty(treeIds)) {
@@ -133,12 +138,12 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
     }
 
     @Override
-    public List<PanelTreeNodeVo> loadTrees(String appId, String name,String uri,CurrentUser user) {
+    public List<PanelTreeNodeVo> loadTrees(String appId, String name,CurrentUser user) {
         if(StringUtils.isBlank(name)){
-            return loadTrees(appId,uri,user);
+            return loadTrees(appId,user);
         }
         List<PanelTreeNodeVo> lists = Lists.newArrayList();
-        R<Map<String, String>> result = setDeptAndRole(user, uri);
+        R<Map<String, String>> result = setDeptAndRole(user);
         Map<String, String> detach = result.detach();
         String userId=user.getUid();
         String officeIds=detach.get("deptIds");
@@ -195,9 +200,9 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
 
 
     @Override
-    public List<PanelTreeNodeVo> loadTrees(String appId,String uri,CurrentUser user) {
+    public List<PanelTreeNodeVo> loadTrees(String appId,CurrentUser user) {
         List<PanelTreeNodeVo> lists = Lists.newArrayList();
-        R<Map<String, String>> result = setDeptAndRole(user, uri);
+        R<Map<String, String>> result = setDeptAndRole(user);
         Map<String, String> detach = result.detach();
         String userId=user.getUid();
         String officeIds=detach.get("deptIds");
@@ -248,7 +253,7 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
                                 break;
                             }
                             num++;
-                            List<PanelTreeNodeVo> childrenNodes = this.children(groupId, null,uri,user);
+                            List<PanelTreeNodeVo> childrenNodes = this.children(groupId, null,user);
                             if(CollectionUtils.isEmpty(childrenNodes)){
                                 flag=false;
                             }
@@ -277,9 +282,9 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
 
     @Override
     @Transactional(readOnly = true)
-    public List<PanelTreeNodeVo> children(String groupId, String name,String uri,CurrentUser user) {
+    public List<PanelTreeNodeVo> children(String groupId, String name,CurrentUser user) {
         List<PanelTreeNodeVo> lists = Lists.newArrayList();
-        R<Map<String, String>> result = setDeptAndRole(user, uri);
+        R<Map<String, String>> result = setDeptAndRole(user);
         Map<String, String> detach = result.detach();
         String userId=user.getUid();
         String officeIds=detach.get("deptIds");
@@ -420,9 +425,10 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
     }
 
 
-    private  R<Map<String,String>> setDeptAndRole(CurrentUser user,String uri){
+    private  R<Map<String,String>> setDeptAndRole(CurrentUser user){
         Map<String,String> uriVariables =Maps.newHashMap();
         uriVariables.put("appId",user.getAppId());
+        String uri = dataCenterConfig.getDcClientHost() + dataCenterConfig.getDeptsRoles();
         return  RestTemplateUtils.get(uri, new TypeToken<R<Map<String,String>>>() {}.getType(), uriVariables);
 
     }

src/main/java/com/syc/slm/slmbi/service/impl/PermissionServiceImpl.java

@@ -2,7 +2,6 @@ package com.syc.slm.slmbi.service.impl;
 
 import com.google.common.collect.Maps;
 import com.google.gson.reflect.TypeToken;
-import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
 import com.syc.slm.slmbi.config.DataCenterConfig;
@@ -22,13 +21,13 @@ import java.util.Map;
 public class PermissionServiceImpl implements PermissionService {
 
     @Autowired
-    private DataCenterConfig centerConfig;
+    private DataCenterConfig dataCenterConfig;
 
     @Override
     public List<PermissionCodeVo> findAllPermissionCode(String appId, String token) {
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId",appId);
-        R<List<PermissionCodeVo>> result = RestTemplateUtils.get(centerConfig.getHost()+centerConfig.getPermissionCodeUrl(), new TypeToken<R<List<PermissionCodeVo>>>() {}.getType(), uriVariables);
+        R<List<PermissionCodeVo>> result = RestTemplateUtils.get(dataCenterConfig.getDcClientHost()+dataCenterConfig.getPermissionCodeUrl(), new TypeToken<R<List<PermissionCodeVo>>>() {}.getType(), uriVariables);
         return result.detach();
     }
 }

src/main/java/com/syc/slm/slmbi/service/impl/PositionServiceImpl.java

 package com.syc.slm.slmbi.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.reflect.TypeToken;
-import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
-import com.syc.slm.slmbi.vo.PositionVo;
+import com.syc.slm.slmbi.config.DataCenterConfig;
 import com.syc.slm.slmbi.service.PositionService;
-import org.springframework.http.ResponseEntity;
+import com.syc.slm.slmbi.vo.PositionVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -25,12 +23,16 @@ import java.util.Map;
 @Service
 public class PositionServiceImpl implements PositionService {
 
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
+
     @Override
-    public List<PositionVo> selectPositionList(String uri ,String token,String appId,String name) {
+    public List<PositionVo> selectPositionList(String token,String appId,String name) {
         Map<String,String> uriVariables =Maps.newHashMap();
         uriVariables.put("positionName",name);
         uriVariables.put("appId",appId);
 
+        String uri = dataCenterConfig.getDcClientHost() + dataCenterConfig.getPositionListUrl();
         R<List<PositionVo>> result = RestTemplateUtils.get(uri, new TypeToken<R<List<PositionVo>>>() {}.getType(), uriVariables);
         return result.detach();
     }

src/main/java/com/syc/slm/slmbi/service/impl/UserServiceImpl.java

 package com.syc.slm.slmbi.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.google.common.collect.Maps;
 import com.google.gson.reflect.TypeToken;
-import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
+import com.syc.slm.slmbi.config.DataCenterConfig;
 import com.syc.slm.slmbi.service.UserService;
-import com.syc.slm.slmbi.vo.DeptVo;
 import com.syc.slm.slmbi.vo.UserTreeVo;
-import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -24,11 +22,15 @@ import java.util.Map;
  **/
 @Service
 public class UserServiceImpl implements UserService {
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
+
     @Override
-    public List<UserTreeVo> selectUserList(String appId,String uri,String token,String userName) {
+    public List<UserTreeVo> selectUserList(String appId,String token,String userName) {
         Map<String,String> uriVariables =Maps.newHashMap();
         uriVariables.put("userName",userName);
         uriVariables.put("appId",appId);
+        String uri = dataCenterConfig.getDcClientHost() + dataCenterConfig.getUserTree();
         R<List<UserTreeVo>> result = RestTemplateUtils.get(uri,new TypeToken<R<List<UserTreeVo>>>() {}.getType(), uriVariables);
         return result.detach();
     }

src/main/java/com/syc/slm/slmbi/service/impl/VariableServiceImpl.java

@@ -11,6 +11,7 @@ import com.google.gson.reflect.TypeToken;
 import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
+import com.syc.slm.slmbi.config.DataCenterConfig;
 import com.syc.slm.slmbi.dto.*;
 import com.syc.slm.slmbi.entity.CurrentUser;
 import com.syc.slm.slmbi.enums.AccessType;
@@ -20,7 +21,7 @@ import com.syc.slm.slmbi.service.VariableService;
 import com.syc.slm.slmbi.vo.VariableDeviceVo;
 import com.syc.slm.slmbi.vo.VariableSourceVo;
 import com.syc.slm.slmbi.vo.VariableVo;
-import lombok.NonNull;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -38,8 +39,12 @@ import java.util.stream.Collectors;
  **/
 @Service
 public class VariableServiceImpl implements VariableService {
+
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
+
     @Override
-    public IPage<VariableVo> getVariableList(VariableDTO variableDTO,String appId,String token,String uri) {
+    public IPage<VariableVo> getVariableList(VariableDTO variableDTO,String appId,String token) {
         IPage<VariableVo> page = new Page<>(variableDTO.getCurrent(),variableDTO.getSize());
         Map<String,String> p = Maps.newHashMap();
         p.put("appId",appId);
@@ -57,6 +62,7 @@ public class VariableServiceImpl implements VariableService {
         p.put("current",variableDTO.getCurrent()+"");
         p.put("size",variableDTO.getSize()+"");
 
+        String uri = dataCenterConfig.getDcClientHost() +  dataCenterConfig.getVariableList();
         R<Map<String, Object>> result = RestTemplateUtils.get(uri, new TypeToken<R<Map<String, Object>>>() {
         }.getType(), p);
         Map<String, Object> detach = result.detach();
@@ -90,7 +96,7 @@ public class VariableServiceImpl implements VariableService {
     }
 
     @Override
-    public IPage<VariableDeviceVo> getVariableDeviceList(String token,String appId,String uri, QueryPageDTO queryPageDTO) {
+    public IPage<VariableDeviceVo> getVariableDeviceList(String token,String appId, QueryPageDTO queryPageDTO) {
 
         IPage<VariableDeviceVo> page = new Page<>(queryPageDTO.getCurrent(), queryPageDTO.getSize());
         Map<String, String> p = Maps.newHashMap();
@@ -105,6 +111,7 @@ public class VariableServiceImpl implements VariableService {
         p.put("warranty_status", null);
         p.put("page_num", queryPageDTO.getCurrent() + "");
         p.put("page_size", queryPageDTO.getSize() + "");
+        String uri =dataCenterConfig.getDcClientHost()+dataCenterConfig.getDeviceList();
         R<Map<String, Object>> result = RestTemplateUtils.get(uri, new TypeToken<R<Map<String, Object>>>() {
         }.getType(), p);
         Map<String, Object> detach = result.detach();
@@ -120,11 +127,9 @@ public class VariableServiceImpl implements VariableService {
     }
 
     @Override
-    public Map<String,List<Object>> listVariableAllDataListByTimeInterval(@NonNull String uri,
+    public Map<String,List<Object>> listVariableAllDataListByTimeInterval(
         VariableAllDataDTO variableDTO,CurrentUser user) {
-        if(StringUtils.isBlank(uri)){
-            throw new SysException("请传入uri");
-        }
+
         if(CollectionUtils.isEmpty(variableDTO.getVariableSearchList())){
             throw new SysException("请传入变量");
         }else{
@@ -147,16 +152,14 @@ public class VariableServiceImpl implements VariableService {
         // Map<String, String> uriVariables =SlmConstants.gson.fromJson(SlmConstants.gson.toJson(variableDTO),new TypeToken<Map<String,String>>(){}.getType());
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId",user.getAppId());
+        String uri =dataCenterConfig.getDcClientHost() + dataCenterConfig.getVariableRealTimeDataList();
         R<Map<String,List<Object>>> result = RestTemplateUtils.post(uri,variableDTO,new TypeToken<R<Map<String,List<Object>>>>() {}.getType(), uriVariables);
         return result.detach();
     }
 
     @Override
-    public  Map<String,Object> listVariableHistoryDataListByCode(@NonNull String uri,
-        VariableHistoryDataDTO variableDTO,CurrentUser user) {
-        if(StringUtils.isBlank(uri)){
-            throw new SysException("请传入uri");
-        }
+    public  Map<String,Object> listVariableHistoryDataListByCode(VariableHistoryDataDTO variableDTO,CurrentUser user) {
+
         if(CollectionUtils.isEmpty(variableDTO.getVariableSearchList())){
             throw new SysException("请传入变量");
         }else{
@@ -196,13 +199,14 @@ public class VariableServiceImpl implements VariableService {
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId",user.getAppId());
 
+        String uri =dataCenterConfig.getDcClientHost() + dataCenterConfig.getVariableHistoryDataList();
         R<Map<String,Object>> result = RestTemplateUtils.post(uri,variableDTO,new TypeToken<R<Map<String,Object>>>() {}.getType(), uriVariables);
         return result.detach();
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void send(VariableSendDTO sendDTO, CurrentUser currentUser,String uri) {
+    public void send(VariableSendDTO sendDTO, CurrentUser currentUser) {
         if(sendDTO.getControl() == null){
             throw new SysException("控件类型必填，控制按钮传1 读写框填2");
         }
@@ -231,7 +235,8 @@ public class VariableServiceImpl implements VariableService {
                         }
                     }
                     if (CollectionUtils.isNotEmpty(departments) || CollectionUtils.isNotEmpty(positions)) {
-                        R<Map<String, String>> result = setDeptAndRole(currentUser, uri);
+
+                        R<Map<String, String>> result = setDeptAndRole(currentUser, dataCenterConfig.getDcClientHost()+dataCenterConfig.getDeptsRoles());
                         Map<String, String> detach = result.detach();
                         String officeIds = detach.get("deptIds");
                         String roleIds = detach.get("roleIds");
@@ -274,13 +279,14 @@ public class VariableServiceImpl implements VariableService {
         dto.setAppId(currentUser.getAppId());
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId", currentUser.getAppId());
+        String uri = dataCenterConfig.getDcClientHost() + dataCenterConfig.getSend();
         R<Object> result = RestTemplateUtils.post(uri, null, dto, new TypeToken<R<Object>>() {}.getType(), uriVariables);
         result.detach();
 
     }
 
     @Override
-    public Map<String, Object> status(String uri, String deviceId,String variableId, String variableCode,CurrentUser user) {
+    public Map<String, Object> status(String deviceId,String variableId, String variableCode,CurrentUser user) {
         if(StringUtils.isBlank(variableCode)){
             throw new SysException("变量code不能为空");
         }
@@ -293,12 +299,13 @@ public class VariableServiceImpl implements VariableService {
         uriVariables.put("deviceId",deviceId);
         uriVariables.put("variableId",variableId);
         uriVariables.put("variableCode",variableCode);
+        String uri =dataCenterConfig.getDcClientHost() + dataCenterConfig.getVariableStatus();
         R<Map<String,Object>> result = RestTemplateUtils.get(uri,new TypeToken<R<Map<String,Object>>>() {}.getType(), uriVariables);
         return  result.detach();
     }
 
     @Override
-    public Map<String, Object> historyStatus(String uri,
+    public Map<String, Object> historyStatus(
         String deviceId,
         String variableCode,
         String startTime,
@@ -326,21 +333,23 @@ public class VariableServiceImpl implements VariableService {
         uriVariables.put("variableCode",variableCode);
         uriVariables.put("startTime",startTime);
         uriVariables.put("endTime",endTime);
+        String uri =dataCenterConfig.getDcClientHost()+dataCenterConfig.getVariableHistoryStatus();
         R<Map<String,Object>> result = RestTemplateUtils.get(uri,new TypeToken<R<Map<String,Object>>>() {}.getType(), uriVariables);
         return  result.detach();
     }
 
     @Override
-    public Map<String,List<Object>> listRealTimeVariableData(@NonNull String uri, RealTimeVariableDataDTO variableDTO, CurrentUser user) {
+    public Map<String,List<Object>> listRealTimeVariableData(RealTimeVariableDataDTO variableDTO, CurrentUser user) {
         this.judgeSearchList(variableDTO.getVariableSearchList());
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId",user.getAppId());
+        String uri =dataCenterConfig.getDcClientHost()+dataCenterConfig.getRealTimeVariableDataList();
         R<Map<String,List<Object>>> result = RestTemplateUtils.post(uri,variableDTO,new TypeToken<R<Map<String,List<Object>>>>() {}.getType(), uriVariables);
         return result.detach();
     }
 
     @Override
-    public Map<String, Map<String, Object>> listVariableStatusRealTimeData(@NonNull String uri, List<VariableStatusRealTimeDataDTO> statusRealTimeDataList, CurrentUser user) {
+    public Map<String, Map<String, Object>> listVariableStatusRealTimeData( List<VariableStatusRealTimeDataDTO> statusRealTimeDataList, CurrentUser user) {
         if(CollectionUtils.isEmpty(statusRealTimeDataList)){
             throw new SysException("请传入变量");
         }else{
@@ -356,6 +365,7 @@ public class VariableServiceImpl implements VariableService {
         }
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId",user.getAppId());
+        String uri =dataCenterConfig.getDcClientHost()+dataCenterConfig.getVariableStatusRealTimeDataList();
         R<Map<String, Map<String, Object>>> result = RestTemplateUtils.post(uri,statusRealTimeDataList,new TypeToken<R<Map<String, Map<String, Object>>>>() {}.getType(), uriVariables);
         return result.detach();
     }