From 1c3f87ad7a0d9c2c7a48a8de660a9aa7bbfee20a Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 8 Aug 2024 10:42:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=BD=E5=B7=A5=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/bracelet/vo/BallTreeVo.java | 24 +++++++++++++++++++ .../controller/ConsControlController.java | 10 ++++++++ .../bracelet/service/IConsControlService.java | 11 +++++++++ .../service/impl/ConsControlServiceImpl.java | 12 ++++++++++ .../mapper/bracelet/PersonMgeMapper.xml | 8 +++---- 5 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BallTreeVo.java diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BallTreeVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BallTreeVo.java new file mode 100644 index 0000000..69d7850 --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BallTreeVo.java @@ -0,0 +1,24 @@ +package com.bonus.common.entity.bracelet.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @className:BallTreeVo + * @author:cwchen + * @date:2024-08-08-10:12 + * @version:1.0 + * @description:球机树 + */ +@Data +public class BallTreeVo { + + private Long id; + + private String label; + + private String puid; + + private List children; +} diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ConsControlController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ConsControlController.java index c4ec779..6f90ad3 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ConsControlController.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ConsControlController.java @@ -1,7 +1,12 @@ package com.bonus.bracelet.controller; import com.bonus.bracelet.service.IConsControlService; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.entity.bracelet.BraceletParamsDto; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -22,5 +27,10 @@ public class ConsControlController { @Resource(name = "IConsControlService") private IConsControlService service; + @GetMapping("getBallDeviceLists") + @SysLog(title = "施工管控", businessType = OperaType.QUERY, logType = 0, module = "施工管控->实时监控", details = "实时监控") + public AjaxResult getBallDeviceLists(BraceletParamsDto dto){ + return service.getBallDeviceLists(dto); + } } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IConsControlService.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IConsControlService.java index 40ce97c..5b180e7 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IConsControlService.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IConsControlService.java @@ -1,5 +1,8 @@ package com.bonus.bracelet.service; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.entity.bracelet.BraceletParamsDto; + /** * @className:IConsControlService * @author:cwchen @@ -8,4 +11,12 @@ package com.bonus.bracelet.service; * @description:施工管控 */ public interface IConsControlService { + /** + * 获取球机设备列表 + * @param dto + * @return AjaxResult + * @author cwchen + * @date 2024/8/8 10:09 + */ + AjaxResult getBallDeviceLists(BraceletParamsDto dto); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java index 7e8d485..b79a46b 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java @@ -2,6 +2,8 @@ package com.bonus.bracelet.service.impl; import com.bonus.bracelet.mapper.ConsControlMapper; import com.bonus.bracelet.service.IConsControlService; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.entity.bracelet.BraceletParamsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -20,4 +22,14 @@ public class ConsControlServiceImpl implements IConsControlService { @Resource(name = "ConsControlMapper") private ConsControlMapper mapper; + + @Override + public AjaxResult getBallDeviceLists(BraceletParamsDto dto) { + try { + return null; + } catch (Exception e) { + log.error(e.toString(),e); + } + return AjaxResult.success(); + } } diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml index bd33e7e..0ce9a9c 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml @@ -105,18 +105,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"