施工管控

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<BallTreeVo> children;
+}

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);
+    }
 
 }

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);
 }

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();
+    }
 }

bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml

@@ -105,18 +105,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--验证安全帽编号是否重复、马甲编号是否重复-->
     <select id="codeIsExist" resultType="java.lang.Integer">
         <if test="type == 1">
-            <if test="id == null">
+            <if test="params.id == null">
                 SELECT COUNT(*) FROM tb_people WHERE aqm_code = #{params.aqmCode} AND del_flag = 0
             </if>
-            <if test="id != null">
+            <if test="params.id != null">
                 SELECT COUNT(*) FROM tb_people WHERE id != #{params.id} AND aqm_code = #{params.aqmCode} AND del_flag = 0
             </if>
         </if>
         <if test="type == 2">
-            <if test="id == null">
+            <if test="params.id == null">
                 SELECT COUNT(*) FROM tb_people WHERE mj_code = #{params.mjCode} AND del_flag = 0
             </if>
-            <if test="id != null">
+            <if test="params.id != null">
                 SELECT COUNT(*) FROM tb_people WHERE mj_code = #{params.mjCode} AND id != #{params.id} AND del_flag = 0
             </if>
         </if>