Parcourir la source

v4.3.0监控接口优化

dengsixing il y a 2 ans
Parent
commit
4397f29844

+ 3 - 5
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SurveillanceServiceImpl.java

@@ -48,13 +48,11 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
         }
         SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByScenePlusId(scenePlus.getId());
 
-        Surveillance surveillance = null;
-        if(StrUtil.isNotEmpty(param.getSid())){
-            surveillance = this.getBySid(param.getSid());
-        }else{
+        Surveillance surveillance = this.getBySid(param.getSid());
+        if(Objects.isNull(surveillance)){
             surveillance = new Surveillance();
-            surveillance.setSid(param.getData().getString("sid"));
         }
+        surveillance.setSid(param.getSid());
         surveillance.setPanoId(param.getPanoId());
         surveillance.setNum(param.getNum());
         surveillance.setName(param.getName());

+ 2 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SurveillanceParamVO.java

@@ -28,8 +28,10 @@ public class SurveillanceParamVO {
     @NotBlank(message = "playUrl不能为空")
     private String playUrl;
 
+    @NotBlank(message = "panoId不能为空")
     private String panoId;
 
+    @NotBlank(message = "sid不能为空")
     private String sid;
 
     private String type;