From e88d34fd4cbe3a0cc57ecfdc1710d66bc88e26b5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 10 六月 2025 14:07:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/video/CameraCtrl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/video/CameraCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/video/CameraCtrl.java
index 39fdaa7..6dfe16e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/video/CameraCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/video/CameraCtrl.java
@@ -14,7 +14,6 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.springframework.beans.factory.annotation.Value;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -96,9 +95,9 @@
                             schema = @Schema(implementation = VoCamera.class))}
             )
     })
-    @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(path = "some")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoCamera>>> some(@RequestBody CameraQo vo){
+    public BaseResponse<QueryResultVo<List<VoCamera>>> some(CameraQo vo){
         try {
             QueryResultVo<List<VoCamera>> res = this.sv.some(vo) ;
             return BaseResponseUtils.buildSuccess(res);
@@ -121,7 +120,7 @@
                             schema = @Schema(implementation = ViCamera.class))}
             )
     })
-    @GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
+    @GetMapping(path = "one")
     @SsoAop()
     public BaseResponse<ViCamera> one(Long id){
         return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
@@ -148,6 +147,7 @@
             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
         ViCamera po = dto.toNewPo() ;
+        po.deleted = 0 ;
         int count;
         try {
             count = this.sv.save(po);
@@ -215,7 +215,7 @@
                             schema = @Schema(implementation = Boolean.class))}
             )
     })
-    @GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
+    @GetMapping(path = "delete")
     @SsoAop()
     public BaseResponse<Boolean> delete(Long id){
         if(id == null){

--
Gitblit v1.8.0