From cc8475b8b83ba93ef1c22b1b8c7121c0cf23a859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Sat, 9 May 2026 13:47:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87-=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=813=EF=BC=8C?= =?UTF-8?q?=E5=A4=84=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceManagerController.java | 76 --------- .../manager/mapper/DeviceManagerMapper.java | 5 - .../mapper/xml/DeviceManagerMapper.xml | 38 +---- .../service/IDeviceManagerService.java | 4 - .../impl/DeviceManagerServiceImpl.java | 20 --- .../controller/CameraInfoController.java | 22 +++ .../camera/service/ICameraInfoService.java | 2 + .../service/impl/CameraInfoServiceImpl.java | 146 ++++++++++++++++++ 8 files changed, 171 insertions(+), 142 deletions(-) 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 209b9169..2f1a48ff 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 @@ -271,82 +271,6 @@ public class DeviceManagerController extends JeecgController> 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); - } - /** * 绑定设备 * 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 5aec0a79..81aeab53 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 @@ -30,15 +30,10 @@ public interface DeviceManagerMapper extends BaseMapper { List queryNuList(DeviceManager deviceManager); List exportDeviceExcel(DeviceManager deviceManager); List exportDeviceHzExcel(DeviceManagerHz 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); void editPreviewStatusBySn(DeviceManager deviceManager); void editPreviewById(DeviceManager deviceManager); IPage findGhPage(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 5c9b57c4..45732127 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 @@ -205,17 +205,8 @@ from nu_iot_device_preview a inner join nu_iot_tplink_camera b on a.sn = b.mac where a.nu_id = #{nuId} - and a.device_type = 'SURVEILLANCECAMERA' - and ifnull(a.device_status,'') != '损坏' - - - - - - - - - update nu_iot_device_preview set device_status = #{deviceStatus} 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 3d99963a..a18e46ef 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 @@ -32,10 +32,6 @@ public interface IDeviceManagerService extends IService { List exportDeviceHzExcel(DeviceManagerHz 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); DeviceManager findBySn(DeviceManager deviceManager); DeviceManager findOneByType(DeviceManager deviceManager); void editPreviewStatusBySn(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 85935e7a..fe15d0bc 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 @@ -156,26 +156,6 @@ public class DeviceManagerServiceImpl extends ServiceImpl 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); - } - @Override public DeviceManager findBySn(DeviceManager deviceManager){ return baseMapper.findBySn(deviceManager); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java index dabecf6b..f45535fd 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java @@ -93,6 +93,28 @@ public class CameraInfoController extends JeecgController getImageSwitch(@RequestBody Map map) { + return service.getImageSwitch(map); + } + + /** + * 设置画面操作信息 + * + * @param map + * @return + */ + @PostMapping(value = "/setImageSwitch") + public Result setImageSwitch(@RequestBody Map map) { + return service.setImageSwitch(map); + } + /** * 获取摄像头实时播放地址 * diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java index 03371709..c006131e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java @@ -23,6 +23,8 @@ public interface ICameraInfoService extends IService { List findModelList(CameraInfo cameraInfo); List findAllList(); Result getDeviceDetails(CameraInfo cameraInfo); + Result getImageSwitch(Map map); + Result setImageSwitch(Map map); Result> getPreviewUrl(CameraInfo cameraInfo); Result testAudio(Map map); Result> getMultitransUrl(CameraInfo cameraInfo) throws Exception; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java index 98b4ed29..d98682bc 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java @@ -137,6 +137,152 @@ public class CameraInfoServiceImpl extends ServiceImpl getImageSwitch(Map map){ + String id = map.get("deviceIndex").toString(); + String type = map.get("type").toString(); + CameraInfo cameraInfo = new CameraInfo(); + cameraInfo.setDeviceIndex(id); + cameraInfo = baseMapper.getByDeviceId(cameraInfo); + String parentId = cameraInfo.getParentId(); + if(!parentId.equals("0")){ + id = parentId; + type = "chn"+cameraInfo.getChannel()+"_switch"; + } + StringBuffer sb = new StringBuffer(); + sb.append("{"); + sb.append("\"devId\"").append(":").append("\"").append(id).append("\"").append(","); + sb.append("\"param\"").append(":").append("{"); + sb.append("\"method\"").append(":").append("\"get\"").append(","); + sb.append("\"image\"").append(":").append("{"); + sb.append("\"name\"").append(":").append("\"").append(type).append("\""); + sb.append("}"); + sb.append("}"); + sb.append("}"); + String addPreviewRes = tumsApi.passthrough(sb.toString()); + JSONObject jsonObject = new JSONObject(addPreviewRes); + String errCode = jsonObject.getStr("error_code"); + if("0".equals(errCode)){ + JSONObject result = (JSONObject)jsonObject.get("result"); + JSONObject responseData = (JSONObject)result.get("responseData"); + String errorCode = responseData.getStr("error_code"); + if("0".equals(errorCode)){ + JSONObject image = (JSONObject)responseData.get("image"); + JSONObject data = (JSONObject)image.get(type); +// updateDeviceStatus(id,errorCode); + return Result.OK(data); + }else{ + String errorMsg = ""; + try{ + ErrorCode errorVo = errorCodeService.getByCode(errorCode); + errorMsg = errorVo.getErrorMsg(); + }catch (Exception e){ + errorMsg = errorCode; + } +// updateDeviceStatus(id,errorCode); + log.info("getImageCommon:{}",errorMsg); + return Result.error(errorMsg); + } + }else{ + String errMsg = ""; + try{ + ErrorCode errVo = errorCodeService.getByCode(errCode); + errMsg = errVo.getErrorMsg(); + }catch (Exception e){ + errMsg = errCode; + } +// updateDeviceStatus(id,errCode); + log.info("getImageCommon:{}",errMsg); + return Result.error(errMsg); + } + } + + /** + * 设置画面操作信息 + * + * @param map + * @return + * @throws Exception + */ + @Override + public Result setImageSwitch(Map map){ + String id = map.get("deviceIndex").toString(); + String type = map.get("type").toString(); + CameraInfo cameraInfo = new CameraInfo(); + cameraInfo.setDeviceIndex(id); + cameraInfo = baseMapper.getByDeviceId(cameraInfo); + String parentId = cameraInfo.getParentId(); + if(!parentId.equals("0")){ + id = parentId; + type = "chn"+cameraInfo.getChannel()+"_switch"; + } + Map paramMap = (Map)map.get("param"); + StringBuffer sb = new StringBuffer(); + sb.append("{"); + sb.append("\"devId\"").append(":").append("\"").append(id).append("\"").append(","); + sb.append("\"param\"").append(":").append("{"); + sb.append("\"method\"").append(":").append("\"set\"").append(","); + sb.append("\"image\"").append(":").append("{"); + sb.append("\"").append(type).append("\"").append(":").append("{"); + //类属性+类值 + StringBuffer csb = new StringBuffer(); + Set keys = paramMap.keySet(); + // 遍历键的集合并打印每个键 + for (String key : keys) { + String value = paramMap.get(key).toString(); + csb.append("\"").append(key).append("\"").append(":").append("\"").append(value).append("\"").append(","); + } + String cstr = csb.toString(); + if(cstr.length()>0){ + cstr = cstr.substring(0,cstr.length()-1); + } + sb.append(cstr); + sb.append("}"); + sb.append("}"); + sb.append("}"); + sb.append("}"); + String addPreviewRes = tumsApi.passthrough(sb.toString()); + JSONObject jsonObject = new JSONObject(addPreviewRes); + String errCode = jsonObject.getStr("error_code"); + if("0".equals(errCode)){ + JSONObject result = (JSONObject)jsonObject.get("result"); + JSONObject responseData = (JSONObject)result.get("responseData"); + String errorCode = responseData.getStr("error_code"); + if("0".equals(errorCode)){ + return Result.OK("设置成功"); + }else{ + String errorMsg = ""; + try{ + ErrorCode errorVo = errorCodeService.getByCode(errorCode); + errorMsg = errorVo.getErrorMsg(); + }catch (Exception e){ + errorMsg = errorCode; + } +// updateDeviceStatus(id,errorCode); + log.info("setImageCommon:{}",errorMsg); + return Result.error(errorMsg); + } + }else{ + String errMsg = ""; + try{ + ErrorCode errVo = errorCodeService.getByCode(errCode); + errMsg = errVo.getErrorMsg(); + }catch (Exception e){ + errMsg = errCode; + } +// updateDeviceStatus(id,errCode); + log.info("setImageCommon:{}",errMsg); + return Result.error(errMsg); + } + } + /** * 获取摄像头实时播放地址 * 添加预览通道