Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sample-form-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
赵啸非
sample-form-platform
Commits
5397cdc0
Commit
5397cdc0
authored
Jun 13, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加appconfig
parent
a0f24b67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
...ain/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
+1
-5
sample-form-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
...a/com/mortals/xhx/module/device/web/DeviceController.java
+3
-0
No files found.
common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
View file @
5397cdc0
...
@@ -81,10 +81,7 @@ public class DevicePdu extends BaseEntityLong {
...
@@ -81,10 +81,7 @@ public class DevicePdu extends BaseEntityLong {
* 备注
* 备注
*/
*/
private
String
deviceRemark
;
private
String
deviceRemark
;
/**
* 设备来源(0.旧设备,1.新设备)
*/
private
Integer
source
;
/**
/**
* 设备生产厂商ID
* 设备生产厂商ID
...
@@ -149,6 +146,5 @@ public void initAttrValue(){
...
@@ -149,6 +146,5 @@ public void initAttrValue(){
this
.
deviceRemark
=
null
;
this
.
deviceRemark
=
null
;
this
.
source
=
1
;
}
}
}
}
\ No newline at end of file
sample-form-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @
5397cdc0
...
@@ -119,7 +119,10 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
...
@@ -119,7 +119,10 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
String
busiDesc
=
this
.
getModuleDesc
()
+
"设备"
;
String
busiDesc
=
this
.
getModuleDesc
()
+
"设备"
;
try
{
try
{
if
(
ObjectUtils
.
isEmpty
(
deviceEntity
.
getId
()))
throw
new
AppException
(
"设备ID不能为空!"
);
if
(
ObjectUtils
.
isEmpty
(
deviceEntity
.
getEnabled
()))
throw
new
AppException
(
"设备启用停用状态不能为空!"
);
this
.
service
.
deviceEnabled
(
deviceEntity
.
getId
(),
deviceEntity
.
getEnabled
(),
getContext
());
this
.
service
.
deviceEnabled
(
deviceEntity
.
getId
(),
deviceEntity
.
getEnabled
(),
getContext
());
recordSysLog
(
request
,
busiDesc
+
EnabledEnum
.
getByValue
(
deviceEntity
.
getEnabled
()).
getDesc
()
+
" 【成功】"
);
recordSysLog
(
request
,
busiDesc
+
EnabledEnum
.
getByValue
(
deviceEntity
.
getEnabled
()).
getDesc
()
+
" 【成功】"
);
jsonObject
.
put
(
KEY_RESULT_DATA
,
model
);
jsonObject
.
put
(
KEY_RESULT_DATA
,
model
);
...
...
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