v4.3.0 监控摄像头功能

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

@@ -11,7 +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.AddSurveillanceParamVO;
+import com.fdkankan.scene.vo.SurveillanceParamVO;
 import com.fdkankan.scene.vo.BallScreenVideoParamVO;
 import com.fdkankan.scene.vo.BaseDataParamVO;
 import com.fdkankan.scene.vo.BaseFileParamVO;
@@ -39,7 +39,6 @@ import com.fdkankan.scene.vo.SceneEditInfoVO;
 import com.fdkankan.scene.vo.SceneEditParamVO;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import com.fdkankan.scene.vo.SceneInfoVO;
-import com.fdkankan.scene.vo.UpdateSurveillanceParamVO;
 import com.fdkankan.scene.vo.UploadContentParamVO;
 import java.io.IOException;
 import lombok.extern.log4j.Log4j2;
@@ -1129,15 +1128,9 @@ public class SceneEditController extends BaseController {
      * @return com.fdkankan.common.response.ResultData
      **/
     @CheckCooperationPermit
-    @PostMapping("/surveillance/add")
-    public ResultData addSurveillance(@RequestBody @Validated AddSurveillanceParamVO param){
-        return surveillanceService.addSurveillance(param);
-    }
-
-    @CheckCooperationPermit
-    @PostMapping("/surveillance/update")
-    public ResultData updateSurveillance(@RequestBody @Validated UpdateSurveillanceParamVO param){
-        return surveillanceService.updateSurveillance(param);
+    @PostMapping("/surveillance/save")
+    public ResultData saveSurveillance(@RequestBody @Validated SurveillanceParamVO param){
+        return surveillanceService.saveSurveillance(param);
     }
 
     @PostMapping("/surveillance/delete")

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

@@ -4,13 +4,9 @@ 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.AddSurveillanceParamVO;
+import com.fdkankan.scene.vo.SurveillanceParamVO;
 import com.fdkankan.scene.vo.BaseIdParamVO;
-import com.fdkankan.scene.vo.BaseSceneParamVO;
-import com.fdkankan.scene.vo.UpdateSurveillanceParamVO;
 import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -22,9 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  */
 public interface ISurveillanceService extends IService<Surveillance> {
 
-    ResultData addSurveillance(AddSurveillanceParamVO param);
-
-    ResultData updateSurveillance(UpdateSurveillanceParamVO param);
+    ResultData saveSurveillance(SurveillanceParamVO param);
 
     ResultData deleteSurveillance(BaseIdParamVO param);
 

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

@@ -1,13 +1,10 @@
 package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-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;
 import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.bean.SurveillanceBean;
@@ -18,11 +15,8 @@ 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.service.impl.IFdkkLaserServiceImpl.Result;
-import com.fdkankan.scene.vo.AddSurveillanceParamVO;
+import com.fdkankan.scene.vo.SurveillanceParamVO;
 import com.fdkankan.scene.vo.BaseIdParamVO;
-import com.fdkankan.scene.vo.BaseSceneParamVO;
-import com.fdkankan.scene.vo.UpdateSurveillanceParamVO;
 import java.util.List;
 import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +39,7 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
     private ISceneEditInfoExtService sceneEditInfoExtService;
 
     @Override
-    public ResultData addSurveillance(AddSurveillanceParamVO param) {
+    public ResultData saveSurveillance(SurveillanceParamVO param) {
 
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         if(Objects.isNull(scenePlus)){
@@ -53,12 +47,17 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
         }
         SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByScenePlusId(scenePlus.getId());
 
-        Surveillance surveillance = new Surveillance();
+        Surveillance surveillance = null;
+        if(Objects.nonNull(param.getId())){
+            surveillance = this.getById(param.getId());
+        }else{
+            surveillance = new Surveillance();
+        }
         surveillance.setNum(param.getNum());
         surveillance.setName(param.getName());
         surveillance.setData(param.getData().toJSONString());
         surveillance.setPlayUrl(param.getPlayUrl());
-        this.save(surveillance);
+        this.saveOrUpdate(surveillance);
 
         sceneEditInfoExt.setSurveillances(CommonStatus.YES.code().intValue());
         sceneEditInfoExtService.updateById(sceneEditInfoExt);
@@ -67,21 +66,6 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
     }
 
     @Override
-    public ResultData updateSurveillance(UpdateSurveillanceParamVO param) {
-
-        Surveillance surveillance = this.getById(param.getId());
-        if(Objects.isNull(surveillance)){
-            throw new BusinessException(ServerCode.SYSTEM_ERROR);
-        }
-        surveillance.setName(param.getName());
-        surveillance.setData(param.getData().toJSONString());
-        surveillance.setPlayUrl(param.getPlayUrl());
-        this.updateById(surveillance);
-
-        return ResultData.ok();
-    }
-
-    @Override
     public ResultData deleteSurveillance(BaseIdParamVO param) {
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         if(Objects.isNull(scenePlus)){

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

@@ -14,7 +14,7 @@ import lombok.Data;
  * @since 2022/9/16
  **/
 @Data
-public class AddSurveillanceParamVO{
+public class SurveillanceParamVO {
 
     @NotBlank(message = "场景码不能为空")
     private String num;
@@ -28,6 +28,8 @@ public class AddSurveillanceParamVO{
     @NotBlank(message = "playUrl不能为空")
     private String playUrl;
 
+    private Long id;
+
     private String type;
 
     private String deviceId;