From 8ff1569a0b46fbe52639e0ee02e70f727d235b62 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 10 Apr 2025 17:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AE=BE=E5=A4=87=E3=80=81?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/basic/controller/DevController.java    |  6 ++++++
 .../base/basic/controller/UnitController.java   |  6 ++++++
 .../com/bonus/base/basic/mapper/IDevMapper.java |  9 +++++++++
 .../bonus/base/basic/mapper/IUnitMapper.java    |  9 +++++++++
 .../bonus/base/basic/service/IDevService.java   |  9 +++++++++
 .../bonus/base/basic/service/IUnitService.java  |  9 +++++++++
 .../base/basic/service/impl/DevServiceImpl.java | 11 +++++++++++
 .../basic/service/impl/UnitServiceImpl.java     | 11 +++++++++++
 .../mapper/smartsite/basic/DevMapper.xml        | 13 +++++++++++++
 .../mapper/smartsite/basic/UnitMapper.xml       | 17 +++++++++++++++++
 10 files changed, 100 insertions(+)

diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java
index 24a72c3..673a155 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java
@@ -44,6 +44,12 @@ public class DevController extends BaseController {
         return service.addDev(vo);
     }
 
+    @ApiOperation(value = "设备详情")
+    @PostMapping("detailDev")
+    public AjaxResult detailDev(@RequestBody DeviceVo vo) {
+        return service.detailDev(vo);
+    }
+
     @ApiOperation(value = "修改设备")
 //    @PreventRepeatSubmit
 //    @RequiresPermissions("basic:dev:edit")
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/UnitController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/UnitController.java
index 9e05f99..84fa672 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/UnitController.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/UnitController.java
@@ -48,6 +48,12 @@ public class UnitController extends BaseController {
         return service.addUnit(vo);
     }
 
+    @ApiOperation(value = "单位详情")
+    @PostMapping("detailUnit")
+    public AjaxResult detailUnit(@RequestBody UnitVo vo) {
+        return service.detailUnit(vo);
+    }
+
     @ApiOperation(value = "修改单位")
 //    @PreventRepeatSubmit
 //    @RequiresPermissions("basic:unit:edit")
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IDevMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IDevMapper.java
index 026680d..0eae134 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IDevMapper.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IDevMapper.java
@@ -59,4 +59,13 @@ public interface IDevMapper {
      * @date 2025/4/10 16:12
      */
     int queryValueIsExist2(@Param("params") DeviceVo vo, @Param("value") String value, @Param("columnName") String columnName);
+
+    /**
+     * 设备详情
+     * @param vo
+     * @return DeviceVo
+     * @author cwchen
+     * @date 2025/4/10 17:54
+     */
+    DeviceVo detailDev(DeviceVo vo);
 }
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IUnitMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IUnitMapper.java
index 28d567e..c35645a 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IUnitMapper.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IUnitMapper.java
@@ -45,4 +45,13 @@ public interface IUnitMapper {
      * @date 2025/4/10 13:53
      */
     void addOrUpdateUnit(@Param("params") UnitVo vo, @Param("type") int type);
+
+    /**
+     * 单位详情
+     * @param vo
+     * @return UnitVo
+     * @author cwchen
+     * @date 2025/4/10 17:52
+     */
+    UnitVo detailUnit(UnitVo vo);
 }
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IDevService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IDevService.java
index 3cbc815..d5a038d 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IDevService.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IDevService.java
@@ -46,4 +46,13 @@ public interface IDevService {
      * @date 2025/4/10 15:54
      */
     AjaxResult delDev(DeviceVo vo);
+
+    /**
+     * 设备详情
+     * @param vo
+     * @return AjaxResult
+     * @author cwchen
+     * @date 2025/4/10 17:53
+     */
+    AjaxResult detailDev(DeviceVo vo);
 }
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IUnitService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IUnitService.java
index f6f34c0..761181f 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IUnitService.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IUnitService.java
@@ -48,4 +48,13 @@ public interface IUnitService {
      * @date 2025/4/10 14:01
      */
     AjaxResult delUnit(UnitVo vo);
+
+    /**
+     * 单位详情
+     * @param vo
+     * @return AjaxResult
+     * @author cwchen
+     * @date 2025/4/10 17:50
+     */
+    AjaxResult detailUnit(UnitVo vo);
 }
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DevServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DevServiceImpl.java
index efbc807..8391001 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DevServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DevServiceImpl.java
@@ -121,4 +121,15 @@ public class DevServiceImpl implements IDevService {
             return AjaxResult.error();
         }
     }
+
+    @Override
+    public AjaxResult detailDev(DeviceVo vo) {
+        try {
+            DeviceVo deviceVo = Optional.ofNullable(mapper.detailDev(vo)).orElseGet(DeviceVo::new);
+            return AjaxResult.success(deviceVo);
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            return AjaxResult.error();
+        }
+    }
 }
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/UnitServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/UnitServiceImpl.java
index e0357b6..2fe9df7 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/UnitServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/UnitServiceImpl.java
@@ -111,4 +111,15 @@ public class UnitServiceImpl implements IUnitService {
             return AjaxResult.error();
         }
     }
+
+    @Override
+    public AjaxResult detailUnit(UnitVo vo) {
+        try {
+            UnitVo unitVo = Optional.ofNullable(mapper.detailUnit(vo)).orElseGet(UnitVo::new);
+            return AjaxResult.success(unitVo);
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            return AjaxResult.error();
+        }
+    }
 }
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml
index cc226d4..4051147 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml
@@ -115,4 +115,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) AND is_active = '1'
         </if>
     </select>
+    <!--设备详情-->
+    <select id="detailDev" resultType="com.bonus.base.basic.domain.vo.DeviceVo">
+        SELECT td.id,
+               td.dev_name AS unitName,
+               td.mac_id AS macId,
+               td.dev_type_code AS devTypeCode,
+               td.puid AS puid,
+               td.gb_code AS gbCode,
+               td.play_idx AS playIdx,
+               td.remark
+        FROM tt_device td
+        WHERE id = #{id}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml
index 4f6c61d..3c19dee 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml
@@ -100,4 +100,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHERE ${columnName} = #{value} AND id != #{params.id} AND is_active = '1'
         </if>
     </select>
+    <!--单位详情-->
+    <select id="detailUnit" resultType="com.bonus.base.basic.domain.vo.UnitVo">
+        SELECT id,
+               unit_name AS unitName,
+               unit_type AS unitType,
+               unit_code AS unitCode,
+               unit_user AS unitUser,
+               unit_phone AS unitPhone,
+               suff_user AS suffUser,
+               suff_phone AS suffPhone,
+               address AS address,
+               brief AS brief,
+               create_day AS createDay,
+               register AS register
+        FROM tt_sys_unit
+        WHERE id = #{id}
+    </select>
 </mapper>
\ No newline at end of file