Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_ht
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pseer
gxpt_ht
Commits
37bbd868
Commit
37bbd868
authored
Jan 25, 2024
by
hayden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
后台管理系统设备管理-设备操作日志:bug修复
parent
f1d2b985
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
DeviceController.java
...in/java/share/web/controller/system/DeviceController.java
+2
-1
Device.java
share-system/src/main/java/share/system/domain/Device.java
+0
-4
DeviceDto.java
...e-system/src/main/java/share/system/domain/DeviceDto.java
+15
-0
No files found.
share-admin/src/main/java/share/web/controller/system/DeviceController.java
View file @
37bbd868
...
@@ -17,6 +17,7 @@ import share.common.core.controller.BaseController;
...
@@ -17,6 +17,7 @@ import share.common.core.controller.BaseController;
import
share.common.core.domain.AjaxResult
;
import
share.common.core.domain.AjaxResult
;
import
share.common.enums.BusinessType
;
import
share.common.enums.BusinessType
;
import
share.common.utils.SecurityUtils
;
import
share.common.utils.SecurityUtils
;
import
share.system.domain.DeviceDto
;
import
share.system.mqtt.MqttGatewayComponent
;
import
share.system.mqtt.MqttGatewayComponent
;
import
share.system.domain.Device
;
import
share.system.domain.Device
;
import
share.system.domain.vo.DeviceParamVo
;
import
share.system.domain.vo.DeviceParamVo
;
...
@@ -51,7 +52,7 @@ public class DeviceController extends BaseController
...
@@ -51,7 +52,7 @@ public class DeviceController extends BaseController
*/
*/
@PreAuthorize
(
"@ss.hasPermi('system:device:list')"
)
@PreAuthorize
(
"@ss.hasPermi('system:device:list')"
)
@GetMapping
(
"/list"
)
@GetMapping
(
"/list"
)
public
TableDataInfo
list
(
Device
device
)
public
TableDataInfo
list
(
Device
Dto
device
)
{
{
startPage
();
startPage
();
List
<
Device
>
list
=
deviceService
.
selectDeviceList
(
device
);
List
<
Device
>
list
=
deviceService
.
selectDeviceList
(
device
);
...
...
share-system/src/main/java/share/system/domain/Device.java
View file @
37bbd868
...
@@ -83,9 +83,6 @@ public class Device extends BaseEntity
...
@@ -83,9 +83,6 @@ public class Device extends BaseEntity
/** 门店房间ID */
/** 门店房间ID */
private
Long
roomId
;
private
Long
roomId
;
/** 门店ID */
private
Long
storeId
;
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
...
@@ -110,7 +107,6 @@ public class Device extends BaseEntity
...
@@ -110,7 +107,6 @@ public class Device extends BaseEntity
.
append
(
"voltage"
,
getVoltage
())
.
append
(
"voltage"
,
getVoltage
())
.
append
(
"signalValue"
,
getSignalValue
())
.
append
(
"signalValue"
,
getSignalValue
())
.
append
(
"roomId"
,
getRoomId
())
.
append
(
"roomId"
,
getRoomId
())
.
append
(
"storeId"
,
getStoreId
())
.
toString
();
.
toString
();
}
}
}
}
share-system/src/main/java/share/system/domain/DeviceDto.java
0 → 100644
View file @
37bbd868
package
share
.
system
.
domain
;
import
lombok.Data
;
/**
* @author lichenghu
* @date 2024/1/25
*/
@Data
public
class
DeviceDto
extends
Device
{
/**
* 门店ID
*/
private
Long
storeId
;
}
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