v4.3.0监控接口优化

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -11,6 +11,7 @@ import com.fdkankan.scene.service.ISceneEditService;
 import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneUploadService;
 import com.fdkankan.scene.service.ISurveillanceService;
+import com.fdkankan.scene.vo.BaseSidParamVO;
 import com.fdkankan.scene.vo.SurveillanceParamVO;
 import com.fdkankan.scene.vo.BallScreenVideoParamVO;
 import com.fdkankan.scene.vo.BaseDataParamVO;
@@ -1134,7 +1135,7 @@ public class SceneEditController extends BaseController {
     }
 
     @PostMapping("/surveillance/delete")
-    public ResultData deleteSurveillance(@RequestBody @Validated BaseIdParamVO param){
+    public ResultData deleteSurveillance(@RequestBody @Validated BaseSidParamVO param){
         return surveillanceService.deleteSurveillance(param);
     }
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/Surveillance.java

@@ -41,6 +41,12 @@ public class Surveillance implements Serializable {
     private String name;
 
     /**
+     * 监控唯一标识
+     */
+    @TableField("sid")
+    private String sid;
+
+    /**
      * 摄像头设置信息
      */
     @TableField("data")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISurveillanceService.java

@@ -4,6 +4,7 @@ import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.bean.SurveillanceBean;
 import com.fdkankan.scene.entity.Surveillance;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.scene.vo.BaseSidParamVO;
 import com.fdkankan.scene.vo.SurveillanceParamVO;
 import com.fdkankan.scene.vo.BaseIdParamVO;
 import java.util.List;
@@ -20,9 +21,10 @@ public interface ISurveillanceService extends IService<Surveillance> {
 
     ResultData saveSurveillance(SurveillanceParamVO param);
 
-    ResultData deleteSurveillance(BaseIdParamVO param);
+    ResultData deleteSurveillance(BaseSidParamVO param);
 
     List<SurveillanceBean> listSurveillance(String num);
 
+    Surveillance getBySid(String sid);
 
 }

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

@@ -1,6 +1,9 @@
 package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.CommonStatus;
@@ -15,6 +18,7 @@ import com.fdkankan.scene.mapper.ISurveillanceMapper;
 import com.fdkankan.scene.service.ISceneEditInfoExtService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.service.ISurveillanceService;
+import com.fdkankan.scene.vo.BaseSidParamVO;
 import com.fdkankan.scene.vo.SurveillanceParamVO;
 import com.fdkankan.scene.vo.BaseIdParamVO;
 import java.util.List;
@@ -48,10 +52,11 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
         SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByScenePlusId(scenePlus.getId());
 
         Surveillance surveillance = null;
-        if(Objects.nonNull(param.getId())){
-            surveillance = this.getById(param.getId());
+        if(StrUtil.isNotEmpty(param.getSid())){
+            surveillance = this.getBySid(param.getSid());
         }else{
             surveillance = new Surveillance();
+            surveillance.setSid(param.getData().getString("sid"));
         }
         surveillance.setNum(param.getNum());
         surveillance.setName(param.getName());
@@ -66,13 +71,15 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
     }
 
     @Override
-    public ResultData deleteSurveillance(BaseIdParamVO param) {
+    public ResultData deleteSurveillance(BaseSidParamVO param) {
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         if(Objects.isNull(scenePlus)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
         SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByScenePlusId(scenePlus.getId());
-        this.removeById(param.getId());
+
+        this.remove(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getSid, param.getSid()));
+
         long count = this.count(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, param.getNum()));
         if(count < 1){
             sceneEditInfoExt.setSurveillances(CommonStatus.NO.code().intValue());
@@ -86,4 +93,10 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
         List<Surveillance> list = this.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
         return BeanUtil.copyToList(list, SurveillanceBean.class);
     }
+
+    @Override
+    public Surveillance getBySid(String sid) {
+        return this.getOne(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getSid, sid));
+    }
+
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/BaseSidParamVO.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * <p>
+ * 通用data类型参数类
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/2/10
+ **/
+@Data
+public class BaseSidParamVO extends BaseSceneParamVO{
+
+    @NotBlank(message = "sid不能为空")
+    private String sid;
+
+}

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

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