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

物联设备页面和接口优化

This commit is contained in:
曹磊 2026-03-16 16:12:24 +08:00
parent 0b45c548ae
commit 82bd9917e6
5 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/IotAreaInfoMapper.xml
View File

@ -12,7 +12,7 @@
b.id as departId
from nu_base_info a
inner join sys_depart b on a.sys_org_code = b.org_code
<where>
where a.status != '5'
<if test="params.sysOrgCode != null and params.sysOrgCode != ''">
AND a.sys_org_code = #{params.sysOrgCode}
</if>
@ -22,8 +22,6 @@
<if test="params.areaFlag != null and params.areaFlag != ''">
AND a.area_flag = #{params.areaFlag}
</if>
</where>
</select>
</mapper>

12
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/IotDeviceInfoMapper.xml
View File

@ -384,8 +384,7 @@
nu_name = null,
depart_id = null,
depart_name = null,
iz_allocate = 'N',
maintain_status = 1
iz_allocate = 'N'
where replace(mac,'-','') = #{sn}
</update>
@ -396,8 +395,7 @@
nu_name = null,
depart_id = null,
depart_name = null,
iz_allocate = 'N',
maintain_status = 1
iz_allocate = 'N'
where sn = #{sn}
</update>
@ -408,8 +406,7 @@
nu_name = null,
depart_id = null,
depart_name = null,
iz_allocate = 'N',
maintain_status = 1
iz_allocate = 'N'
where cid = #{sn}
</update>
@ -420,8 +417,7 @@
nu_name = null,
depart_id = null,
depart_name = null,
iz_allocate = 'N',
maintain_status = 1
iz_allocate = 'N'
where sn = #{sn}
</update>

10
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/mapper/xml/SyncBizMapper.xml
View File

@ -56,6 +56,7 @@
depart_server_url as departServerUrl,
sync_type as syncType,
maintain_status as maintainStatus,
dimension,
channel as channel
from nu_iot_tplink_camera
where nu_id = #{nuId}
@ -121,7 +122,8 @@
depart_name as departName,
depart_server_url as departServerUrl,
sync_type as syncType,
maintain_status as maintainStatus
maintain_status as maintainStatus,
dimension
from nu_iot_ds_electricity_meter
where nu_id = #{nuId}
order by id asc
@ -142,7 +144,8 @@
depart_name as departName,
depart_server_url as departServerUrl,
sync_type as syncType,
maintain_status as maintainStatus
maintain_status as maintainStatus,
dimension
from nu_iot_tq_water_meter
where nu_id = #{nuId}
order by id asc
@ -198,7 +201,8 @@
depart_name as departName,
depart_server_url as departServerUrl,
sync_type as syncType,
maintain_status as maintainStatus
maintain_status as maintainStatus,
dimension
from nu_iot_yiweilian_humid_device
where nu_id = #{nuId}
order by id asc

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

@ -649,7 +649,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){
JSONObject image = (JSONObject)responseData.get("image");
JSONObject data = (JSONObject)image.get(type);
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
return Result.OK(data);
}else{
String errorMsg = "";
@ -659,7 +659,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("getImageCommon:{}",errorMsg);
return Result.error(errorMsg);
}
@ -671,7 +671,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("getImageCommon:{}",errMsg);
return Result.error(errMsg);
}
@ -738,7 +738,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("setImageCommon:{}",errorMsg);
return Result.error(errorMsg);
}
@ -750,7 +750,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("setImageCommon:{}",errMsg);
return Result.error(errMsg);
}
@ -795,7 +795,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
if("0".equals(errorCode)){
JSONObject image = (JSONObject)responseData.get("image");
JSONObject data = (JSONObject)image.get(type);
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
return Result.OK(data);
}else{
String errorMsg = "";
@ -805,7 +805,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("getImageCommon:{}",errorMsg);
return Result.error(errorMsg);
}
@ -817,7 +817,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("getImageCommon:{}",errMsg);
return Result.error(errMsg);
}
@ -884,7 +884,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("setImageCommon:{}",errorMsg);
return Result.error(errorMsg);
}
@ -896,7 +896,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("setImageCommon:{}",errMsg);
return Result.error(errMsg);
}
@ -942,7 +942,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("getOsdCapability:{}",errorMsg);
return Result.error(errorMsg);
}
@ -954,7 +954,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("getOsdCapability:{}",errMsg);
return Result.error(errMsg);
}
@ -1035,7 +1035,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("getOsd:{}",errorMsg);
return Result.error(errorMsg);
}
@ -1047,7 +1047,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("getOsd:{}",errMsg);
return Result.error(errMsg);
}
@ -1121,7 +1121,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("setOsd:{}",errorMsg);
return Result.error(errorMsg);
}
@ -1133,7 +1133,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("setOsd:{}",errMsg);
return Result.error(errMsg);
}
@ -1616,7 +1616,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("getVideoParams:{}",errorMsg);
return Result.error(errorMsg);
}
@ -1628,7 +1628,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("getVideoParams:{}",errMsg);
return Result.error(errMsg);
}
@ -1713,7 +1713,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("setVideoParams:{}",errorMsg);
return Result.error(errorMsg);
}
@ -1725,7 +1725,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("setVideoParams:{}",errMsg);
return Result.error(errMsg);
}
@ -1770,7 +1770,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("configRecovery:{}",errorMsg);
return Result.error(errorMsg);
}
@ -1782,7 +1782,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("configRecovery:{}",errMsg);
return Result.error(errMsg);
}
@ -1851,6 +1851,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
map.put("backupUrl",backupUrl);
map.put("wsUrl",wsUrl);
map.put("wssUrl",wssUrl);
updateDeviceStatus(id, errorCode);
}else if(errorCode.equals("-80703")){
try {
sleep(1000);
@ -2269,7 +2270,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("getTamperDet:{}",errorMsg);
return Result.error(errorMsg);
}
@ -2281,7 +2282,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("getTamperDet:{}",errMsg);
return Result.error(errMsg);
}
@ -2340,7 +2341,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("setTamperDet:{}",errorMsg);
return Result.error(errorMsg);
}
@ -2352,7 +2353,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("setTamperDet:{}",errMsg);
return Result.error(errMsg);
}
@ -2408,7 +2409,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("getTamperNotif:{}",errorMsg);
return Result.error(errorMsg);
}
@ -2420,7 +2421,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("getTamperNotif:{}",errMsg);
return Result.error(errMsg);
}
@ -2526,7 +2527,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("setTamperNotif:{}",errorMsg);
return Result.error(errorMsg);
}
@ -2538,7 +2539,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("setTamperNotif:{}",errMsg);
return Result.error(errMsg);
}
@ -2586,7 +2587,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("testAudio:{}",errorMsg);
return Result.error(errorMsg);
}
@ -2598,7 +2599,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("testAudio:{}",errMsg);
return Result.error(errMsg);
}
@ -2643,7 +2644,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("getAlarmInfo:{}",errorMsg);
return Result.error(errorMsg);
}
@ -2655,7 +2656,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("getAlarmInfo:{}",errMsg);
return Result.error(errMsg);
}
@ -2707,7 +2708,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("setAlarmInfo:{}",errorMsg);
return Result.error(errorMsg);
}
@ -2719,7 +2720,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("setAlarmInfo:{}",errMsg);
return Result.error(errMsg);
}
@ -2769,7 +2770,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("getAlarmPlan:{}",errorMsg);
return Result.error(errorMsg);
}
@ -2781,7 +2782,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("getAlarmPlan:{}",errMsg);
return Result.error(errMsg);
}
@ -2847,7 +2848,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(id,errorCode);
// updateDeviceStatus(id,errorCode);
log.info("setAlarmPlan:{}",errorMsg);
return Result.error(errorMsg);
}
@ -2859,7 +2860,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(id,errCode);
// updateDeviceStatus(id,errCode);
log.info("setAlarmPlan:{}",errMsg);
return Result.error(errMsg);
}
@ -3035,7 +3036,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(deviceIndex,errorCode);
// updateDeviceStatus(deviceIndex,errorCode);
log.info("searchVideo:{}",errorMsg);
return Result.error(errorMsg);
}
@ -3101,7 +3102,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(cameraInfo.getDeviceIndex(),errorCode);
// updateDeviceStatus(cameraInfo.getDeviceIndex(),errorCode);
map.put("error",errorCode);
log.info("getStoragesById:{}",errorMsg);
}
@ -3160,7 +3161,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(cameraInfo.getDeviceIndex(),errorCode);
// updateDeviceStatus(cameraInfo.getDeviceIndex(),errorCode);
map.put("error",errorCode);
log.info("addPlaybackChn:{}",errorMsg);
}
@ -3258,7 +3259,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errorMsg = errorCode;
}
updateDeviceStatus(cameraInfo.getVideoDevId(),errorCode);
// updateDeviceStatus(cameraInfo.getVideoDevId(),errorCode);
map.put("error",errorCode);
log.info("getPlaybackUrl:{}",errorMsg);
}
@ -3347,7 +3348,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errCode;
}
updateDeviceStatus(videoDevId,errCode);
// updateDeviceStatus(videoDevId,errCode);
log.info("deletePlaybackChn:{}","sessionId为"+jsonObj.getStr("sessionId")+"的回放通道删除失败，原因："+errMsg);
}
}
@ -3359,7 +3360,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}catch (Exception e){
errMsg = errorCode;
}
updateDeviceStatus(videoDevId,errorCode);
// updateDeviceStatus(videoDevId,errorCode);
log.info("deletePlaybackChn:{}",errMsg);
}
}

3
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java
View File

@ -378,9 +378,10 @@ public class TumsApi {
* @return
*/
public String getPreviewUrl(String jsonRequest){
log.info("getPreviewUrl:request:{}",jsonRequest);
this.createTumsClient();
String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.IPC_GET_PREVIEW_URL.getValue());
// log.info("getPreviewUrl:{}",jsonResponse);
log.info("getPreviewUrl:response:{}",jsonResponse);
return jsonResponse;
}