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
f6c0d5ab
Commit
f6c0d5ab
authored
Aug 04, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加客户端资源部署
parent
db27d992
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
14 deletions
+8
-14
device-manager-ui/admin/src/views/sitestat/list.vue
device-manager-ui/admin/src/views/sitestat/list.vue
+1
-2
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
...n/java/com/mortals/xhx/busiz/web/DeviceApiController.java
+2
-0
device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java
...java/com/mortals/xhx/module/device/model/vo/DeviceVo.java
+1
-0
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
...als/xhx/module/device/service/impl/DeviceServiceImpl.java
+0
-12
doc/api.md
doc/api.md
+4
-0
No files found.
device-manager-ui/admin/src/views/sitestat/list.vue
View file @
f6c0d5ab
...
...
@@ -123,7 +123,6 @@ export default {
//进入设备列表页面
this
.
$router
.
push
({
path
:
"
/device/list
"
,
query
:
row
,
});
},
...
...
@@ -145,7 +144,7 @@ export default {
if
(
node
.
id
.
search
(
"
,
"
))
{
//this.query = { siteId: node.id.split(",")[0] ,siteIdList:node.id.split(",")};
this
.
query
=
{
siteIdList
:
node
.
id
.
split
(
"
,
"
)
};
this
.
query
=
{
siteIdList
:
parseInt
(
node
.
id
.
split
(
"
,
"
)
)
};
}
else
{
this
.
query
=
{
siteId
:
node
.
id
};
}
...
...
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @
f6c0d5ab
...
...
@@ -608,6 +608,8 @@ public class DeviceApiController {
deviceEntity
.
setIp
(
req
.
getIp
());
deviceEntity
.
setCenternum
(
req
.
getCenternum
());
deviceEntity
.
setPort
(
req
.
getPort
());
deviceEntity
.
setLeadingOfficial
(
req
.
getLeadingOfficial
());
deviceEntity
.
setLeadingOfficialTelephone
(
req
.
getLeadingOfficialTelephone
());
deviceEntity
.
setDeviceRemark
(
req
.
getDeviceRemark
());
deviceEntity
.
setCreateUserId
(
1L
);
deviceEntity
.
setCreateTime
(
new
Date
());
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java
View file @
f6c0d5ab
...
...
@@ -8,6 +8,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
import
lombok.Data
;
import
org.apache.poi.ss.usermodel.PictureData
;
import
java.io.ByteArrayOutputStream
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
View file @
f6c0d5ab
...
...
@@ -607,19 +607,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
entity
.
setSiteName
(
info
.
getData
().
getSiteName
());
}
}
//默认时,需拼接homeUrl
// if(!ObjectUtils.isEmpty(entity.getSkinName())){
//
// if (!ObjectUtils.isEmpty(entity.getProductCode())) {
//
// entity.setHomeUrl(entity.getProductCode().);
// }
// }
updateDeviceHomeUrl
(
entity
);
super
.
saveBefore
(
entity
,
context
);
}
...
...
doc/api.md
View file @
f6c0d5ab
...
...
@@ -458,6 +458,8 @@ productCode|String|产品编码|是|见产品编码附录
ip|String|设备访问ip|否|-
port|String|设备端口|否|-
siteId|Long|站点ID,来源基础服务平台|是|-
leadingOfficial|String|负责人|否|-
leadingOfficialTelephone|String|否|联系电话|-
siteCode|String|站点编号,来源基础服务平台|是|-
siteName|String|站点名称|是|-
homeUrl|String|首页地址|否|-
...
...
@@ -558,6 +560,8 @@ data|object|数据对象|是|-
 
productCode|String|产品编码|是|见附录
 
ip|String|设备访问ip|否|-
 
port|String|设备端口|否|-
 
leadingOfficial|String|否|负责人|-
 
leadingOfficialTelephone|String|否|联系电话|-
 
siteId|Long|站点ID,来源基础服务平台|是|-
 
siteCode|String|站点编号,来源基础服务平台|是|-
 
siteName|String|站点名称|是|-
...
...
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