/*无人机机器人模型同步接口相关修改*/

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()

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<String> 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;
    }

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());
       }
    }
 

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")) {

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;
             }
         }
     }