yangjun
/
hldy_yunwei_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

摄像头错误码描述调整，没有描述的错误码直接返回错误码，避免错误码没找到描述返回实体为空的错误提示。

This commit is contained in:
曹磊 2025-08-19 14:39:46 +08:00
parent 8d046b1342
commit de272042fc
3 changed files with 468 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java
View File

@ -29,6 +29,7 @@ public interface CameraInfoMapper extends BaseMapper<CameraInfo> {
void insertCapability(CameraInfo cameraInfo); void insertCapability(CameraInfo cameraInfo);
void updateCapabilityById(CameraInfo cameraInfo); void updateCapabilityById(CameraInfo cameraInfo);
void deleteCapabilityById(CameraInfo cameraInfo); void deleteCapabilityById(CameraInfo cameraInfo);
void updateDeviceStatusByDevId(CameraInfo cameraInfo);
void updatePlanByDevId(CameraInfo cameraInfo); void updatePlanByDevId(CameraInfo cameraInfo);
IPage<NuBaseInfo> getNuBaseList(Page<NuBaseInfo> page, @Param("params") NuBaseInfo nuBaseInfo); IPage<NuBaseInfo> getNuBaseList(Page<NuBaseInfo> page, @Param("params") NuBaseInfo nuBaseInfo);

6
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml
View File

@ -294,6 +294,12 @@
DELETE FROM nu_iot_tplink_camera_capability WHERE device_index = #{deviceIndex} DELETE FROM nu_iot_tplink_camera_capability WHERE device_index = #{deviceIndex}
</delete> </delete>
<update id="updateDeviceStatusByDevId">
UPDATE nu_iot_tplink_camera
SET device_status = #{deviceStatus}
where device_index = #{deviceIndex}
</update>
<update id="updatePlanByDevId"> <update id="updatePlanByDevId">
UPDATE nu_iot_tplink_camera UPDATE nu_iot_tplink_camera
SET record_plan_id = #{recordPlanId} SET record_plan_id = #{recordPlanId}

598
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
View File

@ -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.project.mapper.ProjectInfoMapper;
import com.nu.modules.tplink.region.entity.RegionInfo; import com.nu.modules.tplink.region.entity.RegionInfo;
import com.nu.modules.tplink.region.mapper.RegionInfoMapper; 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.compress.utils.Lists;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.DateUtils;
import com.nu.modules.tplink.camera.entity.CameraInfo; import com.nu.modules.tplink.camera.entity.CameraInfo;
import com.nu.modules.tplink.camera.mapper.CameraInfoMapper; import com.nu.modules.tplink.camera.mapper.CameraInfoMapper;
@ -151,9 +146,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
psb.append("{"); psb.append("{");
psb.append("\"projectId\"").append(":").append("\"").append(projectId).append("\""); psb.append("\"projectId\"").append(":").append("\"").append(projectId).append("\"");
psb.append("}"); psb.append("}");
System.out.println(psb.toString());
String pJsonRes = tumsApi.setCurrentProject(psb.toString()); String pJsonRes = tumsApi.setCurrentProject(psb.toString());
System.out.println(pJsonRes);
JSONObject pJsonObject = new JSONObject(pJsonRes); JSONObject pJsonObject = new JSONObject(pJsonRes);
if(pJsonObject.getInt("error_code").equals(0)){ if(pJsonObject.getInt("error_code").equals(0)){
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
@ -287,7 +280,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){ }catch (Exception e){
errMsg += errorCode; errMsg += errorCode;
} }
log.info("getImageCommon:{}",errMsg); log.info("syncAllDevices:{}",errMsg);
} }
} }
} }
@ -326,9 +319,14 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
syncProjectIpc(jsonResponse); syncProjectIpc(jsonResponse);
return Result.OK("同步设备成功！"); return Result.OK("同步设备成功！");
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errorCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
log.info("getImageCommon:{}",errMsg); ErrorCode errVo = errorCodeService.getByCode(errorCode);
errMsg += errVo.getErrorMsg();
}catch (Exception e){
errMsg += errorCode;
}
log.info("syncProjectIpcDevice:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
} }
@ -425,6 +423,25 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
return Result.OK(capability); return Result.OK(capability);
} }
/**
* 更新设备在线状态
* @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);
}
}
/** /**
* 获取画面基本信息 * 获取画面基本信息
* *
@ -458,14 +475,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
JSONObject data = (JSONObject)image.get(type); JSONObject data = (JSONObject)image.get(type);
return Result.OK(data); return Result.OK(data);
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("getImageCommon:{}",errorMsg); log.info("getImageCommon:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("getImageCommon:{}",errMsg); log.info("getImageCommon:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -517,14 +546,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){ if("0".equals(errorCode)){
return Result.OK("设置成功"); return Result.OK("设置成功");
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
log.info("getImageCommon:{}",errorMsg); ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("setImageCommon:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("setImageCommon:{}",errMsg); log.info("setImageCommon:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -562,14 +603,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
JSONObject capability = (JSONObject)osdCapability.get("capability"); JSONObject capability = (JSONObject)osdCapability.get("capability");
return Result.OK(capability); return Result.OK(capability);
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("getOsdCapability:{}",errorMsg); log.info("getOsdCapability:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("getOsdCapability:{}",errMsg); log.info("getOsdCapability:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -607,14 +660,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
JSONObject osd = (JSONObject)responseData.get("OSD"); JSONObject osd = (JSONObject)responseData.get("OSD");
return Result.OK(osd); return Result.OK(osd);
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("getOsd:{}",errorMsg); log.info("getOsd:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("getOsd:{}",errMsg); log.info("getOsd:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -666,14 +731,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){ if("0".equals(errorCode)){
return Result.OK("设置成功"); return Result.OK("设置成功");
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("setOsd:{}",errorMsg); log.info("setOsd:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("setOsd:{}",errMsg); log.info("setOsd:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -891,15 +968,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
return Result.OK(resObject); return Result.OK(resObject);
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
log.info("getImageCommon:{}",errorMsg); ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("getVideoParams:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
log.info("getImageCommon:{}",errMsg); ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("getVideoParams:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
} }
@ -965,14 +1054,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){ if("0".equals(errorCode)){
return Result.OK(); return Result.OK();
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("setVideoParams:{}",errorMsg); log.info("setVideoParams:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("setVideoParams:{}",errMsg); log.info("setVideoParams:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -1010,14 +1111,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){ if("0".equals(errorCode)){
return Result.OK(); return Result.OK();
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("configRecovery:{}",errorMsg); log.info("configRecovery:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("configRecovery:{}",errMsg); log.info("configRecovery:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -1075,8 +1188,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
getPreviewSb.append("}"); getPreviewSb.append("}");
String getPreviewSbRes = tumsApi.getPreviewUrl(getPreviewSb.toString()); String getPreviewSbRes = tumsApi.getPreviewUrl(getPreviewSb.toString());
JSONObject jsonObject = new JSONObject(getPreviewSbRes); JSONObject jsonObject = new JSONObject(getPreviewSbRes);
int errorCode = jsonObject.getInt("error_code"); String errorCode = jsonObject.getStr("error_code");
if(errorCode == 0){ if(errorCode.equals("0")){
JSONObject getPreviewResult = (JSONObject)jsonObject.get("result"); JSONObject getPreviewResult = (JSONObject)jsonObject.get("result");
String url = getPreviewResult.getStr("url"); String url = getPreviewResult.getStr("url");
String backupUrl = getPreviewResult.getStr("backupUrl"); String backupUrl = getPreviewResult.getStr("backupUrl");
@ -1086,13 +1199,23 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
map.put("backupUrl",backupUrl); map.put("backupUrl",backupUrl);
map.put("wsUrl",wsUrl); map.put("wsUrl",wsUrl);
map.put("wssUrl",wssUrl); map.put("wssUrl",wssUrl);
}else if(errorCode == -80703){ }else if(errorCode.equals("-80703")){
try { try {
sleep(1000); sleep(1000);
map = getPreviewUrl(id,streamType,sessionId); map = getPreviewUrl(id,streamType,sessionId);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); 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; return map;
} }
@ -1478,14 +1601,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
JSONObject tamperDet = (JSONObject)tamperDetection.get("tamper_det"); JSONObject tamperDet = (JSONObject)tamperDetection.get("tamper_det");
return Result.OK(tamperDet); return Result.OK(tamperDet);
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("getTamperDet:{}",errorMsg); log.info("getTamperDet:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("getTamperDet:{}",errMsg); log.info("getTamperDet:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -1528,14 +1663,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){ if("0".equals(errorCode)){
return Result.OK("设置成功"); return Result.OK("设置成功");
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("setTamperDet:{}",errorMsg); log.info("setTamperDet:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("setTamperDet:{}",errMsg); log.info("setTamperDet:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -1572,14 +1719,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
JSONObject tamperDetection = (JSONObject)responseData.get("tamper_detection"); JSONObject tamperDetection = (JSONObject)responseData.get("tamper_detection");
return Result.OK(tamperDetection); return Result.OK(tamperDetection);
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("getTamperNotif:{}",errorMsg); log.info("getTamperNotif:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("getTamperNotif:{}",errMsg); log.info("getTamperNotif:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -1628,14 +1787,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){ if("0".equals(errorCode)){
return Result.OK(); return Result.OK();
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("setTamperNotif:{}",errorMsg); log.info("setTamperNotif:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("setTamperNotif:{}",errMsg); log.info("setTamperNotif:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -1676,14 +1847,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){ if("0".equals(errorCode)){
return Result.OK(); return Result.OK();
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("testAudio:{}",errorMsg); log.info("testAudio:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("testAudio:{}",errMsg); log.info("testAudio:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -1721,14 +1904,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
JSONObject alarmInfo = (JSONObject)msgAlarm.get("chn1_msg_alarm_info"); JSONObject alarmInfo = (JSONObject)msgAlarm.get("chn1_msg_alarm_info");
return Result.OK(alarmInfo); return Result.OK(alarmInfo);
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("getAlarmInfo:{}",errorMsg); log.info("getAlarmInfo:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("getAlarmInfo:{}",errMsg); log.info("getAlarmInfo:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -1773,14 +1968,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){ if("0".equals(errorCode)){
return Result.OK("设置成功"); return Result.OK("设置成功");
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("setAlarmInfo:{}",errorMsg); log.info("setAlarmInfo:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("setAlarmInfo:{}",errMsg); log.info("setAlarmInfo:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -1823,14 +2030,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
JSONObject alarmPlan = (JSONObject)responseData.get("msg_alarm_plan"); JSONObject alarmPlan = (JSONObject)responseData.get("msg_alarm_plan");
return Result.OK(alarmPlan); return Result.OK(alarmPlan);
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("getAlarmPlan:{}",errorMsg); log.info("getAlarmPlan:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("getAlarmPlan:{}",errMsg); log.info("getAlarmPlan:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -1889,14 +2108,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){ if("0".equals(errorCode)){
return Result.OK(); return Result.OK();
}else{ }else{
ErrorCode errorVo = errorCodeService.getByCode(errorCode); String errorMsg = "";
String errorMsg = errorVo.getErrorMsg(); try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
log.info("setAlarmPlan:{}",errorMsg); log.info("setAlarmPlan:{}",errorMsg);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
log.info("setAlarmPlan:{}",errMsg); log.info("setAlarmPlan:{}",errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }
@ -2010,8 +2241,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
sb.append("}"); sb.append("}");
String res = tumsApi.searchVideo(sb.toString()); String res = tumsApi.searchVideo(sb.toString());
JSONObject jsonObject = new JSONObject(res); JSONObject jsonObject = new JSONObject(res);
int errorCode = jsonObject.getInt("error_code"); String errorCode = jsonObject.getStr("error_code");
if(errorCode == 0){ if(errorCode.equals("0")){
JSONObject result = (JSONObject)jsonObject.get("result"); JSONObject result = (JSONObject)jsonObject.get("result");
int total = result.getInt("total"); int total = result.getInt("total");
if(total>0){ if(total>0){
@ -2064,8 +2295,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
page.setRecords(list); page.setRecords(list);
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode)); String errorMsg = "";
return Result.error(errVo.getErrorMsg()); 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); return Result.OK(page);
} }
@ -2084,8 +2323,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
sb.append("}"); sb.append("}");
String res = tumsApi.getStoragesById(sb.toString()); String res = tumsApi.getStoragesById(sb.toString());
JSONObject jsonObject = new JSONObject(res); JSONObject jsonObject = new JSONObject(res);
int errorCode = jsonObject.getInt("error_code"); String errorCode = jsonObject.getStr("error_code");
if(errorCode == 0){ if(errorCode.equals("0")){
List<CameraInfo> ciList = Lists.newArrayList(); List<CameraInfo> ciList = Lists.newArrayList();
JSONArray list = jsonObject.getJSONArray("result"); JSONArray list = jsonObject.getJSONArray("result");
for(int i=0;i<list.size();i++) { for(int i=0;i<list.size();i++) {
@ -2122,8 +2361,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
} }
map.put("data",ciList); map.put("data",ciList);
}else{ }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); map.put("error",errorCode);
log.info("getStoragesById:{}",errorCode); log.info("getStoragesById:{}",errorMsg);
} }
return map; return map;
} }
@ -2149,8 +2396,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
sb.append("}"); sb.append("}");
String res = tumsApi.addPlaybackChn(sb.toString()); String res = tumsApi.addPlaybackChn(sb.toString());
JSONObject jsonObject = new JSONObject(res); JSONObject jsonObject = new JSONObject(res);
int errorCode = jsonObject.getInt("error_code"); String errorCode = jsonObject.getStr("error_code");
if(errorCode == 0){ if(errorCode.equals("0")){
List<CameraInfo> ciList = Lists.newArrayList(); List<CameraInfo> ciList = Lists.newArrayList();
JSONArray list = jsonObject.getJSONArray("result"); JSONArray list = jsonObject.getJSONArray("result");
for(int i=0;i<list.size();i++) { for(int i=0;i<list.size();i++) {
@ -2173,8 +2420,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
} }
map.put("data",ciList); map.put("data",ciList);
}else{ }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); map.put("error",errorCode);
log.info("addPlaybackChn:{}",errorCode); log.info("addPlaybackChn:{}",errorMsg);
} }
return map; return map;
} }
@ -2200,8 +2455,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
sb.append("}"); sb.append("}");
String res = tumsApi.getPlaybackUrl(sb.toString()); String res = tumsApi.getPlaybackUrl(sb.toString());
JSONObject jsonObject = new JSONObject(res); JSONObject jsonObject = new JSONObject(res);
int errorCode = jsonObject.getInt("error_code"); String errorCode = jsonObject.getStr("error_code");
if(errorCode == 0){ if(errorCode.equals("0")){
List<CameraInfo> ciList = Lists.newArrayList(); List<CameraInfo> ciList = Lists.newArrayList();
JSONArray list = jsonObject.getJSONArray("result"); JSONArray list = jsonObject.getJSONArray("result");
for(int i=0;i<list.size();i++) { for(int i=0;i<list.size();i++) {
@ -2252,7 +2507,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
} }
} }
map.put("data",ciList); map.put("data",ciList);
}else if(errorCode == -80703){ }else if(errorCode.equals("-80703")){
try { try {
if(counter>10){ if(counter>10){
deletePlaybackChn(cameraInfo.getVideoDevId(),cameraInfo.getSessionId()); deletePlaybackChn(cameraInfo.getVideoDevId(),cameraInfo.getSessionId());
@ -2263,8 +2518,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
e.printStackTrace(); e.printStackTrace();
} }
}else{ }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); map.put("error",errorCode);
log.info("getPlaybackUrl:{}",errorCode); log.info("getPlaybackUrl:{}",errorMsg);
} }
return map; return map;
} }
@ -2294,15 +2557,25 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
} }
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(pbError); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(pbError);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = pbError;
}
errorMsgs = errorMsgs+ "<div>获取回放通道时："+errMsg+"</div>"; errorMsgs = errorMsgs+ "<div>获取回放通道时："+errMsg+"</div>";
} }
} }
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(chnError); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(chnError);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = chnError;
}
errorMsgs = errorMsgs+ "<div>添加回放通道时："+errMsg+"</div>"; errorMsgs = errorMsgs+ "<div>添加回放通道时："+errMsg+"</div>";
} }
map.put("error",errorMsgs); map.put("error",errorMsgs);
@ -2334,14 +2607,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
JSONObject jsonObj = (JSONObject)list.get(i); JSONObject jsonObj = (JSONObject)list.get(i);
String errCode = jsonObj.getStr("errorCode"); String errCode = jsonObj.getStr("errorCode");
if(!errCode.equals("0")){ if(!errCode.equals("0")){
ErrorCode errVo = errorCodeService.getByCode(errCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(videoDevId,errCode);
log.info("deletePlaybackChn:{}","sessionId为"+jsonObj.getStr("sessionId")+"的回放通道删除失败，原因："+errMsg); log.info("deletePlaybackChn:{}","sessionId为"+jsonObj.getStr("sessionId")+"的回放通道删除失败，原因："+errMsg);
} }
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errorCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errorCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errorCode;
}
updateDeviceStatus(videoDevId,errorCode);
log.info("deletePlaybackChn:{}",errMsg); log.info("deletePlaybackChn:{}",errMsg);
} }
} }
@ -2388,10 +2673,15 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
} }
} }
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(errorCode); String errMsg = "";
String errMsg = errVo.getErrorMsg(); try{
ErrorCode errVo = errorCodeService.getByCode(errorCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errorCode;
}
errorMsgs = errorMsgs + errMsg; errorMsgs = errorMsgs + errMsg;
log.info("deletePlaybackChn:{}",errMsg); log.info("deletePlaybackChn:{}",errorMsgs);
} }
if(errorMsgs.equals("")){ if(errorMsgs.equals("")){
return Result.error(errorMsgs); return Result.error(errorMsgs);
@ -2418,8 +2708,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
sb.append("}"); sb.append("}");
String res = tumsApi.getMultitransUrl(sb.toString()); String res = tumsApi.getMultitransUrl(sb.toString());
JSONObject jsonObject = new JSONObject(res); JSONObject jsonObject = new JSONObject(res);
int errorCode = jsonObject.getInt("error_code"); String errorCode = jsonObject.getStr("error_code");
if(errorCode == 0){ if(errorCode.equals("0")){
JSONObject result = jsonObject.getJSONObject("result"); JSONObject result = jsonObject.getJSONObject("result");
String url = result.getStr("rtspUrl"); String url = result.getStr("rtspUrl");
String wsUrl = result.getStr("wsUrl"); String wsUrl = result.getStr("wsUrl");
@ -2430,7 +2720,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
entity.setWsUrl(wsUrl); entity.setWsUrl(wsUrl);
entity.setWssUrl(wssUrl); entity.setWssUrl(wssUrl);
map.put("data",entity); map.put("data",entity);
}else if(errorCode == -80703){ }else if(errorCode.equals("-80703")){
try { try {
if(counter>10){ if(counter>10){
map.put("error",errorCode); map.put("error",errorCode);
@ -2442,8 +2732,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
e.printStackTrace(); e.printStackTrace();
} }
}else{ }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); map.put("error",errorCode);
log.info("getMultitransUrl:{}",errorCode); log.info("getMultitransUrl:{}",errorMsg);
} }
return map; return map;
} }
@ -2464,9 +2762,15 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
entity.setQueryAddress(tumsConfig.getTumsUrl()); entity.setQueryAddress(tumsConfig.getTumsUrl());
return Result.OK(entity); return Result.OK(entity);
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(multitransError); String errorMsg = "";
String errMsg = errVo.getErrorMsg(); try{
errorMsgs = errorMsgs+ "<div>获取nvmp设备双向通信URL："+errMsg+"</div>"; 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); return Result.error(errorMsgs);
} }
} }
@ -2529,17 +2833,23 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
sb.append("}"); sb.append("}");
String res = tumsApi.uploadToServer(sb.toString()); String res = tumsApi.uploadToServer(sb.toString());
JSONObject jsonObject = new JSONObject(res); JSONObject jsonObject = new JSONObject(res);
int errorCode = jsonObject.getInt("error_code"); String errorCode = jsonObject.getStr("error_code");
if(errorCode == 0){ if(errorCode.equals("0")){
JSONObject result = jsonObject.getJSONObject("result"); JSONObject result = jsonObject.getJSONObject("result");
String taskId = result.getStr("taskId"); String taskId = result.getStr("taskId");
cameraInfo.setTaskId(taskId); cameraInfo.setTaskId(taskId);
return Result.OK(cameraInfo); return Result.OK(cameraInfo);
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode)); String errorMsg = "";
String errMsg = errVo.getErrorMsg(); try{
log.info("uploadToServer:{}-{}",errorCode,errMsg); ErrorCode errorVo = errorCodeService.getByCode(errorCode);
return Result.error(errMsg); errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(deviceIndex,errorCode);
log.info("uploadToServer:{}-{}",errorCode,errorMsg);
return Result.error(errorMsg);
} }
} }
@ -2556,14 +2866,19 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
sb.append("}"); sb.append("}");
String res = tumsApi.stopUploadToServer(sb.toString()); String res = tumsApi.stopUploadToServer(sb.toString());
JSONObject jsonObject = new JSONObject(res); JSONObject jsonObject = new JSONObject(res);
int errorCode = jsonObject.getInt("error_code"); String errorCode = jsonObject.getStr("error_code");
if(errorCode == 0){ if(errorCode.equals("0")){
return Result.OK("停止转存MP4上传成功"); return Result.OK("停止转存MP4上传成功");
}else{ }else{
ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode)); String errorMsg = "";
String errMsg = errVo.getErrorMsg(); try{
log.info("stopUploadToServer:{}-{}",errorCode,errMsg); ErrorCode errorVo = errorCodeService.getByCode(errorCode);
return Result.error(errMsg); errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
log.info("stopUploadToServer:{}-{}",errorCode,errorMsg);
return Result.error(errorMsg);
} }
} }
@ -2580,8 +2895,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
sb.append("}"); sb.append("}");
String res = tumsApi.getUploadToServerProcess(sb.toString()); String res = tumsApi.getUploadToServerProcess(sb.toString());
JSONObject jsonObject = new JSONObject(res); JSONObject jsonObject = new JSONObject(res);
int errorCode = jsonObject.getInt("error_code"); String errorCode = jsonObject.getStr("error_code");
if(errorCode == 0){ if(errorCode.equals("0")){
JSONObject result = jsonObject.getJSONObject("result"); JSONObject result = jsonObject.getJSONObject("result");
String process = result.getStr("process"); String process = result.getStr("process");
cameraInfo.setProcess(process); cameraInfo.setProcess(process);
@ -2589,8 +2904,12 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}else{ }else{
String errMsg = jsonObject.getStr("msg"); String errMsg = jsonObject.getStr("msg");
if(errMsg == null || errMsg.equals("")) { if(errMsg == null || errMsg.equals("")) {
ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode)); try{
errMsg = errVo.getErrorMsg(); ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errMsg = errorVo.getErrorMsg();
}catch (Exception e){
errMsg = errorCode;
}
} }
log.info("getUploadToServerProcess:{}-{}",errorCode,errMsg); log.info("getUploadToServerProcess:{}-{}",errorCode,errMsg);
return Result.error(errMsg); return Result.error(errMsg);
@ -2620,8 +2939,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
sb.append("}"); sb.append("}");
String res = tumsApi.motionCtrl(sb.toString()); String res = tumsApi.motionCtrl(sb.toString());
JSONObject jsonObject = new JSONObject(res); JSONObject jsonObject = new JSONObject(res);
int errorCode = jsonObject.getInt("error_code"); String errorCode = jsonObject.getStr("error_code");
if(errorCode == 0){ if(errorCode.equals("0")){
// StringBuffer sb2 = new StringBuffer(); // StringBuffer sb2 = new StringBuffer();
// sb2.append("{"); // sb2.append("{");
// sb2.append("\"id\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\","); // sb2.append("\"id\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\",");
@ -2634,9 +2953,14 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}else{ }else{
String errMsg = jsonObject.getStr("msg"); String errMsg = jsonObject.getStr("msg");
if(errMsg == null || errMsg.equals("")) { if(errMsg == null || errMsg.equals("")) {
ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode)); try{
errMsg = errVo.getErrorMsg(); ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errMsg = errorVo.getErrorMsg();
}catch (Exception e){
errMsg = errorCode;
}
} }
updateDeviceStatus(cameraInfo.getDeviceIndex(),errorCode);
log.info("motionCtrl:{}-{}",errorCode,errMsg); log.info("motionCtrl:{}-{}",errorCode,errMsg);
return Result.error(errMsg); return Result.error(errMsg);
} }