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
ce970a18
Commit
ce970a18
authored
Aug 30, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改接口设备更新站点后,站点名称和编码未更新问题
parent
aaa27ee8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
device-manager/src/main/java/com/mortals/xhx/busiz/rsp/DeviceInfo.java
...r/src/main/java/com/mortals/xhx/busiz/rsp/DeviceInfo.java
+5
-0
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
...n/java/com/mortals/xhx/busiz/web/DeviceApiController.java
+2
-0
No files found.
device-manager/src/main/java/com/mortals/xhx/busiz/rsp/DeviceInfo.java
View file @
ce970a18
...
...
@@ -36,6 +36,11 @@ public class DeviceInfo implements Serializable {
*/
private
String
productName
;
/**
* 产品编码
*/
private
String
productCode
;
/**
* 设备启用状态 (0.停止,1.启用)
*/
...
...
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @
ce970a18
...
...
@@ -268,6 +268,7 @@ public class DeviceApiController {
List
<
ProductInfo
>
productInfoList
=
productService
.
find
(
new
ProductEntity
()).
stream
().
map
(
item
->
{
ProductInfo
productInfo
=
new
ProductInfo
();
BeanUtils
.
copyProperties
(
item
,
productInfo
,
BeanUtil
.
getNullPropertyNames
(
item
));
productInfo
.
setProductId
(
item
.
getId
());
return
productInfo
;
}).
collect
(
Collectors
.
toList
());
...
...
@@ -395,6 +396,7 @@ public class DeviceApiController {
deviceInfo
.
setSiteCode
(
deviceEntity
.
getSiteCode
());
deviceInfo
.
setSiteName
(
deviceEntity
.
getSiteName
());
deviceInfo
.
setProductId
(
productEntity
.
getId
());
deviceInfo
.
setProductCode
(
productEntity
.
getProductCode
());
deviceInfo
.
setProductName
(
productEntity
.
getProductName
());
deviceInfo
.
setEnabled
(
deviceEntity
.
getEnabled
());
deviceInfo
.
setSource
(
deviceEntity
.
getSource
());
...
...
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