From 89148fa57f51d2ad538f75e208d07d0c3a5bfd7a Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Thu, 11 Sep 2025 10:13:47 +0800 Subject: [PATCH] =?UTF-8?q?/*=E6=97=A0=E4=BA=BA=E6=9C=BA=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E4=BA=BA=E6=A8=A1=E5=9E=8B=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ivs/controller/IvsStreamController.java | 4 +-- .../com/inspect/ivs/vo/IvsVideoRtspVo.java | 20 ++++++++++++++ .../controller/MainClientController.java | 13 +++++---- .../analysis/utils/ResultAnalysisUtils.java | 27 +++++++++++++------ .../service/impl/SysUserServiceImpl.java | 15 ++++++----- 5 files changed, 57 insertions(+), 22 deletions(-) diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsStreamController.java b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsStreamController.java index eb337f9..44cd7d2 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsStreamController.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsStreamController.java @@ -42,10 +42,10 @@ public class IvsStreamController { @GetMapping({"start"}) public IvsStreamStartView startStream(IvsStreamStartVo ivsStreamStartVo) { - log.info("[IVS] {}", ivsStreamStartVo); + log.info("IVS_STREAM_START param: {}", ivsStreamStartVo); //ivsStreamStartVo.setCameraCode("02160558340532190147"); IvsVideoRtspVo ivsVideoRtspVo = IvsVideoRtspVo.realStream(ivsStreamStartVo.getCameraCode()); - log.info("[IVS] {}", ivsVideoRtspVo); + log.info("IVS_STREAM_START ivsVideoRtspVo: {}", ivsVideoRtspVo); IvsVideoRtspView ivsVideoRtspView; if (bIvsTestMode) { // ivsVideoRtspView = IvsVideoRtspView.builder() diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsVideoRtspVo.java b/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsVideoRtspVo.java index 589c899..e0388aa 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsVideoRtspVo.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsVideoRtspVo.java @@ -4,15 +4,35 @@ import com.inspect.ivs.domain.RealMediaURLParam; import com.inspect.ivs.domain.RecordMediaURLParam; import com.inspect.ivs.domain.TimeSpan; import com.inspect.ivs.view.IvsRecListView; +import lombok.extern.slf4j.Slf4j; + import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +@Slf4j public class IvsVideoRtspVo implements Serializable { private String cameraCode; private RealMediaURLParam mediaURLParam; + private static List transModeFilterList = new ArrayList<>( + Arrays.asList( + "09311660520514610101#7ad45f10ed5d4bf18fa63ec799dc4fc3", + "09311660527455650101#7ad45f10ed5d4bf18fa63ec799dc4fc3", + "09311660520514610101", + "09311660527455650101", + "7ad45f10ed5d4bf18fa63ec799dc4fc3" + )); + public static IvsVideoRtspVo realStream(String cameraCode) { IvsVideoRtspVo ivsVideoRtspVo = new IvsVideoRtspVo(); ivsVideoRtspVo.mediaURLParam = new RealMediaURLParam(); + log.info("IvsVideoRtspVo realStream cameraCode: {}", cameraCode); + if(transModeFilterList.contains(cameraCode)) { + ivsVideoRtspVo.mediaURLParam.setTransMode(0); + log.info("IvsVideoRtspVo realStream mediaURLParam: {}", ivsVideoRtspVo.mediaURLParam); + } ivsVideoRtspVo.cameraCode = cameraCode; return ivsVideoRtspVo; } diff --git a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/MainClientController.java b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/MainClientController.java index 17119d3..1516c31 100644 --- a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/MainClientController.java +++ b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/MainClientController.java @@ -75,18 +75,21 @@ public class MainClientController { @PostMapping({"/sendCommand"}) public AjaxResult sendCommand(@RequestBody String msg) { try { + log.info("SEND_COMMAND_TO_CLIENT param: {}", msg); JSONObject.parseObject(msg); JSONObject jsonObject = clientService.callDeviceCommand(msg); - log.info("[CLIENT] TO TCPSERVER REQUEST: {}, RESPONSE: {}", msg, jsonObject); + log.info("SEND_COMMAND_TO_CLIENT response: {}", msg); return StringUtils.equals(jsonObject.getString("code"), "500")?AjaxResult.fail(500, jsonObject.getString("msg")):AjaxResult.success(); } catch (ServiceException e) { - final String errorMsg = "[CLIENT] TO TCPSERVER SERVICE EXCEPTION:" + e.getMessage(); + final String errorMsg = "SEND_COMMAND_TO_CLIENT SERVICE EXCEPTION:" + e.getMessage(); log.error(errorMsg); - throw new ServiceException(errorMsg); + //throw new ServiceException(errorMsg); + return AjaxResult.fail(500, e.getMessage()); } catch (Exception e) { - final String errorMsg = "[CLIENT] TO TCPSERVER OTHER EXCEPTION:" + e.getMessage(); + final String errorMsg = "SEND_COMMAND_TO_CLIENT OTHER EXCEPTION:" + e.getMessage(); log.error(errorMsg); - throw new ServiceException(errorMsg); + //throw new ServiceException(errorMsg); + return AjaxResult.fail(500, e.getMessage()); } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java index b5fb0df..20750dd 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java @@ -47,7 +47,7 @@ public class ResultAnalysisUtils { } public void parseAlg(String algType, AlgValue algValue, String value, String defaultDesc, ResultAnalysis resultAnalysis) { - log.info("parseAlg algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc); + log.info("PARSE_ALG algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc); if ("1".equals(resultAnalysis.getFilter()) && algType != null && (algType.equals("infrared") || @@ -82,7 +82,7 @@ public class ResultAnalysisUtils { } if (value.isEmpty() || value.equals("-1")) { - log.info("--------------parseAlg value is empty or -1!"); + log.info("PARSE_ALG_EMPTY algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc); resultAnalysis.setPointStatus("0"); resultAnalysis.setResultType("2"); resultAnalysis.setResStatus("0"); @@ -113,24 +113,35 @@ public class ResultAnalysisUtils { } else if (algType.equals("meter")) { log.info("------------------parseAlg : meter"); if (!algValue.isAlarm(value)) { - log.info("------------------parseAlg meter is not alarm"); + log.info("PARSE_ALG_METER_NO_ALARM value: {}", value); resultAnalysis.setResStatus("0"); resultAnalysis.setPointStatus("1"); resultAnalysis.setResultType("1"); defaultDesc = messageUtils.get("正常"); } else { - log.info("------------------parseAlg meter is alarm"); + log.info("PARSE_ALG_METER_ALARM value: {}", value); String[] valueArr = value.split(StringUtils.COMMA); if(valueArr.length > 1) { + log.info("PARSE_ALG_METER_ALARM_VALUE_COMPOSITE value: {}", value); resultAnalysis.setResStatus("0"); resultAnalysis.setPointStatus("0"); resultAnalysis.setResultType("0"); defaultDesc = messageUtils.get("正常"); } else { - resultAnalysis.setResStatus("0"); - resultAnalysis.setPointStatus("0"); - resultAnalysis.setResultType("0"); - defaultDesc = messageUtils.get("表计超限"); + try { + log.info("PARSE_ALG_METER_ALARM_VALUE_SINGLE value: {}", value); + Double.parseDouble(valueArr[0]); + resultAnalysis.setResStatus("0"); + resultAnalysis.setPointStatus("0"); + resultAnalysis.setResultType("0"); + defaultDesc = messageUtils.get("表计超限"); + } catch (Exception e) { + log.info("PARSE_ALG_METER_ALARM_VALUE_SINGLE_NO_DIGIT value: {}", value); + resultAnalysis.setResStatus("0"); + resultAnalysis.setPointStatus("0"); + resultAnalysis.setResultType("0"); + defaultDesc = messageUtils.get("正常"); + } } } } else if (algType.equals("sound")) { diff --git a/inspect-management/src/main/java/com/inspect/system/service/impl/SysUserServiceImpl.java b/inspect-management/src/main/java/com/inspect/system/service/impl/SysUserServiceImpl.java index cb20954..e5719f5 100644 --- a/inspect-management/src/main/java/com/inspect/system/service/impl/SysUserServiceImpl.java +++ b/inspect-management/src/main/java/com/inspect/system/service/impl/SysUserServiceImpl.java @@ -340,13 +340,14 @@ public class SysUserServiceImpl implements ISysUserService { } long limitTimeMills = limitTime * CacheConstants.DAY_MILLIS_TIMES; - if (currTime > updateTime && currTime - updateTime >= limitTimeMills) { - error.put("msg", "密码已过期，请修改密码"); - error.put("updatePashFlag", 1); - return error; - } else { - return error; - } +// if (currTime > updateTime && currTime - updateTime >= limitTimeMills) { +// error.put("msg", "密码已过期，请修改密码"); +// error.put("updatePashFlag", 1); +// return error; +// } else { +// return error; +// } + return error; } } }