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 c4483de..488cab7 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 @@ -29,6 +29,7 @@ public interface CameraInfoMapper extends BaseMapper { void insertCapability(CameraInfo cameraInfo); void updateCapabilityById(CameraInfo cameraInfo); void deleteCapabilityById(CameraInfo cameraInfo); + void updateDeviceStatusByDevId(CameraInfo cameraInfo); void updatePlanByDevId(CameraInfo cameraInfo); IPage getNuBaseList(Page page, @Param("params") NuBaseInfo nuBaseInfo); 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 84767a4..a3d5635 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 @@ -294,6 +294,12 @@ DELETE FROM nu_iot_tplink_camera_capability WHERE device_index = #{deviceIndex} + + UPDATE nu_iot_tplink_camera + SET device_status = #{deviceStatus} + where device_index = #{deviceIndex} + + UPDATE nu_iot_tplink_camera SET record_plan_id = #{recordPlanId} 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 b5cd685..819bba7 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 @@ -17,14 +17,9 @@ import com.nu.modules.tplink.project.entity.ProjectInfo; import com.nu.modules.tplink.project.mapper.ProjectInfoMapper; import com.nu.modules.tplink.region.entity.RegionInfo; import com.nu.modules.tplink.region.mapper.RegionInfoMapper; -import com.nu.modules.tq.electricity.entity.ElectricityMeter; -import com.nu.modules.tq.electricity.service.impl.ElectricityMeterServiceImpl; -import com.nu.modules.tq.water.entity.WaterMeter; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; -import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.DateUtils; import com.nu.modules.tplink.camera.entity.CameraInfo; import com.nu.modules.tplink.camera.mapper.CameraInfoMapper; @@ -151,9 +146,7 @@ public class CameraInfoServiceImpl extends ServiceImpl0){ @@ -2064,8 +2295,16 @@ public class CameraInfoServiceImpl extends ServiceImpl ciList = Lists.newArrayList(); JSONArray list = jsonObject.getJSONArray("result"); for(int i=0;i ciList = Lists.newArrayList(); JSONArray list = jsonObject.getJSONArray("result"); for(int i=0;i ciList = Lists.newArrayList(); JSONArray list = jsonObject.getJSONArray("result"); for(int i=0;i10){ deletePlaybackChn(cameraInfo.getVideoDevId(),cameraInfo.getSessionId()); @@ -2263,8 +2518,16 @@ public class CameraInfoServiceImpl extends ServiceImpl获取回放通道时:"+errMsg+""; } } } }else{ - ErrorCode errVo = errorCodeService.getByCode(chnError); - String errMsg = errVo.getErrorMsg(); + String errMsg = ""; + try{ + ErrorCode errVo = errorCodeService.getByCode(chnError); + errMsg = errVo.getErrorMsg(); + }catch (Exception e){ + errMsg = chnError; + } errorMsgs = errorMsgs+ "
添加回放通道时:"+errMsg+"
"; } map.put("error",errorMsgs); @@ -2334,14 +2607,26 @@ public class CameraInfoServiceImpl extends ServiceImpl10){ map.put("error",errorCode); @@ -2442,8 +2732,16 @@ public class CameraInfoServiceImpl extends ServiceImpl获取nvmp设备双向通信URL:"+errMsg+""; + String errorMsg = ""; + try{ + ErrorCode errorVo = errorCodeService.getByCode(multitransError); + errorMsg = errorVo.getErrorMsg(); + }catch (Exception e){ + errorMsg = multitransError; + } + updateDeviceStatus(cameraInfo.getVideoDevId(),multitransError); + errorMsgs = errorMsgs+ "
获取nvmp设备双向通信URL:"+errorMsg+"
"; return Result.error(errorMsgs); } } @@ -2529,17 +2833,23 @@ public class CameraInfoServiceImpl extends ServiceImpl