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
70f8f6ee
Commit
70f8f6ee
authored
1 year ago
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加设备上线和下线的业务日志记录
parent
7c597757
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
device-manager/src/main/java/com/mortals/xhx/base/framework/config/CorsConfig.java
...ava/com/mortals/xhx/base/framework/config/CorsConfig.java
+4
-0
device-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java
...ava/com/mortals/xhx/module/site/model/SiteTreeSelect.java
+0
-1
No files found.
device-manager/src/main/java/com/mortals/xhx/base/framework/config/CorsConfig.java
View file @
70f8f6ee
package
com.mortals.xhx.base.framework.config
;
package
com.mortals.xhx.base.framework.config
;
import
com.alibaba.fastjson.parser.ParserConfig
;
import
com.mortals.xhx.module.site.model.SiteTreeSelect
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.web.cors.CorsConfiguration
;
import
org.springframework.web.cors.CorsConfiguration
;
...
@@ -18,6 +20,8 @@ public class CorsConfig implements WebMvcConfigurer {
...
@@ -18,6 +20,8 @@ public class CorsConfig implements WebMvcConfigurer {
@Bean
@Bean
public
CorsFilter
corsFilter
(){
public
CorsFilter
corsFilter
(){
ParserConfig
.
getGlobalInstance
().
putDeserializer
(
SiteTreeSelect
.
class
,
new
SiteTreeSelect
.
Deserializer
());
//初始化配置对象
//初始化配置对象
CorsConfiguration
configuration
=
new
CorsConfiguration
();
CorsConfiguration
configuration
=
new
CorsConfiguration
();
//允许跨域访问的域名
//允许跨域访问的域名
...
...
This diff is collapsed.
Click to expand it.
device-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java
View file @
70f8f6ee
...
@@ -212,7 +212,6 @@ public class SiteTreeSelect implements Serializable {
...
@@ -212,7 +212,6 @@ public class SiteTreeSelect implements Serializable {
.
count
();
.
count
();
node
.
setOfflineTotal
(
deviceOfflineCount
.
intValue
());
node
.
setOfflineTotal
(
deviceOfflineCount
.
intValue
());
}
}
//todo 统计当前区域下的所有站点数量
sitePdu
.
setAreaCode
(
node
.
getAreaCode
());
sitePdu
.
setAreaCode
(
node
.
getAreaCode
());
Rest
<
Integer
>
rest
=
siteFeign
.
countSitesByArea
(
sitePdu
);
Rest
<
Integer
>
rest
=
siteFeign
.
countSitesByArea
(
sitePdu
);
...
...
This diff is collapsed.
Click to expand it.
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