Commit 37bbd868 by hayden

后台管理系统设备管理-设备操作日志:bug修复

parent f1d2b985
...@@ -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(DeviceDto device)
{ {
startPage(); startPage();
List<Device> list = deviceService.selectDeviceList(device); List<Device> list = deviceService.selectDeviceList(device);
......
...@@ -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();
} }
} }
package share.system.domain;
import lombok.Data;
/**
* @author lichenghu
* @date 2024/1/25
*/
@Data
public class DeviceDto extends Device {
/**
* 门店ID
*/
private Long storeId;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment