From b7e597e21f6c808d4c9585958a6d911da142abcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 7 May 2026 16:04:23 +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=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppCameraInfoController.java | 277 -- .../camerainfo/entity/AppCameraInfo.java | 303 -- .../camerainfo/entity/AppErrorCode.java | 36 - .../camerainfo/entity/AppProjectInfo.java | 121 - .../camerainfo/entity/AppRegionInfo.java | 118 - .../camerainfo/entity/AppTumsConfig.java | 46 - .../tplink/camerainfo/enums/AppApiEnum.java | 43 - .../mapper/AppCameraInfoMapper.java | 30 - .../camerainfo/mapper/AppErrorCodeMapper.java | 17 - .../mapper/AppProjectInfoMapper.java | 15 - .../mapper/AppRegionInfoMapper.java | 15 - .../mapper/AppTumsConfigMapper.java | 19 - .../mapper/xml/AppCameraInfoMapper.xml | 256 -- .../mapper/xml/AppErrorCodeMapper.xml | 13 - .../mapper/xml/AppProjectInfoMapper.xml | 22 - .../mapper/xml/AppRegionInfoMapper.xml | 26 - .../mapper/xml/AppTumsConfigMapper.xml | 53 - .../service/IAppCameraInfoService.java | 51 - .../service/IAppErrorCodeService.java | 14 - .../service/IAppTumsConfigService.java | 14 - .../impl/AppCameraInfoServiceImpl.java | 1984 ------------ .../service/impl/AppErrorCodeServiceImpl.java | 24 - .../impl/AppTumsConfigServiceImpl.java | 24 - .../tplink/camerainfo/utils/AppTumsApi.java | 360 --- .../tplink/storage/api/TplinkVideoStoApi.java | 31 - .../nu/modules/iot/tq/entity/AppTqConfig.java | 36 - .../nu/modules/iot/tq/enums/AppTqApiEnum.java | 24 - .../iot/tq/mapper/AppTqConfigMapper.java | 19 - .../iot/tq/mapper/xml/AppTqConfigMapper.xml | 41 - .../nu/modules/iot/tq/utils/AppHttpTool.java | 161 - .../nu/modules/iot/tq/utils/AppSignTool.java | 63 - .../com/nu/modules/iot/tq/utils/AppTqApi.java | 199 -- .../yiweilian/entity/AppYiweilianConfig.java | 34 - .../yiweilian/enums/AppYiweilianApiEnum.java | 23 - .../mapper/AppYiweilianConfigMapper.java | 19 - .../mapper/xml/AppYiweilianConfigMapper.xml | 35 - .../iot/yiweilian/utils/AppHttpTool.java | 74 - .../iot/yiweilian/utils/AppYiweilianApi.java | 155 - .../pad/iot/common/api/IotCommonApi.java | 26 +- .../api/ElectricityMeterApi.java | 7 - .../iot/humiddevice/api/HumidDeviceApi.java | 11 - .../modules/pad/iot/water/api/WaterApi.java | 8 - .../com/nu/dto/IotCameraCapabilityMQDto.java | 2 - .../java/com/nu/dto/IotCameraInfoMQDto.java | 17 - .../com/nu/dto/IotEleWaterCollectorMQDto.java | 2 - .../com/nu/dto/IotElectricityMeterMQDto.java | 15 - .../java/com/nu/dto/IotHumidDeviceMQDto.java | 15 - .../java/com/nu/entity/CameraInfoEntity.java | 107 - .../com/nu/entity/ElectricityMeterEntity.java | 9 - .../java/com/nu/entity/HumidDeviceEntity.java | 18 +- .../java/com/nu/entity/WaterMeterEntity.java | 5 - .../modules/camerainfo/api/CameraInfoApi.java | 11 - .../camerainfo/api/ICameraInfoApi.java | 12 + .../api/IElectricityMeterApi.java | 2 - .../humiddevice/api/IHumidDeviceApi.java | 2 - .../com/nu/modules/water/api/IWaterApi.java | 2 - .../controller/CameraInfoController.java | 413 --- .../tplink/camera/entity/CameraInfo.java | 91 +- .../camera/job/CameraCapabilitySyncJob.java | 51 - .../camera/job/CameraDeviceSyncJob.java | 47 - .../camera/mapper/CameraInfoMapper.java | 10 +- .../camera/mapper/xml/CameraInfoMapper.xml | 215 +- .../camera/service/ICameraInfoService.java | 67 - .../service/impl/CameraInfoServiceImpl.java | 2873 +---------------- .../ElectricityMeterController.java | 8 - .../electricity/entity/ElectricityMeter.java | 17 +- .../mapper/ElectricityMeterMapper.java | 2 - .../mapper/xml/ElectricityMeterMapper.xml | 59 +- .../service/IElectricityMeterService.java | 7 - .../impl/ElectricityMeterServiceImpl.java | 144 - .../controller/WaterMeterController.java | 9 - .../modules/tq/water/entity/WaterMeter.java | 13 +- .../tq/water/mapper/WaterMeterMapper.java | 2 - .../tq/water/mapper/xml/WaterMeterMapper.xml | 61 +- .../tq/water/service/IWaterMeterService.java | 5 - .../service/impl/WaterMeterServiceImpl.java | 64 - .../controller/HumidDeviceController.java | 16 - .../yiweilian/humid/entity/HumidDevice.java | 16 +- .../humid/mapper/HumidDeviceMapper.java | 2 - .../humid/mapper/xml/HumidDeviceMapper.xml | 102 +- .../humid/service/IHumidDeviceService.java | 6 - .../service/impl/HumidDeviceServiceImpl.java | 70 - .../device/listener/IotSyncBizMQListener.java | 540 +--- .../mapper/xml/NuBaseInfoMapper.xml | 4 +- .../service/impl/NuBaseInfoServiceImpl.java | 8 +- 85 files changed, 142 insertions(+), 9846 deletions(-) delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/controller/AppCameraInfoController.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppCameraInfo.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppErrorCode.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppProjectInfo.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppRegionInfo.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppTumsConfig.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/enums/AppApiEnum.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppCameraInfoMapper.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppErrorCodeMapper.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppProjectInfoMapper.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppRegionInfoMapper.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppTumsConfigMapper.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppCameraInfoMapper.xml delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppErrorCodeMapper.xml delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppProjectInfoMapper.xml delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppRegionInfoMapper.xml delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppTumsConfigMapper.xml delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppCameraInfoService.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppErrorCodeService.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppTumsConfigService.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppCameraInfoServiceImpl.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppErrorCodeServiceImpl.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppTumsConfigServiceImpl.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/utils/AppTumsApi.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/storage/api/TplinkVideoStoApi.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tq/entity/AppTqConfig.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tq/enums/AppTqApiEnum.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tq/mapper/AppTqConfigMapper.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tq/mapper/xml/AppTqConfigMapper.xml delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppHttpTool.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppSignTool.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppTqApi.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/entity/AppYiweilianConfig.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/enums/AppYiweilianApiEnum.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/mapper/AppYiweilianConfigMapper.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/mapper/xml/AppYiweilianConfigMapper.xml delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/utils/AppHttpTool.java delete mode 100644 nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/utils/AppYiweilianApi.java delete mode 100644 nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/camerainfo/api/CameraInfoApi.java create mode 100644 nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/camerainfo/api/ICameraInfoApi.java delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraCapabilitySyncJob.java delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraDeviceSyncJob.java diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/controller/AppCameraInfoController.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/controller/AppCameraInfoController.java deleted file mode 100644 index 33035d90..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/controller/AppCameraInfoController.java +++ /dev/null @@ -1,277 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.controller; - -import cn.hutool.json.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.nu.modules.iot.tplink.camerainfo.entity.AppCameraInfo; -import com.nu.modules.iot.tplink.camerainfo.service.IAppCameraInfoService; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import java.util.Map; - -/** -* @Description: API-摄像头信息 -* @Author: jeecg-boot -* @Date: 2025-01-17 -* @Version: V1.0 -*/ -@RestController -@RequestMapping("/api/iot/tplink/cameraInfo") -@Slf4j -public class AppCameraInfoController extends JeecgController { - @Autowired - private IAppCameraInfoService service; - - /** - * 分页列表查询 - * - * @param CameraInfo - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @GetMapping(value = "/list") - public Result> queryPageList(AppCameraInfo CameraInfo, - @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.findPage(page, CameraInfo); - return Result.OK(pageList); - } - - @GetMapping(value = "/nuList") - public Result> queryNuPageList(AppCameraInfo CameraInfo, - @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.findNuPage(page, CameraInfo); - return Result.OK(pageList); - } - - @GetMapping(value = "/getByNuId") - public Result getByNuId(AppCameraInfo CameraInfo) { - AppCameraInfo entity = service.getByNuId(CameraInfo); - return Result.OK(entity); - } - - /** - * 修改摄像头信息 - * - * @param cameraInfo - * @return - */ - @RequestMapping(value = "/rebootDevice", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result rebootDevice(@RequestBody AppCameraInfo cameraInfo) { - service.rebootDevice(cameraInfo); - return Result.OK("重启成功!"); - } - - /** - * 获取画面基本信息 - * - * @param map - * @return - */ - @PostMapping(value = "/getImageCommon") - public Result getImageCommon(@RequestBody Map map) { - return service.getImageCommon(map); - } - - /** - * 设置画面基本信息 - * - * @param map - * @return - */ - @PostMapping(value = "/setImageCommon") - public Result setImageCommon(@RequestBody Map map) { - return service.setImageCommon(map); - } - - /** - * 获取OSD参数 - * - * @param map - * @return - */ - @PostMapping(value = "/getOsd") - public Result getOsd(@RequestBody Map map) { - return service.getOsd(map); - } - - /** - * 设置OSD参数 - * - * @param map - * @return - */ - @PostMapping(value = "/setOsd") - public Result setOsd(@RequestBody Map map) { - return service.setOsd(map); - } - - /** - * 获取码率参数 - * - * @param map - * @return - */ - @PostMapping(value = "/getVideoParams") - public Result getVideoParams(@RequestBody Map map) { - return service.getVideoParams(map); - } - - /** - * 设置码率参数 - * - * @param map - * @return - */ - @PostMapping(value = "/setVideoParams") - public Result setVideoParams(@RequestBody Map map) { - return service.setVideoParams(map); - } - - /** - * 恢复画面默认值 - * - * @param map - * @return - */ - @PostMapping(value = "/configRecovery") - public Result configRecovery(@RequestBody Map map) { - return service.configRecovery(map); - } - - /** - * 获取摄像头实时播放地址 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/getPreviewUrl") - public Result> getPreviewUrl(AppCameraInfo cameraInfo) { - return service.getPreviewUrl(cameraInfo); - } - - /** - * 报警声音试听 - * - * @param map - * @return - */ - @PostMapping(value = "/testAudio") - public Result testAudio(@RequestBody Map map) { - return service.testAudio(map); - } - - /** - * 搜索某天的录像数据 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/searchVideo") - public Result> searchVideo(AppCameraInfo cameraInfo, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - return service.searchVideo(pageNo, pageSize, cameraInfo); - } - - /** - * 获取摄像头录像回放地址 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/getPlaybackUrlList") - public Result> getPlaybackUrlList(AppCameraInfo cameraInfo) { - return service.getPlaybackUrlList(cameraInfo); - } - - /** - * 删除回放通道 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/deletePlaybackChn") - public Result deletePlaybackChn(AppCameraInfo cameraInfo) { - return service.deletePlaybackChn(cameraInfo); - } - - /** - * 获取摄像头录像回放地址 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/getMultitransUrl") - public Result> getMultitransUrl(AppCameraInfo cameraInfo) throws Exception{ - return service.getMultitransUrl(cameraInfo); - } - - /** - * 回放视频转mp4上传 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/uploadToServer") - public Result uploadToServer(AppCameraInfo cameraInfo) throws Exception{ - return service.uploadToServer(cameraInfo); - } - - /** - * 停止转存MP4上传任务 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/stopUploadToServer") - public Result stopUploadToServer(AppCameraInfo cameraInfo) throws Exception{ - return service.stopUploadToServer(cameraInfo); - } - - /** - * 获取转存MP4上传任务进度 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/getUploadToServerProcess") - public Result getUploadToServerProcess(AppCameraInfo cameraInfo) throws Exception{ - return service.getUploadToServerProcess(cameraInfo); - } - - /** - * 高速球机移动方向控制 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/motionCtrl") - public Result motionCtrl(AppCameraInfo cameraInfo) throws Exception{ - return service.motionCtrl(cameraInfo); - } - - @AutoLog(value = "设备报修") - @ApiOperation(value="设备报修", notes="设备报修") - @RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result baoxiu(@RequestBody AppCameraInfo cameraInfo) { - service.baoxiu(cameraInfo); - return Result.OK("操作成功!"); - } -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppCameraInfo.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppCameraInfo.java deleted file mode 100644 index 31287043..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppCameraInfo.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.entity; - -import cn.hutool.json.JSONObject; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecg.common.aspect.annotation.Dict; -import org.jeecgframework.poi.excel.annotation.Excel; - -import java.io.Serializable; - -/** - * @Description: 护理单元-物联管理-TPLINK摄像头信息 - * @Author: jeecg-boot - * @Date: 2025-01-17 - * @Version: V1.0 - */ -@Data -@TableName("nu_iot_tplink_camera") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tplink_camera对象", description="护理单元-物联管理-TPLINK摄像头信息") -public class AppCameraInfo implements Serializable { - private static final long serialVersionUID = 1L; - - /**ID*/ - @TableId(type = IdType.AUTO) - @ApiModelProperty(value = "ID") - private Integer id; - /**设备编码*/ - @Excel(name = "设备编码", width = 15) - @ApiModelProperty(value = "设备编码") - private String sn; - /**设备序号*/ - @Excel(name = "设备序号", width = 15) - @ApiModelProperty(value = "设备序号") - private String deviceIndex; - /**设备名称*/ - @Excel(name = "设备名称", width = 15) - @ApiModelProperty(value = "设备名称") - private String deviceName; - /**设备类型*/ - @Excel(name = "设备类型", width = 15) - @ApiModelProperty(value = "设备类型") - private String deviceType; - /**设备状态 0 离线 1 在线 2 重启中 3 升级中 4 配置中 5 同步中*/ - @Excel(name = "设备状态 0 离线 1 在线 2 重启中 3 升级中 4 配置中 5 同步中", width = 15, dicCode = "tplink_status") - @Dict(dicCode = "tplink_status") - @ApiModelProperty(value = "设备状态 0 离线 1 在线 2 重启中 3 升级中 4 配置中 5 同步中") - private String deviceStatus; - /**设备型号*/ - @Excel(name = "设备型号", width = 15) - @ApiModelProperty(value = "设备型号") - private String deviceModel; - /**IP地址*/ - @Excel(name = "IP地址", width = 15) - @ApiModelProperty(value = "IP地址") - private String ip; - /**MAC地址*/ - @Excel(name = "MAC地址", width = 15) - @ApiModelProperty(value = "MAC地址") - private String mac; - /**分组ID*/ - @Excel(name = "分组ID", width = 15) - @ApiModelProperty(value = "分组ID") - private String regionId; - /**分组名称*/ - @Excel(name = "分组名称", width = 15) - @ApiModelProperty(value = "分组名称") - private String regionName; - /**父设备ID*/ - @Excel(name = "父设备ID", width = 15) - @ApiModelProperty(value = "父设备ID") - private String parentId; - /**父设备名称*/ - @Excel(name = "父设备名称", width = 15) - @ApiModelProperty(value = "父设备名称") - private String parentDeviceName; - /**项目ID*/ - @Excel(name = "项目ID", width = 15) - @ApiModelProperty(value = "项目ID") - private String projectId; - /**项目名称*/ - @Excel(name = "项目名称", width = 15) - @ApiModelProperty(value = "项目名称") - private String projectName; - /**软件版本*/ - @Excel(name = "软件版本", width = 15) - @ApiModelProperty(value = "软件版本") - private String firmwareVer; - /**硬件版本*/ - @Excel(name = "硬件版本", width = 15) - @ApiModelProperty(value = "硬件版本") - private String hardwareVer; - /**用户权限类型 -1 无权限 0 可读 1 可控制 2 可配置 3 可控制/配置 4 所有*/ - @Excel(name = "用户权限类型 -1 无权限 0 可读 1 可控制 2 可配置 3 可控制/配置 4 所有", width = 15, dicCode = "tplink_manager_auth_type") - @Dict(dicCode = "tplink_manager_auth_type") - @ApiModelProperty(value = "用户权限类型 -1 无权限 0 可读 1 可控制 2 可配置 3 可控制/配置 4 所有") - private String managerAuthType; - /**告警消息权限 1 有权限 -1 无权限*/ - @Excel(name = "告警消息权限 1 有权限 -1 无权限", width = 15, dicCode = "tplink_msg_auth_type") - @Dict(dicCode = "tplink_msg_auth_type") - @ApiModelProperty(value = "告警消息权限 1 有权限 -1 无权限") - private String msgAuthType; - /**扩展信息*/ - @Excel(name = "扩展信息", width = 15) - @ApiModelProperty(value = "扩展信息") - @TableField(exist = false) - private JSONObject extend; - /**国标编码*/ - @Excel(name = "国标编码", width = 15) - @ApiModelProperty(value = "国标编码") - private String sipCode; - /**位置名称*/ - @Excel(name = "位置名称", width = 15) - @ApiModelProperty(value = "位置名称") - private String locationName; - /**系统类型 public 通用 vms 监控 nms 网络 evcs 新能源充电桩 rms 客控 nbs 音箱 bas 楼控 ams 门禁 smart_agriculture 智慧农业 vps 停车管理 aaa 认证计费*/ - @Excel(name = "系统类型 public 通用 vms 监控 nms 网络 evcs 新能源充电桩 rms 客控 nbs 音箱 bas 楼控 ams 门禁 smart_agriculture 智慧农业 vps 停车管理 aaa 认证计费", width = 15, dicCode = "tplink_system_type") - @Dict(dicCode = "tplink_system_type") - @ApiModelProperty(value = "系统类型 public 通用 vms 监控 nms 网络 evcs 新能源充电桩 rms 客控 nbs 音箱 bas 楼控 ams 门禁 smart_agriculture 智慧农业 vps 停车管理 aaa 认证计费") - private String systemType; - /**协议类型*/ - @Excel(name = "协议类型", width = 15) - @ApiModelProperty(value = "协议类型") - private String protocol; - /**置顶的时间*/ - @Excel(name = "用户设置置顶的时间，毫秒级时间戳", width = 15) - @ApiModelProperty(value = "用户设置置顶的时间，毫秒级时间戳") - @TableField(exist = false) - private String topTime; - /**护理单元*/ - @ApiModelProperty(value = "护理单元ID") - @Dict(dictTable ="nu_base_info",dicText = "nu_name",dicCode = "code") - private String nuId; - /**护理单元*/ - @ApiModelProperty(value = "护理单元") - @TableField(exist = false) - private String nuName; - @ApiModelProperty(value = "码流类型 0 代表主码流，1 代码子码流") - @TableField(exist = false) - private int streamType; - - /** - * 能力集属性 ==> - */ - @ApiModelProperty(value = "运动检测") - @TableField(exist = false) - private String motionDetection; - @ApiModelProperty(value = "视频封面") - @TableField(exist = false) - private String videoCover; - @ApiModelProperty(value = "云台") - @TableField(exist = false) - private String ptz; - @ApiModelProperty(value = "motor") - @TableField(exist = false) - private String motor; - @ApiModelProperty(value = "smartCode") - @TableField(exist = false) - private String smartCode; - @ApiModelProperty(value = "强制在H.264编码过程中生成IDR帧的函数") - @TableField(exist = false) - private String forceIdrFrame; - @ApiModelProperty(value = "音频") - @TableField(exist = false) - private String audio; - @ApiModelProperty(value = "本地存储") - @TableField(exist = false) - private String localStorage; - @ApiModelProperty(value = "回放API本版") - @TableField(exist = false) - private String playbackApiVersionTwo; - @ApiModelProperty(value = "多变性") - @TableField(exist = false) - private String multitrans; - @ApiModelProperty(value = "客流") - @TableField(exist = false) - private String passengerFlow; - @ApiModelProperty(value = "获取预览缩略图") - @TableField(exist = false) - private String getPreviewThumbnail; - @ApiModelProperty(value = "JPG预览缩略图") - @TableField(exist = false) - private String previewThumbnailJpeg; - @ApiModelProperty(value = "走廊") - @TableField(exist = false) - private String corridorMod; - @ApiModelProperty(value = "背光共存") - @TableField(exist = false) - private String backlightCoexistence; - /** - * <== 能力集属性 - */ - @ApiModelProperty(value = "查询日期") - @TableField(exist = false) - private String dataDate; - @ApiModelProperty(value = "设备索引") - @TableField(exist = false) - private String videoDevId; - @ApiModelProperty(value = "存储设备ID") - @TableField(exist = false) - private String storageDevId; - @ApiModelProperty(value = "存储设备名称") - @TableField(exist = false) - private String storageDevName; - @ApiModelProperty(value = "双摄IPC通道ID,双摄IPC的全景摄像头，其值为0.双摄IPC的特写摄像头，其值为1") - @TableField(exist = false) - private String channelId; - @ApiModelProperty(value = "当录像存在存储池中, 录像所属的nvs的ID") - @TableField(exist = false) - private String nvsIdInPoolList; - @ApiModelProperty(value = "录像开始时间. GMT时间，即1970.1.1零时至今的秒数") - @TableField(exist = false) - private String startTime; - @ApiModelProperty(value = "录像结束时间. GMT时间，即1970.1.1零时至今的秒数") - @TableField(exist = false) - private String endTime; - @ApiModelProperty(value = "录像开始时间,YYYY-MM-DD HH:MI:SS") - @TableField(exist = false) - private String startTimeFt; - @ApiModelProperty(value = "录像结束时间,YYYY-MM-DD HH:MI:SS") - @TableField(exist = false) - private String endTimeFt; - @ApiModelProperty(value = "录像时长,HH:MI:SS") - @TableField(exist = false) - private String duration; - @ApiModelProperty(value = "回放录像类型。1: 定时录像; 2: 移动侦测等") - @TableField(exist = false) - private String videoType; - @ApiModelProperty(value = "录像片段大小，单位字节") - @TableField(exist = false) - private String size; - @ApiModelProperty(value = "错误码") - @TableField(exist = false) - private String errorCode; - @ApiModelProperty(value = "错误描述") - @TableField(exist = false) - private String errorMsg; - @ApiModelProperty(value = "录像存储设备类型 -1：未找到，0:ipc，1:nvr，2：nvs：3：server，4：vcs，5：storagePool") - @TableField(exist = false) - private String storageType; - @ApiModelProperty(value = "预览/回放url") - @TableField(exist = false) - private String url; - @ApiModelProperty(value = "预览/回放备用url") - @TableField(exist = false) - private String backupUrl; - @ApiModelProperty(value = "ws连接传输视频地址") - @TableField(exist = false) - private String wsUrl; - @ApiModelProperty(value = "wss接传输视频地址") - @TableField(exist = false) - private String wssUrl; - @ApiModelProperty(value = "预览/回放通道对应的sessionId") - @TableField(exist = false) - private String sessionId; - @ApiModelProperty(value = "双摄IPC通道ID") - @TableField(exist = false) - private String videoChannelId; - @ApiModelProperty(value = "回放速率") - @TableField(exist = false) - private String scale; - @ApiModelProperty(value = "回放api访问前缀") - @TableField(exist = false) - private String queryAddress; - @ApiModelProperty(value = "录像开关;枚举:[0:表示关,1:表示开]") - @TableField(exist = false) - private String recordSwitch; - @ApiModelProperty(value = "任务taskId") - @TableField(exist = false) - private String taskId; - @ApiModelProperty(value = "上传mp4文件名称") - @TableField(exist = false) - private String fileName; - @ApiModelProperty(value = "上传进度") - @TableField(exist = false) - private String process; - @ApiModelProperty(value = "移动方向;枚举:[0:左上,1:上,2:右上,3:左,4:持续水平转动,5:右,6:左下,7:下,8:右下,9:缩小画面,10:放大画面,11:聚焦近处,12:聚焦远处]") - @TableField(exist = false) - private String direction; - @ApiModelProperty(value = "开始或停止移动;枚举:[0:停止,1:开始]") - @TableField(exist = false) - private String startOrNot; - @ApiModelProperty(value = "球机移动速度") - @TableField(exist = false) - private String speed; - - private String ftpIp; //回放视频转FTP上传IP - private String ftpPort; //回放视频转FTP上传端口 - private String ftpUsername; //回放视频转FTP上传用户 - private String ftpPassword; //回放视频转FTP上传密码 - private String ftpUploadpath; //回放视频转FTP上传路径 - - /**维修状态*/ - private String maintainStatus; -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppErrorCode.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppErrorCode.java deleted file mode 100644 index f6408c77..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppErrorCode.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; - -import java.io.Serializable; - -/** - * @Description: 护理单元-物联管理-TPLINK错误码 - * @Author: jeecg-boot - * @Date: 2025-02-10 - * @Version: V1.0 - */ -@Data -@TableName("nu_iot_tplink_error_code") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tplink_error_code对象", description="护理单元-物联管理-TPLINK错误码") -public class AppErrorCode implements Serializable { - private static final long serialVersionUID = 1L; - - /**错误码*/ - @Excel(name = "错误码", width = 15) - @ApiModelProperty(value = "错误码") - private String errorCode; - /**错误描述*/ - @Excel(name = "错误描述", width = 15) - @ApiModelProperty(value = "错误描述") - private String errorMsg; - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppProjectInfo.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppProjectInfo.java deleted file mode 100644 index f49e626d..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppProjectInfo.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecg.common.aspect.annotation.Dict; -import org.jeecgframework.poi.excel.annotation.Excel; - -import java.io.Serializable; - -/** - * @Description: 护理单元-物联管理-TPLINK项目信息 - * @Author: jeecg-boot - * @Date: 2025-08-08 - * @Version: V1.0 - */ -@Data -@TableName("nu_iot_tplink_project") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tplink_project对象", description="护理单元-物联管理-TPLINK项目信息") -public class AppProjectInfo implements Serializable { - private static final long serialVersionUID = 1L; - - /**ID*/ - @TableId(type = IdType.AUTO) - @ApiModelProperty(value = "ID") - private Integer id; - /**项目ID*/ - @Excel(name = "项目ID", width = 15) - @ApiModelProperty(value = "项目ID") - private String projectId; - /**项目名称*/ - @Excel(name = "项目名称", width = 15) - @ApiModelProperty(value = "项目名称") - private String projectName; - /**机构ID*/ - @Excel(name = "机构ID", width = 15) - @ApiModelProperty(value = "机构ID") - @Dict(dicCode = "id" , dictTable = "sys_depart" , dicText = "depart_name") - private String institutionId; - /**创建时间戳，单位秒*/ - @ApiModelProperty(value = "创建时间戳，单位秒") - private String createTime; - @TableField(exist = false) - @ApiModelProperty(value = "创建时间，年月日时分秒") - private String createTimeStr; - /**设备数量*/ - @Excel(name = "设备数量", width = 15) - @ApiModelProperty(value = "设备数量") - private Integer deviceNum; - /**消息数量*/ - @Excel(name = "消息数量", width = 15) - @ApiModelProperty(value = "消息数量") - private Integer messageNum; - /**项目次序*/ - @Excel(name = "项目次序", width = 15) - @ApiModelProperty(value = "项目次序") - private Integer sort; - /**项目次序，接口对应字段，在数据库中是关键字，数据库中用sort代替order*/ - @ApiModelProperty(value = "项目次序") - @TableField(exist = false) - private String order; - /** 离线设备数*/ - @Excel(name = "离线设备数", width = 15) - @ApiModelProperty(value = "离线设备数") - private Integer offlineNum; - /**异常设备数*/ - @Excel(name = "异常设备数", width = 15) - @ApiModelProperty(value = "异常设备数") - private Integer abnormalNum; - /**未读消息数*/ - @Excel(name = "未读消息数", width = 15) - @ApiModelProperty(value = "未读消息数") - private Integer unreadMessageNum; - /**nms设备总数*/ - @Excel(name = "nms设备总数", width = 15) - @ApiModelProperty(value = "nms设备总数") - private Integer totalNmsDevNum; - /**vms设备总数*/ - @Excel(name = "vms设备总数", width = 15) - @ApiModelProperty(value = "vms设备总数") - private Integer totalVmsDevNum; - /**nbs设备总数*/ - @Excel(name = "nbs设备总数", width = 15) - @ApiModelProperty(value = "nbs设备总数") - private Integer totalNbsDevNum; - /**离线nms设备总数*/ - @Excel(name = "离线nms设备总数", width = 15) - @ApiModelProperty(value = "离线nms设备总数") - private Integer offlineNmsDevNum; - /**离线vms设备总数*/ - @Excel(name = "离线vms设备总数", width = 15) - @ApiModelProperty(value = "离线vms设备总数") - private Integer offlineVmsDevNum; - /**离线nbs设备总数*/ - @Excel(name = "离线nbs设备总数", width = 15) - @ApiModelProperty(value = "离线nbs设备总数") - private Integer offlineNbsDevNum; - /**运行时间，单位s*/ - @Excel(name = "运行时间，单位s", width = 15) - @ApiModelProperty(value = "运行时间，单位s") - private Integer runningTime; - @TableField(exist = false) - @ApiModelProperty(value = "运行天数") - private String runningTimeStr; - /**状态1正常 2冻结*/ - @Excel(name = "状态1正常 2冻结", width = 15) - @ApiModelProperty(value = "状态1正常 2冻结") - private Integer status; - /**是否有叶子节点: 1是0否*/ - @Excel(name = "是否有叶子节点: 1是0否", width = 15) - @ApiModelProperty(value = "是否有叶子节点: 1是0否") - private Integer izLeaf; -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppRegionInfo.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppRegionInfo.java deleted file mode 100644 index 5f70a14d..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppRegionInfo.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecg.common.aspect.annotation.Dict; -import org.jeecgframework.poi.excel.annotation.Excel; - -import java.io.Serializable; - -/** - * @Description: 护理单元-物联管理-TPLINK分组信息 - * @Author: jeecg-boot - * @Date: 2025-02-20 - * @Version: V1.0 - */ -@Data -@TableName("nu_iot_tplink_region") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tplink_region对象", description="护理单元-物联管理-TPLINK分组信息") -public class AppRegionInfo implements Serializable { - private static final long serialVersionUID = 1L; - - /**ID*/ - @TableId(type = IdType.AUTO) - @ApiModelProperty(value = "ID") - private Integer id; - /**分组ID*/ - @Excel(name = "分组ID", width = 15) - @ApiModelProperty(value = "分组ID") - private String regionId; - /**分组名称*/ - @Excel(name = "分组名称", width = 15) - @ApiModelProperty(value = "分组名称") - private String regionName; - /**机构ID*/ - @Excel(name = "区域ID", width = 15) - @ApiModelProperty(value = "区域ID") - @Dict(dicCode = "id" , dictTable = "sys_depart" , dicText = "depart_name") - private String areaId; - @Excel(name = "机构ID", width = 15) - @ApiModelProperty(value = "机构ID") - @Dict(dicCode = "id" , dictTable = "sys_depart" , dicText = "depart_name") - private String institutionId; - /**分组层级*/ - @Excel(name = "分组层级", width = 15) - @ApiModelProperty(value = "分组层级") - private String regionLevel; - /**分组次序，接口对应字段，在数据库中是关键字，数据库中用sort代替order*/ - @ApiModelProperty(value = "项目次序") - @TableField(exist = false) - private String order; - /**项目次序*/ - @Excel(name = "项目次序", width = 15) - @ApiModelProperty(value = "项目次序") - private Integer sort; - /**父分组ID*/ - @Excel(name = "父分组ID", width = 15) - @ApiModelProperty(value = "父分组ID") - private String parentId; - /**父分组ID*/ - @Excel(name = "父分组", width = 15) - @ApiModelProperty(value = "父分组") - @TableField(exist = false) - private String parentName; - /**项目ID*/ - @Excel(name = "项目ID", width = 15) - @ApiModelProperty(value = "项目ID") - private String projectId; - /**项目名称*/ - @Excel(name = "项目名称", width = 15) - @ApiModelProperty(value = "项目名称") - @TableField(exist = false) - private String projectName; - /**系统类型*/ - @Excel(name = "系统类型", width = 15) - @ApiModelProperty(value = "系统类型") - private String sysType; - /**流道*/ - @Excel(name = "流道", width = 15) - @ApiModelProperty(value = "流道") - private String streamWay; - /**是否有子分组*/ - @Excel(name = "是否有子分组", width = 15) - @ApiModelProperty(value = "是否有子分组 0无 1有") - private String hasChildren; - /**分组类型*/ - @Excel(name = "分组类型", width = 15) - @ApiModelProperty(value = "分组类型") - private String regionType; - /**更新时间*/ - @Excel(name = "更新时间", width = 15) - @ApiModelProperty(value = "更新时间，年月日时分秒") - private String updateTime; - /**流媒体服务器ID*/ - @Excel(name = "流媒体服务器ID", width = 15) - @ApiModelProperty(value = "流媒体服务器ID") - private String mediaServerId; - /**备用流媒体服务器ID*/ - @Excel(name = "备用流媒体服务器ID", width = 15) - @ApiModelProperty(value = "备用流媒体服务器ID") - private String backupMediaServerId; - /**绑定类型*/ - @Excel(name = "绑定类型", width = 15) - @ApiModelProperty(value = "绑定类型 0:设备直接取流/流媒体转发模式，1: 自动模式") - private String bindType; - /**是否有叶子节点: 1是0否*/ - @Excel(name = "是否有叶子节点: 1是0否", width = 15) - @ApiModelProperty(value = "是否有叶子节点: 1是0否") - private Integer izLeaf; -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppTumsConfig.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppTumsConfig.java deleted file mode 100644 index e3131a0b..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppTumsConfig.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @Description: 护理单元-物联管理-TPLINK图门系统配置信息 - * @Author: caolei - * @Date: 2025-03-31 - * @Version: V1.0 - */ -@Data -@TableName("nu_iot_tplink_tums_base") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tplink_tums_base", description="护理单元-物联管理-TPLINK图门系统配置信息") -public class AppTumsConfig implements Serializable { - private static final long serialVersionUID = 1L; - /**ID*/ - @TableId(type = IdType.AUTO) - @ApiModelProperty(value = "ID") - private Integer id; - private String tumsUrl; //获取图门系统地址 -// private String tumsProjectId; //图门系统登录项目ID -// @TableField(exist = false) -// private String tumsProjectName; //图门系统登录项目ID -// private String tumsUserId; // 图门系统登录用户ID - private String tumsUsername; // 获取图门系统用户 - private String tumsPassword; //获取图门系统密码 -// private String tumsRoleId; //图门系统角色ID - private String ftpIp; //回放视频转FTP上传IP - private String ftpPort; //回放视频转FTP上传端口 - private String ftpUsername; //回放视频转FTP上传用户 - private String ftpPassword; //回放视频转FTP上传密码 - private String ftpUploadpath; //回放视频转FTP上传路径 - private String updateDate; //更新时间 -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/enums/AppApiEnum.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/enums/AppApiEnum.java deleted file mode 100644 index 6299eb25..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/enums/AppApiEnum.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -/** - * 接口枚举类 - */ -@Getter -@RequiredArgsConstructor -public enum AppApiEnum { - //前缀对应相应设备的API，无前缀则是公用API - //IPC 视频 - //NVS 存储服务器 - //AUDIO 音箱 - //ROUTER 路由器 - //SWITCH 交换机 - //AP 无线路由器 - //AC ⽆线控制器 - - GET_ENCRYPT_KEY_FOR_LOGIN("/tums/account/v1/getEncryptKeyForLogin","获取登录公钥"), - LOGIN("/tums/account/v2/login","登录"), - LOGOUT("/tums/account/v1/logout","注销"), - SET_CURRENT_PROJECT("/tums/resource/v2/setCurrentProject","设置当前项目"), - REBOOT_DEVICE_LIST("/tums/deviceManager/v2/rebootDeviceList","重启设备"), - IPC_PASSTHROUGH("/tums/devConfig/v1/passthrough","设备配置信息"), - IPC_ADD_PREVIEW_CHN("/tums/preview/v1/addPreviewChn","添加预览通道"), - IPC_GET_PREVIEW_URL("/tums/preview/v1/getPreviewUrl","获取预览通道的url"), - IPC_GET_PLAYBACK_URL("/tums/playback/v1/getPlaybackUrl","获取回放通道的url"), - IPC_SUSPEND_PLAYBACK("/tums/playback/v1/suspendPlayback","暂停通道回放"), - IPC_DELETE_PLAYBACK_CHN("/tums/playback/v1/deletePlaybackChn","删除回放通道"), - IPC_GET_STORAGES_BY_ID("/tums/playback/v1/getStoragesById","获取指定监控点的存储设备列表"), - IPC_SEARCH_VIDEO("/tums/playback/v3/searchVideo","搜索当天的录像数据V3"), - IPC_ADD_PLAYBACK_CHN("/tums/playback/v2/addPlaybackChn","添加回放通道V2"), - IPC_GET_MULTITRANS_URL("/tums/playback/v1/getMultitransUrl","获取nvmp设备双向通信URL"), - IPC_UPLOAD_TO_SERVER("/tums/playback/v1/uploadToServer","回放视频转mp4上传"), - IPC_STOP_UPLOAD_TO_SERVER("/tums/preview/v1/stopUploadToServer","停止转存MP4上传任务"), - IPC_GET_UPLOAD_TO_SERVER_PROCESS("/tums/preview/v1/getUploadToServerProcess","获取转存MP4上传任务进度"), - IPC_MOTION_CTRL("/tums/ptz/v1/motionCtrl","高速球机移动方向控制"); - - private final String value;//自定义属性，枚举值，获取：如ApiEnum.GET_ENCRYPT_KEY_FOR_LOGIN.getValue(); - private final String remark;//自定义属性，枚举描述，获取：如ApiEnum.GET_ENCRYPT_KEY_FOR_LOGIN.getRemark(); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppCameraInfoMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppCameraInfoMapper.java deleted file mode 100644 index 08bbfb88..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppCameraInfoMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.iot.tplink.camerainfo.entity.AppCameraInfo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 护理单元-物联管理-摄像头信息 - * @Author: jeecg-boot - * @Date: 2025-01-17 - * @Version: V1.0 - */ - -@Mapper -public interface AppCameraInfoMapper extends BaseMapper { - IPage findPage(Page page, @Param("params") AppCameraInfo cameraInfo); - List findAllList(); - IPage findNuPage(Page page, @Param("params") AppCameraInfo cameraInfo); - AppCameraInfo getByDeviceId(AppCameraInfo cameraInfo); - AppCameraInfo getByNuId(AppCameraInfo cameraInfo); - AppCameraInfo getCapabilityByDeviceId(AppCameraInfo cameraInfo); - void insertCapability(AppCameraInfo cameraInfo); - void updateCapabilityById(AppCameraInfo cameraInfo); - void updateDeviceStatusByDevId(AppCameraInfo cameraInfo); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppErrorCodeMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppErrorCodeMapper.java deleted file mode 100644 index 47787b19..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppErrorCodeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.iot.tplink.camerainfo.entity.AppErrorCode; -import org.apache.ibatis.annotations.Mapper; - -/** - * @Description: 护理单元-物联管理-错误码 - * @Author: jeecg-boot - * @Date: 2025-02-10 - * @Version: V1.0 - */ - -@Mapper -public interface AppErrorCodeMapper extends BaseMapper { - AppErrorCode getByCode(String errorCode); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppProjectInfoMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppProjectInfoMapper.java deleted file mode 100644 index 8f9be51b..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppProjectInfoMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.iot.tplink.camerainfo.entity.AppProjectInfo; - -/** - * @Description: 护理单元-物联管理-TPLINK项目信息 - * @Author: jeecg-boot - * @Date: 2025-08-08 - * @Version: V1.0 - */ -public interface AppProjectInfoMapper extends BaseMapper { - void addProjectInfo(AppProjectInfo projectInfo); - void deleteProjectInfo(); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppRegionInfoMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppRegionInfoMapper.java deleted file mode 100644 index 083d6c26..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppRegionInfoMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.iot.tplink.camerainfo.entity.AppRegionInfo; - -/** - * @Description: 护理单元-物联管理-TPLINK分组信息 - * @Author: jeecg-boot - * @Date: 2025-02-20 - * @Version: V1.0 - */ -public interface AppRegionInfoMapper extends BaseMapper { - void addRegionInfo(AppRegionInfo regionInfo); - void deleteRegionInfo(); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppTumsConfigMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppTumsConfigMapper.java deleted file mode 100644 index 500101ed..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/AppTumsConfigMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.iot.tplink.camerainfo.entity.AppTumsConfig; -import org.apache.ibatis.annotations.Mapper; - -/** - * @Description: 护理单元-物联管理-配置信息 - * @Author: jeecg-boot - * @Date: 2025-02-10 - * @Version: V1.0 - */ - -@Mapper -public interface AppTumsConfigMapper extends BaseMapper { - AppTumsConfig getByCode(); - void addConfig(AppTumsConfig appTumsConfig); - void deleteConfig(); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppCameraInfoMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppCameraInfoMapper.xml deleted file mode 100644 index cd28f7a7..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppCameraInfoMapper.xml +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - - - - - - - - - - - - insert into nu_iot_tplink_camera_capability ( - id, - device_index, - motion_detection, - video_cover, - ptz, - motor, - smart_code, - force_idr_frame, - audio, - local_storage, - playback_api_version_two, - multitrans, - passenger_flow, - get_preview_thumbnail, - preview_thumbnail_jpeg, - corridor_mod, - backlight_coexistence - ) - values ( - #{id}, - #{deviceIndex}, - #{motionDetection}, - #{videoCover}, - #{ptz}, - #{motor}, - #{smartCode}, - #{forceIdrFrame}, - #{audio}, - #{localStorage}, - #{playbackApiVersionTwo}, - #{multitrans}, - #{passengerFlow}, - #{getPreviewThumbnail}, - #{previewThumbnailJpeg}, - #{corridorMod}, - #{backlightCoexistence} - ) - - - - UPDATE nu_iot_tplink_camera_capability - SET - device_index = #{deviceIndex}, - motion_detection = #{motionDetection}, - video_cover = #{videoCover}, - ptz = #{ptz}, - motor = #{motor}, - smart_code = #{smartCode}, - force_idr_frame = #{forceIdrFrame}, - audio = #{audio}, - local_storage = #{localStorage}, - playback_api_version_two = #{playbackApiVersionTwo}, - multitrans = #{multitrans}, - passenger_flow = #{passengerFlow}, - get_preview_thumbnail = #{getPreviewThumbnail}, - preview_thumbnail_jpeg = #{previewThumbnailJpeg}, - corridor_mod = #{corridorMod}, - backlight_coexistence = #{backlightCoexistence} - where id = #{id} - - - - UPDATE nu_iot_tplink_camera - SET device_status = #{deviceStatus} - where device_index = #{deviceIndex} - - - diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppErrorCodeMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppErrorCodeMapper.xml deleted file mode 100644 index 8d2533c1..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppErrorCodeMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppProjectInfoMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppProjectInfoMapper.xml deleted file mode 100644 index 9c9759d7..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppProjectInfoMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - insert into nu_iot_tplink_project( - id, - project_id, - project_name - ) - values ( - #{id}, - #{projectId}, - #{projectName} - ) - - - - delete from nu_iot_tplink_project - - - diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppRegionInfoMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppRegionInfoMapper.xml deleted file mode 100644 index 18c0c13a..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppRegionInfoMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - insert into nu_iot_tplink_region( - id, - region_id, - region_name, - project_id, - region_type - ) - values ( - #{id}, - #{regionId}, - #{regionName}, - #{projectId}, - #{regionType} - ) - - - - delete from nu_iot_tplink_region - - - diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppTumsConfigMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppTumsConfigMapper.xml deleted file mode 100644 index 105ed802..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppTumsConfigMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - insert into nu_iot_tplink_tums_base( - id, - tums_url, - tums_username, - tums_password, - ftp_ip, - ftp_port, - ftp_username, - ftp_password, - ftp_uploadpath, - update_date - ) - values ( - #{id}, - #{tumsUrl}, - #{tumsUsername}, - #{tumsPassword}, - #{ftpIp}, - #{ftpPort}, - #{ftpUsername}, - #{ftpPassword}, - #{ftpUploadpath}, - #{updateDate} - ) - - - - delete from nu_iot_tplink_tums_base - - - diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppCameraInfoService.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppCameraInfoService.java deleted file mode 100644 index bd1483db..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppCameraInfoService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.service; - -import cn.hutool.json.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.iot.tplink.camerainfo.entity.AppCameraInfo; -import org.jeecg.common.api.vo.Result; - -import java.util.Map; - -/** - * @Description: 护理单元-物联管理-摄像头信息 - * @Author: jeecg-boot - * @Date: 2025-01-17 - * @Version: V1.0 - */ -public interface IAppCameraInfoService extends IService { - IPage findPage(Page page, AppCameraInfo cameraInfo); - IPage findNuPage(Page page, AppCameraInfo cameraInfo); - AppCameraInfo getByNuId(AppCameraInfo cameraInfo); - void rebootDevice(AppCameraInfo cameraInfo); - Result getImageCommon(Map map); - Result setImageCommon(Map map); - Result getOsdCapability(Map map); - Result getOsd(Map map); - Result setOsd(Map map); - Result getVideoParams(Map map); - Result setVideoParams(Map map); - Result configRecovery(Map map); - Result> getPreviewUrl(AppCameraInfo cameraInfo); - Result getTamperDet(Map map); - Result setTamperDet(Map map); - Result getTamperNotif(Map map); - Result setTamperNotif(Map map); - Result testAudio(Map map); - Result getAlarmInfo(Map map); - Result setAlarmInfo(Map map); - Result getAlarmPlan(Map map); - Result setAlarmPlan(Map map); - Result> searchVideo(Integer pageNo, Integer pageSize, AppCameraInfo cameraInfo); - Result> getPlaybackUrlList(AppCameraInfo cameraInfo); - Result deletePlaybackChn(AppCameraInfo cameraInfo); - Result> getMultitransUrl(AppCameraInfo cameraInfo) throws Exception; - Result uploadToServer(AppCameraInfo cameraInfo); - Result stopUploadToServer(AppCameraInfo cameraInfo); - Result getUploadToServerProcess(AppCameraInfo cameraInfo); - Result motionCtrl(AppCameraInfo cameraInfo); - - void baoxiu(AppCameraInfo cameraInfo); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppErrorCodeService.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppErrorCodeService.java deleted file mode 100644 index fc57d521..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppErrorCodeService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.iot.tplink.camerainfo.entity.AppErrorCode; - -/** - * @Description: 护理单元-物联管理-错误码 - * @Author: jeecg-boot - * @Date: 2025-02-10 - * @Version: V1.0 - */ -public interface IAppErrorCodeService extends IService { - AppErrorCode getByCode(String errorCode); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppTumsConfigService.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppTumsConfigService.java deleted file mode 100644 index c4f80dac..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppTumsConfigService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.iot.tplink.camerainfo.entity.AppTumsConfig; - -/** - * @Description: 护理单元-物联管理-图门系统配置 - * @Author: jeecg-boot - * @Date: caolei - * @Version: V1.0 - */ -public interface IAppTumsConfigService extends IService { - AppTumsConfig getByCode(); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppCameraInfoServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppCameraInfoServiceImpl.java deleted file mode 100644 index 72d93320..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppCameraInfoServiceImpl.java +++ /dev/null @@ -1,1984 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.service.impl; - -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.nu.modules.iot.tplink.camerainfo.entity.AppCameraInfo; -import com.nu.modules.iot.tplink.camerainfo.entity.AppErrorCode; -import com.nu.modules.iot.tplink.camerainfo.mapper.AppCameraInfoMapper; -import com.nu.modules.iot.tplink.camerainfo.entity.AppTumsConfig; -import com.nu.modules.iot.tplink.camerainfo.mapper.AppTumsConfigMapper; -import com.nu.modules.iot.tplink.camerainfo.service.IAppCameraInfoService; -import com.nu.modules.iot.tplink.camerainfo.service.IAppErrorCodeService; -import com.nu.modules.iot.tplink.camerainfo.utils.AppTumsApi; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.compress.utils.Lists; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.util.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static java.lang.Thread.sleep; - -/** - * @Description: 护理单元-物联管理-摄像头信息 - * @Author: jeecg-boot - * @Date: 2025-01-17 - * @Version: V1.0 - */ -@Service -@Slf4j -public class AppCameraInfoServiceImpl extends ServiceImpl implements IAppCameraInfoService { - - @Autowired - private AppTumsApi tumsApi; - @Autowired - private IAppErrorCodeService errorCodeService; - @Autowired - private AppTumsConfigMapper tumsConfigMapper; - - @Lazy - @Autowired - private AppCameraInfoServiceImpl syncImpl; - - /** - * 获取摄像头信息-分页 - * @param page - * @param cameraInfo - * @return - */ - public IPage findPage(Page page, AppCameraInfo cameraInfo){ - return baseMapper.findPage(page,cameraInfo); - } - - /** - * 获取护理单元信息 - * @return - */ - public IPage findNuPage(Page page, AppCameraInfo cameraInfo){ - return baseMapper.findNuPage(page,cameraInfo); - } - - /** - * 获取护理单元信息 - * @return - */ - public AppCameraInfo getByNuId(AppCameraInfo cameraInfo){ - return baseMapper.getByNuId(cameraInfo); - } - - /** - * 调用接口-重启摄像头设备 - * @param cameraInfo - * @return - */ - public Result rebootDeviceList(AppCameraInfo cameraInfo){ - //1、先设置项目 2、重启设备 - String projectId = cameraInfo.getProjectId(); - String id = cameraInfo.getDeviceIndex(); - StringBuffer psb = new StringBuffer(); - psb.append("{"); - psb.append("\"projectId\"").append(":").append("\"").append(projectId).append("\""); - psb.append("}"); - String pJsonRes = tumsApi.setCurrentProject(psb.toString()); - JSONObject pJsonObject = new JSONObject(pJsonRes); - if(pJsonObject.getInt("error_code").equals(0)){ - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"deviceIndexList\"").append(":").append("[\"").append(id).append("\"]"); - sb.append("}"); - String jsonRes = tumsApi.rebootDeviceList(sb.toString()); - JSONObject jsonObject = new JSONObject(jsonRes); - if(jsonObject.getInt("error_code").equals(0)){ - return Result.OK(); - }else{ - return Result.error(jsonObject.getStr("msg")); - } - }else{ - return Result.error(pJsonObject.getStr("msg")); - } - } - - /** - * 重启摄像头设备 - * @param cameraInfo - * @return - */ - @Override - public void rebootDevice(AppCameraInfo cameraInfo){ - rebootDeviceList(cameraInfo); - } - - /** - * 获取画面基本信息 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getImageCommon(Map map){ - String id = map.get("deviceIndex").toString(); - String type = map.get("type").toString(); - 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); - return Result.OK(data); - }else{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("getImageCommon:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("getImageCommon:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置画面基本信息 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setImageCommon(Map map){ - String id = map.get("deviceIndex").toString(); - String type = map.get("type").toString(); - 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{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("getImageCommon:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("setImageCommon:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取OSD能力集参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getOsdCapability(Map map){ - String id = map.get("deviceIndex").toString(); - 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("\"osd_capability\"").append(":").append("{"); - sb.append("\"name\"").append(":").append("\"capability\""); - 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 osdCapability = (JSONObject)responseData.get("osd_capability"); - JSONObject capability = (JSONObject)osdCapability.get("capability"); - return Result.OK(capability); - }else{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("getOsdCapability:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("getOsdCapability:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取OSD参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getOsd(Map map){ - String id = map.get("deviceIndex").toString(); - 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("\"OSD\"").append(":").append("{"); - sb.append("\"name\"").append(":[").append("\"font\",").append("\"week\",").append("\"date\"").append("],"); - sb.append("\"table\"").append(":").append("\"label_info\""); - 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 osd = (JSONObject)responseData.get("OSD"); - return Result.OK(osd); - }else{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("getOsd:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("getOsd:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置OSD参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setOsd(Map map){ - String id = map.get("deviceIndex").toString(); - String dateEnabled = map.get("dateEnabled").toString(); - String weekEnabled = map.get("weekEnabled").toString(); - String labelEnabled = map.get("labelEnabled").toString(); - String mainFontPixel = map.get("mainFontPixel").toString(); - 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("\"OSD\"").append(":").append("{"); - sb.append("\"font\"").append(":").append("{"); - sb.append("\"display\"").append(":").append("\"ntnb\","); - sb.append("\"main_font_pixel\"").append(":").append(mainFontPixel); - sb.append("},"); - sb.append("\"date\"").append(":").append("{"); - sb.append("\"enabled\"").append(":").append("\"").append(dateEnabled).append("\""); - sb.append("},"); - sb.append("\"week\"").append(":").append("{"); - sb.append("\"enabled\"").append(":").append("\"").append(weekEnabled).append("\""); - sb.append("},"); - sb.append("\"label_info_1\"").append(":").append("{"); - sb.append("\"enabled\"").append(":").append("\"").append(labelEnabled).append("\""); - 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{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("setOsd:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("setOsd:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取码率参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getVideoParams(Map map){ - String id = map.get("deviceIndex").toString(); - 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("\"video\"").append(":").append("{"); - sb.append("\"name\"").append(":[").append("\"main\"").append(",").append("\"minor\"").append("]"); - sb.append("},"); - sb.append("\"video_capability\"").append(":").append("{"); - sb.append("\"name\"").append(":[").append("\"main\"").append(",").append("\"minor\"").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 resObject = new JSONObject(); - JSONObject video = (JSONObject)responseData.get("video"); - JSONObject mainData = (JSONObject)video.get("main"); - resObject.set("mainData",mainData); - JSONObject minorData = (JSONObject)video.get("minor"); - resObject.set("minorData",minorData); - JSONObject videoCapability = (JSONObject)responseData.get("video_capability"); - JSONObject mainCapability = (JSONObject)videoCapability.get("main"); - JSONArray encodeTypes = mainCapability.getJSONArray("encode_types"); - JSONArray mainEncodeTypeArr = new JSONArray(); - for(int i=0;i map){ - String id = map.get("deviceIndex").toString(); - Map mainMap = (Map)map.get("main"); - Map minorMap = (Map)map.get("minor"); - 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("\"video\"").append(":").append("{"); - sb.append("\"main\"").append(":").append("{"); - //类属性+类值 - StringBuffer mainSb = new StringBuffer(); - Set mainKeys = mainMap.keySet(); - // 遍历键的集合并打印每个键 - for (String key : mainKeys) { - String value = mainMap.get(key).toString(); - mainSb.append("\"").append(key).append("\"").append(":").append("\"").append(value).append("\"").append(","); - } - String mainStr = mainSb.toString(); - if(mainStr.length()>0){ - mainStr = mainStr.substring(0,mainStr.length()-1); - } - sb.append(mainStr); - sb.append("},"); - sb.append("\"minor\"").append(":").append("{"); - //类属性+类值 - StringBuffer minorSb = new StringBuffer(); - Set minorKeys = minorMap.keySet(); - // 遍历键的集合并打印每个键 - for (String key : minorKeys) { - String value = minorMap.get(key).toString(); - minorSb.append("\"").append(key).append("\"").append(":").append("\"").append(value).append("\"").append(","); - } - String minorStr = minorSb.toString(); - if(minorStr.length()>0){ - minorStr = minorStr.substring(0,minorStr.length()-1); - } - sb.append(minorStr); - 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{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("setVideoParams:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("setVideoParams:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 恢复画面默认值 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result configRecovery(Map map){ - String id = map.get("deviceIndex").toString(); - 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("\"do\"").append(","); - sb.append("\"system\"").append(":").append("{"); - sb.append("\"config_recovery\"").append(":").append("{"); - sb.append("\"config_name\"").append(":").append("[").append("\"image\"").append("]"); - 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{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("configRecovery:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("configRecovery:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取摄像头实时播放地址 - * 添加预览通道 - * @param cameraInfo - * @return - */ - @Override - public Result> getPreviewUrl(AppCameraInfo cameraInfo){ - Map map = new HashMap<>(); - map.put("url",""); - map.put("backupUrl",""); - map.put("wsUrl",""); - map.put("wssUrl",""); - String id = cameraInfo.getDeviceIndex(); - int streamType = cameraInfo.getStreamType(); - StringBuffer addPreviewSb = new StringBuffer(); - addPreviewSb.append("{"); - addPreviewSb.append("\"id\"").append(":").append("\"").append(id).append("\"").append(","); - addPreviewSb.append("\"streamType\"").append(":").append(streamType); - addPreviewSb.append("}"); - String addPreviewRes = tumsApi.addPreviewChn(addPreviewSb.toString()); - JSONObject jsonObject = new JSONObject(addPreviewRes); - if(jsonObject.getInt("error_code").equals(0)){ - JSONObject addPreviewResult = (JSONObject)jsonObject.get("result"); - String sessionId = addPreviewResult.getStr("sessionId"); - map = getPreviewUrl(id,streamType,sessionId); - } - return Result.OK(map); - } - - /** - * 获取摄像头实时播放地址 - * 获取预览通道的url - * @param id - * @param streamType - * @param sessionId - * @return - */ - private Map getPreviewUrl(String id,int streamType,String sessionId){ - Map map = new HashMap<>(); - map.put("url",""); - map.put("backupUrl",""); - map.put("wsUrl",""); - map.put("wssUrl",""); - StringBuffer getPreviewSb = new StringBuffer(); - getPreviewSb.append("{"); - getPreviewSb.append("\"id\"").append(":").append("\"").append(id).append("\"").append(","); - getPreviewSb.append("\"streamType\"").append(":").append(streamType).append(","); - getPreviewSb.append("\"sessionId\"").append(":").append("\"").append(sessionId).append("\""); - getPreviewSb.append("}"); - String getPreviewSbRes = tumsApi.getPreviewUrl(getPreviewSb.toString()); - JSONObject jsonObject = new JSONObject(getPreviewSbRes); - String errorCode = jsonObject.getStr("error_code"); - if(errorCode.equals("0")){ - JSONObject getPreviewResult = (JSONObject)jsonObject.get("result"); - String url = getPreviewResult.getStr("url"); - String backupUrl = getPreviewResult.getStr("backupUrl"); - String wsUrl = getPreviewResult.getStr("wsUrl"); - String wssUrl = getPreviewResult.getStr("wssUrl"); - map.put("url",url); - map.put("backupUrl",backupUrl); - map.put("wsUrl",wsUrl); - map.put("wssUrl",wssUrl); - }else if(errorCode.equals("-80703")){ - try { - sleep(1000); - map = getPreviewUrl(id,streamType,sessionId); - } catch (InterruptedException e) { - e.printStackTrace(); - } - }else{ - String errorMsg = ""; - try{ - AppErrorCode errVo = errorCodeService.getByCode(errorCode); - errorMsg = errVo.getErrorMsg(); - }catch (Exception e){ - errorMsg = errorCode; - } - log.info("getPreviewUrl:{}",errorMsg); - } - updateDeviceStatus(id,errorCode); - return map; - } - - /** - * 更新设备在线状态 - * @param deviceIndex - * @param errCode - */ - private void updateDeviceStatus(String deviceIndex,String errCode){ - AppCameraInfo cameraInfo = new AppCameraInfo(); - cameraInfo.setDeviceIndex(deviceIndex); - if(errCode.equals("0")){ - //在线 - cameraInfo.setDeviceStatus("1"); - baseMapper.updateDeviceStatusByDevId(cameraInfo); - }else if(errCode.equals("-80327")){ - //离线 - cameraInfo.setDeviceStatus("0"); - baseMapper.updateDeviceStatusByDevId(cameraInfo); - } - } - - /** - * 获取镜头遮挡参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getTamperDet(Map map){ - String id = map.get("deviceIndex").toString(); - 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("\"tamper_detection\"").append(":").append("{"); - sb.append("\"name\"").append(":[").append("\"tamper_det\"").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 tamperDetection = (JSONObject)responseData.get("tamper_detection"); - JSONObject tamperDet = (JSONObject)tamperDetection.get("tamper_det"); - return Result.OK(tamperDet); - }else{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("getTamperDet:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("getTamperDet:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置镜头遮挡参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setTamperDet(Map map){ - String id = map.get("deviceIndex").toString(); - String enabled = map.get("enabled").toString(); - 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("\"tamper_detection\"").append(":").append("{"); - sb.append("\"tamper_det\"").append(":").append("{"); - if("on".equals(enabled)){ - String digitalSensitivity = map.get("digitalSensitivity").toString(); - sb.append("\"digital_sensitivity\"").append(":").append(digitalSensitivity).append(","); - } - sb.append("\"enabled\"").append(":").append("\"").append(enabled).append("\""); - 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{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("setTamperDet:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("setTamperDet:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取镜头遮挡处理方式 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getTamperNotif(Map map){ - String id = map.get("deviceIndex").toString(); - 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("\"tamper_detection\"").append(":").append("{"); - sb.append("\"name\"").append(":[").append("\"tamper_notif_list\",").append("\"sound_alarm_info\"").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 tamperDetection = (JSONObject)responseData.get("tamper_detection"); - return Result.OK(tamperDetection); - }else{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("getTamperNotif:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("getTamperNotif:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置镜头遮挡处理方式 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setTamperNotif(Map map){ - String id = map.get("deviceIndex").toString(); - String msgPushEnabled = map.get("msgPushEnabled").toString(); - String lightAlarmEnabled = map.get("lightAlarmEnabled").toString(); - String soundAlarmEnabled = map.get("soundAlarmEnabled").toString(); - String soundAlarmType = map.get("soundAlarmType").toString(); - String soundAlarmTimes = map.get("soundAlarmTimes").toString(); - 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("\"tamper_detection\"").append(":").append("{"); - sb.append("\"tamper_notif_list\"").append(":").append("{"); - sb.append("\"msg_push_enabled\"").append(":").append("\"").append(msgPushEnabled).append("\","); - sb.append("\"light_alarm_enabled\"").append(":").append("\"").append(lightAlarmEnabled).append("\","); - sb.append("\"sound_alarm_enabled\"").append(":").append("\"").append(soundAlarmEnabled).append("\""); - sb.append("},"); - sb.append("\"sound_alarm_info\"").append(":").append("{"); - sb.append("\"sound_alarm_type\"").append(":").append("\"").append(soundAlarmType).append("\","); - sb.append("\"sound_alarm_times\"").append(":").append("\"").append(soundAlarmTimes).append("\""); - 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{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("setTamperNotif:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("setTamperNotif:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 报警声音试听 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result testAudio(Map map){ - String devId = map.get("deviceIndex").toString(); - String id = map.get("id").toString(); - String force = map.get("force").toString(); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"devId\"").append(":").append("\"").append(devId).append("\"").append(","); - sb.append("\"param\"").append(":").append("{"); - sb.append("\"method\"").append(":").append("\"do\"").append(","); - sb.append("\"usr_def_audio_alarm\"").append(":").append("{"); - sb.append("\"test_audio\"").append(":").append("{"); - sb.append("\"id\"").append(":").append("\"").append(id).append("\","); - sb.append("\"force\"").append(":").append("\"").append(force).append("\""); - 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{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("testAudio:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("testAudio:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取白光/声音告警参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getAlarmInfo(Map map){ - String id = map.get("deviceIndex").toString(); - 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("\"msg_alarm\"").append(":").append("{"); - sb.append("\"name\"").append(":").append("\"chn1_msg_alarm_info\""); - 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 msgAlarm = (JSONObject)responseData.get("msg_alarm"); - JSONObject alarmInfo = (JSONObject)msgAlarm.get("chn1_msg_alarm_info"); - return Result.OK(alarmInfo); - }else{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("getAlarmInfo:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("getAlarmInfo:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置白光/声音告警参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setAlarmInfo(Map map){ - String id = map.get("deviceIndex").toString(); - String type = map.get("type").toString(); - String enabled = map.get("enabled").toString(); - 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("\"msg_alarm\"").append(":").append("{"); - sb.append("\"chn1_msg_alarm_info\"").append(":").append("{"); - if("light".equals(type)){ - sb.append("\"light_alarm_enabled\"").append(":").append("\"").append(enabled).append("\""); - } - if("sound".equals(type)){ - sb.append("\"sound_alarm_enabled\"").append(":").append("\"").append(enabled).append("\""); - } - 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{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("setAlarmInfo:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("setAlarmInfo:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取白光/声音告警布防时间 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getAlarmPlan(Map map){ - String id = map.get("deviceIndex").toString(); - String type = map.get("type").toString(); - 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("\"msg_alarm_plan\"").append(":").append("{"); - if("light".equals(type)){ - sb.append("\"name\"").append(":[").append("\"arming_schedule_light\"").append("]"); - } - if("sound".equals(type)){ - sb.append("\"name\"").append(":[").append("\"arming_schedule_sound\"").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 alarmPlan = (JSONObject)responseData.get("msg_alarm_plan"); - return Result.OK(alarmPlan); - }else{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("getAlarmPlan:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("getAlarmPlan:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置白光/声音告警布防时间 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setAlarmPlan(Map map){ - String id = map.get("deviceIndex").toString(); - String type = map.get("type").toString(); - Map alarmPlan = (Map)map.get("alarmPlan"); - String monday = alarmPlan.get("monday").toString(); - String tuesday = alarmPlan.get("tuesday").toString(); - String wednesday = alarmPlan.get("wednesday").toString(); - String thursday = alarmPlan.get("thursday").toString(); - String friday = alarmPlan.get("friday").toString(); - String saturday = alarmPlan.get("saturday").toString(); - String sunday = alarmPlan.get("sunday").toString(); - 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("\"msg_alarm_plan\"").append(":").append("{"); - if("light".equals(type)){ - sb.append("\"arming_schedule_light\""); - } - if("sound".equals(type)){ - sb.append("\"arming_schedule_sound\""); - } - sb.append(":{"); - sb.append("\"monday\"").append(":").append("\"").append(monday).append("\"").append(","); - sb.append("\"tuesday\"").append(":").append("\"").append(tuesday).append("\"").append(","); - sb.append("\"wednesday\"").append(":").append("\"").append(wednesday).append("\"").append(","); - sb.append("\"thursday\"").append(":").append("\"").append(thursday).append("\"").append(","); - sb.append("\"friday\"").append(":").append("\"").append(friday).append("\"").append(","); - sb.append("\"saturday\"").append(":").append("\"").append(saturday).append("\"").append(","); - sb.append("\"sunday\"").append(":").append("\"").append(sunday).append("\""); - 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{ - AppErrorCode errorVo = errorCodeService.getByCode(errorCode); - String errorMsg = errorVo.getErrorMsg(); - log.info("setAlarmPlan:{}",errorMsg); - return Result.error(errorMsg); - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("setAlarmPlan:{}",errMsg); - return Result.error(errMsg); - } - } - - /** - * 搜索某天的录像数据的总条数 - * - * @param deviceIndex - * @param parentId - * @param dataDate - * @param pageNo - * @param pageSize - * @return - */ - int getVideoTotal(String deviceIndex,String parentId,String dataDate,int pageNo,int pageSize){ - int count = 0; - int startIdx = (pageNo-1)*pageSize; - int endIdx = pageNo*pageSize-1; - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("[{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(deviceIndex).append("\","); - if(parentId!=null&&!parentId.equals("")&&!parentId.equals("0")){ - //存储设备ID - sb.append("\"storageDevId\"").append(":").append("\"").append(parentId).append("\""); - }else{ - //SK卡，取自身设备ID - sb.append("\"storageDevId\"").append(":").append("\"").append(deviceIndex).append("\""); - } - sb.append("}],"); - sb.append("\"searchDay\"").append(":").append("\"").append(dataDate).append("\","); - sb.append("\"startIdx\"").append(":").append(startIdx).append(","); - sb.append("\"endIdx\"").append(":").append(endIdx); - sb.append("}"); - String res = tumsApi.searchVideo(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if(errorCode == 0) { - JSONObject result = (JSONObject) jsonObject.get("result"); - int total = result.getInt("total"); - count = count + total; - if(total>=pageSize){ - int more = getVideoTotal(deviceIndex,parentId,dataDate,pageNo+1,pageSize); - count = count + more; - } - } - return count; - } - - /** - * 搜索某天的录像数据 - * - * @param pageNo - * @param pageSize - * @param cameraInfo - * @return - */ - @Override - public Result> searchVideo(Integer pageNo, Integer pageSize, AppCameraInfo cameraInfo){ - Page page = new Page(pageNo, pageSize); - String deviceIndex = cameraInfo.getDeviceIndex(); - String parentId = cameraInfo.getParentId(); - String dataDate = cameraInfo.getDataDate(); - dataDate = dataDate.replaceAll("-",""); - int totalCount = getVideoTotal(deviceIndex,parentId,dataDate,1,800); - page = new Page(pageNo, pageSize, totalCount); - int startIdx = (pageNo-1)*pageSize; - int endIdx = pageNo*pageSize-1; - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("[{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(deviceIndex).append("\","); - if(parentId!=null&&!parentId.equals("")&&!parentId.equals("0")){ - //存储设备ID - sb.append("\"storageDevId\"").append(":").append("\"").append(parentId).append("\""); - }else{ - //SK卡，取自身设备ID - sb.append("\"storageDevId\"").append(":").append("\"").append(deviceIndex).append("\""); - } - sb.append("}],"); - sb.append("\"searchDay\"").append(":").append("\"").append(dataDate).append("\","); - sb.append("\"startIdx\"").append(":").append(startIdx).append(","); - sb.append("\"endIdx\"").append(":").append(endIdx); - sb.append("}"); - String res = tumsApi.searchVideo(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if(errorCode == 0){ - JSONObject result = (JSONObject)jsonObject.get("result"); - int total = result.getInt("total"); - if(total>0){ - List list = Lists.newArrayList(); - JSONArray videos = result.getJSONArray("videos"); - JSONObject videoJson = (JSONObject)videos.get(0); - String videoDevId = videoJson.getStr("videoDevId"); - String storageDevId = videoJson.getStr("storageDevId"); - String channelId = videoJson.getStr("channelId"); - String nvsIdInPoolList = videoJson.getStr("nvsIdInPoolList"); - JSONArray startTime = videoJson.getJSONArray("startTime"); - JSONArray endTime = videoJson.getJSONArray("endTime"); - JSONArray videoTypeArr = videoJson.getJSONArray("videoType"); - JSONArray size = videoJson.getJSONArray("size"); - String errCode = videoJson.getStr("errorCode"); - AppErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - for(int i=0;i getStoragesById(AppCameraInfo cameraInfo){ - Map map = new HashMap<>(); - map.put("error","0"); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"devIds\"").append(":").append("[\"").append(cameraInfo.getDeviceIndex()).append("\"]"); - sb.append("}"); - String res = tumsApi.getStoragesById(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if(errorCode == 0){ - List ciList = Lists.newArrayList(); - JSONArray list = jsonObject.getJSONArray("result"); - for(int i=0;i addPlaybackChn(AppCameraInfo cameraInfo){ - Map map = new HashMap<>(); - map.put("error","0"); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("[{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(cameraInfo.getVideoDevId()).append("\","); - sb.append("\"storageDevId\"").append(":").append("\"").append(cameraInfo.getStorageDevId()).append("\""); - sb.append("}],"); - sb.append("\"videoType\"").append(":").append("[").append(cameraInfo.getVideoType()).append("],"); - sb.append("\"scale\"").append(":\"").append(cameraInfo.getScale()).append("/1").append("\","); - sb.append("\"startTime\"").append(":").append(cameraInfo.getStartTime()).append(","); - sb.append("\"endTime\"").append(":").append(cameraInfo.getEndTime()); - sb.append("}"); - String res = tumsApi.addPlaybackChn(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if(errorCode == 0){ - List ciList = Lists.newArrayList(); - JSONArray list = jsonObject.getJSONArray("result"); - for(int i=0;i getPlaybackUrl(AppCameraInfo cameraInfo, int counter){ - Map map = new HashMap<>(); - map.put("error","0"); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("[{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(cameraInfo.getVideoDevId()).append("\","); - sb.append("\"storageDevId\"").append(":").append("\"").append(cameraInfo.getStorageDevId()).append("\","); - sb.append("\"sessionId\"").append(":").append("\"").append(cameraInfo.getSessionId()).append("\""); - sb.append("}],"); - sb.append("\"scale\"").append(":\"").append(cameraInfo.getScale()).append("/1").append("\","); - sb.append("\"startTime\"").append(":").append(cameraInfo.getStartTime()).append(","); - sb.append("\"endTime\"").append(":").append(cameraInfo.getEndTime()); - sb.append("}"); - String res = tumsApi.getPlaybackUrl(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if(errorCode == 0){ - List ciList = Lists.newArrayList(); - JSONArray list = jsonObject.getJSONArray("result"); - for(int i=0;i10){ - deletePlaybackChn(cameraInfo.getVideoDevId(),cameraInfo.getSessionId()); - map.put("error",errCode); - break; - } - sleep(1000); - map = getPlaybackUrl(cameraInfo,++counter); - return map; - } catch (InterruptedException e) { - e.printStackTrace(); - } - }else{ - System.out.println("getPlaybackUrl:"+errCode); - } - } - map.put("data",ciList); - }else if(errorCode == -80703){ - try { - if(counter>10){ - deletePlaybackChn(cameraInfo.getVideoDevId(),cameraInfo.getSessionId()); - } - sleep(1000); - map = getPlaybackUrl(cameraInfo,++counter); - } catch (InterruptedException e) { - e.printStackTrace(); - } - }else{ - map.put("error",errorCode); - log.info("getPlaybackUrl:{}",errorCode); - } - return map; - } - - @Override - public Result> getPlaybackUrlList(AppCameraInfo cameraInfo){ - Map map = new HashMap<>(); - String errorMsgs = ""; - List dataList = Lists.newArrayList(); - Map chnMap = addPlaybackChn(cameraInfo); - String chnError = chnMap.get("error").toString(); - if(chnError.equals("0")){ - List chnList = (List)chnMap.get("data"); - if(chnList!=null&&chnList.size()>0){ - AppTumsConfig tumsConfig = tumsConfigMapper.getByCode(); - for(int j=0;j playbackMap = getPlaybackUrl(chn,1); - String pbError = playbackMap.get("error").toString(); - if(pbError.equals("0")){ - List pbList = (List)playbackMap.get("data"); - if(pbList!=null&&pbList.size()>0){ - for(int k=0;k获取回放通道时："+errMsg+""; - } - } - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(chnError); - String errMsg = errVo.getErrorMsg(); - errorMsgs = errorMsgs+ "
添加回放通道时："+errMsg+"
"; - } - map.put("error",errorMsgs); - map.put("data",dataList); - return Result.ok(map); - } - - /** - * 删除某一回放通道 - * @param videoDevId - * @param sessionId - */ - public void deletePlaybackChn(String videoDevId,String sessionId){ - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("["); - sb.append("{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(videoDevId).append("\","); - sb.append("\"sessionId\"").append(":").append("\"").append(sessionId).append("\""); - sb.append("}"); - sb.append("]"); - sb.append("}"); - String res = tumsApi.deletePlaybackChn(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - String errorCode = jsonObject.getStr("error_code"); - if(errorCode.equals("0")){ - JSONArray list = jsonObject.getJSONArray("result"); - for(int i=0;i deletePlaybackChn(AppCameraInfo cameraInfo){ - String errorMsgs = ""; - String sessions = cameraInfo.getSessionId(); - if(sessions!=null&&!sessions.equals("")){ - String[] sessionIds = sessions.split(","); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("["); - for(int i=0;isessionId为"+sessionId+"的回放通道删除失败，原因："+errMsg+""; - } - } - }else{ - AppErrorCode errVo = errorCodeService.getByCode(errorCode); - String errMsg = errVo.getErrorMsg(); - errorMsgs = errorMsgs + errMsg; - log.info("deletePlaybackChn:{}",errMsg); - } - if(errorMsgs.equals("")){ - return Result.error(errorMsgs); - }else{ - return Result.OK(""); - } - } - return Result.OK(""); - } - - - /** - * 获取nvmp设备双向通信URL - * @param cameraInfo - * @return - */ - public Map getMultitransUrl(AppCameraInfo cameraInfo, int counter){ - Map map = new HashMap<>(); - map.put("error","0"); - map.put("error","0"); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"devId\"").append(":").append("\"").append(cameraInfo.getVideoDevId()).append("\""); - sb.append("}"); - String res = tumsApi.getMultitransUrl(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if(errorCode == 0){ - JSONObject result = jsonObject.getJSONObject("result"); - String url = result.getStr("rtspUrl"); - String wsUrl = result.getStr("wsUrl"); - String wssUrl = result.getStr("wssUrl"); - AppCameraInfo entity = new AppCameraInfo(); - entity.setVideoDevId(cameraInfo.getVideoDevId()); - entity.setUrl(url); - entity.setWsUrl(wsUrl); - entity.setWssUrl(wssUrl); - map.put("data",entity); - }else if(errorCode == -80703){ - try { - if(counter>10){ - map.put("error",errorCode); - return map; - } - sleep(1000); - map = getMultitransUrl(cameraInfo,++counter); - } catch (InterruptedException e) { - e.printStackTrace(); - } - }else{ - map.put("error",errorCode); - log.info("getMultitransUrl:{}",errorCode); - } - return map; - } - - /** - * 获取nvmp设备双向通信URL - * @param cameraInfo - * @return - */ - @Override - public Result getMultitransUrl(AppCameraInfo cameraInfo) throws Exception{ - String errorMsgs = ""; - Map multitransMap = getMultitransUrl(cameraInfo,1); - String multitransError = multitransMap.get("error").toString(); - if(multitransError.equals("0")){ - AppTumsConfig tumsConfig = tumsConfigMapper.getByCode(); - AppCameraInfo entity = (AppCameraInfo)multitransMap.get("data"); - entity.setQueryAddress(tumsConfig.getTumsUrl()); - return Result.OK(entity); - }else{ - AppErrorCode errVo = errorCodeService.getByCode(multitransError); - String errMsg = errVo.getErrorMsg(); - errorMsgs = errorMsgs+ "
获取nvmp设备双向通信URL："+errMsg+"
"; - return Result.error(errorMsgs); - } - } - - /** - * 回放视频转mp4上传 - * @param cameraInfo - * @return - */ - @Override - public Result uploadToServer(AppCameraInfo cameraInfo){ - String ftpUsername = ""; - String ftpPassword = ""; - String ftpUploadpath = ""; - String ftpIp = ""; - String ftpPort = ""; - AppCameraInfo entity = baseMapper.getByDeviceId(cameraInfo); - if(entity.getFtpIp()!=null&&!entity.getFtpIp().equals("")){ - ftpIp = entity.getFtpIp(); - ftpPort = entity.getFtpPort(); - ftpUsername = entity.getFtpUsername(); - ftpPassword = entity.getFtpPassword(); - ftpUploadpath = entity.getFtpUploadpath(); - }else{ - AppTumsConfig tumsConfig = tumsConfigMapper.getByCode(); - ftpIp = tumsConfig.getFtpIp(); - ftpPort = tumsConfig.getFtpPort(); - ftpUsername = tumsConfig.getFtpUsername(); - ftpPassword = tumsConfig.getFtpPassword(); - ftpUploadpath = tumsConfig.getFtpUploadpath(); - } - String deviceIndex = cameraInfo.getDeviceIndex(); - String parentId = cameraInfo.getParentId(); - String fileName = cameraInfo.getFileName(); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(deviceIndex).append("\","); - if(parentId!=null&&!parentId.equals("")&&!parentId.equals("0")){ - //存储设备ID - sb.append("\"storageDevId\"").append(":").append("\"").append(parentId).append("\","); - }else{ - //SK卡，取自身设备ID - sb.append("\"storageDevId\"").append(":").append("\"").append(deviceIndex).append("\","); - } - sb.append("\"videoType\"").append(":").append(cameraInfo.getVideoType()).append(","); - sb.append("\"storageType\"").append(":").append(cameraInfo.getStorageType()).append(","); - if(fileName!=null&&!fileName.equals("")){ - //存储设备ID - sb.append("\"filename\"").append(":").append("\"").append(fileName).append("\","); - } - sb.append("\"startTime\"").append(":").append(cameraInfo.getStartTime()).append(","); - sb.append("\"endTime\"").append(":").append(cameraInfo.getEndTime()).append(","); - sb.append("\"downloadInfo\"").append(":{"); - sb.append("\"username\"").append(":").append("\"").append(ftpUsername).append("\","); - sb.append("\"password\"").append(":").append("\"").append(ftpPassword).append("\","); - sb.append("\"path\"").append(":").append("\"").append(ftpUploadpath).append("\","); - sb.append("\"ftpIp\"").append(":").append("\"").append(ftpIp).append("\","); - sb.append("\"ftpPort\"").append(":").append(ftpPort); - sb.append("}"); - sb.append("}"); - String res = tumsApi.uploadToServer(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if(errorCode == 0){ - JSONObject result = jsonObject.getJSONObject("result"); - String taskId = result.getStr("taskId"); - cameraInfo.setTaskId(taskId); - return Result.OK(cameraInfo); - }else{ - AppErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode)); - String errMsg = errVo.getErrorMsg(); - log.info("uploadToServer:{}-{}",errorCode,errMsg); - return Result.error(errMsg); - } - } - - /** - * 停止转存MP4上传任务 - * @param cameraInfo - * @return - */ - @Override - public Result stopUploadToServer(AppCameraInfo cameraInfo){ - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"taskId\"").append(":").append("\"").append(cameraInfo.getTaskId()).append("\""); - sb.append("}"); - String res = tumsApi.stopUploadToServer(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if(errorCode == 0){ - return Result.OK("停止转存MP4上传成功"); - }else{ - AppErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode)); - String errMsg = errVo.getErrorMsg(); - log.info("stopUploadToServer:{}-{}",errorCode,errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取转存MP4上传任务进度 - * @param cameraInfo - * @return - */ - @Override - public Result getUploadToServerProcess(AppCameraInfo cameraInfo){ - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"taskId\"").append(":").append("\"").append(cameraInfo.getTaskId()).append("\""); - sb.append("}"); - String res = tumsApi.getUploadToServerProcess(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if(errorCode == 0){ - JSONObject result = jsonObject.getJSONObject("result"); - String process = result.getStr("process"); - cameraInfo.setProcess(process); - return Result.OK(cameraInfo); - }else{ - AppErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode)); - String errMsg = errVo.getErrorMsg(); - log.info("getUploadToServerProcess:{}-{}",errorCode,errMsg); - return Result.error(errMsg); - } - } - - /** - * 高速球机移动方向控制 - * @param cameraInfo - * @return - */ - @Override - public Result motionCtrl(AppCameraInfo cameraInfo){ - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\","); - sb.append("\"direction\"").append(":").append(cameraInfo.getDirection()).append(","); - sb.append("\"startOrNot\"").append(":").append(cameraInfo.getStartOrNot()).append(","); - sb.append("\"speed\"").append(":").append("\"").append(cameraInfo.getSpeed()).append("\""); - sb.append("}"); - String res = tumsApi.motionCtrl(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if(errorCode == 0){ - return Result.OK(); - }else{ - String errMsg = jsonObject.getStr("msg"); - if(errMsg == null || errMsg.equals("")) { - AppErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode)); - errMsg = errVo.getErrorMsg(); - } - log.info("motionCtrl:{}-{}",errorCode,errMsg); - return Result.error(errMsg); - } - } - - @Override - public void baoxiu(AppCameraInfo cameraInfo) { - cameraInfo.setMaintainStatus("1"); - baseMapper.updateById(cameraInfo); - syncImpl.devopsBaoxiu(cameraInfo); - } - - @DS("devops") - public void devopsBaoxiu(AppCameraInfo cameraInfo){ - baseMapper.updateById(cameraInfo); - } -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppErrorCodeServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppErrorCodeServiceImpl.java deleted file mode 100644 index 31fe6087..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppErrorCodeServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.iot.tplink.camerainfo.entity.AppErrorCode; -import com.nu.modules.iot.tplink.camerainfo.mapper.AppErrorCodeMapper; -import com.nu.modules.iot.tplink.camerainfo.service.IAppErrorCodeService; -import org.springframework.stereotype.Service; - - -/** - * @Description: 护理单元-物联管理-错误码 - * @Author: jeecg-boot - * @Date: 2025-02-10 - * @Version: V1.0 - */ -@Service -public class AppErrorCodeServiceImpl extends ServiceImpl implements IAppErrorCodeService { - - @Override - public AppErrorCode getByCode(String errorCode){ - return baseMapper.getByCode(errorCode); - } - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppTumsConfigServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppTumsConfigServiceImpl.java deleted file mode 100644 index d1249013..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppTumsConfigServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.iot.tplink.camerainfo.entity.AppTumsConfig; -import com.nu.modules.iot.tplink.camerainfo.mapper.AppTumsConfigMapper; -import com.nu.modules.iot.tplink.camerainfo.service.IAppTumsConfigService; -import org.springframework.stereotype.Service; - - -/** - * @Description: 护理单元-物联管理-图门系统配置 - * @Author: caolei - * @Date: 2025-03-31 - * @Version: V1.0 - */ -@Service -public class AppTumsConfigServiceImpl extends ServiceImpl implements IAppTumsConfigService { - - @Override - public AppTumsConfig getByCode(){ - return baseMapper.getByCode(); - } - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/utils/AppTumsApi.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/utils/AppTumsApi.java deleted file mode 100644 index cf6d4709..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/utils/AppTumsApi.java +++ /dev/null @@ -1,360 +0,0 @@ -package com.nu.modules.iot.tplink.camerainfo.utils; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.nu.modules.iot.tplink.camerainfo.entity.AppProjectInfo; -import com.nu.modules.iot.tplink.camerainfo.entity.AppRegionInfo; -import com.nu.modules.iot.tplink.camerainfo.enums.AppApiEnum; -import com.nu.modules.iot.tplink.camerainfo.mapper.AppProjectInfoMapper; -import com.nu.modules.iot.tplink.camerainfo.mapper.AppRegionInfoMapper; -import com.nu.modules.iot.tplink.camerainfo.mapper.AppTumsConfigMapper; -import com.nu.modules.iot.tplink.camerainfo.entity.AppTumsConfig; -import com.nu.modules.sysconfig.ISysConfigApi; -import com.nu.utils.HttpRequestUtil; -import com.tplink.ignite.libs.developersdk.api.TumsClient; -import com.tplink.ignite.libs.developersdk.vo.ResultVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -@Slf4j -public class AppTumsApi { - - TumsClient tumsClient; - - AppTumsConfig tumsConfig; - - @Autowired - private AppTumsConfigMapper tumsConfigMapper; - @Autowired - private AppProjectInfoMapper projectInfoMapper; - @Autowired - private AppRegionInfoMapper regionInfoMapper; - @Autowired - private ISysConfigApi sysConfigApi; - - /** - * 创建tumsClient - * @return - */ - public TumsClient createTumsClient(){ - if(this.tumsClient==null){ - login(); - } - return this.tumsClient; - } - - /** - * 销毁tumsClient - */ - public void destroyTumsClient(){ - if(this.tumsClient!=null){ - logout(); - } - } - - private void initTumsConfig(){ - if(tumsConfig==null){ - tumsConfig = tumsConfigMapper.getByCode(); - if(tumsConfig==null){ - //调用接口从运维平台获取配置信息 - getConfigByApi(); - getProjectByApi(); - getRegionByApi(); - tumsConfig = tumsConfigMapper.getByCode(); - } - } - } - - private void getConfigByApi(){ - JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "devops_open_url"); - String opeApiAddress = opeOpenUrl.getString("configValue"); - if (opeApiAddress.endsWith("/")) { - opeApiAddress = opeApiAddress.substring(0, opeApiAddress.length() - 1); - } - String bizApiAddress = opeApiAddress + "/api/iot/tplink/config/getConfig"; - - try { - String res = HttpRequestUtil.doGet(bizApiAddress, HttpRequestUtil.createDefaultHeaders()); - JSONObject jsonResponse = JSON.parseObject(res); - JSONObject result = jsonResponse.getJSONObject("result"); - tumsConfigMapper.deleteConfig(); - AppTumsConfig tumsConfig = JSON.parseObject(result.toJSONString(), AppTumsConfig.class); - tumsConfigMapper.addConfig(tumsConfig); - } catch (Exception e) { - e.printStackTrace(); - } - } - private void getProjectByApi(){ - JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "devops_open_url"); - String opeApiAddress = opeOpenUrl.getString("configValue"); - if (opeApiAddress.endsWith("/")) { - opeApiAddress = opeApiAddress.substring(0, opeApiAddress.length() - 1); - } - String bizApiAddress = opeApiAddress + "/api/iot/tplink/config/getProject"; - - try { - String res = HttpRequestUtil.doGet(bizApiAddress, HttpRequestUtil.createDefaultHeaders()); - JSONObject jsonResponse = JSON.parseObject(res); - JSONObject result = jsonResponse.getJSONObject("result"); - projectInfoMapper.deleteProjectInfo(); - AppProjectInfo projectInfo = JSON.parseObject(result.toJSONString(), AppProjectInfo.class); - projectInfoMapper.addProjectInfo(projectInfo); - } catch (Exception e) { - e.printStackTrace(); - } - } - private void getRegionByApi(){ - JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "devops_open_url"); - String opeApiAddress = opeOpenUrl.getString("configValue"); - if (opeApiAddress.endsWith("/")) { - opeApiAddress = opeApiAddress.substring(0, opeApiAddress.length() - 1); - } - String bizApiAddress = opeApiAddress + "/api/iot/tplink/config/getRegion"; - - try { - String res = HttpRequestUtil.doGet(bizApiAddress, HttpRequestUtil.createDefaultHeaders()); - JSONObject jsonResponse = JSON.parseObject(res); - JSONObject result = jsonResponse.getJSONObject("result"); - regionInfoMapper.deleteRegionInfo(); - AppRegionInfo regionInfo = JSON.parseObject(result.toJSONString(), AppRegionInfo.class); - regionInfoMapper.addRegionInfo(regionInfo); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 登录 - * @return - */ - public void login(){ - initTumsConfig(); - TumsClient tc = new TumsClient(tumsConfig.getTumsUsername(), tumsConfig.getTumsPassword(), tumsConfig.getTumsUrl()); - ResultVO loginResult = tc.login(); - // 判断是否登录成功 - if (loginResult.getErrorCode() != 0) { - log.error("login fail, fail message:[{}]", loginResult.getMsg()); - tumsClient = null; - } else { - log.info("login success"); - String cookie = tc.getCookie(); - String rsaKey = tc.getRsaKey(); - log.info("cookie",cookie); - log.info("rsaKey",rsaKey); - tumsClient = tc; - } - - } - - /** - * 注销 - */ - public void logout(){ - ResultVO logoutResult = tumsClient.logout(); - if (logoutResult.getErrorCode() != 0) { - log.error("logout fail, errorCode:{}", logoutResult.getErrorCode()); - } else { - log.info("logout success"); - tumsClient = null; - } - } - - /** - * 设置当前项目 - * @param jsonRequest - * @return - */ - public String setCurrentProject(String jsonRequest){ - this.createTumsClient(); - log.info("setCurrentProject:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.SET_CURRENT_PROJECT.getValue()); - log.info("setCurrentProject:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 重启设备 - * @param jsonRequest - * @return - */ - public String rebootDeviceList(String jsonRequest){ - this.createTumsClient(); - log.info("rebootDeviceList:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.REBOOT_DEVICE_LIST.getValue()); - log.info("rebootDeviceList:response:{}",jsonResponse); - return jsonResponse; - } - - - /** - * 设备配置信息 - * @param jsonRequest - * @return - */ - public String passthrough(String jsonRequest){ - this.createTumsClient(); - log.info("passthrough:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_PASSTHROUGH.getValue()); - log.info("passthrough:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 添加预览通道 - * @param jsonRequest - * @return - */ - public String addPreviewChn(String jsonRequest){ - this.createTumsClient(); - log.info("addPreviewChn:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_ADD_PREVIEW_CHN.getValue()); - log.info("addPreviewChn:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 获取预览通道的url - * @param jsonRequest - * @return - */ - public String getPreviewUrl(String jsonRequest){ - this.createTumsClient(); - log.info("getPreviewUrl:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_GET_PREVIEW_URL.getValue()); - log.info("getPreviewUrl:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 搜索当天的录像数据 - * @param jsonRequest - * @return - */ - public String searchVideo(String jsonRequest){ - this.createTumsClient(); - log.info("searchVideo:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_SEARCH_VIDEO.getValue()); - log.info("searchVideo:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 获取指定监控点的存储设备列表 - * @param jsonRequest - * @return - */ - public String getStoragesById(String jsonRequest){ - this.createTumsClient(); - log.info("getStoragesById:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_GET_STORAGES_BY_ID.getValue()); - log.info("getStoragesById:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 添加回放通道V2 - * @param jsonRequest - * @return - */ - public String addPlaybackChn(String jsonRequest){ - this.createTumsClient(); - log.info("addPlaybackChn:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_ADD_PLAYBACK_CHN.getValue()); - log.info("addPlaybackChn:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 获取回放通道的url - * @param jsonRequest - * @return - */ - public String getPlaybackUrl(String jsonRequest){ - this.createTumsClient(); - log.info("getPlaybackUrl:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_GET_PLAYBACK_URL.getValue()); - log.info("getPlaybackUrl:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 删除回放通道 - * @param jsonRequest - * @return - */ - public String deletePlaybackChn(String jsonRequest){ - this.createTumsClient(); - log.info("deletePlaybackChn:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_DELETE_PLAYBACK_CHN.getValue()); - log.info("deletePlaybackChn:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 获取nvmp设备双向通信URL - * @param jsonRequest - * @return - */ - public String getMultitransUrl(String jsonRequest){ - this.createTumsClient(); - log.info("getMultitransUrl:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_GET_MULTITRANS_URL.getValue()); - log.info("getMultitransUrl:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 回放视频转mp4上传 - * @param jsonRequest - * @return - */ - public String uploadToServer(String jsonRequest){ - this.createTumsClient(); - log.info("uploadToServer:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_UPLOAD_TO_SERVER.getValue()); - log.info("uploadToServer:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 停止转存MP4上传任务 - * @param jsonRequest - * @return - */ - public String stopUploadToServer(String jsonRequest){ - this.createTumsClient(); - log.info("stopUploadToServer:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_STOP_UPLOAD_TO_SERVER.getValue()); - log.info("stopUploadToServer:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 获取转存MP4上传任务进度 - * @param jsonRequest - * @return - */ - public String getUploadToServerProcess(String jsonRequest){ - this.createTumsClient(); - log.info("getUploadToServerProcess:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_GET_UPLOAD_TO_SERVER_PROCESS.getValue()); - log.info("getUploadToServerProcess:response:{}",jsonResponse); - return jsonResponse; - } - - /** - * 高速球机移动方向控制 - * @param jsonRequest - * @return - */ - public String motionCtrl(String jsonRequest){ - this.createTumsClient(); - log.info("motionCtrl:request:{}",jsonRequest); - String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_MOTION_CTRL.getValue()); - log.info("motionCtrl:response:{}",jsonResponse); - return jsonResponse; - } - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/storage/api/TplinkVideoStoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/storage/api/TplinkVideoStoApi.java deleted file mode 100644 index 8ce77ca5..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/storage/api/TplinkVideoStoApi.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.nu.modules.iot.tplink.storage.api; - -import com.nu.modules.camerainfo.api.TplinkVideoStorageApi; -import org.jeecg.common.api.vo.Result; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -@RestController -@RequestMapping("/api/tplink/videoStorage") -public class TplinkVideoStoApi { - - @Autowired - private TplinkVideoStorageApi storageApi; - - - - /** - * tplink缓存视频存储 - * - * @param pic 封面图片 - * @param video 视频缓存 - * @param url 存储路径 - */ - @PostMapping("/tplinkVideoStorage") - public Result tplinkVideoStorage(@RequestPart("pic") MultipartFile pic, @RequestPart("video") MultipartFile video, @RequestParam("url") String url) { - storageApi.tplinkVideoStorage(pic, video, url); - return Result.ok(); - } - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/entity/AppTqConfig.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/entity/AppTqConfig.java deleted file mode 100644 index 42bce749..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/entity/AppTqConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.nu.modules.iot.tq.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @Description: 护理单元-物联管理-电水表-配置信息 - * @Author: caolei - * @Date: 2025-06-04 - * @Version: V1.0 - */ -@Data -@TableName("nu_iot_tq_config") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tq_config", description="护理单元-物联管理-电水表-配置信息") -public class AppTqConfig implements Serializable { - private static final long serialVersionUID = 1L; - /**ID*/ - @TableId(type = IdType.AUTO) - @ApiModelProperty(value = "ID") - private Integer id; - private String requestUrl; //后台系统地址 - private String authCode; //授权码 - private String randomCode; //随机字符串，签名时需要 - private String notifyUrl; //通知地址 - private String updateDate; //更新时间 -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/enums/AppTqApiEnum.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/enums/AppTqApiEnum.java deleted file mode 100644 index 9da647da..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/enums/AppTqApiEnum.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.nu.modules.iot.tq.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -/** - * 接口枚举类 - */ -@Getter -@RequiredArgsConstructor -public enum AppTqApiEnum { - - METER_INFO("/Api/Meter","查询设备列表和当前状态"), - COLLECTOR_INFO("/Api/Collector","查询采集器列表和当前状态"), - ELE_RESET("/Api_v2/ele_security/reset","电表清零"), - WATER_RESET("/Api_v2/water_security/reset","水表清零"), - ELE_CONTROL("/Api_v2/ele_control","电表开关闸"), - WATER_CONTROL("/Api_v2/water_control","水表开关闸"), - ELE_READ("/Api_v2/ele_read","电表抄表"), - WATER_READ("/Api_v2/water_read","水表抄表"); - - private final String value;//自定义属性，枚举值，获取：如ApiEnum.GET_ENCRYPT_KEY_FOR_LOGIN.getValue(); - private final String remark;//自定义属性，枚举描述，获取：如ApiEnum.GET_ENCRYPT_KEY_FOR_LOGIN.getRemark(); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/mapper/AppTqConfigMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/mapper/AppTqConfigMapper.java deleted file mode 100644 index 4cda9b30..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/mapper/AppTqConfigMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.iot.tq.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.iot.tq.entity.AppTqConfig; -import org.apache.ibatis.annotations.Mapper; - -/** - * @Description: 护理单元-物联管理-电水表配置信息 - * @Author: jeecg-boot - * @Date: 2025-08-08 - * @Version: V1.0 - */ - -@Mapper -public interface AppTqConfigMapper extends BaseMapper { - AppTqConfig getConfig(); - void addConfig(AppTqConfig tqConfig); - void deleteConfig(); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/mapper/xml/AppTqConfigMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/mapper/xml/AppTqConfigMapper.xml deleted file mode 100644 index c5017c98..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/mapper/xml/AppTqConfigMapper.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - insert into nu_iot_tq_config( - id, - request_url, - auth_code, - random_code, - notify_url, - update_date - ) - values ( - #{id}, - #{requestUrl}, - #{authCode}, - #{randomCode}, - #{notifyUrl}, - #{updateDate} - ) - - - - delete from nu_iot_tq_config - - - \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppHttpTool.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppHttpTool.java deleted file mode 100644 index 146dad6d..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppHttpTool.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.nu.modules.iot.tq.utils; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; - -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -public class AppHttpTool { - - public static String generateOperateId() { - return UUID.randomUUID().toString().replaceAll("-", ""); - } - - public static String getUrlParams(Map map) { - if (map == null || map.size() == 0) { - return ""; - } - List list = new ArrayList<>(); - map.forEach((key, value)->{ - try { - list.add(key + "=" + URLEncoder.encode(value.toString(), "UTF-8")); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - }); - return String.join("&", list); - } - - /** - * 发送http GET请求 - * @param url - * @return - */ - public static String httpClientGet(String url) { - try { - CloseableHttpClient client = HttpClients.createDefault(); - HttpGet httpGet = new HttpGet(url); - CloseableHttpResponse Response = client.execute(httpGet); - HttpEntity entity = Response.getEntity(); - String resp = EntityUtils.toString(entity, "UTF-8"); - Response.close(); - return resp; - } catch (Exception e) { - System.out.println(e.getMessage()); - return ""; - } - } - - /** - * 发送http POST请求 - * @param url - * @param bodyMap - * @return - * @throws Exception - */ - public static String httpClientPost(String url, Map bodyMap) throws Exception { - System.out.println("请求地址：" + url); - System.out.println("发送参数：" + bodyMap.toString()); - HttpClient client = HttpClientBuilder.create().build(); - HttpPost postRequest = new HttpPost(url); - - List nvps = new ArrayList<>(); - - for(String key : bodyMap.keySet()) { - nvps.add(new BasicNameValuePair(key,bodyMap.get(key))); - } - postRequest.setEntity(new UrlEncodedFormEntity(nvps,"utf-8")); - - - int retry = 3; - HttpResponse execute = null; - while(retry-- > 0) { - try { - execute = client.execute(postRequest); - break; - } catch (Exception e) { - Thread.sleep(5000); - } - } - if(execute == null) { - throw new Exception("接口请求失败"); - } - String resp = EntityUtils.toString(execute.getEntity(), "UTF-8"); - System.out.println("接口返回：" + resp); - return resp; - } - -// public static String postUrl(String url, Map map){ -// String errorMsg = ""; -// Gson gson = new Gson(); -// String map2 = gson.toJson(map); -// System.out.println(map2); -// try { -// URL obj = new URL(url); -// HttpURLConnection con = (HttpURLConnection) obj.openConnection(); -// // 设置请求方法为 POST -// con.setRequestMethod("POST"); -// // 设置请求头 -// con.setRequestProperty("Content-Type", "application/json"); // 声明发送 JSON -// con.setRequestProperty("Accept", "application/json"); // 声明期望接收 JSON -// con.setDoOutput(true); // 允许写入请求体 -// // 写入 JSON 请求体 -// try (OutputStream os = con.getOutputStream()) { -// byte[] input = map2.getBytes("utf-8"); -// os.write(input, 0, input.length); -// } -// // 获取响应码 -// int responseCode = con.getResponseCode(); -// System.out.println("Response Code: " + responseCode); -// // 读取响应（成功时） -// if (responseCode == HttpURLConnection.HTTP_OK) { // 200 -// try (BufferedReader br = new BufferedReader( -// new InputStreamReader(con.getInputStream(), "UTF-8"))) { -// StringBuilder response = new StringBuilder(); -// String responseLine; -// while ((responseLine = br.readLine()) != null) { -// response.append(responseLine.trim()); -// } -// System.out.println("Response: " + response.toString()); -// JSONObject result = new JSONObject(response.toString()); -// String status = result.getStr("status"); -// if(status.equals("SUCCESS")){ -// errorMsg = ""; -// }else{ -// errorMsg = result.getStr("error_msg"); -// } -// } -// } else { // 错误时读取错误流 -// try (BufferedReader br = new BufferedReader( -// new InputStreamReader(con.getErrorStream(), "UTF-8"))) { -// StringBuilder errorResponse = new StringBuilder(); -// String errorLine; -// while ((errorLine = br.readLine()) != null) { -// errorResponse.append(errorLine.trim()); -// } -// errorMsg = errorResponse.toString(); -// System.out.println("Error Response: " + errorResponse.toString()); -// } -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } -// return errorMsg; -// } -} \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppSignTool.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppSignTool.java deleted file mode 100644 index f4e6b10c..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppSignTool.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.nu.modules.iot.tq.utils; - -import org.springframework.stereotype.Component; - -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Map; - -@Component -public class AppSignTool { - - // 生成签名字符串 - public static String getSign(String nonce,Map data) - { - // 获取关键字列表 - List keys = new ArrayList<>(data.keySet()); - // 关键字列表排序 - keys.sort(Comparator.naturalOrder()); - StringBuilder sb = new StringBuilder(); - for (String key : keys) - { - // 取各个字段内容拼接字符串 - sb.append(data.get(key)); - } - // 加上双方约定随机字符串 - String txt = sb.toString() + nonce; - - // 计算哈希值 - return getMD5(txt); - } - - public static boolean checkSign(String response_content, String timestamp, String sign,String nonce) { - String buf = response_content + timestamp + nonce; - String encode = getMD5(buf); - return encode.equals(sign); - } - - // md5加密 - public static String getMD5(String password) { - MessageDigest md5 = null; - try { - md5 = MessageDigest.getInstance("MD5"); - } catch (Exception e) { - throw new RuntimeException(e); - } - byte[] byteArray = password.getBytes(StandardCharsets.UTF_8); - - byte[] md5Bytes = md5.digest(byteArray); - StringBuilder hexValue = new StringBuilder(); - for (byte md5Byte : md5Bytes) { - int val = ((int) md5Byte) & 0xff; - if (val < 16) { - hexValue.append("0"); - } - - hexValue.append(Integer.toHexString(val)); - } - return hexValue.toString(); - } -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppTqApi.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppTqApi.java deleted file mode 100644 index 10c7c291..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tq/utils/AppTqApi.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.nu.modules.iot.tq.utils; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.nu.modules.iot.tq.entity.AppTqConfig; -import com.nu.modules.iot.tq.enums.AppTqApiEnum; -import com.nu.modules.iot.tq.mapper.AppTqConfigMapper; -import com.nu.modules.sysconfig.ISysConfigApi; -import com.nu.utils.HttpRequestUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Component -@Slf4j -public class AppTqApi { - - AppTqConfig tqConfig; - - @Autowired - AppTqConfigMapper tqConfigMapper; - - @Autowired - private ISysConfigApi sysConfigApi; - - private void initTqConfig(){ - if(tqConfig==null){ - tqConfig = tqConfigMapper.getConfig(); - if(tqConfig==null){ - getConfigByApi(); - tqConfig = tqConfigMapper.getConfig(); - } - } - } - - private void getConfigByApi(){ - JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "devops_open_url"); - String opeApiAddress = opeOpenUrl.getString("configValue"); - if (opeApiAddress.endsWith("/")) { - opeApiAddress = opeApiAddress.substring(0, opeApiAddress.length() - 1); - } - String bizApiAddress = opeApiAddress + "/api/iot/tq/config/getConfig"; - try { - String res = HttpRequestUtil.doGet(bizApiAddress, HttpRequestUtil.createDefaultHeaders()); - JSONObject jsonResponse = JSON.parseObject(res); - JSONObject result = jsonResponse.getJSONObject("result"); - tqConfigMapper.deleteConfig(); - AppTqConfig tqConfig = JSON.parseObject(result.toJSONString(), AppTqConfig.class); - tqConfigMapper.addConfig(tqConfig); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public AppTqConfig getTqConfig(){ - this.initTqConfig(); - return tqConfig; - } - - /** - * 查询设备列表和当前状态 - */ - public String getMeters(){ - this.initTqConfig(); - Map params = new HashMap<>(); - params.put("auth", tqConfig.getAuthCode()); - String urlParams = AppHttpTool.getUrlParams(params); - log.info("getMeters:request:{}",urlParams); - String url = tqConfig.getRequestUrl()+AppTqApiEnum.METER_INFO.getValue()+"?"+urlParams; - String responseStr = AppHttpTool.httpClientGet(url); - log.info("getMeters:response:{}",responseStr); - return responseStr; - } - - /** - * 查询采集器列表和当前状态 - */ - public String getCollectors(){ - this.initTqConfig(); - Map params = new HashMap<>(); - params.put("auth", tqConfig.getAuthCode()); - String urlParams = AppHttpTool.getUrlParams(params); - log.info("getCollectors:request:{}",urlParams); - String url = tqConfig.getRequestUrl()+AppTqApiEnum.COLLECTOR_INFO.getValue()+"?"+urlParams; - String responseStr = AppHttpTool.httpClientGet(url); - log.info("getCollectors:response:{}",responseStr); - return responseStr; - } - - /** - * 电表清零 - */ - public String eleReset(List> req){ - this.initTqConfig(); - String request_content = JSON.toJSONString(req); - log.info("eleReset:request:{}",request_content); - String url = tqConfig.getRequestUrl()+AppTqApiEnum.ELE_RESET.getValue(); - String notifyUrl = tqConfig.getNotifyUrl()+"/electricityMeter/eleResetNotify"; - String responseStr = requestAsync(url,request_content,notifyUrl); - log.info("eleReset:response:{}",responseStr); - return responseStr; - } - - /** - * 电表开关闸 - */ - public String eleControl(List> req){ - this.initTqConfig(); - String request_content = JSON.toJSONString(req); - log.info("eleControl:request:{}",request_content); - String url = tqConfig.getRequestUrl()+AppTqApiEnum.ELE_CONTROL.getValue(); - String notifyUrl = tqConfig.getNotifyUrl()+"/electricityMeter/eleControlNotify"; - String responseStr = requestAsync(url,request_content,notifyUrl); - log.info("eleControl:response:{}",responseStr); - return responseStr; - } - - /** - * 电表抄表 - */ - public String eleRead(List> req){ - this.initTqConfig(); - String request_content = JSON.toJSONString(req); - log.info("eleRead:request:{}",request_content); - String url = tqConfig.getRequestUrl()+AppTqApiEnum.ELE_READ.getValue(); - String notifyUrl = tqConfig.getNotifyUrl()+"/electricityMeter/eleReadNotify"; - String responseStr = requestAsync(url,request_content,notifyUrl); - log.info("eleRead:response:{}",responseStr); - return responseStr; - } - - /** - * 水表清零 - */ - public String waterReset(List> req){ - this.initTqConfig(); - String request_content = JSON.toJSONString(req); - log.info("waterReset:request:{}",request_content); - String url = tqConfig.getRequestUrl()+AppTqApiEnum.WATER_RESET.getValue(); - String notifyUrl = tqConfig.getNotifyUrl()+"/waterMeter/waterResetNotify"; - String responseStr = requestAsync(url,request_content,notifyUrl); - log.info("waterReset:response:{}",responseStr); - return responseStr; - } - - /** - * 水表开关闸 - */ - public String waterControl(List> req){ - this.initTqConfig(); - String request_content = JSON.toJSONString(req); - log.info("waterControl:request:{}",request_content); - String url = tqConfig.getRequestUrl()+AppTqApiEnum.WATER_CONTROL.getValue(); - String notifyUrl = tqConfig.getNotifyUrl()+"/waterMeter/waterControlNotify"; - String responseStr = requestAsync(url,request_content,notifyUrl); - log.info("waterControl:response:{}",responseStr); - return responseStr; - } - - /** - * 水表抄表 - */ - public String waterRead(List> req){ - this.initTqConfig(); - String request_content = JSON.toJSONString(req); - log.info("waterRead:request:{}",request_content); - String url = tqConfig.getRequestUrl()+ AppTqApiEnum.WATER_READ.getValue(); - String notifyUrl = tqConfig.getNotifyUrl()+"/waterMeter/waterReadNotify"; - String responseStr = requestAsync(url,request_content,notifyUrl); - log.info("waterRead:response:{}",responseStr); - return responseStr; - } - - private String requestAsync(String url, String request_content,String notifyUrl){ - // 时间戳 - String timestamp = String.valueOf(new Date().getTime()/1000); - // 用于签名的内容 - Map data = new HashMap<>(); - data.put("timestamp", timestamp); - data.put("auth_code", tqConfig.getAuthCode()); - data.put("request_content", request_content); - data.put("notify_url", notifyUrl); - // 获取签名 - String sign = AppSignTool.getSign(tqConfig.getRandomCode(),data); - data.put("sign", sign); - try { - return AppHttpTool.httpClientPost(url, data); - } catch (Exception e) { - e.printStackTrace(); - } - return ""; - } - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/entity/AppYiweilianConfig.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/entity/AppYiweilianConfig.java deleted file mode 100644 index c904e830..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/entity/AppYiweilianConfig.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.nu.modules.iot.yiweilian.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @Description: 护理单元-物联管理-易维联-配置信息 - * @Author: caolei - * @Date: 2025-06-13 - * @Version: V1.0 - */ -@Data -@TableName("nu_iot_yiweilian_config") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_yiweilian_config", description="护理单元-物联管理-易维联-配置信息") -public class AppYiweilianConfig implements Serializable { - private static final long serialVersionUID = 1L; - /**ID*/ - @TableId(type = IdType.AUTO) - @ApiModelProperty(value = "ID") - private Integer id; - private String requestUrl; //云平台系统地址 - private String clientId; //识别用户的唯一标识 - private String updateDate; //更新时间 -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/enums/AppYiweilianApiEnum.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/enums/AppYiweilianApiEnum.java deleted file mode 100644 index cde0ba57..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/enums/AppYiweilianApiEnum.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.nu.modules.iot.yiweilian.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -/** - * 接口枚举类 - */ -@Getter -@RequiredArgsConstructor -public enum AppYiweilianApiEnum { - - ADD_DEVICE("/mtInterface/device/addDevice","添加设备"), - UPDATE_DEVICE_CONFIG("/mtInterface/device/updateDeviceConfig","修改设备配置"), - DELETE_DEVICE("/mtInterface/device/deleteDevice","删除设备"), -// GET_DEVICES("/mtInterface/device/getDevices","查询设备列表（分页）"), - GET_DEVICE_CONFIGS("/mtInterface/device/getDeciveConfigs","查询设备列表含配置信息（分页）"), - GET_REAL_TIME("/mtInterface/realTime/getRealTime","查询设备实时数据（分页）"), - GET_WARNING_DATA("/mtInterface/warning/getWarningData","查询告警记录（分页）"); - - private final String value;//自定义属性，枚举值，获取：如ApiEnum.GET_ENCRYPT_KEY_FOR_LOGIN.getValue(); - private final String remark;//自定义属性，枚举描述，获取：如ApiEnum.GET_ENCRYPT_KEY_FOR_LOGIN.getRemark(); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/mapper/AppYiweilianConfigMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/mapper/AppYiweilianConfigMapper.java deleted file mode 100644 index 1b18d87e..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/mapper/AppYiweilianConfigMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.iot.yiweilian.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.iot.yiweilian.entity.AppYiweilianConfig; -import org.apache.ibatis.annotations.Mapper; - -/** - * @Description: 护理单元-物联管理-易维联-配置信息 - * @Author: caolei - * @Date: 2025-08-08 - * @Version: V1.0 - */ - -@Mapper -public interface AppYiweilianConfigMapper extends BaseMapper { - AppYiweilianConfig getConfig(); - void addConfig(AppYiweilianConfig yiweilianConfig); - void deleteConfig(); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/mapper/xml/AppYiweilianConfigMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/mapper/xml/AppYiweilianConfigMapper.xml deleted file mode 100644 index ba939118..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/mapper/xml/AppYiweilianConfigMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - insert into nu_iot_yiweilian_config( - id, - request_url, - client_id, - update_date - ) - values ( - #{id}, - #{requestUrl}, - #{clientId}, - #{updateDate} - ) - - - - delete from nu_iot_yiweilian_config - - - \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/utils/AppHttpTool.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/utils/AppHttpTool.java deleted file mode 100644 index a6766049..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/utils/AppHttpTool.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.nu.modules.iot.yiweilian.utils; - -import com.google.gson.Gson; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.Map; - -public class AppHttpTool { - - /** - * 发送http POST请求 - * @param url - * @param map - * @return - * @throws Exception - */ - public static String httpClientPost(String url, Map map){ - String errorMsg = ""; - Gson gson = new Gson(); - String map2 = gson.toJson(map); - System.out.println(map2); - try { - URL obj = new URL(url); - HttpURLConnection con = (HttpURLConnection) obj.openConnection(); - // 设置请求方法为 POST - con.setRequestMethod("POST"); - // 设置请求头 - con.setRequestProperty("Content-Type", "application/json"); // 声明发送 JSON - con.setRequestProperty("Accept", "application/json"); // 声明期望接收 JSON - con.setDoOutput(true); // 允许写入请求体 - // 写入 JSON 请求体 - try (OutputStream os = con.getOutputStream()) { - byte[] input = map2.getBytes("utf-8"); - os.write(input, 0, input.length); - } - // 获取响应码 - int responseCode = con.getResponseCode(); - System.out.println("Response Code: " + responseCode); - // 读取响应（成功时） - if (responseCode == HttpURLConnection.HTTP_OK) { // 200 - try (BufferedReader br = new BufferedReader( - new InputStreamReader(con.getInputStream(), "UTF-8"))) { - StringBuilder response = new StringBuilder(); - String responseLine; - while ((responseLine = br.readLine()) != null) { - response.append(responseLine.trim()); - } - System.out.println("Response: " + response.toString()); - errorMsg = response.toString(); - } - } else { // 错误时读取错误流 - try (BufferedReader br = new BufferedReader( - new InputStreamReader(con.getErrorStream(), "UTF-8"))) { - StringBuilder errorResponse = new StringBuilder(); - String errorLine; - while ((errorLine = br.readLine()) != null) { - errorResponse.append(errorLine.trim()); - } - System.out.println("Error Response: " + errorResponse.toString()); - errorMsg = "{\"code\":"+responseCode+",\"msg\":\""+errorResponse.toString()+"\" }"; - } - } - } catch (IOException e) { - e.printStackTrace(); - } - return errorMsg; - } - -} \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/utils/AppYiweilianApi.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/utils/AppYiweilianApi.java deleted file mode 100644 index 0781a116..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/yiweilian/utils/AppYiweilianApi.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.nu.modules.iot.yiweilian.utils; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.nu.modules.iot.yiweilian.entity.AppYiweilianConfig; -import com.nu.modules.iot.yiweilian.enums.AppYiweilianApiEnum; -import com.nu.modules.iot.yiweilian.mapper.AppYiweilianConfigMapper; -import com.nu.modules.sysconfig.ISysConfigApi; -import com.nu.utils.HttpRequestUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Map; - -@Component -@Slf4j -public class AppYiweilianApi { - - AppYiweilianConfig yiweilianConfig; - - @Autowired - AppYiweilianConfigMapper yiweilianConfigMapper; - - @Autowired - private ISysConfigApi sysConfigApi; - - private void initYiweilianConfig(){ - if(yiweilianConfig==null){ - yiweilianConfig = yiweilianConfigMapper.getConfig(); - if(yiweilianConfig==null){ - getConfigByApi(); - yiweilianConfig = yiweilianConfigMapper.getConfig(); - } - } - } - - private void getConfigByApi(){ - JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "devops_open_url"); - String opeApiAddress = opeOpenUrl.getString("configValue"); - if (opeApiAddress.endsWith("/")) { - opeApiAddress = opeApiAddress.substring(0, opeApiAddress.length() - 1); - } - String bizApiAddress = opeApiAddress + "/api/iot/yiweilian/config/getConfig"; - try { - String res = HttpRequestUtil.doGet(bizApiAddress, HttpRequestUtil.createDefaultHeaders()); - JSONObject jsonResponse = JSON.parseObject(res); - JSONObject result = jsonResponse.getJSONObject("result"); - yiweilianConfigMapper.deleteConfig(); - AppYiweilianConfig yiweilianConfig = JSON.parseObject(result.toJSONString(), AppYiweilianConfig.class); - yiweilianConfigMapper.addConfig(yiweilianConfig); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public AppYiweilianConfig getYiweilianConfig(){ - this.initYiweilianConfig(); - return yiweilianConfig; - } - - /** - * 添加设备 - */ - public String addDevice(Map params){ - this.initYiweilianConfig(); - params.put("clientId", yiweilianConfig.getClientId()); - log.info("addDevice:request:{}",params); - String url = yiweilianConfig.getRequestUrl()+ AppYiweilianApiEnum.ADD_DEVICE.getValue(); - String responseStr = AppHttpTool.httpClientPost(url, params); - log.info("addDevice:response:{}",responseStr); - return responseStr; - } - - - /** - * 修改设备配置 - */ - public String updateDeviceConfig(Map params){ - this.initYiweilianConfig(); - params.put("clientId", yiweilianConfig.getClientId()); - log.info("updateDeviceConfig:request:{}",params); - String url = yiweilianConfig.getRequestUrl()+AppYiweilianApiEnum.UPDATE_DEVICE_CONFIG.getValue(); - String responseStr = AppHttpTool.httpClientPost(url, params); - log.info("updateDeviceConfig:response:{}",responseStr); - return responseStr; - } - - /** - * 删除设备 - */ - public String deleteDevice(Map params){ - this.initYiweilianConfig(); - params.put("clientId", yiweilianConfig.getClientId()); - log.info("deleteDevice:request:{}",params); - String url = yiweilianConfig.getRequestUrl()+AppYiweilianApiEnum.DELETE_DEVICE.getValue(); - String responseStr = AppHttpTool.httpClientPost(url, params); - log.info("deleteDevice:response:{}",responseStr); - return responseStr; - } - - /** - * 查询设备列表（分页） - */ -// public String getDevices(Map params){ -// this.initYiweilianConfig(); -// params.put("clientId", yiweilianConfig.getClientId()); -// log.info("getDevices:request:{}",params); -// String url = yiweilianConfig.getRequestUrl()+AppYiweilianApiEnum.GET_DEVICES.getValue(); -// String responseStr = AppHttpTool.httpClientPost(url, params); -// log.info("getDevices:response:{}",responseStr); -// return responseStr; -// } - - /** - * 查询设备列表含配置信息（分页） - */ - public String getDeviceConfigs(Map params){ - this.initYiweilianConfig(); - params.put("clientId", yiweilianConfig.getClientId()); - log.info("getDeviceConfigs:request:{}",params); - String url = yiweilianConfig.getRequestUrl()+AppYiweilianApiEnum.GET_DEVICE_CONFIGS.getValue(); - String responseStr = AppHttpTool.httpClientPost(url, params); - log.info("getDeviceConfigs:response:{}",responseStr); - return responseStr; - } - - - /** - * 查询设备实时数据（分页） - */ - public String getRealTime(Map params){ - this.initYiweilianConfig(); - params.put("clientId", yiweilianConfig.getClientId()); - log.info("getRealTime:request:{}",params); - String url = yiweilianConfig.getRequestUrl()+ AppYiweilianApiEnum.GET_REAL_TIME.getValue(); - String responseStr = AppHttpTool.httpClientPost(url, params); - log.info("getRealTime:response:{}",responseStr); - return responseStr; - } - - /** - * 查询告警记录（分页） - */ - public String getWarningData(Map params){ - this.initYiweilianConfig(); - params.put("clientId", yiweilianConfig.getClientId()); - log.info("getWarningData:request:{}",params); - String url = yiweilianConfig.getRequestUrl()+AppYiweilianApiEnum.GET_WARNING_DATA.getValue(); - String responseStr = AppHttpTool.httpClientPost(url, params); - log.info("getWarningData:response:{}",responseStr); - return responseStr; - } - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/common/api/IotCommonApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/common/api/IotCommonApi.java index cf9498c6..4558891a 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/common/api/IotCommonApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/common/api/IotCommonApi.java @@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.entity.*; import com.nu.modules.electricitymeter.api.IElectricityMeterApi; import com.nu.modules.humiddevice.api.IHumidDeviceApi; -import com.nu.modules.iot.tplink.camerainfo.entity.AppCameraInfo; -import com.nu.modules.iot.tplink.camerainfo.service.IAppCameraInfoService; +import com.nu.modules.camerainfo.api.ICameraInfoApi; import com.nu.modules.water.api.IWaterApi; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; @@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; import java.util.List; @RestController @@ -25,7 +22,7 @@ import java.util.List; @Slf4j public class IotCommonApi { @Autowired - private IAppCameraInfoService cameraInfoService; + private ICameraInfoApi cameraInfoService; @Autowired private IElectricityMeterApi electricityMeterApi; @Autowired @@ -46,13 +43,11 @@ public class IotCommonApi { //摄像头 { - Page page = new Page(1, -1); - AppCameraInfo cameraInfo = new AppCameraInfo(); + CameraInfoEntity cameraInfo = new CameraInfoEntity(); cameraInfo.setNuId(nuId); - IPage pageList = cameraInfoService.findPage(page, cameraInfo); - List records = pageList.getRecords(); - if (records != null && records.size() > 0) { - result.setCameraInfoEntityList(BeanUtil.copyToList(records, CameraInfoEntity.class)); + List cameraList = cameraInfoService.getCameraInfoList(cameraInfo); + if (cameraList != null && cameraList.size() > 0) { + result.setCameraInfoEntityList(cameraList); } } @@ -63,7 +58,8 @@ public class IotCommonApi { IPage pageList = electricityMeterApi.list(electricityMeterEntity, 1, -1, null); List records = pageList.getRecords(); if (records != null && records.size() > 0) { - result.setElectricityMeterEntityList(BeanUtil.copyToList(records, ElectricityMeterEntity.class)); +// result.setElectricityMeterEntityList(BeanUtil.copyToList(records, ElectricityMeterEntity.class)); + result.setElectricityMeterEntityList(records); } } @@ -74,7 +70,8 @@ public class IotCommonApi { IPage pageList = waterApi.list(waterMeterEntity, 1, -1, null); List records = pageList.getRecords(); if (records != null && records.size() > 0) { - result.setWaterMeterEntityList(BeanUtil.copyToList(records, WaterMeterEntity.class)); +// result.setWaterMeterEntityList(BeanUtil.copyToList(records, WaterMeterEntity.class)); + result.setWaterMeterEntityList(records); } } @@ -85,7 +82,8 @@ public class IotCommonApi { IPage pageList = humidDeviceApi.list(humidDeviceEntity, 1, -1, null); List records = pageList.getRecords(); if (records != null && records.size() > 0) { - result.setHumidDeviceEntityList(BeanUtil.copyToList(records, HumidDeviceEntity.class)); +// result.setHumidDeviceEntityList(BeanUtil.copyToList(records, HumidDeviceEntity.class)); + result.setHumidDeviceEntityList(records); } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/electricityMeter/api/ElectricityMeterApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/electricityMeter/api/ElectricityMeterApi.java index f651a5b5..0ea640ab 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/electricityMeter/api/ElectricityMeterApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/electricityMeter/api/ElectricityMeterApi.java @@ -70,11 +70,4 @@ public class ElectricityMeterApi { return electricityMeterApi.eleReset(electricityMeterEntity); } - @AutoLog(value = "设备报修") - @ApiOperation(value="设备报修", notes="设备报修") - @RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result baoxiu(@RequestBody ElectricityMeterEntity electricityMeterEntity) { - electricityMeterApi.baoxiu(electricityMeterEntity); - return Result.OK("操作成功!"); - } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/humiddevice/api/HumidDeviceApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/humiddevice/api/HumidDeviceApi.java index b90ed984..6079870b 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/humiddevice/api/HumidDeviceApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/humiddevice/api/HumidDeviceApi.java @@ -59,17 +59,6 @@ public class HumidDeviceApi { return Result.OK("抄表成功"); } - /** - * 报修 - */ - @AutoLog(value = "设备报修") - @ApiOperation(value = "设备报修", notes = "设备报修") - @RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT, RequestMethod.POST}) - public Result baoxiu(@RequestBody HumidDeviceEntity humidDeviceEntity) { - humidDeviceApi.baoxiu(humidDeviceEntity); - return Result.OK("操作成功!"); - } - /** * 抄表日志 * diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/water/api/WaterApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/water/api/WaterApi.java index e1e7c77f..4831fdd9 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/water/api/WaterApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/iot/water/api/WaterApi.java @@ -69,12 +69,4 @@ public class WaterApi { return waterApi.waterRead(waterMeterEntity); } - - @AutoLog(value = "设备报修") - @ApiOperation(value="设备报修", notes="设备报修") - @RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result baoxiu(@RequestBody WaterMeterEntity waterMeterEntity) { - waterApi.baoxiu(waterMeterEntity); - return Result.OK("操作成功!"); - } } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/IotCameraCapabilityMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/IotCameraCapabilityMQDto.java index 838809dc..f48b3b3e 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/IotCameraCapabilityMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/IotCameraCapabilityMQDto.java @@ -43,8 +43,6 @@ public class IotCameraCapabilityMQDto{ private String corridorMod; /**背光共存*/ private String backlightCoexistence; - /**是否同步 0 未同步 1已同步*/ - private String syncType; /**日志ID*/ private String logId; } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/IotCameraInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/IotCameraInfoMQDto.java index 9b23ac6e..195d8866 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/IotCameraInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/IotCameraInfoMQDto.java @@ -56,8 +56,6 @@ public class IotCameraInfoMQDto{ private String systemType; /**协议类型*/ private String protocol; - /**录像计划ID**/ - private String recordPlanId; /**回放视频转FTP上传IP**/ private String ftpIp; /**回放视频转FTP上传端口**/ @@ -68,22 +66,7 @@ public class IotCameraInfoMQDto{ private String ftpPassword; /**回放视频转FTP上传路径**/ private String ftpUploadpath; - /**区域编码*/ - private String nuId; - /**区域编码*/ - private String nuName; - /**机构ID*/ - private String departId; - /**机构名称*/ - private String departName; - /**机构服务地址*/ - private String departServerUrl; - /**是否同步 0 未同步 1已同步*/ - private String syncType; - /**维修状态*/ - private String maintainStatus; /**日志ID*/ private String logId; - private String dimension;//设备维度 private String channel;//通道号 } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/IotEleWaterCollectorMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/IotEleWaterCollectorMQDto.java index 47ca4fa2..080f9c5b 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/IotEleWaterCollectorMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/IotEleWaterCollectorMQDto.java @@ -24,8 +24,6 @@ public class IotEleWaterCollectorMQDto{ private String connectTime; /**描述*/ private String remark; - /**是否同步 0 未同步 1已同步*/ - private String syncType; /**日志ID*/ private String logId; } \ No newline at end of file diff --git a/nursing-unit-common/src/main/java/com/nu/dto/IotElectricityMeterMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/IotElectricityMeterMQDto.java index f4c2c050..1100cb35 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/IotElectricityMeterMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/IotElectricityMeterMQDto.java @@ -23,21 +23,6 @@ public class IotElectricityMeterMQDto{ /**描述*/ private String remark; private String sim; - /**区域编码*/ - private String nuId; - /**区域名称*/ - private String nuName; - /**机构ID*/ - private String departId; - /**机构名称*/ - private String departName; - /**机构服务地址*/ - private String departServerUrl; - /**是否同步*/ - private String syncType; - /**维修状态*/ - private String maintainStatus; /**日志ID*/ private String logId; - private String dimension;//设备维度 } \ No newline at end of file diff --git a/nursing-unit-common/src/main/java/com/nu/dto/IotHumidDeviceMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/IotHumidDeviceMQDto.java index b653462b..a94d97cf 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/IotHumidDeviceMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/IotHumidDeviceMQDto.java @@ -56,21 +56,6 @@ public class IotHumidDeviceMQDto{ private String reportingTime; /**电量*/ private String electricity; - /**区域编码*/ - private String nuId; - /**区域名称*/ - private String nuName; - /**机构ID*/ - private String departId; - /**机构名称*/ - private String departName; - /**机构服务地址*/ - private String departServerUrl; - /**是否同步 0 未同步 1已同步*/ - private String syncType; - /**维修状态*/ - private String maintainStatus; /**日志ID*/ private String logId; - private String dimension;//设备维度 } \ No newline at end of file diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java index 8d900806..a3dcd754 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java @@ -12,10 +12,6 @@ public class CameraInfoEntity { /**ID*/ @ApiModelProperty(value = "ID") private Integer id; - /**设备编码*/ - @Excel(name = "设备编码", width = 15) - @ApiModelProperty(value = "设备编码") - private String sn; /**设备序号*/ @ApiModelProperty(value = "设备序号") private String deviceIndex; @@ -88,108 +84,5 @@ public class CameraInfoEntity { /**护理单元*/ @ApiModelProperty(value = "护理单元ID") private String nuId; - /**护理单元*/ - @ApiModelProperty(value = "护理单元") - private String nuName; - @ApiModelProperty(value = "码流类型 0 代表主码流，1 代码子码流") - private int streamType; - /** - * 能力集属性 ==> - */ - @ApiModelProperty(value = "运动检测") - private String motionDetection; - @ApiModelProperty(value = "视频封面") - private String videoCover; - @ApiModelProperty(value = "云台") - private String ptz; - @ApiModelProperty(value = "motor") - private String motor; - @ApiModelProperty(value = "smartCode") - private String smartCode; - @ApiModelProperty(value = "强制在H.264编码过程中生成IDR帧的函数") - private String forceIdrFrame; - @ApiModelProperty(value = "音频") - private String audio; - @ApiModelProperty(value = "本地存储") - private String localStorage; - @ApiModelProperty(value = "回放API本版") - private String playbackApiVersionTwo; - @ApiModelProperty(value = "多变性") - private String multitrans; - @ApiModelProperty(value = "客流") - private String passengerFlow; - @ApiModelProperty(value = "获取预览缩略图") - private String getPreviewThumbnail; - @ApiModelProperty(value = "JPG预览缩略图") - private String previewThumbnailJpeg; - @ApiModelProperty(value = "走廊") - private String corridorMod; - @ApiModelProperty(value = "背光共存") - private String backlightCoexistence; - /** - * <== 能力集属性 - */ - @ApiModelProperty(value = "查询日期") - private String dataDate; - @ApiModelProperty(value = "设备索引") - private String videoDevId; - @ApiModelProperty(value = "存储设备ID") - private String storageDevId; - @ApiModelProperty(value = "存储设备名称") - private String storageDevName; - @ApiModelProperty(value = "双摄IPC通道ID,双摄IPC的全景摄像头，其值为0.双摄IPC的特写摄像头，其值为1") - private String channelId; - @ApiModelProperty(value = "当录像存在存储池中, 录像所属的nvs的ID") - private String nvsIdInPoolList; - @ApiModelProperty(value = "录像开始时间. GMT时间，即1970.1.1零时至今的秒数") - private String startTime; - @ApiModelProperty(value = "录像结束时间. GMT时间，即1970.1.1零时至今的秒数") - private String endTime; - @ApiModelProperty(value = "录像开始时间,YYYY-MM-DD HH:MI:SS") - private String startTimeFt; - @ApiModelProperty(value = "录像结束时间,YYYY-MM-DD HH:MI:SS") - private String endTimeFt; - @ApiModelProperty(value = "录像时长,HH:MI:SS") - private String duration; - @ApiModelProperty(value = "回放录像类型。1: 定时录像; 2: 移动侦测等") - private String videoType; - @ApiModelProperty(value = "录像片段大小，单位字节") - private String size; - @ApiModelProperty(value = "错误码") - private String errorCode; - @ApiModelProperty(value = "错误描述") - private String errorMsg; - @ApiModelProperty(value = "录像存储设备类型 -1：未找到，0:ipc，1:nvr，2：nvs：3：server，4：vcs，5：storagePool") - private String storageType; - @ApiModelProperty(value = "预览/回放url") - private String url; - @ApiModelProperty(value = "预览/回放备用url") - private String backupUrl; - @ApiModelProperty(value = "ws连接传输视频地址") - private String wsUrl; - @ApiModelProperty(value = "wss接传输视频地址") - private String wssUrl; - @ApiModelProperty(value = "预览/回放通道对应的sessionId") - private String sessionId; - @ApiModelProperty(value = "双摄IPC通道ID") - private String videoChannelId; - @ApiModelProperty(value = "回放速率") - private String scale; - @ApiModelProperty(value = "回放api访问前缀") - private String queryAddress; - @ApiModelProperty(value = "录像开关;枚举:[0:表示关,1:表示开]") - private String recordSwitch; - @ApiModelProperty(value = "任务taskId") - private String taskId; - @ApiModelProperty(value = "上传mp4文件名称") - private String fileName; - @ApiModelProperty(value = "上传进度") - private String process; - @ApiModelProperty(value = "移动方向;枚举:[0:左上,1:上,2:右上,3:左,4:持续水平转动,5:右,6:左下,7:下,8:右下,9:缩小画面,10:放大画面,11:聚焦近处,12:聚焦远处]") - private String direction; - @ApiModelProperty(value = "开始或停止移动;枚举:[0:停止,1:开始]") - private String startOrNot; - @ApiModelProperty(value = "球机移动速度") - private String speed; } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElectricityMeterEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElectricityMeterEntity.java index 4fae5198..fb27dc48 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/ElectricityMeterEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElectricityMeterEntity.java @@ -21,14 +21,5 @@ public class ElectricityMeterEntity implements Serializable { private String readTime; //电表-上次查表时间 private String remark; private String nuId;//护理单元ID - private String nuName;//护理单元 - private String departId;//机构ID - private String departName;//机构名称 - private String departServerUrl;//机构服务地址 - private String oldServerUrl;//原机构服务地址 - private String syncType;//是否同步 0 未同步 1已同步 - private String oldDepartId;//原机构id - private String oldDepartName;//原机构名称 - private String maintainStatus;//维修状态 } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/HumidDeviceEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/HumidDeviceEntity.java index 9326b369..4902b367 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/HumidDeviceEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/HumidDeviceEntity.java @@ -45,22 +45,6 @@ public class HumidDeviceEntity implements Serializable { private String status; //在线状态，0在线 1离线 private String reportingTime; //最新上报时间 private String electricity; //电量 0~4 - - private String optType; //操作类型 - private String optTime; //操作时间 - private String optBy; //操作人 - - private Integer alarmCn; //告警数量 - private String nuId;//护理单元ID - private String nuName;//护理单元 - private String departId;//机构ID - private String departName;//机构名称 - private String departServerUrl;//机构服务地址 - private String oldServerUrl;//原机构服务地址 - private String syncType;//是否同步 0 未同步 1已同步 - private String oldDepartId;//原机构id - private String oldDepartName;//原机构名称 - /**维修状态*/ - private String maintainStatus; + } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/WaterMeterEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/WaterMeterEntity.java index 2894568c..f9e56165 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/WaterMeterEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/WaterMeterEntity.java @@ -32,9 +32,4 @@ public class WaterMeterEntity implements Serializable { private String readTime; //电表-上次查表时间 private String remark; private String nuId;//护理单元ID - private String nuName;//护理单元 - private String departId;//机构ID - private String departName;//机构名称 - private String departServerUrl;//机构服务地址 - private String maintainStatus;//维修状态 } diff --git a/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/camerainfo/api/CameraInfoApi.java b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/camerainfo/api/CameraInfoApi.java deleted file mode 100644 index 4ef75e13..00000000 --- a/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/camerainfo/api/CameraInfoApi.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.nu.modules.camerainfo.api; - - -import com.nu.entity.CameraInfoEntity; - -import java.util.List; - -public interface CameraInfoApi { - - public List getCameraInfoList(); -} diff --git a/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/camerainfo/api/ICameraInfoApi.java b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/camerainfo/api/ICameraInfoApi.java new file mode 100644 index 00000000..e49d9a06 --- /dev/null +++ b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/camerainfo/api/ICameraInfoApi.java @@ -0,0 +1,12 @@ +package com.nu.modules.camerainfo.api; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.entity.CameraInfoEntity; + +import java.util.List; + +public interface ICameraInfoApi { + public List getCameraInfoList(CameraInfoEntity cameraInfoEntity); +} diff --git a/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/electricitymeter/api/IElectricityMeterApi.java b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/electricitymeter/api/IElectricityMeterApi.java index 2440dd33..71f2aae8 100644 --- a/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/electricitymeter/api/IElectricityMeterApi.java +++ b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/electricitymeter/api/IElectricityMeterApi.java @@ -15,6 +15,4 @@ public interface IElectricityMeterApi { IPage list(ElectricityMeterEntity electricityMeterEntity, Integer pageNo, Integer pageSize, HttpServletRequest req); Result eleReset(ElectricityMeterEntity electricityMeterEntity); - - void baoxiu(ElectricityMeterEntity electricityMeterEntity); } diff --git a/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/humiddevice/api/IHumidDeviceApi.java b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/humiddevice/api/IHumidDeviceApi.java index 506cd6dc..c70e3a61 100644 --- a/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/humiddevice/api/IHumidDeviceApi.java +++ b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/humiddevice/api/IHumidDeviceApi.java @@ -11,8 +11,6 @@ public interface IHumidDeviceApi { String updateDeviceRealTime(HumidDeviceEntity humidDeviceEntity); - void baoxiu(HumidDeviceEntity humidDeviceEntity); - IPage queryLogPageList(HumidDeviceEntity humidDeviceEntity, Integer pageNo, Integer pageSize, HttpServletRequest req); List listAll(); diff --git a/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/water/api/IWaterApi.java b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/water/api/IWaterApi.java index 550a0229..b53bc3c5 100644 --- a/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/water/api/IWaterApi.java +++ b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/water/api/IWaterApi.java @@ -8,9 +8,7 @@ import javax.servlet.http.HttpServletRequest; public interface IWaterApi { IPage list(WaterMeterEntity waterMeterEntity, Integer pageNo, Integer pageSize, HttpServletRequest req); - Result waterReset(WaterMeterEntity waterMeterEntity); Result waterControl(WaterMeterEntity waterMeterEntity); Result waterRead(WaterMeterEntity waterMeterEntity); - void baoxiu(WaterMeterEntity waterMeterEntity); } 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 8be582d9..dabecf6b 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 @@ -82,72 +82,6 @@ public class CameraInfoController extends JeecgController> queryNuPageList(CameraInfo CameraInfo, - @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.findNuPage(page, CameraInfo); - return Result.OK(pageList); - } - - /** - * 编辑 - * - * @param cameraInfo - * @return - */ - @AutoLog(value = "护理单元-物联管理-摄像头信息-编辑") - @ApiOperation(value="护理单元-物联管理-摄像头信息-编辑", notes="护理单元-物联管理-摄像头信息-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody CameraInfo cameraInfo) { - service.edit(cameraInfo); - return Result.OK("编辑成功!"); - } - @AutoLog(value = "设备报修") - @ApiOperation(value="设备报修", notes="设备报修") - @RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result baoxiu(@RequestBody CameraInfo cameraInfo) { - service.baoxiu(cameraInfo); - return Result.OK("操作成功!"); - } - - /** - * 修改摄像头信息 - * - * @param cameraInfo - * @return - */ - @RequestMapping(value = "/rebootDevice", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result rebootDevice(@RequestBody CameraInfo cameraInfo) { - service.rebootDevice(cameraInfo); - return Result.OK("重启成功!"); - } - - /** - * 获取IPC设备能力集 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/getIpcCapability") - public Result getIpcCapability(CameraInfo cameraInfo) { - return service.getIpcCapability(cameraInfo); - } - - /** - * 同步此项目下的IPC设备 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/syncProjectIpcDevice") - public Result syncProjectIpcDevice(CameraInfo cameraInfo) { - return service.syncProjectIpcDevice(cameraInfo); - } - /** * 获取设备详情信息 * @@ -159,116 +93,6 @@ public class CameraInfoController extends JeecgController getImageCommon(@RequestBody Map map) { - return service.getImageCommon(map); - } - - /** - * 设置画面基本信息 - * - * @param map - * @return - */ - @PostMapping(value = "/setImageCommon") - public Result setImageCommon(@RequestBody Map map) { - return service.setImageCommon(map); - } - - /** - * 获取画面操作信息 - * - * @param map - * @return - */ - @PostMapping(value = "/getImageSwitch") - public Result getImageSwitch(@RequestBody Map map) { - return service.getImageSwitch(map); - } - - /** - * 设置画面操作信息 - * - * @param map - * @return - */ - @PostMapping(value = "/setImageSwitch") - public Result setImageSwitch(@RequestBody Map map) { - return service.setImageSwitch(map); - } - - /** - * 获取OSD能力集 - * - * @param map - * @return - */ - @PostMapping(value = "/getOsdCapability") - public Result getOsdCapability(@RequestBody Map map) { - return service.getOsdCapability(map); - } - - /** - * 获取OSD参数 - * - * @param map - * @return - */ - @PostMapping(value = "/getOsd") - public Result getOsd(@RequestBody Map map) { - return service.getOsd(map); - } - - /** - * 设置OSD参数 - * - * @param map - * @return - */ - @PostMapping(value = "/setOsd") - public Result setOsd(@RequestBody Map map) { - return service.setOsd(map); - } - - /** - * 获取码率参数 - * - * @param map - * @return - */ - @PostMapping(value = "/getVideoParams") - public Result getVideoParams(@RequestBody Map map) { - return service.getVideoParams(map); - } - - /** - * 设置码率参数 - * - * @param map - * @return - */ - @PostMapping(value = "/setVideoParams") - public Result setVideoParams(@RequestBody Map map) { - return service.setVideoParams(map); - } - - /** - * 恢复画面默认值 - * - * @param map - * @return - */ - @PostMapping(value = "/configRecovery") - public Result configRecovery(@RequestBody Map map) { - return service.configRecovery(map); - } - /** * 获取摄像头实时播放地址 * @@ -280,130 +104,6 @@ public class CameraInfoController extends JeecgController> getRecordCfgs(CameraInfo cameraInfo, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) throws Exception{ - IPage pageList = service.getRecordCfgs(cameraInfo,pageNo,pageSize); - return Result.OK(pageList); - } - - /** - * 获取批量操作录像计划进度 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/getBatchProgress") - public Result getBatchProgress(CameraInfo cameraInfo) throws Exception{ - return service.getBatchProgress(cameraInfo); - } - - /** - * 获取镜头遮挡参数 - * - * @param map - * @return - */ - @PostMapping(value = "/getTamperDet") - public Result getTamperDet(@RequestBody Map map) { - return service.getTamperDet(map); - } - - /** - * 设置镜头遮挡参数 - * - * @param map - * @return - */ - @PostMapping(value = "/setTamperDet") - public Result setTamperDet(@RequestBody Map map) { - return service.setTamperDet(map); - } - - /** - * 获取镜头遮挡处理方式 - * - * @param map - * @return - */ - @PostMapping(value = "/getTamperNotif") - public Result getTamperNotif(@RequestBody Map map) { - return service.getTamperNotif(map); - } - - /** - * 设置镜头遮挡处理方式 - * - * @param map - * @return - */ - @PostMapping(value = "/setTamperNotif") - public Result setTamperNotif(@RequestBody Map map) { - return service.setTamperNotif(map); - } - /** * 报警声音试听 * @@ -415,86 +115,6 @@ public class CameraInfoController extends JeecgController getAlarmInfo(@RequestBody Map map) { - return service.getAlarmInfo(map); - } - - /** - * 设置白光/声音告警参数 - * - * @param map - * @return - */ - @PostMapping(value = "/setAlarmInfo") - public Result setAlarmInfo(@RequestBody Map map) { - return service.setAlarmInfo(map); - } - - /** - * 获取白光/声音告警布防时间 - * - * @param map - * @return - */ - @PostMapping(value = "/getAlarmPlan") - public Result getAlarmPlan(@RequestBody Map map) { - return service.getAlarmPlan(map); - } - - /** - * 设置白光/声音告警布防时间 - * - * @param map - * @return - */ - @PostMapping(value = "/setAlarmPlan") - public Result setAlarmPlan(@RequestBody Map map) { - return service.setAlarmPlan(map); - } - - /** - * 搜索某天的录像数据 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/searchVideo") - public Result> searchVideo(CameraInfo cameraInfo, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - return service.searchVideo(pageNo, pageSize, cameraInfo); - } - - /** - * 获取摄像头录像回放地址 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/getPlaybackUrlList") - public Result> getPlaybackUrlList(CameraInfo cameraInfo) { - return service.getPlaybackUrlList(cameraInfo); - } - - /** - * 删除回放通道 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/deletePlaybackChn") - public Result deletePlaybackChn(CameraInfo cameraInfo) { - return service.deletePlaybackChn(cameraInfo); - } - /** * 获取摄像头录像回放地址 * @@ -506,39 +126,6 @@ public class CameraInfoController extends JeecgController stopUploadToServer(CameraInfo cameraInfo) throws Exception{ - return service.stopUploadToServer(cameraInfo); - } - - /** - * 获取转存MP4上传任务进度 - * - * @param cameraInfo - * @return - */ - @GetMapping(value = "/getUploadToServerProcess") - public Result getUploadToServerProcess(CameraInfo cameraInfo) throws Exception{ - return service.getUploadToServerProcess(cameraInfo); - } - /** * 高速球机移动方向控制 * 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 893fcdc5..e1d8b6bd 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 @@ -36,6 +36,7 @@ public class CameraInfo implements Serializable { /**设备编码*/ @Excel(name = "设备编码", width = 15) @ApiModelProperty(value = "设备编码") + @TableField(exist = false) private String sn; /**设备序号*/ @Excel(name = "设备序号", width = 15) @@ -141,101 +142,21 @@ public class CameraInfo implements Serializable { /**护理单元*/ @ApiModelProperty(value = "护理单元编码") @Dict(dictTable ="nu_base_info",dicText = "nu_name",dicCode = "nu_id") + @TableField(exist = false) private String nuId; - - /**设备维度*/ - @Excel(name = "设备维度", width = 15) - @ApiModelProperty(value = "设备维度") - @Dict(dicCode = "dimension") - private String dimension; /**护理单元*/ @ApiModelProperty(value = "护理单元") - private String nuName; - /**区域属性*/ @TableField(exist = false) - @Dict(dicCode = "nu_type") - private java.lang.String areaFlag; + private String nuName; + @ApiModelProperty(value = "码流类型 0 代表主码流，1 代码子码流") @TableField(exist = false) private int streamType; - @ApiModelProperty(value = "录像计划ID") - private String recordPlanId; - @ApiModelProperty(value = "录像计划名称") - @TableField(exist = false) - private String planName; - @ApiModelProperty(value = "批量处理类型 1:表示查询添加进度,2:表示查询设置进度,3:表示查询删除进度") - @TableField(exist = false) - private int batchType; - /** - * 能力集属性 ==> - */ - @ApiModelProperty(value = "运动检测") - @TableField(exist = false) - private String motionDetection; - @ApiModelProperty(value = "视频封面") - @TableField(exist = false) - private String videoCover; - @ApiModelProperty(value = "云台") - @TableField(exist = false) - private String ptz; - @ApiModelProperty(value = "motor") - @TableField(exist = false) - private String motor; - @ApiModelProperty(value = "smartCode") - @TableField(exist = false) - private String smartCode; - @ApiModelProperty(value = "强制在H.264编码过程中生成IDR帧的函数") - @TableField(exist = false) - private String forceIdrFrame; - @ApiModelProperty(value = "音频") - @TableField(exist = false) - private String audio; - @ApiModelProperty(value = "本地存储") - @TableField(exist = false) - private String localStorage; - @ApiModelProperty(value = "回放API本版") - @TableField(exist = false) - private String playbackApiVersionTwo; - @ApiModelProperty(value = "多变性") - @TableField(exist = false) - private String multitrans; - @ApiModelProperty(value = "客流") - @TableField(exist = false) - private String passengerFlow; - @ApiModelProperty(value = "获取预览缩略图") - @TableField(exist = false) - private String getPreviewThumbnail; - @ApiModelProperty(value = "JPG预览缩略图") - @TableField(exist = false) - private String previewThumbnailJpeg; - @ApiModelProperty(value = "走廊") - @TableField(exist = false) - private String corridorMod; - @ApiModelProperty(value = "背光共存") - @TableField(exist = false) - private String backlightCoexistence; - /** - * <== 能力集属性 - */ - @ApiModelProperty(value = "查询日期") - @TableField(exist = false) - private String dataDate; @ApiModelProperty(value = "设备索引") @TableField(exist = false) private String videoDevId; - @ApiModelProperty(value = "存储设备ID") - @TableField(exist = false) - private String storageDevId; - @ApiModelProperty(value = "存储设备名称") - @TableField(exist = false) - private String storageDevName; - @ApiModelProperty(value = "双摄IPC通道ID,双摄IPC的全景摄像头，其值为0.双摄IPC的特写摄像头，其值为1") - @TableField(exist = false) - private String channelId; - @ApiModelProperty(value = "当录像存在存储池中, 录像所属的nvs的ID") - @TableField(exist = false) - private String nvsIdInPoolList; + @ApiModelProperty(value = "录像开始时间. GMT时间，即1970.1.1零时至今的秒数") @TableField(exist = false) private String startTime; @@ -323,8 +244,6 @@ public class CameraInfo implements Serializable { private String ftpUsername; //回放视频转FTP上传用户 private String ftpPassword; //回放视频转FTP上传密码 private String ftpUploadpath; //回放视频转FTP上传路径 - /**维修状态*/ - private String maintainStatus; private String remarks;//备注 private String channel;//通道号 } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraCapabilitySyncJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraCapabilitySyncJob.java deleted file mode 100644 index 378c7ab5..00000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraCapabilitySyncJob.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.nu.modules.tplink.camera.job; - -import cn.hutool.json.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.util.DateUtils; -import com.nu.modules.tplink.camera.entity.CameraInfo; -import com.nu.modules.tplink.camera.service.ICameraInfoService; -import com.nu.modules.tplink.utils.TumsApi; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - * 摄像头能力集同步 - */ -@Slf4j -public class CameraCapabilitySyncJob implements Job { - - @Autowired - ICameraInfoService service; - - @Autowired - private TumsApi tumsApi; - - //摄像头能力集同步，每10分钟 - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - List list = service.findAllList(); - if(list!=null&&list.size()>0){ - for(int i=0;i< list.size();i++){ - CameraInfo cameraInfo = list.get(i); - String id = cameraInfo.getDeviceIndex(); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"devId\"").append(":").append("\"").append(id).append("\""); - sb.append("}"); - String jsonResponse = tumsApi.getIpcCapability(sb.toString()); - JSONObject jsonObject = new JSONObject(jsonResponse); - String errorCode = jsonObject.getStr("error_code"); - if(errorCode.equals("0")){ - service.syncCapability(id,jsonResponse); - }else{ - log.error("CameraCapabilitySyncJob:{}-{}", DateUtils.now(),"devId:"+id+","+jsonObject.getStr("msg")); - } - } - } - } -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraDeviceSyncJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraDeviceSyncJob.java deleted file mode 100644 index 3f0e6ac5..00000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraDeviceSyncJob.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.nu.modules.tplink.camera.job; - -import cn.hutool.json.JSONObject; -import com.nu.modules.tplink.camera.entity.CameraInfo; -import lombok.extern.slf4j.Slf4j; -import com.nu.modules.tplink.camera.service.ICameraInfoService; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.util.DateUtils; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 摄像头设备信息同步 - */ -@Slf4j -public class CameraDeviceSyncJob implements Job { - - @Autowired - ICameraInfoService service; - - //每10分钟获取设备在线状态 - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - List list = service.findAllList(); - if(list!=null&&list.size()>0){ - for(int i=0;i< list.size();i++){ - CameraInfo cameraInfo = list.get(i); - Map map = new HashMap<>(); - map.put("deviceIndex",cameraInfo.getDeviceIndex()); - map.put("type","switch"); - try{ - Result result = service.getImageCommon(map); - log.error("CameraDeviceSyncJob:{}-{}", DateUtils.now(),result.getResult()); - - }catch (Exception e){ - log.info(e.getMessage()); - } - } - } - } -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java index c1086be8..59d9c49b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java @@ -20,16 +20,8 @@ import java.util.List; public interface CameraInfoMapper extends BaseMapper { IPage findPage(Page page, @Param("params") CameraInfo cameraInfo); List findList(CameraInfo cameraInfo); - List findAllList(); - IPage findNuPage(Page page, @Param("params") CameraInfo cameraInfo); + List findAllList(CameraInfo cameraInfo); CameraInfo getByDeviceId(CameraInfo cameraInfo); - CameraInfo getCapabilityByDeviceId(CameraInfo cameraInfo); - void insertCapability(CameraInfo cameraInfo); - void updateCapabilityById(CameraInfo cameraInfo); void updateDeviceStatusByDevId(CameraInfo cameraInfo); - void updatePlanByDevId(CameraInfo cameraInfo); - IPage previewList(Page page, @Param("params") CameraInfo cameraInfo); - void release(CameraInfo cameraInfo); - void updateBind(CameraInfo cameraInfo); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index a633c27b..6607893a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -25,14 +25,9 @@ location_name as locationName, system_type as systemType, protocol as protocol, - record_plan_id as recordPlanId, - a.nu_id as nuId, - b.nu_name as nuName, ifnull(c.multitrans,0) as multitrans, - a.sn, - a.maintain_status, a.channel - from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id + from nu_iot_tplink_camera a left join nu_iot_tplink_camera_capability c on a.device_index = c.device_index @@ -50,12 +45,6 @@ AND a.region_name LIKE concat('%',#{params.regionName},'%') - - AND a.nu_id = #{params.nuId} - - - AND b.nu_name LIKE concat('%',#{params.nuName},'%') - AND a.project_id = #{params.projectId} @@ -88,11 +77,8 @@ location_name as locationName, system_type as systemType, protocol as protocol, - record_plan_id as recordPlanId, - a.nu_id as nuId, - b.nu_name as nuName, a.channel - from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id + from nu_iot_tplink_camera a AND a.project_id = #{projectId} @@ -100,63 +86,40 @@ AND a.region_id = #{regionId} - - AND ifnull(a.record_plan_id,'-1') = #{recordPlanId} - - - - - - - insert into nu_iot_tplink_camera_capability ( - id, - device_index, - motion_detection, - video_cover, - ptz, - motor, - smart_code, - force_idr_frame, - audio, - local_storage, - playback_api_version_two, - multitrans, - passenger_flow, - get_preview_thumbnail, - preview_thumbnail_jpeg, - corridor_mod, - backlight_coexistence - ) - values ( - #{id}, - #{deviceIndex}, - #{motionDetection}, - #{videoCover}, - #{ptz}, - #{motor}, - #{smartCode}, - #{forceIdrFrame}, - #{audio}, - #{localStorage}, - #{playbackApiVersionTwo}, - #{multitrans}, - #{passengerFlow}, - #{getPreviewThumbnail}, - #{previewThumbnailJpeg}, - #{corridorMod}, - #{backlightCoexistence} - ) - - - - UPDATE nu_iot_tplink_camera_capability - SET - device_index = #{deviceIndex}, - motion_detection = #{motionDetection}, - video_cover = #{videoCover}, - ptz = #{ptz}, - motor = #{motor}, - smart_code = #{smartCode}, - force_idr_frame = #{forceIdrFrame}, - audio = #{audio}, - local_storage = #{localStorage}, - playback_api_version_two = #{playbackApiVersionTwo}, - multitrans = #{multitrans}, - passenger_flow = #{passengerFlow}, - get_preview_thumbnail = #{getPreviewThumbnail}, - preview_thumbnail_jpeg = #{previewThumbnailJpeg}, - corridor_mod = #{corridorMod}, - backlight_coexistence = #{backlightCoexistence} - where id = #{id} - - UPDATE nu_iot_tplink_camera @@ -283,12 +159,6 @@ where device_index = #{deviceIndex} - - UPDATE nu_iot_tplink_camera - SET record_plan_id = #{recordPlanId} - where device_index = #{deviceIndex} - - - - update nu_iot_tplink_camera - set - nu_id = null, - nu_name = null, - dimension = null - where id = #{id} - - - - update nu_iot_tplink_camera - set - nu_id = #{nuId}, - dimension = #{dimension} - where id = #{id} - 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 5f5b997f..03371709 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 @@ -22,78 +22,11 @@ public interface ICameraInfoService extends IService { IPage findPage(Page page, CameraInfo cameraInfo); List findModelList(CameraInfo cameraInfo); List findAllList(); - IPage findNuPage(Page page, CameraInfo cameraInfo); - void edit(CameraInfo cameraInfo); - void rebootDevice(CameraInfo cameraInfo); - void sync(String jsonResponse); - void syncCapability(String deviceIndex,String jsonResponse); - Result syncProjectIpcDevice(CameraInfo cameraInfo); - Result getIpcCapability(CameraInfo cameraInfo); Result getDeviceDetails(CameraInfo cameraInfo); - Result getImageCommon(Map map); - Result setImageCommon(Map map); - Result getImageSwitch(Map map); - Result setImageSwitch(Map map); - Result getOsdCapability(Map map); - Result getOsd(Map map); - Result setOsd(Map map); - Result getVideoParams(Map map); - Result setVideoParams(Map map); - Result configRecovery(Map map); Result> getPreviewUrl(CameraInfo cameraInfo); - Result getStorageDevice(CameraInfo cameraInfo) throws Exception; - Result getAllRecordPlans(CameraInfo cameraInfo) throws Exception; - Result addRecordCfgs(CameraInfo cameraInfo) throws Exception; - Result setRecordCfgs(CameraInfo cameraInfo) throws Exception; - Result delRecordCfgs(CameraInfo cameraInfo) throws Exception; - IPage getRecordCfgs(CameraInfo cameraInfo,Integer pageNo,Integer pageSize) throws Exception; - Result getBatchProgress(CameraInfo cameraInfo) throws Exception; - Result getTamperDet(Map map); - Result setTamperDet(Map map); - Result getTamperNotif(Map map); - Result setTamperNotif(Map map); Result testAudio(Map map); - Result getAlarmInfo(Map map); - Result setAlarmInfo(Map map); - Result getAlarmPlan(Map map); - Result setAlarmPlan(Map map); - Result> searchVideo(Integer pageNo, Integer pageSize, CameraInfo cameraInfo); - Result> getPlaybackUrlList(CameraInfo cameraInfo); - Result deletePlaybackChn(CameraInfo cameraInfo); Result> getMultitransUrl(CameraInfo cameraInfo) throws Exception; - - /** - * 功能：tplink下载服务视频 - * - * @param cameraInfo 参数如下
- * deviceIndex设备序号
- * parentId父设备id
- * fileName文件名称
- * videoType回放录像类型。1代表定时录像，2代表移动侦测录像，3代表全选
- * ftpUploadpath视频上传位置
- * startTime开始时间
- * endTime结束时间
- * @return - */ - Result uploadToServer(CameraInfo cameraInfo); - Result stopUploadToServer(CameraInfo cameraInfo); - Result getUploadToServerProcess(CameraInfo cameraInfo); Result motionCtrl(CameraInfo cameraInfo); - - void baoxiu(CameraInfo cameraInfo); - - /** - * 下载tplink自定义录像 - * @param nuId 护理单元id - * @param startTime 下载开始时间 - * @param endTime 下载结束时间 - * @return - */ - String zdyTplinkVideo(String nuId, String startTime, String endTime); - IPage previewList(Page page, CameraInfo cameraInfo); - //释放设备 - void release(CameraInfo cameraInfo); - void updateBind(CameraInfo cameraInfo); } 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 b0eacb38..31974367 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 @@ -1,41 +1,29 @@ package com.nu.modules.tplink.camera.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; -import com.baomidou.dynamic.datasource.annotation.DS; -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.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.collect.Maps; -import com.nu.entity.DirectiveOrderEntity; -import com.nu.modules.camerainfo.api.CameraInfoApi; +import com.nu.modules.camerainfo.api.ICameraInfoApi; import com.nu.entity.CameraInfoEntity; import com.nu.modules.tplink.camera.model.CameraTreeModel; import com.nu.modules.tplink.common.entity.TumsConfig; import com.nu.modules.tplink.common.mapper.TumsConfigMapper; import org.apache.commons.compress.utils.Lists; -import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.util.DateUtils; import com.nu.modules.tplink.camera.entity.CameraInfo; import com.nu.modules.tplink.camera.mapper.CameraInfoMapper; import com.nu.modules.tplink.camera.service.ICameraInfoService; import com.nu.modules.tplink.common.entity.ErrorCode; import com.nu.modules.tplink.common.service.IErrorCodeService; import com.nu.modules.tplink.utils.TumsApi; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; -import java.io.File; -import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; import static java.lang.Thread.sleep; @@ -48,7 +36,7 @@ import static java.lang.Thread.sleep; */ @Service @Slf4j -public class CameraInfoServiceImpl extends ServiceImpl implements ICameraInfoService, CameraInfoApi { +public class CameraInfoServiceImpl extends ServiceImpl implements ICameraInfoService, ICameraInfoApi { @Autowired private TumsApi tumsApi; @@ -57,10 +45,6 @@ public class CameraInfoServiceImpl extends ServiceImpl findAllList() { - return baseMapper.findAllList(); + return baseMapper.findAllList(null); } - /** - * 获取护理单元信息 - * - * @return - */ - public IPage findNuPage(Page page, CameraInfo cameraInfo) { - return baseMapper.findNuPage(page, cameraInfo); - } - - /** - * 调用接口-修改tums摄像头名称 - * - * @param cameraInfo - * @return - */ - public Result modifyDeviceDetails(CameraInfo cameraInfo) { - String id = cameraInfo.getDeviceIndex(); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"devId\"").append(":").append("\"").append(id).append("\"").append(","); - sb.append("\"deviceName\"").append(":").append("\"").append(cameraInfo.getDeviceName()).append("\""); - sb.append("}"); - String jsonRes = tumsApi.modifyDeviceDetails(sb.toString()); - JSONObject jsonObject = new JSONObject(jsonRes); - if (jsonObject.getInt("error_code").equals(0)) { - return Result.OK(); - } else { - return Result.error(jsonObject.getStr("msg")); - } - } - - /** - * 修改摄像头设备信息 - * - * @param cameraInfo - * @return - */ - @Override - public void edit(CameraInfo cameraInfo) { - modifyDeviceDetails(cameraInfo); - baseMapper.updateById(cameraInfo); - } - - /** - * 调用接口-重启摄像头设备 - * - * @param cameraInfo - * @return - */ - public Result rebootDeviceList(CameraInfo cameraInfo) { - //1、先设置项目 2、重启设备 - String projectId = cameraInfo.getProjectId(); - String id = cameraInfo.getDeviceIndex(); - StringBuffer psb = new StringBuffer(); - psb.append("{"); - psb.append("\"projectId\"").append(":").append("\"").append(projectId).append("\""); - psb.append("}"); - System.out.println(psb.toString()); - String pJsonRes = tumsApi.setCurrentProject(psb.toString()); - System.out.println(pJsonRes); - JSONObject pJsonObject = new JSONObject(pJsonRes); - if (pJsonObject.getInt("error_code").equals(0)) { - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"deviceIndexList\"").append(":").append("[\"").append(id).append("\"]"); - sb.append("}"); - String jsonRes = tumsApi.rebootDeviceList(sb.toString()); - JSONObject jsonObject = new JSONObject(jsonRes); - if (jsonObject.getInt("error_code").equals(0)) { - return Result.OK(); - } else { - return Result.error(jsonObject.getStr("msg")); - } - } else { - return Result.error(pJsonObject.getStr("msg")); - } - } - - /** - * 重启摄像头设备 - * - * @param cameraInfo - * @return - */ - @Override - public void rebootDevice(CameraInfo cameraInfo) { - rebootDeviceList(cameraInfo); - } - - /** - * 同步摄像头设备信息入库 - * - * @param jsonResponse - * @return - */ - @Override - public void sync(String jsonResponse) { - JSONObject jsonObject = new JSONObject(jsonResponse); - if (jsonObject.getInt("error_code").equals(0)) { - JSONObject result = (JSONObject) jsonObject.get("result"); - if (result.getInt("total") > 0) { - JSONArray list = result.getJSONArray("list"); - for (int i = 0; i < list.size(); i++) { - ObjectMapper mapper = new ObjectMapper(); - String jsonString = list.get(i).toString(); - try { - CameraInfo cameraInfo = mapper.readValue(jsonString, CameraInfo.class); - CameraInfo entity = baseMapper.getByDeviceId(cameraInfo); - if (entity == null) { - //新增 - baseMapper.insert(cameraInfo); - } else { - //修改 - cameraInfo.setId(entity.getId()); - baseMapper.updateById(cameraInfo); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } - } - - /** - * 同步摄像头设备能力集入库 - * - * @param deviceIndex - * @param jsonResponse - * @return - */ - @Override - public void syncCapability(String deviceIndex, String jsonResponse) { - JSONObject jsonObject = new JSONObject(jsonResponse); - if (jsonObject.getInt("error_code").equals(0)) { - JSONObject result = (JSONObject) jsonObject.get("result"); - String capability = result.getStr("capability"); - ObjectMapper mapper = new ObjectMapper(); - try { - CameraInfo cameraInfo = mapper.readValue(capability, CameraInfo.class); - cameraInfo.setDeviceIndex(deviceIndex); - CameraInfo entity = baseMapper.getCapabilityByDeviceId(cameraInfo); - if (entity == null) { - //新增 - baseMapper.insertCapability(cameraInfo); - } else { - //修改 - cameraInfo.setId(entity.getId()); - baseMapper.updateCapabilityById(cameraInfo); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - /** - * 接口调用-获取摄像头能力集 - * - * @param cameraInfo - * @return - */ - @Override - public Result getIpcCapability(CameraInfo cameraInfo) { - JSONObject capability = new JSONObject(); - String id = cameraInfo.getDeviceIndex(); - StringBuffer paramsSb = new StringBuffer(); - paramsSb.append("{"); - paramsSb.append("\"devId\"").append(":").append("\"").append(id).append("\""); - paramsSb.append("}"); - String ipcCapabilityRes = tumsApi.getIpcCapability(paramsSb.toString()); - JSONObject jsonObject = new JSONObject(ipcCapabilityRes); - if (jsonObject.getInt("error_code").equals(0)) { - JSONObject ipcCapabilityResult = (JSONObject) jsonObject.get("result"); - capability = (JSONObject) ipcCapabilityResult.get("capability"); - } - return Result.OK(capability); - } - - /** - * 同步此项目下的IPC设备 - * - * @param cameraInfo - * @return - */ - @Override - public Result syncProjectIpcDevice(CameraInfo cameraInfo) { - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"start\"").append(":0").append(","); - sb.append("\"limit\"").append(":1000").append(","); - sb.append("\"filterAnd\"").append(":").append("{"); - sb.append("\"deviceTypeList\"").append(":[").append("\"SURVEILLANCECAMERA\"").append("],"); - sb.append("\"projectId\"").append(":").append("\"").append(cameraInfo.getProjectId()).append("\""); - sb.append("},"); - sb.append("\"sort\"").append(":").append("[{"); - sb.append("\"key\"").append(":").append("\"deviceIndex\"").append(","); - sb.append("\"value\"").append(":").append("\"asc\""); - sb.append("}]"); - sb.append("}"); - String jsonResponse = tumsApi.getDeviceList(sb.toString()); - JSONObject jsonObject = new JSONObject(jsonResponse); - String errorCode = jsonObject.getStr("error_code"); - if (errorCode.equals("0")) { - syncProjectIpc(jsonResponse); - return Result.OK("同步设备成功！"); - } else { - String errMsg = ""; - try { - ErrorCode errVo = errorCodeService.getByCode(errorCode); - errMsg += errVo.getErrorMsg(); - } catch (Exception e) { - errMsg += errorCode; - } - log.info("syncProjectIpcDevice:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 同步IPC设备信息入库 - * - * @param jsonResponse - * @return - */ - private void syncProjectIpc(String jsonResponse) { - JSONObject jsonObject = new JSONObject(jsonResponse); - if (jsonObject.getInt("error_code").equals(0)) { - JSONObject result = (JSONObject) jsonObject.get("result"); - if (result.getInt("total") > 0) { - JSONArray list = result.getJSONArray("list"); - for (int i = 0; i < list.size(); i++) { - ObjectMapper mapper = new ObjectMapper(); - String jsonString = list.get(i).toString(); - try { - CameraInfo cameraInfo = mapper.readValue(jsonString, CameraInfo.class); - CameraInfo entity = baseMapper.getByDeviceId(cameraInfo); - if (entity == null) { - //新增 - baseMapper.insert(cameraInfo); - } else { - //修改 - cameraInfo.setId(entity.getId()); - baseMapper.updateById(cameraInfo); - } - //同步能力集 - syncIpcCapability(cameraInfo); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } - } - - /** - * 同步IPC设备能力集入库 - * - * @param cameraInfo - * @return - */ - private void syncIpcCapability(CameraInfo cameraInfo) { - String deviceIndex = cameraInfo.getDeviceIndex(); - StringBuffer paramsSb = new StringBuffer(); - paramsSb.append("{"); - paramsSb.append("\"devId\"").append(":").append("\"").append(deviceIndex).append("\""); - paramsSb.append("}"); - String ipcCapabilityRes = tumsApi.getIpcCapability(paramsSb.toString()); - JSONObject jsonObject = new JSONObject(ipcCapabilityRes); - if (jsonObject.getInt("error_code").equals(0)) { - JSONObject result = (JSONObject) jsonObject.get("result"); - String capabilityStr = result.getStr("capability"); - ObjectMapper mapper = new ObjectMapper(); - try { - CameraInfo capability = mapper.readValue(capabilityStr, CameraInfo.class); - capability.setDeviceIndex(deviceIndex); - CameraInfo entity = baseMapper.getCapabilityByDeviceId(capability); - if (entity == null) { - //新增 - baseMapper.insertCapability(capability); - } else { - //修改 - capability.setId(entity.getId()); - baseMapper.updateCapabilityById(capability); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } /** * 更新设备在线状态 @@ -443,847 +137,6 @@ public class CameraInfoServiceImpl extends ServiceImpl getImageCommon(Map map) { - String id = map.get("deviceIndex").toString(); - String type = map.get("type").toString(); - 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 setImageCommon(Map map) { - String id = map.get("deviceIndex").toString(); - String type = map.get("type").toString(); - 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("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("setImageCommon:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取画面操作信息 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result 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); - } - } - - /** - * 获取OSD能力集参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getOsdCapability(Map map) { - String id = map.get("deviceIndex").toString(); - 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("\"osd_capability\"").append(":").append("{"); - sb.append("\"name\"").append(":").append("\"capability\""); - 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 osdCapability = (JSONObject) responseData.get("osd_capability"); - JSONObject capability = (JSONObject) osdCapability.get("capability"); - return Result.OK(capability); - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(id, errorCode); - log.info("getOsdCapability:{}", 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("getOsdCapability:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取OSD参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getOsd(Map map) { - String id = map.get("deviceIndex").toString(); - 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("\"OSD\"").append(":").append("{"); - sb.append("\"name\"").append(":[").append("\"font\",").append("\"week\",").append("\"date\"").append("],"); - sb.append("\"table\"").append(":").append("\"label_info\""); - 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 osd = (JSONObject) responseData.get("OSD"); - return Result.OK(osd); - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(id, errorCode); - log.info("getOsd:{}", 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("getOsd:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置OSD参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setOsd(Map map) { - String id = map.get("deviceIndex").toString(); - String dateEnabled = map.get("dateEnabled").toString(); - String weekEnabled = map.get("weekEnabled").toString(); - String labelEnabled = map.get("labelEnabled").toString(); - String mainFontPixel = map.get("mainFontPixel").toString(); - 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("\"OSD\"").append(":").append("{"); - sb.append("\"font\"").append(":").append("{"); - sb.append("\"display\"").append(":").append("\"ntnb\","); - sb.append("\"main_font_pixel\"").append(":").append(mainFontPixel); - sb.append("},"); - sb.append("\"date\"").append(":").append("{"); - sb.append("\"enabled\"").append(":").append("\"").append(dateEnabled).append("\""); - sb.append("},"); - sb.append("\"week\"").append(":").append("{"); - sb.append("\"enabled\"").append(":").append("\"").append(weekEnabled).append("\""); - sb.append("},"); - sb.append("\"label_info_1\"").append(":").append("{"); - sb.append("\"enabled\"").append(":").append("\"").append(labelEnabled).append("\""); - 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("setOsd:{}", 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("setOsd:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取码率参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getVideoParams(Map map) { - String id = map.get("deviceIndex").toString(); - 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("\"video\"").append(":").append("{"); - sb.append("\"name\"").append(":[").append("\"main\"").append(",").append("\"minor\"").append("]"); - sb.append("},"); - sb.append("\"video_capability\"").append(":").append("{"); - sb.append("\"name\"").append(":[").append("\"main\"").append(",").append("\"minor\"").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 resObject = new JSONObject(); - JSONObject video = (JSONObject) responseData.get("video"); - JSONObject mainData = (JSONObject) video.get("main"); - resObject.set("mainData", mainData); - JSONObject minorData = (JSONObject) video.get("minor"); - resObject.set("minorData", minorData); - JSONObject videoCapability = (JSONObject) responseData.get("video_capability"); - JSONObject mainCapability = (JSONObject) videoCapability.get("main"); - JSONArray encodeTypes = mainCapability.getJSONArray("encode_types"); - JSONArray mainEncodeTypeArr = new JSONArray(); - for (int i = 0; i < encodeTypes.size(); i++) { - JSONObject json = new JSONObject(); - String value = encodeTypes.get(i).toString(); - json.set("label", value); - json.set("value", value); - mainEncodeTypeArr.put(json); - } - resObject.set("mainEncodeTypeArr", mainEncodeTypeArr); - JSONArray frameRates = mainCapability.getJSONArray("frame_rates"); - JSONArray mainFrameRatesArr = new JSONArray(); - for (int i = 0; i < frameRates.size(); i++) { - JSONObject json = new JSONObject(); - String value = frameRates.get(i).toString(); - if ("65537".equals(value)) { - json.set("label", "1"); - } - if ("65546".equals(value)) { - json.set("label", "10"); - } - if ("65551".equals(value)) { - json.set("label", "15"); - } - if ("65556".equals(value)) { - json.set("label", "20"); - } - json.set("value", value); - mainFrameRatesArr.put(json); - } - resObject.set("mainFrameRatesArr", mainFrameRatesArr); - JSONArray bitrates = mainCapability.getJSONArray("bitrates"); - JSONArray mainBitrateArr = new JSONArray(); - for (int i = 0; i < bitrates.size(); i++) { - JSONObject json = new JSONObject(); - String value = bitrates.get(i).toString(); - json.set("label", value); - json.set("value", value); - mainBitrateArr.put(json); - } - resObject.set("mainBitrateArr", mainBitrateArr); - JSONArray bitrateTypes = mainCapability.getJSONArray("bitrate_types"); - JSONArray mainBitrateTypeArr = new JSONArray(); - for (int i = 0; i < bitrateTypes.size(); i++) { - JSONObject json = new JSONObject(); - String value = bitrateTypes.get(i).toString(); - if ("cbr".equals(value)) { - json.set("label", "定码率"); - } - if ("vbr".equals(value)) { - json.set("label", "变码率"); - } - json.set("value", value); - mainBitrateTypeArr.put(json); - } - resObject.set("mainBitrateTypeArr", mainBitrateTypeArr); - JSONArray resolutions = mainCapability.getJSONArray("resolutions"); - JSONArray mainResolutionArr = new JSONArray(); - for (int i = 0; i < resolutions.size(); i++) { - JSONObject json = new JSONObject(); - String value = resolutions.get(i).toString(); - json.set("label", value); - json.set("value", value); - mainResolutionArr.put(json); - } - resObject.set("mainResolutionArr", mainResolutionArr); - JSONArray qualitys = mainCapability.getJSONArray("qualitys"); - JSONArray mainQualityArr = new JSONArray(); - for (int i = 0; i < qualitys.size(); i++) { - JSONObject json = new JSONObject(); - String value = qualitys.get(i).toString(); - if ("1".equals(value)) { - json.set("label", "低"); - } - if ("3".equals(value)) { - json.set("label", "中"); - } - if ("5".equals(value)) { - json.set("label", "高 "); - } - json.set("value", value); - mainQualityArr.put(json); - } - resObject.set("mainQualityArr", mainQualityArr); - - JSONObject minorCapability = (JSONObject) videoCapability.get("minor"); - encodeTypes = minorCapability.getJSONArray("encode_types"); - JSONArray minorEncodeTypeArr = new JSONArray(); - for (int i = 0; i < encodeTypes.size(); i++) { - JSONObject json = new JSONObject(); - String value = encodeTypes.get(i).toString(); - json.set("label", value); - json.set("value", value); - minorEncodeTypeArr.put(json); - } - resObject.set("minorEncodeTypeArr", minorEncodeTypeArr); - frameRates = minorCapability.getJSONArray("frame_rates"); - JSONArray minorFrameRatesArr = new JSONArray(); - for (int i = 0; i < frameRates.size(); i++) { - JSONObject json = new JSONObject(); - String value = frameRates.get(i).toString(); - if ("65537".equals(value)) { - json.set("label", "1"); - } - if ("65546".equals(value)) { - json.set("label", "10"); - } - if ("65551".equals(value)) { - json.set("label", "15"); - } - if ("65556".equals(value)) { - json.set("label", "20"); - } - json.set("value", value); - minorFrameRatesArr.put(json); - } - resObject.set("minorFrameRatesArr", minorFrameRatesArr); - bitrates = minorCapability.getJSONArray("bitrates"); - JSONArray minorBitrateArr = new JSONArray(); - for (int i = 0; i < bitrates.size(); i++) { - JSONObject json = new JSONObject(); - String value = bitrates.get(i).toString(); - json.set("label", value); - json.set("value", value); - minorBitrateArr.put(json); - } - resObject.set("minorBitrateArr", minorBitrateArr); - bitrateTypes = minorCapability.getJSONArray("bitrate_types"); - JSONArray minorBitrateTypeArr = new JSONArray(); - for (int i = 0; i < bitrateTypes.size(); i++) { - JSONObject json = new JSONObject(); - String value = bitrateTypes.get(i).toString(); - if ("cbr".equals(value)) { - json.set("label", "定码率"); - } - if ("vbr".equals(value)) { - json.set("label", "变码率"); - } - json.set("value", value); - minorBitrateTypeArr.put(json); - } - resObject.set("minorBitrateTypeArr", minorBitrateTypeArr); - resolutions = minorCapability.getJSONArray("resolutions"); - JSONArray minorResolutionArr = new JSONArray(); - for (int i = 0; i < resolutions.size(); i++) { - JSONObject json = new JSONObject(); - String value = resolutions.get(i).toString(); - json.set("label", value); - json.set("value", value); - minorResolutionArr.put(json); - } - resObject.set("minorResolutionArr", minorResolutionArr); - qualitys = minorCapability.getJSONArray("qualitys"); - JSONArray minorQualityArr = new JSONArray(); - for (int i = 0; i < qualitys.size(); i++) { - JSONObject json = new JSONObject(); - String value = qualitys.get(i).toString(); - if ("1".equals(value)) { - json.set("label", "低"); - } - if ("3".equals(value)) { - json.set("label", "中"); - } - if ("5".equals(value)) { - json.set("label", "高 "); - } - json.set("value", value); - minorQualityArr.put(json); - } - resObject.set("minorQualityArr", minorQualityArr); - - return Result.OK(resObject); - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(id, errorCode); - log.info("getVideoParams:{}", 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("getVideoParams:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置码率参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setVideoParams(Map map) { - String id = map.get("deviceIndex").toString(); - Map mainMap = (Map) map.get("main"); - Map minorMap = (Map) map.get("minor"); - 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("\"video\"").append(":").append("{"); - sb.append("\"main\"").append(":").append("{"); - //类属性+类值 - StringBuffer mainSb = new StringBuffer(); - Set mainKeys = mainMap.keySet(); - // 遍历键的集合并打印每个键 - for (String key : mainKeys) { - String value = mainMap.get(key).toString(); - mainSb.append("\"").append(key).append("\"").append(":").append("\"").append(value).append("\"").append(","); - } - String mainStr = mainSb.toString(); - if (mainStr.length() > 0) { - mainStr = mainStr.substring(0, mainStr.length() - 1); - } - sb.append(mainStr); - sb.append("},"); - sb.append("\"minor\"").append(":").append("{"); - //类属性+类值 - StringBuffer minorSb = new StringBuffer(); - Set minorKeys = minorMap.keySet(); - // 遍历键的集合并打印每个键 - for (String key : minorKeys) { - String value = minorMap.get(key).toString(); - minorSb.append("\"").append(key).append("\"").append(":").append("\"").append(value).append("\"").append(","); - } - String minorStr = minorSb.toString(); - if (minorStr.length() > 0) { - minorStr = minorStr.substring(0, minorStr.length() - 1); - } - sb.append(minorStr); - 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("setVideoParams:{}", 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("setVideoParams:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 恢复画面默认值 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result configRecovery(Map map) { - String id = map.get("deviceIndex").toString(); - 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("\"do\"").append(","); - sb.append("\"system\"").append(":").append("{"); - sb.append("\"config_recovery\"").append(":").append("{"); - sb.append("\"config_name\"").append(":").append("[").append("\"image\"").append("]"); - 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("configRecovery:{}", 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("configRecovery:{}", errMsg); - return Result.error(errMsg); - } - } - /** * 获取摄像头实时播放地址 * 添加预览通道 @@ -1372,564 +225,6 @@ public class CameraInfoServiceImpl extends ServiceImpl 0) { - idsStr = idsStr.substring(0, idsStr.length() - 1); - } - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"devIds\"").append(":").append("[").append(idsStr).append("],"); - sb.append("\"storageList\"").append(":").append("["); - sb.append("{"); - if (cameraInfo.getStorageDevId() != null && !cameraInfo.getStorageDevId().equals("")) { - //存储设备ID - sb.append("\"storageDevId\"").append(":").append(cameraInfo.getStorageDevId()).append(","); - if (cameraInfo.getStorageDevId().equals("0")) { - sb.append("\"storageType\"").append(":").append("1").append(","); - } else { - sb.append("\"storageType\"").append(":").append("2").append(","); - } - } - sb.append("\"recordPlanId\"").append(":").append(cameraInfo.getRecordPlanId()).append(","); - sb.append("\"streamType\"").append(":").append(cameraInfo.getStreamType()); - sb.append("}"); - sb.append("]"); - sb.append("}"); - String res = tumsApi.addRecordCfgs(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if (errorCode == 0) { - for (int i = 0; i < idArr.length; i++) { - CameraInfo entity = new CameraInfo(); - entity.setDeviceIndex(idArr[i]); - entity.setRecordPlanId(cameraInfo.getRecordPlanId()); - baseMapper.updatePlanByDevId(entity); - } - return Result.OK("添加录像计划成功!计划生效有延迟，请刷新查看！"); - } else { - return Result.error("添加录像计划失败!"); - } - } - - /** - * 设置录像计划 - * - * @param cameraInfo - * @return - * @throws Exception - */ - @Override - public Result setRecordCfgs(CameraInfo cameraInfo) throws Exception { - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"ids\"").append(":").append("[").append(cameraInfo.getIds()).append("],"); -// sb.append("\"streamType\"").append(":").append(cameraInfo.getStreamType()).append(","); -// if(cameraInfo.getStorageDevId()!=null&&!cameraInfo.getStorageDevId().equals("")&&!cameraInfo.getStorageDevId().equals("0")){ -// //存储设备ID -// sb.append("\"storageDevId\"").append(":").append("\"").append(cameraInfo.getStorageDevId()).append("\","); -// } -// sb.append("\"recordPlanId\"").append(":").append(cameraInfo.getRecordPlanId()).append(","); - sb.append("\"recordSwitch\"").append(":").append(cameraInfo.getRecordSwitch()); - sb.append("}"); - String res = tumsApi.setRecordCfgs(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if (errorCode == 0) { - return Result.OK("设置录像计划成功!计划生效有延迟，请刷新查看！"); - } else { - return Result.error("设置录像计划失败!"); - } - } - - /** - * 删除录像计划 - * - * @param cameraInfo - * @return - * @throws Exception - */ - @Override - public Result delRecordCfgs(CameraInfo cameraInfo) throws Exception { - String ids = cameraInfo.getIds(); - String devIds = cameraInfo.getDeviceIndex(); - String[] idArr = ids.split(","); - String[] devIdArr = devIds.split(","); - StringBuffer idSb = new StringBuffer(); - for (int i = 0; i < idArr.length; i++) { - idSb.append("\"").append(idArr[i]).append("\","); - } - String idsStr = idSb.toString(); - if (idsStr.length() > 0) { - idsStr = idsStr.substring(0, idsStr.length() - 1); - } - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"ids\"").append(":").append("[").append(idsStr).append("]"); - sb.append("}"); - String res = tumsApi.delRecordCfgs(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if (errorCode == 0) { - for (int i = 0; i < devIdArr.length; i++) { - CameraInfo entity = new CameraInfo(); - entity.setDeviceIndex(devIdArr[i]); - entity.setRecordPlanId("-1"); - baseMapper.updatePlanByDevId(entity); - } - return Result.OK("删除录像计划成功!计划生效有延迟，请刷新查看！"); - } else { - return Result.error("删除录像计划失败!"); - } - } - - /** - * 获取录像配置 - * - * @param cameraInfo - * @return - * @throws Exception - */ - @Override - public IPage getRecordCfgs(CameraInfo cameraInfo, Integer pageNo, Integer pageSize) throws Exception { - IPage page = new Page<>(); - page.setSize(pageSize); - page.setCurrent(pageNo); - if (cameraInfo.getProjectId() == null || cameraInfo.getProjectId().equals("")) { - return page; - } - if (cameraInfo.getRegionId() == null || cameraInfo.getRegionId().equals("")) { - return page; - } - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"start\"").append(":").append((pageNo - 1) * pageSize).append(","); - sb.append("\"limit\"").append(":").append(pageSize).append(","); - sb.append("\"filterAnd\"").append(":").append("{"); - sb.append("\"projectId\"").append(":").append("\"").append(cameraInfo.getProjectId()).append("\","); - sb.append("\"regionId\"").append(":").append("\"").append(cameraInfo.getRegionId()).append("\""); - sb.append("},"); - sb.append("\"sort\"").append(":").append("[{"); - sb.append("\"key\"").append(":").append("\"ip\","); - sb.append("\"value\"").append(":").append("\"desc\""); - sb.append("}]"); - sb.append("}"); - String res = tumsApi.getRecordCfgs(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if (errorCode == 0) { - JSONObject result = (JSONObject) jsonObject.get("result"); - Long total = result.getLong("total"); - page.setTotal(total); - if (total > 0) { - List list = Lists.newArrayList(); - JSONArray array = result.getJSONArray("list"); - for (int i = 0; i < array.size(); i++) { - CameraInfo ci = new CameraInfo(); - JSONObject json = (JSONObject) array.get(i); - String devId = json.getStr("devId"); - ci.setDeviceIndex(devId); - String devName = json.getStr("devName"); - ci.setDeviceName(devName); - String ip = json.getStr("ip"); - ci.setIp(ip); - JSONArray expand = json.getJSONArray("expand"); - JSONObject expandJson = (JSONObject) expand.get(0); - String id = expandJson.getStr("id"); - ci.setIds(id); - String recordSwitch = expandJson.getStr("recordSwitch"); - ci.setRecordSwitch(recordSwitch); - if (recordSwitch.equals("1")) { - ci.setRecordSwitchBoolean(true); - } else { - ci.setRecordSwitchBoolean(false); - } - int streamType = expandJson.getInt("streamType"); - ci.setStreamType(streamType); - String recordPlanId = expandJson.getStr("recordPlanId"); - ci.setRecordPlanId(recordPlanId); - String recordPlanName = expandJson.getStr("recordPlanName"); - ci.setPlanName(recordPlanName); - String storageType = expandJson.getStr("storageType"); - ci.setStorageType(storageType); - if (storageType.equals("0")) { - ci.setStorageDevId("0"); - ci.setStorageDevName("本设备"); - } else { - String storageDevId = expandJson.getStr("storageDevId"); - ci.setStorageDevId(storageDevId); - String storageDevName = expandJson.getStr("storageDevName"); - ci.setStorageDevName(storageDevName); - } - list.add(ci); - } - page.setRecords(list); - } - } - return page; - } - - /** - * 获取批量操作录像计划进度 - * - * @param cameraInfo - * @return - * @throws Exception - */ - @Override - public Result getBatchProgress(CameraInfo cameraInfo) throws Exception { - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"batchType\"").append(":").append(cameraInfo.getBatchType()); - sb.append("}"); - String res = tumsApi.getBatchProgress(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if (errorCode == 0) { - return Result.OK("获取批量操作录像计划进度成功!"); - } else { - return Result.error("获取批量操作录像计划进度失败!"); - } - } - - /** - * 获取镜头遮挡参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getTamperDet(Map map) { - String id = map.get("deviceIndex").toString(); - 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("\"tamper_detection\"").append(":").append("{"); - sb.append("\"name\"").append(":[").append("\"tamper_det\"").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 tamperDetection = (JSONObject) responseData.get("tamper_detection"); - JSONObject tamperDet = (JSONObject) tamperDetection.get("tamper_det"); - return Result.OK(tamperDet); - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(id, errorCode); - log.info("getTamperDet:{}", 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("getTamperDet:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置镜头遮挡参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setTamperDet(Map map) { - String id = map.get("deviceIndex").toString(); - String enabled = map.get("enabled").toString(); - 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("\"tamper_detection\"").append(":").append("{"); - sb.append("\"tamper_det\"").append(":").append("{"); - if ("on".equals(enabled)) { - String digitalSensitivity = map.get("digitalSensitivity").toString(); - sb.append("\"digital_sensitivity\"").append(":").append(digitalSensitivity).append(","); - } - sb.append("\"enabled\"").append(":").append("\"").append(enabled).append("\""); - 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("getTamperDet:{}", 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("getTamperDet:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取镜头遮挡处理方式 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getTamperNotif(Map map) { - String id = map.get("deviceIndex").toString(); - 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("\"tamper_detection\"").append(":").append("{"); - sb.append("\"name\"").append(":[").append("\"tamper_notif_list\",").append("\"sound_alarm_info\"").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 tamperDetection = (JSONObject) responseData.get("tamper_detection"); - return Result.OK(tamperDetection); - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(id, errorCode); - log.info("setTamperDet:{}", 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("setTamperDet:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置镜头遮挡处理方式 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setTamperNotif(Map map) { - String id = map.get("deviceIndex").toString(); - String msgPushEnabled = map.get("msgPushEnabled").toString(); - String lightAlarmEnabled = map.get("lightAlarmEnabled").toString(); - String soundAlarmEnabled = map.get("soundAlarmEnabled").toString(); - String soundAlarmType = map.get("soundAlarmType").toString(); - String soundAlarmTimes = map.get("soundAlarmTimes").toString(); - 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("\"tamper_detection\"").append(":").append("{"); - sb.append("\"tamper_notif_list\"").append(":").append("{"); - sb.append("\"msg_push_enabled\"").append(":").append("\"").append(msgPushEnabled).append("\","); - sb.append("\"light_alarm_enabled\"").append(":").append("\"").append(lightAlarmEnabled).append("\","); - sb.append("\"sound_alarm_enabled\"").append(":").append("\"").append(soundAlarmEnabled).append("\""); - sb.append("},"); - sb.append("\"sound_alarm_info\"").append(":").append("{"); - sb.append("\"sound_alarm_type\"").append(":").append("\"").append(soundAlarmType).append("\","); - sb.append("\"sound_alarm_times\"").append(":").append("\"").append(soundAlarmTimes).append("\""); - 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("getTamperNotif:{}", 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("getTamperNotif:{}", errMsg); - return Result.error(errMsg); - } - } - /** * 报警声音试听 * @@ -1990,823 +285,6 @@ public class CameraInfoServiceImpl extends ServiceImpl getAlarmInfo(Map map) { - String id = map.get("deviceIndex").toString(); - 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("\"msg_alarm\"").append(":").append("{"); - sb.append("\"name\"").append(":").append("\"chn1_msg_alarm_info\""); - 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 msgAlarm = (JSONObject) responseData.get("msg_alarm"); - JSONObject alarmInfo = (JSONObject) msgAlarm.get("chn1_msg_alarm_info"); - return Result.OK(alarmInfo); - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(id, errorCode); - log.info("testAudio:{}", 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("testAudio:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置白光/声音告警参数 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setAlarmInfo(Map map) { - String id = map.get("deviceIndex").toString(); - String type = map.get("type").toString(); - String enabled = map.get("enabled").toString(); - 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("\"msg_alarm\"").append(":").append("{"); - sb.append("\"chn1_msg_alarm_info\"").append(":").append("{"); - if ("light".equals(type)) { - sb.append("\"light_alarm_enabled\"").append(":").append("\"").append(enabled).append("\""); - } - if ("sound".equals(type)) { - sb.append("\"sound_alarm_enabled\"").append(":").append("\"").append(enabled).append("\""); - } - 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("getAlarmInfo:{}", 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("getAlarmInfo:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 获取白光/声音告警布防时间 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result getAlarmPlan(Map map) { - String id = map.get("deviceIndex").toString(); - String type = map.get("type").toString(); - 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("\"msg_alarm_plan\"").append(":").append("{"); - if ("light".equals(type)) { - sb.append("\"name\"").append(":[").append("\"arming_schedule_light\"").append("]"); - } - if ("sound".equals(type)) { - sb.append("\"name\"").append(":[").append("\"arming_schedule_sound\"").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 alarmPlan = (JSONObject) responseData.get("msg_alarm_plan"); - return Result.OK(alarmPlan); - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(id, errorCode); - log.info("setAlarmInfo:{}", 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("setAlarmInfo:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 设置白光/声音告警布防时间 - * - * @param map - * @return - * @throws Exception - */ - @Override - public Result setAlarmPlan(Map map) { - String id = map.get("deviceIndex").toString(); - String type = map.get("type").toString(); - Map alarmPlan = (Map) map.get("alarmPlan"); - String monday = alarmPlan.get("monday").toString(); - String tuesday = alarmPlan.get("tuesday").toString(); - String wednesday = alarmPlan.get("wednesday").toString(); - String thursday = alarmPlan.get("thursday").toString(); - String friday = alarmPlan.get("friday").toString(); - String saturday = alarmPlan.get("saturday").toString(); - String sunday = alarmPlan.get("sunday").toString(); - 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("\"msg_alarm_plan\"").append(":").append("{"); - if ("light".equals(type)) { - sb.append("\"arming_schedule_light\""); - } - if ("sound".equals(type)) { - sb.append("\"arming_schedule_sound\""); - } - sb.append(":{"); - sb.append("\"monday\"").append(":").append("\"").append(monday).append("\"").append(","); - sb.append("\"tuesday\"").append(":").append("\"").append(tuesday).append("\"").append(","); - sb.append("\"wednesday\"").append(":").append("\"").append(wednesday).append("\"").append(","); - sb.append("\"thursday\"").append(":").append("\"").append(thursday).append("\"").append(","); - sb.append("\"friday\"").append(":").append("\"").append(friday).append("\"").append(","); - sb.append("\"saturday\"").append(":").append("\"").append(saturday).append("\"").append(","); - sb.append("\"sunday\"").append(":").append("\"").append(sunday).append("\""); - 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("getAlarmPlan:{}", 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("getAlarmPlan:{}", errMsg); - return Result.error(errMsg); - } - } - - /** - * 搜索存在回放录像的日期-预留 - * - * @param videoDevId,year - * @return - */ - public Map searchYear(String videoDevId, String year) { - Map map = new HashMap<>(); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("[{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(videoDevId).append("\""); - sb.append("}],"); - sb.append("\"year\"").append(":").append("\"").append(year).append("\""); - sb.append("}"); - String res = tumsApi.searchYear(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if (errorCode == 0) { - JSONArray result = jsonObject.getJSONArray("result"); - map.put("result", result); - } else { - map.put("result", new JSONArray()); - } - return map; - } - - /** - * 搜索某天的录像数据的总条数 - * - * @param deviceIndex - * @param parentId - * @param dataDate - * @param pageNo - * @param pageSize - * @return - */ - int getVideoTotal(String deviceIndex, String parentId, String dataDate, int pageNo, int pageSize) { - int count = 0; - int startIdx = (pageNo - 1) * pageSize; - int endIdx = pageNo * pageSize - 1; - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("[{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(deviceIndex).append("\","); - if (parentId != null && !parentId.equals("") && !parentId.equals("0")) { - //存储设备ID - sb.append("\"storageDevId\"").append(":").append("\"").append(parentId).append("\""); - } else { - //SK卡，取自身设备ID - sb.append("\"storageDevId\"").append(":").append("\"").append(deviceIndex).append("\""); - } - sb.append("}],"); - sb.append("\"searchDay\"").append(":").append("\"").append(dataDate).append("\","); - sb.append("\"startIdx\"").append(":").append(startIdx).append(","); - sb.append("\"endIdx\"").append(":").append(endIdx); - sb.append("}"); - String res = tumsApi.searchVideo(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - int errorCode = jsonObject.getInt("error_code"); - if (errorCode == 0) { - JSONObject result = (JSONObject) jsonObject.get("result"); - int total = result.getInt("total"); - count = count + total; - if (total >= pageSize) { - int more = getVideoTotal(deviceIndex, parentId, dataDate, pageNo + 1, pageSize); - count = count + more; - } - } - return count; - } - - /** - * 搜索某天的录像数据 - * - * @param pageNo - * @param pageSize - * @param cameraInfo - * @return - */ - @Override - public Result> searchVideo(Integer pageNo, Integer pageSize, CameraInfo cameraInfo) { - Page page = new Page(pageNo, pageSize); - String deviceIndex = cameraInfo.getDeviceIndex(); - String parentId = cameraInfo.getParentId(); - String dataDate = cameraInfo.getDataDate(); - dataDate = dataDate.replaceAll("-", ""); - int totalCount = getVideoTotal(deviceIndex, parentId, dataDate, 1, 800); - page = new Page(pageNo, pageSize, totalCount); - int startIdx = (pageNo - 1) * pageSize; - int endIdx = pageNo * pageSize - 1; - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("[{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(deviceIndex).append("\","); - if (parentId != null && !parentId.equals("") && !parentId.equals("0")) { - //存储设备ID - sb.append("\"storageDevId\"").append(":").append("\"").append(parentId).append("\""); - } else { - //SK卡，取自身设备ID - sb.append("\"storageDevId\"").append(":").append("\"").append(deviceIndex).append("\""); - } - sb.append("}],"); - sb.append("\"searchDay\"").append(":").append("\"").append(dataDate).append("\","); - sb.append("\"startIdx\"").append(":").append(startIdx).append(","); - sb.append("\"endIdx\"").append(":").append(endIdx); - sb.append("}"); - String res = tumsApi.searchVideo(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - String errorCode = jsonObject.getStr("error_code"); - if (errorCode.equals("0")) { - JSONObject result = (JSONObject) jsonObject.get("result"); - int total = result.getInt("total"); - if (total > 0) { - List list = Lists.newArrayList(); - JSONArray videos = result.getJSONArray("videos"); - JSONObject videoJson = (JSONObject) videos.get(0); - String videoDevId = videoJson.getStr("videoDevId"); - String storageDevId = videoJson.getStr("storageDevId"); - String channelId = videoJson.getStr("channelId"); - String nvsIdInPoolList = videoJson.getStr("nvsIdInPoolList"); - JSONArray startTime = videoJson.getJSONArray("startTime"); - JSONArray endTime = videoJson.getJSONArray("endTime"); - JSONArray videoTypeArr = videoJson.getJSONArray("videoType"); - JSONArray size = videoJson.getJSONArray("size"); - String errCode = videoJson.getStr("errorCode"); - ErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - for (int i = 0; i < total; i++) { - String videoTypeStr = videoTypeArr.get(i).toString(); - CameraInfo entity = new CameraInfo(); - entity.setVideoDevId(videoDevId); - entity.setStorageDevId(storageDevId); - entity.setChannelId(channelId); - entity.setNvsIdInPoolList(nvsIdInPoolList); - String startTimeStr = startTime.get(i).toString(); - entity.setStartTime(startTimeStr); - String endTimeStr = endTime.get(i).toString(); - entity.setEndTime(endTimeStr); - String sizeStr = size.get(i).toString(); - long startTimeL = Long.valueOf(startTimeStr) * 1000; - String startTimeFt = DateUtils.formatDate(DateUtils.getDate(startTimeL), "yyyy-MM-dd HH:mm:ss"); - entity.setStartTimeFt(startTimeFt); - long endTimeL = Long.valueOf(endTimeStr) * 1000; - String endTimeFt = DateUtils.formatDate(DateUtils.getDate(endTimeL), "yyyy-MM-dd HH:mm:ss"); - entity.setEndTimeFt(endTimeFt); - String duration = DateUtils.dateDiff(startTimeL, endTimeL); - entity.setDuration(duration); - entity.setVideoType(videoTypeStr); - BigDecimal zjs = new BigDecimal(sizeStr); - BigDecimal hs = new BigDecimal(1024); - BigDecimal MB = zjs.divide(hs).divide(hs).setScale(4, BigDecimal.ROUND_HALF_UP); - entity.setSize(MB.toString()); - entity.setErrorCode(errCode); - entity.setErrorMsg(errMsg); - list.add(entity); - } - page.setRecords(list); - } - } else { - String errorMsg = ""; - try { - ErrorCode errVo = errorCodeService.getByCode(errorCode); - errorMsg = errVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(deviceIndex, errorCode); - log.info("searchVideo:{}", errorMsg); - return Result.error(errorMsg); - } - return Result.OK(page); - } - - /** - * 获取指定监控点的存储设备列表 - * - * @param cameraInfo - * @return - */ - public Map getStoragesById(CameraInfo cameraInfo) { - Map map = new HashMap<>(); - map.put("error", "0"); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"devIds\"").append(":").append("[\"").append(cameraInfo.getDeviceIndex()).append("\"]"); - sb.append("}"); - String res = tumsApi.getStoragesById(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - String errorCode = jsonObject.getStr("error_code"); - if (errorCode.equals("0")) { - List ciList = Lists.newArrayList(); - JSONArray list = jsonObject.getJSONArray("result"); - for (int i = 0; i < list.size(); i++) { - JSONObject jsonObj = (JSONObject) list.get(i); - String devId = jsonObj.getStr("devId"); - if (devId.equals(cameraInfo.getDeviceIndex())) { - JSONArray storages = jsonObj.getJSONArray("storages"); - for (int j = 0; j < storages.size(); j++) { - JSONObject storage = (JSONObject) storages.get(j); - String storageType = storage.getStr("storageType"); - if (storageType.equals("-1")) { - continue; - } - String storageDevId = storage.getStr("storageDevId"); - String storageDevName = storage.getStr("storageDevName"); - String protocol = storage.getStr("protocol"); - String channel = storage.getStr("channel"); - CameraInfo entity = new CameraInfo(); - entity.setVideoDevId(cameraInfo.getDeviceIndex()); - entity.setStorageType(storageType); - entity.setStorageDevId(storageDevId); - entity.setStorageDevName(storageDevName); - entity.setProtocol(protocol); - entity.setChannelId(channel); - entity.setStartTime(cameraInfo.getStartTime()); - entity.setEndTime(cameraInfo.getEndTime()); - entity.setVideoType(cameraInfo.getVideoType()); - entity.setScale(cameraInfo.getScale()); - ciList.add(entity); - } - } else { - continue; - } - } - map.put("data", ciList); - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(cameraInfo.getDeviceIndex(), errorCode); - map.put("error", errorCode); - log.info("getStoragesById:{}", errorMsg); - } - return map; - } - - /** - * 添加回放通道V2 - * - * @param cameraInfo - * @return - */ - public Map addPlaybackChn(CameraInfo cameraInfo) { - Map map = new HashMap<>(); - map.put("error", "0"); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("[{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(cameraInfo.getVideoDevId()).append("\","); - sb.append("\"storageDevId\"").append(":").append("\"").append(cameraInfo.getStorageDevId()).append("\""); - sb.append("}],"); - sb.append("\"videoType\"").append(":").append("[").append(cameraInfo.getVideoType()).append("],"); - sb.append("\"scale\"").append(":\"").append(cameraInfo.getScale()).append("/1").append("\","); - sb.append("\"startTime\"").append(":").append(cameraInfo.getStartTime()).append(","); - sb.append("\"endTime\"").append(":").append(cameraInfo.getEndTime()); - sb.append("}"); - String res = tumsApi.addPlaybackChn(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - String errorCode = jsonObject.getStr("error_code"); - if (errorCode.equals("0")) { - List ciList = Lists.newArrayList(); - JSONArray list = jsonObject.getJSONArray("result"); - for (int i = 0; i < list.size(); i++) { - JSONObject jsonObj = (JSONObject) list.get(i); - String videoDevId = jsonObj.getStr("videoDevId"); - String videoChannelId = jsonObj.getStr("videoChannelId"); - String sessionId = jsonObj.getStr("sessionId"); - String errCode = jsonObj.getStr("errorCode"); - CameraInfo entity = new CameraInfo(); - entity.setVideoDevId(videoDevId); - entity.setVideoChannelId(videoChannelId); - entity.setSessionId(sessionId); - entity.setErrorCode(errCode); - entity.setStorageDevId(cameraInfo.getStorageDevId()); - entity.setVideoType(cameraInfo.getVideoType()); - entity.setStartTime(cameraInfo.getStartTime()); - entity.setEndTime(cameraInfo.getEndTime()); - entity.setScale(cameraInfo.getScale()); - ciList.add(entity); - } - map.put("data", ciList); - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(cameraInfo.getDeviceIndex(), errorCode); - map.put("error", errorCode); - log.info("addPlaybackChn:{}", errorMsg); - } - return map; - } - - /** - * 获取回放通道的url - * - * @param cameraInfo - * @return - */ - public Map getPlaybackUrl(CameraInfo cameraInfo, int counter) { - Map map = new HashMap<>(); - map.put("error", "0"); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("[{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(cameraInfo.getVideoDevId()).append("\","); - sb.append("\"storageDevId\"").append(":").append("\"").append(cameraInfo.getStorageDevId()).append("\","); - sb.append("\"sessionId\"").append(":").append("\"").append(cameraInfo.getSessionId()).append("\""); - sb.append("}],"); - sb.append("\"scale\"").append(":\"").append(cameraInfo.getScale()).append("/1").append("\","); - sb.append("\"startTime\"").append(":").append(cameraInfo.getStartTime()).append(","); - sb.append("\"endTime\"").append(":").append(cameraInfo.getEndTime()); - sb.append("}"); - String res = tumsApi.getPlaybackUrl(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - String errorCode = jsonObject.getStr("error_code"); - if (errorCode.equals("0")) { - List ciList = Lists.newArrayList(); - JSONArray list = jsonObject.getJSONArray("result"); - for (int i = 0; i < list.size(); i++) { - JSONObject jsonObj = (JSONObject) list.get(i); - String errCode = jsonObj.getStr("errorCode"); - if (errCode.equals("0")) { - String videoDevId = jsonObj.getStr("videoDevId"); - String videoChannelId = jsonObj.getStr("videoChannelId"); - String sessionId = jsonObj.getStr("sessionId"); - if (sessionId == null || sessionId.equals("")) { - sessionId = cameraInfo.getSessionId(); - } - String url = jsonObj.getStr("url"); - String backupUrl = jsonObj.getStr("backupUrl"); - String wsUrl = jsonObj.getStr("wsUrl"); - String wssUrl = jsonObj.getStr("wssUrl"); - CameraInfo entity = new CameraInfo(); - entity.setVideoDevId(videoDevId); - entity.setVideoChannelId(videoChannelId); - entity.setSessionId(sessionId); - entity.setUrl(url); - entity.setBackupUrl(backupUrl); - entity.setWsUrl(wsUrl); - entity.setWssUrl(wssUrl); - entity.setErrorCode(errCode); - entity.setStorageDevId(cameraInfo.getStorageDevId()); - entity.setStorageType(cameraInfo.getStorageType()); - entity.setVideoType(cameraInfo.getVideoType()); - entity.setStartTime(cameraInfo.getStartTime()); - entity.setEndTime(cameraInfo.getEndTime()); - entity.setScale(cameraInfo.getScale()); - ciList.add(entity); - } else if (errCode.equals("-80703")) { - try { - if (counter > 10) { - deletePlaybackChn(cameraInfo.getVideoDevId(), cameraInfo.getSessionId()); - map.put("error", errCode); - break; - } - sleep(1000); - map = getPlaybackUrl(cameraInfo, ++counter); - return map; - } catch (InterruptedException e) { - e.printStackTrace(); - } - } else { - System.out.println("getPlaybackUrl:" + errCode); - } - } - map.put("data", ciList); - } else if (errorCode.equals("-80703")) { - try { - if (counter > 10) { - deletePlaybackChn(cameraInfo.getVideoDevId(), cameraInfo.getSessionId()); - } - sleep(1000); - map = getPlaybackUrl(cameraInfo, ++counter); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } -// updateDeviceStatus(cameraInfo.getVideoDevId(), errorCode); - map.put("error", errorCode); - log.info("getPlaybackUrl:{}", errorMsg); - } - return map; - } - - @Override - public Result> getPlaybackUrlList(CameraInfo cameraInfo) { - Map map = new HashMap<>(); - String errorMsgs = ""; - List dataList = Lists.newArrayList(); - Map chnMap = addPlaybackChn(cameraInfo); - String chnError = chnMap.get("error").toString(); - if (chnError.equals("0")) { - List chnList = (List) chnMap.get("data"); - if (chnList != null && chnList.size() > 0) { - TumsConfig tumsConfig = tumsConfigMapper.getByCode(); - for (int j = 0; j < chnList.size(); j++) { - CameraInfo chn = chnList.get(j); - Map playbackMap = getPlaybackUrl(chn, 1); - String pbError = playbackMap.get("error").toString(); - if (pbError.equals("0")) { - List pbList = (List) playbackMap.get("data"); - if (pbList != null && pbList.size() > 0) { - for (int k = 0; k < pbList.size(); k++) { - CameraInfo pb = pbList.get(k); - pb.setQueryAddress(tumsConfig.getTumsUrl()); - dataList.add(pb); - } - } - } else { - String errMsg = ""; - try { - ErrorCode errVo = errorCodeService.getByCode(pbError); - errMsg = errVo.getErrorMsg(); - } catch (Exception e) { - errMsg = pbError; - } - errorMsgs = errorMsgs + "
获取回放通道时：" + errMsg + "
"; - } - } - } - } else { - String errMsg = ""; - try { - ErrorCode errVo = errorCodeService.getByCode(chnError); - errMsg = errVo.getErrorMsg(); - } catch (Exception e) { - errMsg = chnError; - } - errorMsgs = errorMsgs + "
添加回放通道时：" + errMsg + "
"; - } - map.put("error", errorMsgs); - map.put("data", dataList); - return Result.ok(map); - } - - /** - * 删除某一回放通道 - * - * @param videoDevId - * @param sessionId - */ - public void deletePlaybackChn(String videoDevId, String sessionId) { - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("["); - sb.append("{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(videoDevId).append("\","); - sb.append("\"sessionId\"").append(":").append("\"").append(sessionId).append("\""); - sb.append("}"); - sb.append("]"); - sb.append("}"); - String res = tumsApi.deletePlaybackChn(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - String errorCode = jsonObject.getStr("error_code"); - if (errorCode.equals("0")) { - JSONArray list = jsonObject.getJSONArray("result"); - for (int i = 0; i < list.size(); i++) { - JSONObject jsonObj = (JSONObject) list.get(i); - String errCode = jsonObj.getStr("errorCode"); - if (!errCode.equals("0")) { - ErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - log.info("deletePlaybackChn:{}", "sessionId为" + jsonObj.getStr("sessionId") + "的回放通道删除失败，原因：" + errMsg); - } - } - } else { - String errMsg = ""; - try { - ErrorCode errVo = errorCodeService.getByCode(errorCode); - errMsg = errVo.getErrorMsg(); - } catch (Exception e) { - errMsg = errorCode; - } -// updateDeviceStatus(videoDevId, errorCode); - log.info("deletePlaybackChn:{}", errMsg); - } - } - - /** - * 获取nvmp设备双向通信URL - * - * @param cameraInfo - * @return - */ - @Override - public Result deletePlaybackChn(CameraInfo cameraInfo) { - String errorMsgs = ""; - String sessions = cameraInfo.getSessionId(); - if (sessions != null && !sessions.equals("")) { - String[] sessionIds = sessions.split(","); - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"id\"").append(":").append("["); - for (int i = 0; i < sessionIds.length; i++) { - String sessionId = sessionIds[i]; - if (!sessionId.equals("")) { - sb.append("{"); - sb.append("\"videoDevId\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\","); - sb.append("\"sessionId\"").append(":").append("\"").append(sessionId).append("\""); - sb.append("}"); - } - } - sb.append("]"); - sb.append("}"); - String res = tumsApi.deletePlaybackChn(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - String errorCode = jsonObject.getStr("error_code"); - if (errorCode.equals("0")) { - JSONArray list = jsonObject.getJSONArray("result"); - for (int i = 0; i < list.size(); i++) { - JSONObject jsonObj = (JSONObject) list.get(i); - String errCode = jsonObj.getStr("errorCode"); - if (!errCode.equals("0")) { - String sessionId = jsonObj.getStr("sessionId"); - ErrorCode errVo = errorCodeService.getByCode(errCode); - String errMsg = errVo.getErrorMsg(); - errorMsgs = errorMsgs + "
sessionId为" + sessionId + "的回放通道删除失败，原因：" + errMsg + "
"; - } - } - } else { - String errMsg = ""; - try { - ErrorCode errVo = errorCodeService.getByCode(errorCode); - errMsg = errVo.getErrorMsg(); - } catch (Exception e) { - errMsg = errorCode; - } - errorMsgs = errorMsgs + errMsg; - log.info("deletePlaybackChn:{}", errorMsgs); - } - if (errorMsgs.equals("")) { - return Result.error(errorMsgs); - } else { - return Result.OK(""); - } - } - return Result.OK(""); - } - - /** * 获取nvmp设备双向通信URL * @@ -2905,153 +383,6 @@ public class CameraInfoServiceImpl extends ServiceImpl stopUploadToServer(CameraInfo cameraInfo) { - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"taskId\"").append(":").append("\"").append(cameraInfo.getTaskId()).append("\""); - sb.append("}"); - String res = tumsApi.stopUploadToServer(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - String errorCode = jsonObject.getStr("error_code"); - if (errorCode.equals("0")) { - return Result.OK("停止转存MP4上传成功"); - } else { - String errorMsg = ""; - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errorMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errorMsg = errorCode; - } - log.info("stopUploadToServer:{}-{}", errorCode, errorMsg); - return Result.error(errorMsg); - } - } - - /** - * 获取转存MP4上传任务进度 - * - * @param cameraInfo - * @return - */ - @Override - public Result getUploadToServerProcess(CameraInfo cameraInfo) { - StringBuffer sb = new StringBuffer(); - sb.append("{"); - sb.append("\"taskId\"").append(":").append("\"").append(cameraInfo.getTaskId()).append("\""); - sb.append("}"); - String res = tumsApi.getUploadToServerProcess(sb.toString()); - JSONObject jsonObject = new JSONObject(res); - String errorCode = jsonObject.getStr("error_code"); - if (errorCode.equals("0")) { - JSONObject result = jsonObject.getJSONObject("result"); - String process = result.getStr("process"); - cameraInfo.setProcess(process); - return Result.OK(cameraInfo); - } else { - String errMsg = jsonObject.getStr("msg"); - if (errMsg == null || errMsg.equals("")) { - try { - ErrorCode errorVo = errorCodeService.getByCode(errorCode); - errMsg = errorVo.getErrorMsg(); - } catch (Exception e) { - errMsg = errorCode; - } - } - log.info("getUploadToServerProcess:{}-{}", errorCode, errMsg); - return Result.error(errMsg); - } - } - /** * 高速球机移动方向控制 * @@ -3098,49 +429,12 @@ public class CameraInfoServiceImpl extends ServiceImpl result = Maps.newHashMap(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("nu_id", nuId); - List tplinkList = baseMapper.selectList(queryWrapper); - if (tplinkList.size() == 0) { - return "error"; - } - String fileName = nuId + "-" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss"); - String year = DateUtils.formatDate(new Date(), "yyyy"); - String month = DateUtils.formatDate(new Date(), "MM"); - String day = DateUtils.formatDate(new Date(), "dd"); - CameraInfo tplinkInfo = tplinkList.get(0); + public List getCameraInfoList(CameraInfoEntity cameraInfoEntity) { CameraInfo cameraInfo = new CameraInfo(); - cameraInfo.setDeviceIndex(tplinkInfo.getDeviceIndex()); - cameraInfo.setParentId(tplinkInfo.getParentId()); - cameraInfo.setFileName(fileName); - cameraInfo.setVideoType("1"); - cameraInfo.setFtpUploadpath(uploadpath + "/" + year + month + day + "/fwxm/tplinkVideo"); - cameraInfo.setStartTime(startTime); - cameraInfo.setEndTime(endTime); - try { - return uploadToServerResult(cameraInfo); - } catch (Exception e) { - e.printStackTrace(); - return "error"; - } + BeanUtils.copyProperties(cameraInfoEntity, cameraInfo); + List list = baseMapper.findAllList(cameraInfo); + List listDto = BeanUtil.copyToList(list, CameraInfoEntity.class); + return listDto; } @Override @@ -3148,154 +442,5 @@ public class CameraInfoServiceImpl extends ServiceImpl getCameraInfoList() { - List list = baseMapper.findAllList(); - List listDto = BeanUtil.copyToList(list, CameraInfoEntity.class); - return listDto; - } - - public String mkdirsFolder(String folderPath) { - // 创建File对象 - File folder = new File(folderPath); - String ctxPath = uploadpath; - String fileName = null; - File file = new File(ctxPath + File.separator + File.separator); - if (!file.exists()) { - file.mkdirs();// 创建文件根目录 - } // 判断文件夹是否存在 - if (!folder.exists()) { - System.out.println("文件夹不存在，开始创建..."); - - // 创建文件夹（包括所有不存在的父文件夹） - boolean created = folder.mkdirs(); - - if (created) { - System.out.println("文件夹创建成功：" + folderPath); - } else { - System.out.println("文件夹创建失败：" + folderPath); - } - } else { - System.out.println("文件夹已存在：" + folderPath); - - // 还可以判断是否是文件夹而不是文件 - if (folder.isDirectory()) { - System.out.println("这是一个文件夹"); - } else { - System.out.println("这不是一个文件夹，而是文件"); - } - } - return "success"; - } - - //释放设备 - @Override - public void release(CameraInfo cameraInfo) { - baseMapper.release(cameraInfo); - } - - //释放设备 - @Override - public void updateBind(CameraInfo cameraInfo) { - baseMapper.updateBind(cameraInfo); - } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java index 07f8dfec..09a02b1d 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java @@ -76,7 +76,6 @@ public class ElectricityMeterController extends JeecgController edit(@RequestBody ElectricityMeter electricityMeter) { @@ -84,11 +83,4 @@ public class ElectricityMeterController extends JeecgController baoxiu(@RequestBody ElectricityMeter electricityMeter) { - service.baoxiu(electricityMeter); - return Result.OK("操作成功!"); - } } 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 58cbcea5..9765f8c2 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 @@ -68,23 +68,8 @@ public class ElectricityMeter implements Serializable { @ApiModelProperty(value = "描述") private String remark; private String sim; - @Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info") + @TableField(exist = false) private String nuId;//护理单元ID - private String nuName;//护理单元 - private String departId;//机构ID - private String departName;//机构名称 - private String departServerUrl;//机构服务地址 - private String oldServerUrl;//原机构服务地址 - private String syncType;//是否同步 0 未同步 1已同步 - private String oldDepartId;//原机构id - private String oldDepartName;//原机构名称 - /**维修状态*/ - 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/electricity/mapper/ElectricityMeterMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java index 1da29af9..93bf5fe7 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java @@ -14,6 +14,4 @@ public interface ElectricityMeterMapper extends BaseMapper { int update(ElectricityMeter electricityMeter); int updateValue(ElectricityMeter electricityMeter); int updateRelayState(ElectricityMeter electricityMeter); - void release(ElectricityMeter electricityMeter); - void updateBind(ElectricityMeter electricityMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml index 163561b3..eaa9e10c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml @@ -12,26 +12,16 @@ a.read_time as readTime, a.remark, ( case when timestampdiff(minute, str_to_date(read_time, '%y-%m-%d %h:%i:%s'), now()) > 120 then 'false' else 'true' end ) as online, - a.nu_id as nuId, - c.nu_name as nuName, - a.depart_id as departId, - a.depart_name as departName, - a.depart_server_url as departServerUrl, - a.old_server_url , - a.sync_type, - a.maintain_status, + b.nu_id as nuId, a.sim from nu_iot_ds_electricity_meter a - left join nu_base_info c on a.nu_id = c.nu_id - + inner join nu_iot_device_preview b on a.sn = b.sn + where b.device_status != '损坏' AND a.sn like concat('%',#{params.sn},'%') - AND a.nu_id = #{params.nuId} - - - AND a.depart_id = #{params.departId} + AND b.nu_id = #{params.nuId} AND a.relay_state = #{params.relayState} @@ -39,7 +29,6 @@ AND ( case when timestampdiff(minute, str_to_date(read_time, '%y-%m-%d %h:%i:%s'), now()) > 120 then 'false' else 'true' end ) = #{params.online} - @@ -111,21 +93,4 @@ where sn = #{sn} - - update nu_iot_ds_electricity_meter - set - nu_id = null, - nu_name = null, - dimension = null - where id = #{id} - - - - update nu_iot_ds_electricity_meter - set - nu_id = #{nuId}, - dimension = #{dimension} - where id = #{id} - - \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java index 05bc110d..a4bd34bb 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java @@ -16,12 +16,5 @@ public interface IElectricityMeterService extends IService { Result eleReset(ElectricityMeter electricityMeter); Result eleControl(ElectricityMeter electricityMeter); Result eleRead(ElectricityMeter electricityMeter); - - void editHldy(ElectricityMeter electricityMeter); - - void baoxiu(ElectricityMeter electricityMeter); - void processReceivedMessage(String payload); - void release(ElectricityMeter electricityMeter); - void updateBind(ElectricityMeter electricityMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java index 9e09152d..176b7b43 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java @@ -1,38 +1,24 @@ package com.nu.modules.tq.electricity.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; -import com.alibaba.fastjson.JSON; -import com.baomidou.dynamic.datasource.annotation.DS; -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; -import com.nu.dto.IotElectricityMeterMQDto; import com.nu.entity.ElectricityMeterEntity; import com.nu.modules.electricitymeter.api.IElectricityMeterApi; -import com.nu.modules.syncLog.entity.SyncBizLog; -import com.nu.modules.syncLog.service.ISyncBizLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.*; -import com.nu.modules.tq.water.entity.WaterMeter; -import com.nu.utils.RabbitMQUtil; import lombok.extern.slf4j.Slf4j; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.electricity.mapper.ElectricityMeterMapper; import com.nu.modules.tq.electricity.service.IElectricityMeterService; -import me.zhyd.oauth.utils.UuidUtils; -import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; - import javax.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; @@ -41,18 +27,9 @@ import java.util.stream.Collectors; @Service public class ElectricityMeterServiceImpl extends ServiceImpl implements IElectricityMeterService, IElectricityMeterApi { - @Autowired - private TqApi tqApi; - @Autowired private ITqApiLogService logService; - @Autowired - private ISyncBizLogService bizLogService; - - @Autowired - private RabbitMQUtil rabbitMQUtil; - @Lazy @Autowired private ElectricityMeterServiceImpl syncImpl; @@ -117,13 +94,6 @@ public class ElectricityMeterServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("sn", electricityMeter.getSn()); - ElectricityMeter oldParam = baseMapper.selectOne(queryWrapper);//查询数据库中该表号数据原始数据 - if (oldParam == null) { - baseMapper.insert(electricityMeter); - } else { - baseMapper.updateById(electricityMeter); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - return true; - } - /** * mqtt收到消息，并处理 */ @@ -469,13 +333,5 @@ public class ElectricityMeterServiceImpl extends ServiceImpl baoxiu(@RequestBody WaterMeter waterMeter) { - service.baoxiu(waterMeter); - return Result.OK("操作成功!"); - } - } 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 8de08798..fe9299df 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 @@ -70,18 +70,7 @@ public class WaterMeter implements Serializable { @Excel(name = "描述", width = 15) @ApiModelProperty(value = "描述") private String remark; - @Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info") + @TableField(exist = false) private String nuId;//护理单元ID - private String nuName;//护理单元 - private String departId;//机构ID - private String departName;//机构名称 - private String departServerUrl;//机构服务地址 - /**维修状态*/ - 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/tq/water/mapper/WaterMeterMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java index 73e94d81..ec1606df 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java @@ -15,6 +15,4 @@ public interface WaterMeterMapper extends BaseMapper { int update(WaterMeter waterMeter); int updateValue(WaterMeter waterMeter); int updateRelayState(WaterMeter waterMeter); - void release(WaterMeter waterMeter); - void updateBind(WaterMeter waterMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml index 496127f8..8e46bfcc 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml @@ -16,23 +16,16 @@ b.csq, b.disconnect_time as disconnectTime, b.connect_time as connectTime, - a.nu_id as nuId, - c .nu_name as nuName, - a.depart_id as departId, - a.depart_name as departName, - a.maintain_status + c.nu_id as nuId from nu_iot_tq_water_meter a left join nu_iot_tq_collector b on a.cid = b.cid - left join nu_base_info c on a.nu_id = c.nu_id + inner join nu_iot_device_preview c on a.cid = c.sn AND a.address like concat('%',#{params.address},'%') - AND a.nu_id = #{params.nuId} - - - AND a.depart_id = #{params.departId} + AND c.nu_id = #{params.nuId} AND a.relay_state = #{params.relayState} @@ -54,15 +47,21 @@ select a.id, - a.sn, - a.device_name as deviceName, - a.device_types as deviceTypes, - a.reporting_interval as reportingInterval, - a.record_interval as recordInterval, - a.history_report_time as historyReportTime, - a.history_interval as historyInterval, - a.temperature_high as temperatureHigh, - a.temperature_low as temperatureLow, - a.temperature_buffer as temperatureBuffer, - a.humidity_high as humidityHigh, - a.humidity_low as humidityLow, - a.humidity_buffer as humidityBuffer, - a.iz_outages as izOutages, - a.iz_low_battery as izLowBattery, - a.iz_online as izOnline, - a.time_code as timeCode, - a.temperature, - a.humidity, - a.status, - a.reporting_time as reportingTime, - a.electricity, - a.nu_id as nuId, - b.nu_name as nuName, - a.depart_id as departId, - a.depart_name as departName, - a.depart_server_url as departServerUrl, - a.old_server_url , - a.sync_type, - (select count(*) from nu_iot_yiweilian_humid_alarm b where a.sn = b.sn and b.status = '0') as alarmCn, - a.maintain_status + a.sn, + a.device_name as deviceName, + a.device_types as deviceTypes, + a.reporting_interval as reportingInterval, + a.record_interval as recordInterval, + a.history_report_time as historyReportTime, + a.history_interval as historyInterval, + a.temperature_high as temperatureHigh, + a.temperature_low as temperatureLow, + a.temperature_buffer as temperatureBuffer, + a.humidity_high as humidityHigh, + a.humidity_low as humidityLow, + a.humidity_buffer as humidityBuffer, + a.iz_outages as izOutages, + a.iz_low_battery as izLowBattery, + a.iz_online as izOnline, + a.time_code as timeCode, + a.temperature, + a.humidity, + a.status, + a.reporting_time as reportingTime, + a.electricity, + b.nu_id as nuId from nu_iot_yiweilian_humid_device a - left join nu_base_info b on a.nu_id = b.nu_id + inner join nu_iot_device_preview b on a.sn = b.sn AND a.sn LIKE CONCAT('%', #{params.sn}, '%') - AND a.nu_id = #{params.nuId} - - - AND a.depart_id = #{params.departId} + AND b.nu_id = #{params.nuId} AND a.status = #{params.status} @@ -109,23 +98,13 @@ humidity, status, reporting_time as reportingTime, - electricity, - nu_id as nuId, - nu_name as nuName, - depart_id as departId, - depart_name as departName, - depart_server_url as departServerUrl, - old_server_url , - sync_type, + electricity (select count(*) from nu_iot_yiweilian_humid_alarm b where a.sn = b.sn and b.status = '0') as alarmCn from nu_iot_yiweilian_humid_device AND sn = #{sn} - - AND nu_id = #{nuId} - @@ -394,36 +373,9 @@ humidity, status, reporting_time as reportingTime, - electricity, - nu_id as nuId, - nu_name as nuName, - depart_id as departId, - depart_name as departName, - depart_server_url as departServerUrl, - old_depart_id as oldDepartId, - old_depart_name as oldDepartName, - old_server_url as oldServerUrl, - sync_type, - del_flag as delFlag + electricity from nu_iot_yiweilian_humid_device a where sn = #{sn} - - update nu_iot_yiweilian_humid_device - set - nu_id = null, - nu_name = null, - dimension = null - where id = #{id} - - - - update nu_iot_yiweilian_humid_device - set - nu_id = #{nuId}, - dimension = #{dimension} - where id = #{id} - - diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java index 8ee9b58a..140e72b4 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java @@ -17,10 +17,4 @@ public interface IHumidDeviceService extends IService { Result deleteDevice(HumidDevice humidDevice); Result getDeviceParameters(HumidDevice humidDevice); IPage findLogPage(Page page, HumidDevice humidDevice); - - void editHldy(HumidDevice humidDevice); - - void baoxiu(HumidDevice humidDevice); - void release(HumidDevice humidDevice); - void updateBind(HumidDevice humidDevice); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index 8bb7a469..a5e1083b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -322,8 +322,6 @@ public class HumidDeviceServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("sn", humidDevice.getSn()); - HumidDevice oldParam = baseMapper.selectOne(queryWrapper);//查询数据库中该表号数据原始数据 - if (oldParam == null) { - baseMapper.insert(humidDevice); - } else { - baseMapper.updateById(humidDevice); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - return true; - } - @Override public IPage list(HumidDeviceEntity humidDeviceEntity, Integer pageNo, Integer pageSize, HttpServletRequest req) { HumidDevice humidDevice = new HumidDevice(); @@ -585,13 +522,6 @@ public class HumidDeviceServiceImpl extends ServiceImpl queryLogPageList(HumidDeviceEntity humidDeviceEntity, Integer pageNo, Integer pageSize, HttpServletRequest req) { HumidDevice humidDevice = new HumidDevice(); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java index 1804095d..a0eb3a98 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java @@ -58,9 +58,6 @@ public class IotSyncBizMQListener { @Autowired private IHumidDeviceService humidDeviceService; - @Autowired - private INuBaseInfoApi nuBaseInfoApi; - @Autowired private MqttMessageHandler mqttMessageHandler; @@ -81,41 +78,6 @@ public class IotSyncBizMQListener { private void saveSyncBizInfo(IotSyncBizMQDto dto) { List statusList = new ArrayList<>(); -// IotNuBaseInfoMQDto iotNuBaseInfoMQDto = dto.getNuBaseInfo(); -// try { -// NuBaseInfoEntity entity = nuBaseInfoApi.getOneByNuId(iotNuBaseInfoMQDto.getNuId()); -// StatusMQDto statusMQDto = new StatusMQDto(); -// statusMQDto.setAsyncId(iotNuBaseInfoMQDto.getId()); -// statusMQDto.setMessage("成功"); -// statusMQDto.setPrimaryKey(iotNuBaseInfoMQDto.getLogId()); -// statusMQDto.setNote("区域"); -// if(entity!=null){ -// if(iotNuBaseInfoMQDto.getDelFlag().equals(entity.getDelFlag())){ -// statusMQDto.setMessage("忽略"); -// }else{ -// entity.setDelFlag(iotNuBaseInfoMQDto.getDelFlag()); -// NuBaseInfoEntity nuBaseInfo = new NuBaseInfoEntity(); -// BeanUtils.copyProperties(entity, nuBaseInfo); -// nuBaseInfo.setSysOrgCode(iotNuBaseInfoMQDto.getOrgCode()); -// nuBaseInfoApi.updateById(nuBaseInfo); -// } -// }else{ -// NuBaseInfoEntity nuBaseInfo = new NuBaseInfoEntity(); -// BeanUtils.copyProperties(iotNuBaseInfoMQDto, nuBaseInfo); -// nuBaseInfo.setSysOrgCode(iotNuBaseInfoMQDto.getOrgCode()); -// nuBaseInfo.setStatus("0"); -// nuBaseInfoApi.save(nuBaseInfo); -// } -// statusList.add(statusMQDto); -// } catch (Exception e) { -// StatusMQDto statusMQDto = new StatusMQDto(); -// statusMQDto.setAsyncId(iotNuBaseInfoMQDto.getId()); -// statusMQDto.setMessage("失败"); -// statusMQDto.setPrimaryKey(iotNuBaseInfoMQDto.getLogId()); -// statusMQDto.setNote("区域"); -// statusList.add(statusMQDto); -// e.printStackTrace(); -// } List cameraList = dto.getCameraInfoList(); if(cameraList!=null&&cameraList.size()>0){ @@ -131,17 +93,6 @@ public class IotSyncBizMQListener { cameraQw.eq("device_index",iotCameraInfoMQDto.getDeviceIndex()); CameraInfo entity = cameraInfoService.getOne(cameraQw); if(entity!=null){ - -// if(entity.getNuId()==null||entity.getNuId().equals("")){ -// entity.setNuId(iotCameraInfoMQDto.getNuId()); -// cameraInfoService.updateById(entity); -// } -// if(iotCameraInfoMQDto.getMaintainStatus().equals(entity.getMaintainStatus())){ -// statusMQDto.setMessage("忽略"); -// }else{ -// entity.setMaintainStatus(iotCameraInfoMQDto.getMaintainStatus()); -// cameraInfoService.updateById(entity); -// } CameraInfo cameraInfo = new CameraInfo(); BeanUtils.copyProperties(iotCameraInfoMQDto, cameraInfo); cameraInfo.setId(entity.getId()); @@ -233,16 +184,7 @@ public class IotSyncBizMQListener { electricityQw.eq("sn",iotElectricityMeterMQDto.getSn()); ElectricityMeter entity = electricityMeterService.getOne(electricityQw); if(entity!=null){ -// if(entity.getNuId()==null||entity.getNuId().equals("")){ -// entity.setNuId(iotElectricityMeterMQDto.getNuId()); -// electricityMeterService.updateById(entity); -// } -// if(iotElectricityMeterMQDto.getMaintainStatus().equals(entity.getMaintainStatus())){ - statusMQDto.setMessage("忽略"); -// }else{ -// entity.setMaintainStatus(iotElectricityMeterMQDto.getMaintainStatus()); -// electricityMeterService.updateById(entity); -// } + statusMQDto.setMessage("忽略"); }else{ ElectricityMeter electricityMeter = new ElectricityMeter(); BeanUtils.copyProperties(iotElectricityMeterMQDto, electricityMeter); @@ -281,16 +223,7 @@ public class IotSyncBizMQListener { waterQw.eq("cid",iotWaterMeterMQDto.getCid()); WaterMeter entity = waterMeterService.getOne(waterQw); if(entity!=null){ -// if(entity.getNuId()==null||entity.getNuId().equals("")){ -// entity.setNuId(iotWaterMeterMQDto.getNuId()); -// waterMeterService.updateById(entity); -// } -// if(iotWaterMeterMQDto.getMaintainStatus().equals(entity.getMaintainStatus())){ - statusMQDto.setMessage("忽略"); -// }else{ -// entity.setMaintainStatus(iotWaterMeterMQDto.getMaintainStatus()); -// waterMeterService.updateById(entity); -// } + statusMQDto.setMessage("忽略"); }else{ WaterMeter waterMeter = new WaterMeter(); BeanUtils.copyProperties(iotWaterMeterMQDto, waterMeter); @@ -359,16 +292,7 @@ public class IotSyncBizMQListener { humidQw.eq("sn",iotHumidDeviceMQDto.getSn()); HumidDevice entity = humidDeviceService.getOne(humidQw); if(entity!=null){ -// if(entity.getNuId()==null||entity.getNuId().equals("")){ -// entity.setNuId(iotHumidDeviceMQDto.getNuId()); -// humidDeviceService.updateById(entity); -// } -// if(iotHumidDeviceMQDto.getMaintainStatus().equals(entity.getMaintainStatus())){ - statusMQDto.setMessage("忽略"); -// }else{ -// entity.setMaintainStatus(iotHumidDeviceMQDto.getMaintainStatus()); -// humidDeviceService.updateById(entity); -// } + statusMQDto.setMessage("忽略"); }else{ HumidDevice humidDevice = new HumidDevice(); BeanUtils.copyProperties(iotHumidDeviceMQDto, humidDevice); @@ -396,462 +320,4 @@ public class IotSyncBizMQListener { rabbitMQUtil.sendToExchange("hldy.iotsyncbiz", "iotsyncbiz.async.result", statusListMQDto); } - @RabbitListener( - bindings = @QueueBinding( - value = @Queue(name = "#{iotDeviceAsyncDQNP.getReleaseDeviceQueueName()}"), - exchange = @Exchange(name = "hldy.iotsyncbiz", type = ExchangeTypes.DIRECT), - key = "#{iotDeviceAsyncDQNP.getReleaseDeviceKeyName()}" - ), - errorHandler = "iotDeviceMQErrorHandler" - ) - public void handleRelease_unify(IotSyncBizMQDto dto) { - syncReleaseIot(dto); - } - - private void syncReleaseIot(IotSyncBizMQDto dto) { - List statusList = new ArrayList<>(); - - List cameraList = dto.getCameraInfoList(); - if(cameraList!=null&&cameraList.size()>0){ - for(int i=0;i cameraQw = new QueryWrapper<>(); - cameraQw.eq("mac",iotCameraInfoMQDto.getMac()); - CameraInfo entity = cameraInfoService.getOne(cameraQw); - if(entity!=null){ - cameraInfoService.release(entity); - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotCameraInfoMQDto.getMac()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotCameraInfoMQDto.getLogId()); - statusMQDto.setNote("TPLINK"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - - List electricityList = dto.getElectricityMeterList(); - if(electricityList!=null&&electricityList.size()>0){ - for(int i=0;i electricityQw = new QueryWrapper<>(); - electricityQw.eq("sn",iotElectricityMeterMQDto.getSn()); - ElectricityMeter entity = electricityMeterService.getOne(electricityQw); - if(entity!=null){ - electricityMeterService.release(entity); - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotElectricityMeterMQDto.getSn()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotElectricityMeterMQDto.getLogId()); - statusMQDto.setNote("电表"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - - List waterMeterList = dto.getWaterMeterList(); - if(waterMeterList!=null&&waterMeterList.size()>0){ - for(int i=0;i waterQw = new QueryWrapper<>(); - waterQw.eq("cid",iotWaterMeterMQDto.getCid()); - WaterMeter entity = waterMeterService.getOne(waterQw); - if(entity!=null){ - waterMeterService.release(entity); - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotWaterMeterMQDto.getCid()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotWaterMeterMQDto.getLogId()); - statusMQDto.setNote("水表"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - - List humidDeviceList = dto.getHumidDeviceList(); - if(humidDeviceList!=null&&humidDeviceList.size()>0){ - for(int i=0;i humidQw = new QueryWrapper<>(); - humidQw.eq("sn",iotHumidDeviceMQDto.getSn()); - HumidDevice entity = humidDeviceService.getOne(humidQw); - if(entity!=null){ - humidDeviceService.release(entity); - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotHumidDeviceMQDto.getSn()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotHumidDeviceMQDto.getLogId()); - statusMQDto.setNote("温湿度计"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - StatusListMQDto statusListMQDto = new StatusListMQDto(); - statusListMQDto.setStatusList(statusList); - rabbitMQUtil.sendToExchange("hldy.iotsyncbiz", "iotsyncbiz.release.result", statusListMQDto); - } - - @RabbitListener( - bindings = @QueueBinding( - value = @Queue(name = "#{iotDeviceAsyncDQNP.getUnbindDeviceQueueName()}"), - exchange = @Exchange(name = "hldy.iotsyncbiz", type = ExchangeTypes.DIRECT), - key = "#{iotDeviceAsyncDQNP.getUnbindDeviceKeyName()}" - ), - errorHandler = "iotDeviceMQErrorHandler" - ) - public void handleUnbind_unify(IotSyncBizMQDto dto) { - syncUnbindIot(dto); - } - - private void syncUnbindIot(IotSyncBizMQDto dto) { - List statusList = new ArrayList<>(); - - List cameraList = dto.getCameraInfoList(); - if(cameraList!=null&&cameraList.size()>0){ - for(int i=0;i cameraQw = new QueryWrapper<>(); - cameraQw.eq("mac",iotCameraInfoMQDto.getMac()); - CameraInfo entity = cameraInfoService.getOne(cameraQw); - if(entity!=null){ - cameraInfoService.removeById(entity.getId()); - QueryWrapper capabilityQw = new QueryWrapper<>(); - capabilityQw.eq("device_index",entity.getDeviceIndex()); - CameraCapability capability = cameraCapabilityService.getOne(capabilityQw); - if(capability!=null){ - cameraCapabilityService.removeById(capability.getId()); - } - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotCameraInfoMQDto.getMac()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotCameraInfoMQDto.getLogId()); - statusMQDto.setNote("TPLINK"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - - List electricityList = dto.getElectricityMeterList(); - if(electricityList!=null&&electricityList.size()>0){ - for(int i=0;i electricityQw = new QueryWrapper<>(); - electricityQw.eq("sn",iotElectricityMeterMQDto.getSn()); - ElectricityMeter entity = electricityMeterService.getOne(electricityQw); - if(entity!=null){ - electricityMeterService.removeById(entity.getId()); - mqttMessageHandler.unsubscribeUplinkMessage(iotElectricityMeterMQDto.getSn()); - } - statusList.add(statusMQDto); - } - catch (Exception e) { - log.error(e.getMessage()); - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotElectricityMeterMQDto.getSn()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotElectricityMeterMQDto.getLogId()); - statusMQDto.setNote("电表"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - - List waterMeterList = dto.getWaterMeterList(); - if(waterMeterList!=null&&waterMeterList.size()>0){ - for(int i=0;i waterQw = new QueryWrapper<>(); - waterQw.eq("cid",iotWaterMeterMQDto.getCid()); - WaterMeter entity = waterMeterService.getOne(waterQw); - if(entity!=null){ - waterMeterService.removeById(entity.getId()); - QueryWrapper collectorQw = new QueryWrapper<>(); - collectorQw.eq("cid",entity.getCid()); - TqDeviceInfo collector = collectorService.getOne(collectorQw); - if(collector!=null) { - collectorService.removeById(collector.getId()); - } - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotWaterMeterMQDto.getCid()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotWaterMeterMQDto.getLogId()); - statusMQDto.setNote("水表"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - - List humidDeviceList = dto.getHumidDeviceList(); - if(humidDeviceList!=null&&humidDeviceList.size()>0){ - for(int i=0;i humidQw = new QueryWrapper<>(); - humidQw.eq("sn",iotHumidDeviceMQDto.getSn()); - HumidDevice entity = humidDeviceService.getOne(humidQw); - if(entity!=null){ - humidDeviceService.removeById(entity.getId()); - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotHumidDeviceMQDto.getSn()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotHumidDeviceMQDto.getLogId()); - statusMQDto.setNote("温湿度计"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - StatusListMQDto statusListMQDto = new StatusListMQDto(); - statusListMQDto.setStatusList(statusList); - rabbitMQUtil.sendToExchange("hldy.iotsyncbiz", "iotsyncbiz.unbind.result", statusListMQDto); - } - - @RabbitListener( - bindings = @QueueBinding( - value = @Queue(name = "#{iotDeviceAsyncDQNP.getUpdateBindDeviceQueueName()}"), - exchange = @Exchange(name = "hldy.iotsyncbiz", type = ExchangeTypes.DIRECT), - key = "#{iotDeviceAsyncDQNP.getUpdateBindDeviceKeyName()}" - ), - errorHandler = "iotDeviceMQErrorHandler" - ) - public void handleUpdateBind_unify(IotSyncBizMQDto dto) { - syncUpdateBindIot(dto); - } - - private void syncUpdateBindIot(IotSyncBizMQDto dto) { - List statusList = new ArrayList<>(); - - List cameraList = dto.getCameraInfoList(); - if(cameraList!=null&&cameraList.size()>0){ - for(int i=0;i cameraQw = new QueryWrapper<>(); - cameraQw.eq("mac",iotCameraInfoMQDto.getMac()); - CameraInfo entity = cameraInfoService.getOne(cameraQw); - if(entity!=null){ - CameraInfo ci = new CameraInfo(); - ci.setId(entity.getId()); - ci.setDimension(iotCameraInfoMQDto.getDimension()); - ci.setNuId(null); - if(iotCameraInfoMQDto.getDimension().equals("区域维度")){ - ci.setNuId(iotCameraInfoMQDto.getNuId()); - } - cameraInfoService.updateBind(ci); - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotCameraInfoMQDto.getMac()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotCameraInfoMQDto.getLogId()); - statusMQDto.setNote("TPLINK"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - - List electricityList = dto.getElectricityMeterList(); - if(electricityList!=null&&electricityList.size()>0){ - for(int i=0;i electricityQw = new QueryWrapper<>(); - electricityQw.eq("sn",iotElectricityMeterMQDto.getSn()); - ElectricityMeter entity = electricityMeterService.getOne(electricityQw); - if(entity!=null){ - ElectricityMeter em = new ElectricityMeter(); - em.setId(entity.getId()); - em.setDimension(iotElectricityMeterMQDto.getDimension()); - em.setNuId(null); - if(iotElectricityMeterMQDto.getDimension().equals("区域维度")){ - em.setNuId(iotElectricityMeterMQDto.getNuId()); - } - electricityMeterService.updateBind(em); - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotElectricityMeterMQDto.getSn()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotElectricityMeterMQDto.getLogId()); - statusMQDto.setNote("电表"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - - List waterMeterList = dto.getWaterMeterList(); - if(waterMeterList!=null&&waterMeterList.size()>0){ - for(int i=0;i waterQw = new QueryWrapper<>(); - waterQw.eq("cid",iotWaterMeterMQDto.getCid()); - WaterMeter entity = waterMeterService.getOne(waterQw); - if(entity!=null){ - WaterMeter wm = new WaterMeter(); - wm.setId(entity.getId()); - wm.setDimension(iotWaterMeterMQDto.getDimension()); - wm.setNuId(null); - if(iotWaterMeterMQDto.getDimension().equals("区域维度")){ - wm.setNuId(iotWaterMeterMQDto.getNuId()); - } - waterMeterService.updateBind(wm); - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotWaterMeterMQDto.getCid()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotWaterMeterMQDto.getLogId()); - statusMQDto.setNote("水表"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - - List humidDeviceList = dto.getHumidDeviceList(); - if(humidDeviceList!=null&&humidDeviceList.size()>0){ - for(int i=0;i humidQw = new QueryWrapper<>(); - humidQw.eq("sn",iotHumidDeviceMQDto.getSn()); - HumidDevice entity = humidDeviceService.getOne(humidQw); - if(entity!=null){ - HumidDevice hd = new HumidDevice(); - hd.setId(entity.getId()); - hd.setDimension(iotHumidDeviceMQDto.getDimension()); - hd.setNuId(null); - if(iotHumidDeviceMQDto.getDimension().equals("区域维度")){ - hd.setNuId(iotHumidDeviceMQDto.getNuId()); - } - humidDeviceService.updateBind(hd); - } - statusList.add(statusMQDto); - } - catch (Exception e) { - StatusMQDto statusMQDto = new StatusMQDto(); - statusMQDto.setAsyncId(iotHumidDeviceMQDto.getSn()); - statusMQDto.setMessage("失败"); - statusMQDto.setPrimaryKey(iotHumidDeviceMQDto.getLogId()); - statusMQDto.setNote("温湿度计"); - statusList.add(statusMQDto); - e.printStackTrace(); - } - } - } - StatusListMQDto statusListMQDto = new StatusListMQDto(); - statusListMQDto.setStatusList(statusList); - rabbitMQUtil.sendToExchange("hldy.iotsyncbiz", "iotsyncbiz.updatebind.result", statusListMQDto); - } } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml index 24d83d78..4e0a1c3b 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml @@ -60,8 +60,8 @@ cameraInfo.device_index AS deviceIndex FROM nu_base_info nuInfo - left join nu_iot_tplink_camera cameraInfo on nuInfo.nu_id = cameraInfo.nu_id - LEFT JOIN nu_iot_tplink_camera_capability c ON cameraInfo.device_index = c.device_index + left join nu_iot_device_preview c on nuInfo.nu_id = c.nu_id + left join nu_iot_tplink_camera cameraInfo on cameraInfo.mac = c.sn left join nu_biz_elder_info elderInfo on nuInfo.elder_id = elderInfo.id LEFT JOIN sys_dict dict ON dict.dict_code = 'nu_type' LEFT JOIN sys_dict_item mainStatus diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java index 7b576f1d..137ca060 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java @@ -10,10 +10,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.dto.IotNuBaseInfoMQDto; import com.nu.entity.*; -import com.nu.modules.appConfig.entity.NuAppPermission; -import com.nu.modules.camerainfo.api.CameraInfoApi; +import com.nu.modules.camerainfo.api.ICameraInfoApi; import com.nu.modules.elder.api.IElderInfoApi; -import com.nu.modules.humiddevice.api.IHumidAlarmApi; import com.nu.modules.humiddevice.api.IHumidDeviceApi; import com.nu.modules.nubaseinfo.entity.NuBaseInfo; import com.nu.modules.nubaseinfo.mapper.NuBaseInfoMapper; @@ -52,7 +50,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl list = baseMapper.queryPadPageList(page, queryWrapper); //查询相应的摄像头信息 - List cameraList = cameraInfoApiService.getCameraInfoList(); + List cameraList = cameraInfoApiService.getCameraInfoList(null); //查询未退住的老人 List elderList = elderInfoApi.selectCurrentState3();