diff --git a/src/main/java/com/ycwl/basic/controller/extern/AioDeviceController.java b/src/main/java/com/ycwl/basic/controller/extern/AioDeviceController.java index d9a5dc8..cb2c56a 100644 --- a/src/main/java/com/ycwl/basic/controller/extern/AioDeviceController.java +++ b/src/main/java/com/ycwl/basic/controller/extern/AioDeviceController.java @@ -3,7 +3,9 @@ package com.ycwl.basic.controller.extern; import com.ycwl.basic.annotation.IgnoreToken; import com.ycwl.basic.mapper.AioDeviceMapper; import com.ycwl.basic.mapper.MemberMapper; +import com.ycwl.basic.model.aio.entity.AioDeviceBannerEntity; import com.ycwl.basic.model.aio.entity.AioDeviceEntity; +import com.ycwl.basic.model.aio.resp.AioDeviceInfoResp; import com.ycwl.basic.model.jwt.JwtInfo; import com.ycwl.basic.model.mobile.face.FaceRecognizeResp; import com.ycwl.basic.model.mobile.goods.GoodsDetailVO; @@ -46,7 +48,28 @@ public class AioDeviceController { @Autowired private AioDeviceMapper aioDeviceMapper; - @Autowired + @GetMapping("/info") + public ApiResponse getDeviceInfo(HttpServletRequest request) { + String deviceId = request.getHeader("X-DeviceId"); + AioDeviceEntity aioDevice = aioDeviceMapper.getByKey(deviceId); + if (aioDevice == null) { + return ApiResponse.fail("设备不存在"); + } + List banners = aioDeviceMapper.getBannerByDeviceId(aioDevice.getId()); + return ApiResponse.success(new AioDeviceInfoResp(aioDevice, banners)); + } + + @GetMapping("/banners") + public ApiResponse> getBanners(HttpServletRequest request) { + String deviceId = request.getHeader("X-DeviceId"); + AioDeviceEntity aioDevice = aioDeviceMapper.getByKey(deviceId); + if (aioDevice == null) { + return ApiResponse.fail("设备不存在"); + } + List banners = aioDeviceMapper.getBannerByDeviceId(aioDevice.getId()); + return ApiResponse.success(banners); + } + @PostMapping("/faceUpload") public ApiResponse faceUpload(@RequestParam("file") MultipartFile file, HttpServletRequest request) { String deviceId = request.getHeader("X-DeviceId"); diff --git a/src/main/java/com/ycwl/basic/mapper/AioDeviceMapper.java b/src/main/java/com/ycwl/basic/mapper/AioDeviceMapper.java index 7ae5498..a371dd3 100644 --- a/src/main/java/com/ycwl/basic/mapper/AioDeviceMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/AioDeviceMapper.java @@ -1,8 +1,13 @@ package com.ycwl.basic.mapper; +import com.ycwl.basic.model.aio.entity.AioDeviceBannerEntity; import com.ycwl.basic.model.aio.entity.AioDeviceEntity; +import java.util.List; + public interface AioDeviceMapper { AioDeviceEntity getById(Long id); AioDeviceEntity getByKey(String key); + List getBannerByDeviceId(Long deviceId); + } diff --git a/src/main/java/com/ycwl/basic/model/aio/entity/AioDeviceBannerEntity.java b/src/main/java/com/ycwl/basic/model/aio/entity/AioDeviceBannerEntity.java new file mode 100644 index 0000000..262c5e1 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/aio/entity/AioDeviceBannerEntity.java @@ -0,0 +1,35 @@ +package com.ycwl.basic.model.aio.entity; + +import lombok.Data; +import java.util.Date; + +/** + * 智能设备横幅实体类 + */ +@Data +public class AioDeviceBannerEntity { + /** + * 主键ID + */ + private Long id; + + /** + * 设备ID + */ + private Long deviceId; + + /** + * 横幅URL + */ + private String url; + + /** + * 状态 (0-禁用 1-启用) + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createAt; +} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/aio/resp/AioDeviceInfoResp.java b/src/main/java/com/ycwl/basic/model/aio/resp/AioDeviceInfoResp.java new file mode 100644 index 0000000..ce62406 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/aio/resp/AioDeviceInfoResp.java @@ -0,0 +1,15 @@ +package com.ycwl.basic.model.aio.resp; + +import com.ycwl.basic.model.aio.entity.AioDeviceBannerEntity; +import com.ycwl.basic.model.aio.entity.AioDeviceEntity; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; + +@Data +@AllArgsConstructor +public class AioDeviceInfoResp { + private AioDeviceEntity info; + private List banners; +} diff --git a/src/main/resources/mapper/AioDeviceMapper.xml b/src/main/resources/mapper/AioDeviceMapper.xml index f2fa8c7..1fc952e 100644 --- a/src/main/resources/mapper/AioDeviceMapper.xml +++ b/src/main/resources/mapper/AioDeviceMapper.xml @@ -7,4 +7,7 @@ + \ No newline at end of file