From 34e2b611518f1f854eb98e68b142253f2b7e97b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 19 Aug 2025 14:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=A0=81=E6=8F=8F=E8=BF=B0=E8=B0=83=E6=95=B4=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8F=8F=E8=BF=B0=E7=9A=84=E9=94=99=E8=AF=AF=E7=A0=81?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E9=94=99=E8=AF=AF=E7=A0=81=E6=B2=A1?=
 =?UTF-8?q?=E6=89=BE=E5=88=B0=E6=8F=8F=E8=BF=B0=E8=BF=94=E5=9B=9E=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../camera/mapper/CameraInfoMapper.java       |   1 +
 .../camera/mapper/xml/CameraInfoMapper.xml    |   6 +
 .../service/impl/CameraInfoServiceImpl.java   | 610 ++++++++++++++----
 3 files changed, 476 insertions(+), 141 deletions(-)

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 7c398e3d..f660b561 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
@@ -26,5 +26,6 @@ public interface CameraInfoMapper extends BaseMapper<CameraInfo> {
     CameraInfo getCapabilityByDeviceId(CameraInfo cameraInfo);
     void insertCapability(CameraInfo cameraInfo);
     void updateCapabilityById(CameraInfo cameraInfo);
+    void updateDeviceStatusByDevId(CameraInfo cameraInfo);
     void updatePlanByDevId(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 3a3b200a..e65fb655 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
@@ -260,6 +260,12 @@
         where id = #{id}
     </update>
 
+    <update id="updateDeviceStatusByDevId">
+        UPDATE nu_iot_tplink_camera
+        SET device_status = #{deviceStatus}
+        where device_index = #{deviceIndex}
+    </update>
+
     <update id="updatePlanByDevId">
         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 3f8f11b5..60490e60 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
@@ -283,8 +283,13 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             syncProjectIpc(jsonResponse);
             return Result.OK("同步设备成功！");
         }else{
-            ErrorCode errVo = errorCodeService.getByCode(errorCode);
-            String errMsg = errVo.getErrorMsg();
+            String errMsg = "";
+            try{
+                ErrorCode errVo = errorCodeService.getByCode(errorCode);
+                errMsg += errVo.getErrorMsg();
+            }catch (Exception e){
+                errMsg += errorCode;
+            }
             log.info("getImageCommon:{}",errMsg);
             return Result.error(errMsg);
         }
@@ -360,6 +365,25 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         }
     }
 
+    /**
+     * 更新设备在线状态
+     * @param deviceIndex
+     * @param errCode
+     */
+    private void updateDeviceStatus(String deviceIndex,String errCode){
+        CameraInfo cameraInfo = new CameraInfo();
+        cameraInfo.setDeviceIndex(deviceIndex);
+        if(errCode.equals("0")){
+            //在线
+            cameraInfo.setDeviceStatus("1");
+            baseMapper.updateDeviceStatusByDevId(cameraInfo);
+        }else if(errCode.equals("-80327")){
+            //离线
+            cameraInfo.setDeviceStatus("0");
+            baseMapper.updateDeviceStatusByDevId(cameraInfo);
+        }
+    }
+
     /**
      * 获取画面基本信息
      *
@@ -393,14 +417,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 JSONObject data = (JSONObject)image.get(type);
                 return Result.OK(data);
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
+            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);
         }
@@ -452,14 +488,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             if("0".equals(errorCode)){
                 return Result.OK("设置成功");
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
+            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);
         }
@@ -497,14 +545,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 JSONObject capability = (JSONObject)osdCapability.get("capability");
                 return Result.OK(capability);
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
+            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);
         }
@@ -542,14 +602,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 JSONObject osd = (JSONObject)responseData.get("OSD");
                 return Result.OK(osd);
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
+            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);
         }
@@ -601,14 +673,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             if("0".equals(errorCode)){
                 return Result.OK("设置成功");
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
+            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);
         }
@@ -826,15 +910,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
                 return Result.OK(resObject);
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
-                log.info("getImageCommon:{}",errorMsg);
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
-            log.info("getImageCommon:{}",errMsg);
+            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);
         }
     }
@@ -900,14 +996,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             if("0".equals(errorCode)){
                 return Result.OK();
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
+            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);
         }
@@ -945,14 +1053,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             if("0".equals(errorCode)){
                 return Result.OK();
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
+            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);
         }
@@ -1010,8 +1130,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         getPreviewSb.append("}");
         String getPreviewSbRes = tumsApi.getPreviewUrl(getPreviewSb.toString());
         JSONObject jsonObject = new JSONObject(getPreviewSbRes);
-        int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        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");
@@ -1021,13 +1141,23 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             map.put("backupUrl",backupUrl);
             map.put("wsUrl",wsUrl);
             map.put("wssUrl",wssUrl);
-        }else if(errorCode == -80703){
+        }else if(errorCode.equals("-80703")){
             try {
                 sleep(1000);
                 map = getPreviewUrl(id,streamType,sessionId);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
+        }else{
+            String errorMsg = "";
+            try{
+                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
+                errorMsg = errorVo.getErrorMsg();
+            }catch (Exception e){
+                errorMsg = errorCode;
+            }
+            updateDeviceStatus(id,errorCode);
+            log.info("getPreviewUrl:{}",errorMsg);
         }
         return map;
     }
@@ -1379,14 +1509,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 JSONObject tamperDet = (JSONObject)tamperDetection.get("tamper_det");
                 return Result.OK(tamperDet);
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
+            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);
         }
@@ -1429,15 +1571,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             if("0".equals(errorCode)){
                 return Result.OK("设置成功");
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
-                log.info("setTamperDet:{}",errorMsg);
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
-            log.info("setTamperDet:{}",errMsg);
+            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);
         }
     }
@@ -1473,15 +1627,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 JSONObject tamperDetection = (JSONObject)responseData.get("tamper_detection");
                 return Result.OK(tamperDetection);
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
-                log.info("getTamperNotif:{}",errorMsg);
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
-            log.info("getTamperNotif:{}",errMsg);
+            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);
         }
     }
@@ -1529,15 +1695,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             if("0".equals(errorCode)){
                 return Result.OK();
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
-                log.info("setTamperNotif:{}",errorMsg);
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
-            log.info("setTamperNotif:{}",errMsg);
+            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);
         }
     }
@@ -1577,15 +1755,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             if("0".equals(errorCode)){
                 return Result.OK();
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
-                log.info("testAudio:{}",errorMsg);
+                String errorMsg = "";
+                try{
+                    ErrorCode errorVo = errorCodeService.getByCode(errorCode);
+                    errorMsg = errorVo.getErrorMsg();
+                }catch (Exception e){
+                    errorMsg = errorCode;
+                }
+                updateDeviceStatus(id,errorCode);
+                log.info("setTamperNotif:{}",errorMsg);
                 return Result.error(errorMsg);
             }
         }else{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
-            log.info("testAudio:{}",errMsg);
+            String errMsg = "";
+            try{
+                ErrorCode errVo = errorCodeService.getByCode(errCode);
+                errMsg = errVo.getErrorMsg();
+            }catch (Exception e){
+                errMsg = errCode;
+            }
+            updateDeviceStatus(id,errCode);
+            log.info("setTamperNotif:{}",errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1622,15 +1812,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 JSONObject alarmInfo = (JSONObject)msgAlarm.get("chn1_msg_alarm_info");
                 return Result.OK(alarmInfo);
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
-                log.info("getAlarmInfo:{}",errorMsg);
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
-            log.info("getAlarmInfo:{}",errMsg);
+            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);
         }
     }
@@ -1674,15 +1876,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             if("0".equals(errorCode)){
                 return Result.OK("设置成功");
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
-                log.info("setAlarmInfo:{}",errorMsg);
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
-            log.info("setAlarmInfo:{}",errMsg);
+            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);
         }
     }
@@ -1724,15 +1938,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 JSONObject alarmPlan = (JSONObject)responseData.get("msg_alarm_plan");
                 return Result.OK(alarmPlan);
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
-                log.info("getAlarmPlan:{}",errorMsg);
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
-            log.info("getAlarmPlan:{}",errMsg);
+            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);
         }
     }
@@ -1790,15 +2016,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             if("0".equals(errorCode)){
                 return Result.OK();
             }else{
-                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
-                String errorMsg = errorVo.getErrorMsg();
-                log.info("setAlarmPlan:{}",errorMsg);
+                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{
-            ErrorCode errVo = errorCodeService.getByCode(errCode);
-            String errMsg = errVo.getErrorMsg();
-            log.info("setAlarmPlan:{}",errMsg);
+            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);
         }
     }
@@ -1911,8 +2149,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("}");
         String res = tumsApi.searchVideo(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
-        int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        String errorCode = jsonObject.getStr("error_code");
+        if(errorCode.equals("0")){
             JSONObject result = (JSONObject)jsonObject.get("result");
             int total = result.getInt("total");
             if(total>0){
@@ -1962,8 +2200,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 page.setRecords(list);
             }
         }else{
-            ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode));
-            return Result.error(errVo.getErrorMsg());
+            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);
     }
@@ -1982,8 +2228,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("}");
         String res = tumsApi.getStoragesById(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
-        int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        String errorCode = jsonObject.getStr("error_code");
+        if(errorCode.equals("0")){
             List<CameraInfo> ciList = Lists.newArrayList();
             JSONArray list = jsonObject.getJSONArray("result");
             for(int i=0;i<list.size();i++) {
@@ -2020,8 +2266,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             }
             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:{}",errorCode);
+            log.info("getStoragesById:{}",errorMsg);
         }
         return map;
     }
@@ -2047,8 +2301,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("}");
         String res = tumsApi.addPlaybackChn(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
-        int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        String errorCode = jsonObject.getStr("error_code");
+        if(errorCode.equals("0")){
             List<CameraInfo> ciList = Lists.newArrayList();
             JSONArray list = jsonObject.getJSONArray("result");
             for(int i=0;i<list.size();i++) {
@@ -2071,8 +2325,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             }
             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:{}",errorCode);
+            log.info("addPlaybackChn:{}",errorMsg);
         }
         return map;
     }
@@ -2098,8 +2360,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("}");
         String res = tumsApi.getPlaybackUrl(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
-        int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        String errorCode = jsonObject.getStr("error_code");
+        if(errorCode.equals("0")){
             List<CameraInfo> ciList = Lists.newArrayList();
             JSONArray list = jsonObject.getJSONArray("result");
             for(int i=0;i<list.size();i++) {
@@ -2150,7 +2412,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 }
             }
             map.put("data",ciList);
-        }else if(errorCode == -80703){
+        }else if(errorCode.equals("-80703")){
             try {
                 if(counter>10){
                     deletePlaybackChn(cameraInfo.getVideoDevId(),cameraInfo.getSessionId());
@@ -2161,8 +2423,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 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:{}",errorCode);
+            log.info("getPlaybackUrl:{}",errorMsg);
         }
         return map;
     }
@@ -2192,15 +2462,25 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                             }
                         }
                     }else{
-                        ErrorCode errVo = errorCodeService.getByCode(pbError);
-                        String errMsg = errVo.getErrorMsg();
+                        String errMsg = "";
+                        try{
+                            ErrorCode errVo = errorCodeService.getByCode(pbError);
+                            errMsg = errVo.getErrorMsg();
+                        }catch (Exception e){
+                            errMsg = pbError;
+                        }
                         errorMsgs = errorMsgs+ "<div>获取回放通道时："+errMsg+"</div>";
                     }
                 }
             }
         }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+ "<div>添加回放通道时："+errMsg+"</div>";
         }
         map.put("error",errorMsgs);
@@ -2238,8 +2518,14 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 }
             }
         }else{
-            ErrorCode errVo = errorCodeService.getByCode(errorCode);
-            String errMsg = errVo.getErrorMsg();
+            String errMsg = "";
+            try{
+                ErrorCode errVo = errorCodeService.getByCode(errorCode);
+                errMsg = errVo.getErrorMsg();
+            }catch (Exception e){
+                errMsg = errorCode;
+            }
+            updateDeviceStatus(videoDevId,errorCode);
             log.info("deletePlaybackChn:{}",errMsg);
         }
     }
@@ -2286,10 +2572,15 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                     }
                 }
             }else{
-                ErrorCode errVo = errorCodeService.getByCode(errorCode);
-                String errMsg = errVo.getErrorMsg();
+                String errMsg = "";
+                try{
+                    ErrorCode errVo = errorCodeService.getByCode(errorCode);
+                    errMsg = errVo.getErrorMsg();
+                }catch (Exception e){
+                    errMsg = errorCode;
+                }
                 errorMsgs = errorMsgs + errMsg;
-                log.info("deletePlaybackChn:{}",errMsg);
+                log.info("deletePlaybackChn:{}",errorMsgs);
             }
             if(errorMsgs.equals("")){
                 return Result.error(errorMsgs);
@@ -2316,8 +2607,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("}");
         String res = tumsApi.getMultitransUrl(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
-        int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        String errorCode = jsonObject.getStr("error_code");
+        if(errorCode.equals("0")){
             JSONObject result = jsonObject.getJSONObject("result");
             String url = result.getStr("rtspUrl");
             String wsUrl = result.getStr("wsUrl");
@@ -2328,7 +2619,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             entity.setWsUrl(wsUrl);
             entity.setWssUrl(wssUrl);
             map.put("data",entity);
-        }else if(errorCode == -80703){
+        }else if(errorCode.equals("-80703")){
             try {
                 if(counter>10){
                     map.put("error",errorCode);
@@ -2340,8 +2631,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 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("getMultitransUrl:{}",errorCode);
+            log.info("getMultitransUrl:{}",errorMsg);
         }
         return map;
     }
@@ -2362,9 +2661,15 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             entity.setQueryAddress(tumsConfig.getTumsUrl());
             return Result.OK(entity);
         }else{
-            ErrorCode errVo = errorCodeService.getByCode(multitransError);
-            String errMsg = errVo.getErrorMsg();
-            errorMsgs = errorMsgs+ "<div>获取nvmp设备双向通信URL："+errMsg+"</div>";
+            String errorMsg = "";
+            try{
+                ErrorCode errorVo = errorCodeService.getByCode(multitransError);
+                errorMsg = errorVo.getErrorMsg();
+            }catch (Exception e){
+                errorMsg = multitransError;
+            }
+            updateDeviceStatus(cameraInfo.getVideoDevId(),multitransError);
+            errorMsgs = errorMsgs+ "<div>获取nvmp设备双向通信URL："+errorMsg+"</div>";
             return Result.error(errorMsgs);
         }
     }
@@ -2427,17 +2732,23 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("}");
         String res = tumsApi.uploadToServer(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
-        int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        String errorCode = jsonObject.getStr("error_code");
+        if(errorCode.equals("0")){
             JSONObject result = jsonObject.getJSONObject("result");
             String taskId = result.getStr("taskId");
             cameraInfo.setTaskId(taskId);
             return Result.OK(cameraInfo);
         }else{
-            ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode));
-            String errMsg = errVo.getErrorMsg();
-            log.info("uploadToServer:{}-{}",errorCode,errMsg);
-            return Result.error(errMsg);
+            String errorMsg = "";
+            try{
+                ErrorCode errorVo = errorCodeService.getByCode(errorCode);
+                errorMsg = errorVo.getErrorMsg();
+            }catch (Exception e){
+                errorMsg = errorCode;
+            }
+            updateDeviceStatus(deviceIndex,errorCode);
+            log.info("uploadToServer:{}-{}",errorCode,errorMsg);
+            return Result.error(errorMsg);
         }
     }
 
@@ -2454,14 +2765,19 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("}");
         String res = tumsApi.stopUploadToServer(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
-        int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        String errorCode = jsonObject.getStr("error_code");
+        if(errorCode.equals("0")){
             return Result.OK("停止转存MP4上传成功");
         }else{
-            ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode));
-            String errMsg = errVo.getErrorMsg();
-            log.info("stopUploadToServer:{}-{}",errorCode,errMsg);
-            return Result.error(errMsg);
+            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);
         }
     }
 
@@ -2478,15 +2794,22 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("}");
         String res = tumsApi.getUploadToServerProcess(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
-        int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        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{
-            ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode));
-            String errMsg = errVo.getErrorMsg();
+            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);
         }
@@ -2508,8 +2831,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("}");
         String res = tumsApi.motionCtrl(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
-        int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        String errorCode = jsonObject.getStr("error_code");
+        if(errorCode.equals("0")){
 //            StringBuffer sb2 = new StringBuffer();
 //            sb2.append("{");
 //            sb2.append("\"id\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\",");
@@ -2522,9 +2845,14 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         }else{
             String errMsg = jsonObject.getStr("msg");
             if(errMsg == null || errMsg.equals("")) {
-                ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode));
-                errMsg = errVo.getErrorMsg();
+                try{
+                    ErrorCode errorVo = errorCodeService.getByCode(errorCode);
+                    errMsg = errorVo.getErrorMsg();
+                }catch (Exception e){
+                    errMsg = errorCode;
+                }
             }
+            updateDeviceStatus(cameraInfo.getDeviceIndex(),errorCode);
             log.info("motionCtrl:{}-{}",errorCode,errMsg);
             return Result.error(errMsg);
         }