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
090cf87b
Commit
090cf87b
authored
Jan 15, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
设备添加楼层与楼栋
parent
b14277d8
Pipeline
#2739
failed with stages
Changes
4
Pipelines
1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1674 additions
and
997 deletions
+1674
-997
fill-manager/db/add.sql
fill-manager/db/add.sql
+10
-1
fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
...ava/com/mortals/xhx/module/device/model/DeviceEntity.java
+46
-52
fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
...java/com/mortals/xhx/module/device/model/DeviceQuery.java
+1005
-649
fill-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml
.../src/main/resources/sqlmap/module/device/DeviceMapper.xml
+613
-295
No files found.
fill-manager/db/add.sql
View file @
090cf87b
...
@@ -37,3 +37,12 @@ ALTER TABLE mortals_xhx_device
...
@@ -37,3 +37,12 @@ ALTER TABLE mortals_xhx_device
ADD
COLUMN
`onlineTime`
datetime
DEFAULT
NULL
COMMENT
'最近上线时间'
AFTER
enabled
;
ADD
COLUMN
`onlineTime`
datetime
DEFAULT
NULL
COMMENT
'最近上线时间'
AFTER
enabled
;
ALTER
TABLE
mortals_xhx_device
ALTER
TABLE
mortals_xhx_device
ADD
COLUMN
`offlineTime`
datetime
DEFAULT
NULL
COMMENT
'最近离线时间'
AFTER
onlineTime
;
ADD
COLUMN
`offlineTime`
datetime
DEFAULT
NULL
COMMENT
'最近离线时间'
AFTER
onlineTime
;
-- ----------------------------
2024
-
01
-
15
-- ----------------------------
ALTER
TABLE
mortals_xhx_device
ADD
COLUMN
`deviceInBuilding`
tinyint
(
4
)
COMMENT
'所属楼栋'
;
ALTER
TABLE
mortals_xhx_device
ADD
COLUMN
`deviceInFloor`
tinyint
(
4
)
COMMENT
'所属楼层'
;
\ No newline at end of file
fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
View file @
090cf87b
...
@@ -2,6 +2,9 @@ package com.mortals.xhx.module.device.model;
...
@@ -2,6 +2,9 @@ package com.mortals.xhx.module.device.model;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.math.BigDecimal
;
import
cn.hutool.core.date.DateUtil
;
import
java.util.Date
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.mortals.framework.annotation.Excel
;
import
com.mortals.framework.annotation.Excel
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.framework.model.BaseEntityLong
;
...
@@ -11,7 +14,7 @@ import lombok.Data;
...
@@ -11,7 +14,7 @@ import lombok.Data;
* 设备实体对象
* 设备实体对象
*
*
* @author zxfei
* @author zxfei
* @date 202
3-06-21
* @date 202
4-01-15
*/
*/
@Data
@Data
public
class
DeviceEntity
extends
DeviceVo
{
public
class
DeviceEntity
extends
DeviceVo
{
...
@@ -45,6 +48,26 @@ public class DeviceEntity extends DeviceVo {
...
@@ -45,6 +48,26 @@ public class DeviceEntity extends DeviceVo {
* 站点名称
* 站点名称
*/
*/
private
String
siteName
;
private
String
siteName
;
/**
* 设备生产厂商ID
*/
private
Long
deviceFirmId
;
/**
* 设备生产厂商名称
*/
private
String
deviceFirmname
;
/**
* 设备访问ip
*/
private
String
ip
;
/**
* 端口
*/
private
String
port
;
/**
* 启用状态 (0.停止,1.启用)
*/
private
Integer
enabled
;
/**
/**
* 产品编码
* 产品编码
*/
*/
...
@@ -82,29 +105,17 @@ public class DeviceEntity extends DeviceVo {
...
@@ -82,29 +105,17 @@ public class DeviceEntity extends DeviceVo {
*/
*/
private
String
deviceRemark
;
private
String
deviceRemark
;
/**
/**
*
设备来源(0.旧设备,1.新设备)
*
所属机构
*/
*/
private
Integer
source
;
private
String
belong
;
/**
/**
*
设备生产厂商ID
*
所属楼栋
*/
*/
private
Long
deviceFirmId
;
private
Integer
deviceInBuilding
;
/**
/**
*
设备生产厂商名称
*
所属楼层
*/
*/
private
String
deviceFirmname
;
private
Integer
deviceInFloor
;
/**
* 设备访问ip
*/
private
String
ip
;
/**
* 端口
*/
private
String
port
;
/**
* 启用状态 (0.停止,1.启用)
*/
private
Integer
enabled
;
/**
/**
* 最近上线时间
* 最近上线时间
*/
*/
...
@@ -113,6 +124,10 @@ public class DeviceEntity extends DeviceVo {
...
@@ -113,6 +124,10 @@ public class DeviceEntity extends DeviceVo {
* 最近离线时间
* 最近离线时间
*/
*/
private
Date
offlineTime
;
private
Date
offlineTime
;
/**
* 设备来源(0.旧设备,1.新设备)
*/
private
Integer
source
;
@Override
@Override
public
int
hashCode
()
{
public
int
hashCode
()
{
return
this
.
getId
().
hashCode
();
return
this
.
getId
().
hashCode
();
...
@@ -130,53 +145,32 @@ public class DeviceEntity extends DeviceVo {
...
@@ -130,53 +145,32 @@ public class DeviceEntity extends DeviceVo {
}
}
public
void
initAttrValue
(){
public
void
initAttrValue
(){
this
.
deviceId
=
null
;
this
.
deviceId
=
-
1L
;
this
.
deviceName
=
""
;
this
.
deviceName
=
""
;
this
.
deviceCode
=
""
;
this
.
deviceCode
=
""
;
this
.
deviceMac
=
""
;
this
.
deviceMac
=
""
;
this
.
siteId
=
null
;
this
.
siteId
=
-
1L
;
this
.
siteCode
=
""
;
this
.
siteCode
=
""
;
this
.
siteName
=
""
;
this
.
siteName
=
""
;
this
.
deviceFirmId
=
null
;
this
.
deviceFirmname
=
""
;
this
.
ip
=
""
;
this
.
port
=
""
;
this
.
enabled
=
0
;
this
.
productCode
=
""
;
this
.
productCode
=
""
;
this
.
productName
=
""
;
this
.
productName
=
""
;
this
.
deviceSrc
=
2
;
this
.
deviceSrc
=
2
;
this
.
lon
=
""
;
this
.
lon
=
""
;
this
.
lati
=
""
;
this
.
lati
=
""
;
this
.
leadingOfficial
=
""
;
this
.
leadingOfficial
=
""
;
this
.
leadingOfficialTelephone
=
""
;
this
.
leadingOfficialTelephone
=
""
;
this
.
deviceStatus
=
0
;
this
.
deviceStatus
=
0
;
this
.
deviceRemark
=
""
;
this
.
deviceRemark
=
""
;
this
.
belong
=
""
;
this
.
deviceInBuilding
=
0
;
this
.
deviceInFloor
=
0
;
this
.
onlineTime
=
new
Date
();
this
.
offlineTime
=
new
Date
();
this
.
source
=
1
;
this
.
source
=
1
;
this
.
deviceFirmId
=
-
1L
;
this
.
deviceFirmname
=
""
;
this
.
ip
=
""
;
this
.
port
=
""
;
this
.
enabled
=
0
;
this
.
onlineTime
=
null
;
this
.
offlineTime
=
null
;
}
}
}
}
\ No newline at end of file
fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
View file @
090cf87b
This diff is collapsed.
Click to expand it.
fill-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml
View file @
090cf87b
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