diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java index cf77047..a523878 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java @@ -281,6 +281,14 @@ public class DeviceController extends BaseController { return getDataTable(deviceService.getDeviceList(getLoginUser(), device)); } + /** + * 查询设备列表 分配页面 + */ + @GetMapping("/getDeviceBySpiltCode") + public AjaxResult getDeviceBySpiltCode(@RequestParam String code) { + return AjaxResult.success(deviceService.getDeviceBySpiltCode(code)); + } + /** * 设备授权修改 */ diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceMapper.java index 0da43a8..7196869 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceMapper.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceMapper.java @@ -91,4 +91,6 @@ public interface DeviceMapper extends BaseMapperX { */ public List selectSerialNumbersByProductId(@Param("productId") Long productId); + + public Device selectDeviceBySpiltCode(@Param("code") String code); } diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IDeviceService.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IDeviceService.java index 116d472..d5a587d 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IDeviceService.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IDeviceService.java @@ -92,6 +92,8 @@ public interface IDeviceService { public List getDeviceList(LoginUser loginUser, Device device); + public Device getDeviceBySpiltCode(String code); + public boolean paramModifyAuth(DeviceParamAuthDTO dto); public boolean hasPermission(String deviceId); diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java index 734b3e7..51951c1 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java @@ -382,6 +382,12 @@ public class DeviceServiceImpl implements IDeviceService { return deviceList; } + @Override + public Device getDeviceBySpiltCode(String code) { + return deviceMapper.selectDeviceBySpiltCode(code); + } + + @Override public boolean paramModifyAuth(DeviceParamAuthDTO dto) { if (dto != null && !StringUtils.isEmpty(dto.getDeviceId())) { diff --git a/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml b/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml index 103d9f0..a74fa4f 100644 --- a/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml +++ b/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml @@ -261,6 +261,11 @@ where serial_number = #{serialNumber} + +