Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fill-system
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
廖旭伟
fill-system
Commits
45ba34a9
Commit
45ba34a9
authored
Mar 13, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加部分
parent
3dfe42a7
Pipeline
#2771
failed with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
1 deletion
+32
-1
common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
...ain/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
+31
-0
fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
.../java/com/mortals/xhx/module/home/web/HomeController.java
+1
-1
No files found.
common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
View file @
45ba34a9
...
@@ -2,6 +2,8 @@ package com.mortals.xhx.common.pdu.device;
...
@@ -2,6 +2,8 @@ package com.mortals.xhx.common.pdu.device;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.framework.model.BaseEntityLong
;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.Date
;
/**
/**
* 设备Pdu对象
* 设备Pdu对象
*
*
...
@@ -82,6 +84,35 @@ public class DevicePdu extends BaseEntityLong {
...
@@ -82,6 +84,35 @@ public class DevicePdu extends BaseEntityLong {
*/
*/
private
Integer
source
;
private
Integer
source
;
/**
* 设备生产厂商ID
*/
private
Long
deviceFirmId
;
/**
* 设备生产厂商名称
*/
private
String
deviceFirmname
;
/**
* 设备访问ip
*/
private
String
ip
;
/**
* 端口
*/
private
String
port
;
/**
* 启用状态 (0.停止,1.启用)
*/
private
Integer
enabled
;
/**
* 最近上线时间
*/
private
Date
onlineTime
;
/**
* 最近离线时间
*/
private
Date
offlineTime
;
public
void
initAttrValue
(){
public
void
initAttrValue
(){
this
.
deviceId
=
null
;
this
.
deviceId
=
null
;
...
...
fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
View file @
45ba34a9
...
@@ -375,7 +375,7 @@ public class HomeController extends BaseJsonBodyController {
...
@@ -375,7 +375,7 @@ public class HomeController extends BaseJsonBodyController {
String
serverName
=
request
.
getHeader
(
"server-name"
);
String
serverName
=
request
.
getHeader
(
"server-name"
);
Integer
serverPort
=
DataUtil
.
converStr2Int
(
request
.
getHeader
(
"server-port"
),
0
);
Integer
serverPort
=
DataUtil
.
converStr2Int
(
request
.
getHeader
(
"server-port"
),
0
);
//
log.info("【应用请求】【请求体】-->serverName{} ,port:{}", serverName, serverPort);
log
.
info
(
"【应用请求】【请求体】-->serverName{} ,port:{}"
,
serverName
,
serverPort
);
String
appWhiteStr
=
GlobalSysInfo
.
getParamValue
(
Constant
.
PARAMS_WHITE_APP_LIST
,
"中心简介,办事指南,意见建议,通知公告"
);
String
appWhiteStr
=
GlobalSysInfo
.
getParamValue
(
Constant
.
PARAMS_WHITE_APP_LIST
,
"中心简介,办事指南,意见建议,通知公告"
);
log
.
info
(
"【应用请求】【请求体】-->appWhiteStr{} "
,
appWhiteStr
);
log
.
info
(
"【应用请求】【请求体】-->appWhiteStr{} "
,
appWhiteStr
);
...
...
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