Commit 114b4650 authored by 赵啸非's avatar 赵啸非

修改设备导入功能

parent d1d11717
...@@ -7,6 +7,7 @@ import com.mortals.xhx.feign.IFeign; ...@@ -7,6 +7,7 @@ import com.mortals.xhx.feign.IFeign;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -65,7 +66,7 @@ public interface ISiteFeign extends IFeign { ...@@ -65,7 +66,7 @@ public interface ISiteFeign extends IFeign {
* *
* @return * @return
*/ */
@GetMapping(value = "/site/siteTree") @GetMapping(value = "/site/siteTree",produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = "application/json;charset=UTF-8")
String siteTree(@RequestHeader("Authorization") String authorization); String siteTree(@RequestHeader("Authorization") String authorization);
/** /**
......
...@@ -128,6 +128,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si ...@@ -128,6 +128,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
// String token = authTokenService.getToken(request); // String token = authTokenService.getToken(request);
String resp = siteFeign.siteTree(token); String resp = siteFeign.siteTree(token);
log.info("treeResp:"+resp);
return resp; return resp;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment