Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
self-service
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
廖旭伟
self-service
Commits
42b30e45
Commit
42b30e45
authored
May 15, 2023
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改下发设备开柜指令
parent
cf5447e3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
sst-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceOpenBoxPdu.java
...com/mortals/xhx/module/device/model/DeviceOpenBoxPdu.java
+2
-0
sst-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
...a/com/mortals/xhx/module/device/web/DeviceController.java
+12
-1
No files found.
sst-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceOpenBoxPdu.java
View file @
42b30e45
...
@@ -4,6 +4,8 @@ import lombok.Data;
...
@@ -4,6 +4,8 @@ import lombok.Data;
@Data
@Data
public
class
DeviceOpenBoxPdu
{
public
class
DeviceOpenBoxPdu
{
private
Long
siteId
;
/*** 目标设备 */
/*** 目标设备 */
private
String
targetDevice
;
private
String
targetDevice
;
...
...
sst-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @
42b30e45
...
@@ -262,7 +262,18 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
...
@@ -262,7 +262,18 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
try
{
try
{
DeviceNotifyPdu
pdu
=
new
DeviceNotifyPdu
();
DeviceNotifyPdu
pdu
=
new
DeviceNotifyPdu
();
List
<
String
>
deviceCodeList
=
new
ArrayList
<>();
List
<
String
>
deviceCodeList
=
new
ArrayList
<>();
deviceCodeList
.
add
(
device
.
getTargetDevice
());
DevicePdu
devicePdu
=
new
DevicePdu
();
devicePdu
.
setSiteId
(
device
.
getSiteId
());
devicePdu
.
setProductName
(
"取件柜"
);
Rest
<
RespData
<
List
<
DevicePdu
>>>
restd
=
deviceFeign
.
list
(
devicePdu
);
if
(
restd
.
getCode
().
equals
(
YesNoEnum
.
YES
.
getValue
()))
{
if
(
restd
.
getData
()!=
null
&&
restd
.
getData
().
getData
().
size
()>
0
)
{
deviceCodeList
.
add
(
restd
.
getData
().
getData
().
get
(
0
).
getDeviceCode
());
}
}
//
//
// deviceCodeList.add(device.getTargetDevice());
pdu
.
setDeviceCodeList
(
deviceCodeList
);
pdu
.
setDeviceCodeList
(
deviceCodeList
);
pdu
.
setAction
(
"openBox"
);
pdu
.
setAction
(
"openBox"
);
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
...
...
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