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 | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 d8a9fd3..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;
@@ -44,8 +43,6 @@
this.sv = sv ;
}
- @Value("${video.types}")
- private String[] types;
/**
* 瀹㈡埛绔姹傚緱鍒版墍鏈夋憚鍍忔満绫诲瀷
* @return 鎵�鏈夋憚鍍忔満绫诲瀷
@@ -64,8 +61,8 @@
public BaseResponse<QueryResultVo<List<TypesVo>>> types() {
try {
List<TypesVo> list = new ArrayList<>() ;
- if(types != null && types.length > 0){
- for (String type : types) {
+ if(CameraTypesConfig.types != null && CameraTypesConfig.types.size() > 0){
+ for (String type : CameraTypesConfig.types) {
String[] typeGrp = type.split(",");
if(typeGrp.length == 2){
TypesVo vo = new TypesVo() ;
@@ -98,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);
@@ -123,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));
@@ -150,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);
@@ -217,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