From 9957093846c799b0e7435653398e87a4efbe0dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 2 Apr 2026 14:49:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceManagerController.java | 105 ++++++++++++++++++ .../manager/mapper/DeviceManagerMapper.java | 14 +++ .../mapper/xml/DeviceManagerMapper.xml | 70 +++++++++++- .../service/IDeviceManagerService.java | 11 ++ .../impl/DeviceManagerServiceImpl.java | 41 +++++++ .../tplink/camera/entity/CameraInfo.java | 2 + .../electricity/entity/ElectricityMeter.java | 4 + .../modules/tq/water/entity/WaterMeter.java | 4 + .../yiweilian/humid/entity/HumidDevice.java | 4 + 9 files changed, 254 insertions(+), 1 deletion(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java index 30e6f8be..bdca005a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java @@ -5,6 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.manager.entity.DeviceBindLog; import com.nu.modules.manager.entity.DeviceManager; import com.nu.modules.manager.service.IDeviceManagerService; +import com.nu.modules.tplink.camera.entity.CameraInfo; +import com.nu.modules.tq.electricity.entity.ElectricityMeter; +import com.nu.modules.tq.water.entity.WaterMeter; +import com.nu.modules.yiweilian.humid.entity.HumidDevice; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; @@ -15,6 +20,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Map; /** * @Description: 设备管理 @@ -196,5 +202,104 @@ public class DeviceManagerController extends JeecgController> bindedList(DeviceManager deviceManager) { + Map pageList = service.bindedList(deviceManager); + return Result.OK(pageList); + } + /** + * 设备集成-区域获取要添加摄像头列表查询 + * + * @param deviceManager + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/cameraInfoUnbindList") + public Result> cameraInfoUnbindList(DeviceManager deviceManager, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findCameraInfoUnbindPage(page, deviceManager); + return Result.OK(pageList); + } + + /** + * 设备集成-区域获取要添加电表列表查询 + * + * @param deviceManager + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/electricityMeterUnbindList") + public Result> electricityMeterUnbindList(DeviceManager deviceManager, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findElectricityMeterUnbindPage(page, deviceManager); + return Result.OK(pageList); + } + + /** + * 设备集成-区域获取要添加水表列表查询 + * + * @param deviceManager + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/waterMeterUnbindList") + public Result> waterMeterUnbindList(DeviceManager deviceManager, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findWaterMeterUnbindPage(page, deviceManager); + return Result.OK(pageList); + } + + /** + * 设备集成-区域获取要添加温湿度计列表查询 + * + * @param deviceManager + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/humidDeviceUnbindList") + public Result> humidDeviceUnbindList(DeviceManager deviceManager, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findHumidDeviceUnbindPage(page, deviceManager); + return Result.OK(pageList); + } + + /** + * 绑定设备 + * + * @param deviceManager + * @return + */ + @RequestMapping(value = "/bindDevice", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result bindDevice(@RequestBody DeviceManager deviceManager) { + service.updateById(deviceManager); + return Result.OK("绑定成功！"); + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java index f59c7902..9ccbb9ba 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java @@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.manager.entity.DeviceBindLog; import com.nu.modules.manager.entity.DeviceManager; +import com.nu.modules.tplink.camera.entity.CameraInfo; +import com.nu.modules.tq.electricity.entity.ElectricityMeter; +import com.nu.modules.tq.water.entity.WaterMeter; +import com.nu.modules.yiweilian.humid.entity.HumidDevice; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -21,4 +25,14 @@ public interface DeviceManagerMapper extends BaseMapper { IPage findBingLogPage(Page page, @Param("params") DeviceBindLog deviceBindLog); void addLog(DeviceBindLog deviceBindLog); List queryNuList(DeviceManager deviceManager); + + List cameraInfoList(DeviceManager deviceManager); + IPage findCameraInfoUnbindPage(Page page, @Param("params") DeviceManager deviceManager); + List waterMeterList(DeviceManager deviceManager); + IPage findWaterMeterUnbindPage(Page page, @Param("params") DeviceManager deviceManager); + List electricityMeterList(DeviceManager deviceManager); + IPage findElectricityMeterUnbindPage(Page page, @Param("params") DeviceManager deviceManager); + List humidDeviceList(DeviceManager deviceManager); + IPage findHumidDeviceUnbindPage(Page page, @Param("params") DeviceManager deviceManager); + } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml index 0bdccae7..bd93ba1a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml @@ -16,7 +16,7 @@ a.update_time, a.remarks, a.device_status, - t.online_status + ifnull(t.online_status,'待集成') as online_status from nu_iot_device_preview a left join nu_base_info c on a.nu_id = c.nu_id left join ( @@ -122,4 +122,72 @@ order by nu_id asc + + + + + + + + + + + + + + + + diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java index 781b8584..1b8e6f4a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java @@ -5,8 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.nu.modules.manager.entity.DeviceBindLog; import com.nu.modules.manager.entity.DeviceManager; +import com.nu.modules.tplink.camera.entity.CameraInfo; +import com.nu.modules.tq.electricity.entity.ElectricityMeter; +import com.nu.modules.tq.water.entity.WaterMeter; +import com.nu.modules.yiweilian.humid.entity.HumidDevice; import java.util.List; +import java.util.Map; /** * @Description: 设备管理-机构信息 @@ -20,4 +25,10 @@ public interface IDeviceManagerService extends IService { IPage findBingLogPage(Page page, DeviceBindLog deviceBindLog); void addLog(DeviceBindLog deviceBindLog); List queryNuList(DeviceManager deviceManager); + + Map bindedList(DeviceManager deviceManager); + IPage findCameraInfoUnbindPage(Page page, DeviceManager deviceManager); + IPage findElectricityMeterUnbindPage(Page page, DeviceManager deviceManager); + IPage findWaterMeterUnbindPage(Page page, DeviceManager deviceManager); + IPage findHumidDeviceUnbindPage(Page page, DeviceManager deviceManager); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java index 7f947246..d772edf9 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java @@ -1,5 +1,6 @@ package com.nu.modules.manager.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -7,10 +8,15 @@ import com.nu.modules.manager.entity.DeviceBindLog; import com.nu.modules.manager.entity.DeviceManager; import com.nu.modules.manager.mapper.DeviceManagerMapper; import com.nu.modules.manager.service.IDeviceManagerService; +import com.nu.modules.tplink.camera.entity.CameraInfo; +import com.nu.modules.tq.electricity.entity.ElectricityMeter; +import com.nu.modules.tq.water.entity.WaterMeter; +import com.nu.modules.yiweilian.humid.entity.HumidDevice; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * @Description: 设备管理-机构信息 @@ -54,4 +60,39 @@ public class DeviceManagerServiceImpl extends ServiceImpl queryNuList(DeviceManager deviceManager){ return baseMapper.queryNuList(deviceManager); } + + @Override + public Map bindedList(DeviceManager deviceManager) { + List cameraInfoList = baseMapper.cameraInfoList(deviceManager); + List waterMeterList = baseMapper.waterMeterList(deviceManager); + List electricityMeterList = baseMapper.electricityMeterList(deviceManager); + List humidDeviceList = baseMapper.humidDeviceList(deviceManager); + Map map = Map.of( + "cameraInfoList", cameraInfoList, + "waterMeterList", waterMeterList, + "electricityMeterList", electricityMeterList, + "humidDeviceList", humidDeviceList + ); + return map; + } + + @Override + public IPage findCameraInfoUnbindPage(Page page, DeviceManager deviceManager) { + return baseMapper.findCameraInfoUnbindPage(page,deviceManager); + } + + @Override + public IPage findElectricityMeterUnbindPage(Page page, DeviceManager deviceManager) { + return baseMapper.findElectricityMeterUnbindPage(page,deviceManager); + } + + @Override + public IPage findWaterMeterUnbindPage(Page page, DeviceManager deviceManager) { + return baseMapper.findWaterMeterUnbindPage(page,deviceManager); + } + + @Override + public IPage findHumidDeviceUnbindPage(Page page, DeviceManager deviceManager) { + return baseMapper.findHumidDeviceUnbindPage(page,deviceManager); + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java index b4fe9b63..893fcdc5 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java @@ -136,6 +136,8 @@ public class CameraInfo implements Serializable { @ApiModelProperty(value = "用户设置置顶的时间，毫秒级时间戳") @TableField(exist = false) private String topTime; + @TableField(exist = false) + private String isIntensiveMonitor; /**护理单元*/ @ApiModelProperty(value = "护理单元编码") @Dict(dictTable ="nu_base_info",dicText = "nu_name",dicCode = "nu_id") diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java index e84c9a67..1be0b886 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java @@ -81,5 +81,9 @@ public class ElectricityMeter implements Serializable { /**维修状态*/ private String maintainStatus; private String dimension;//设备维度 + @TableField(exist = false) + private String deviceStatus;//设备状态 + @TableField(exist = false) + private String deviceModel; } \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java index e0dfb6b1..8de08798 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java @@ -80,4 +80,8 @@ public class WaterMeter implements Serializable { /**维修状态*/ private String maintainStatus; private String dimension;//设备维度 + @TableField(exist = false) + private String sn; + @TableField(exist = false) + private String deviceModel; } \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java index 6335802e..7a430ff9 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java @@ -119,4 +119,8 @@ public class HumidDevice implements Serializable { /**维修状态*/ private String maintainStatus; private String dimension;//设备维度 + @TableField(exist = false) + private String deviceStatus;//设备状态 + @TableField(exist = false) + private String deviceModel; } \ No newline at end of file