Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
device-new-platform
Commits
114b4650
Commit
114b4650
authored
Jul 07, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改设备导入功能
parent
d1d11717
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java
.../src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java
+2
-1
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
...xhx/module/sitestat/service/impl/SitestatServiceImpl.java
+1
-0
No files found.
common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java
View file @
114b4650
...
@@ -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
);
/**
/**
...
...
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
View file @
114b4650
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment