From 1cad14bca191807e18705c3a5526eda8151be439 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 14 四月 2025 23:10:22 +0800
Subject: [PATCH] 批量审核和图片保存bug
---
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java | 108 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 90 insertions(+), 18 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
index 3dce945..0e7b4eb 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
@@ -4,17 +4,23 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
+import com.ycl.dto.video.Camera;
+import com.ycl.dto.video.PageResult;
import com.ycl.entity.dict.DataDictionary;
+import com.ycl.enums.common.DictTypeEnum;
import com.ycl.service.dict.IDataDictionaryService;
+import com.ycl.util.VideoUtil;
+import com.ycl.vo.dict.DataDictionaryVo;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -30,29 +36,43 @@
public class DatabaseDictionaryController extends BaseController {
@Resource
private IDataDictionaryService iDatabaseDictionaryService;
+ @Autowired
+ private VideoUtil videoUtil;
@GetMapping("/listAll")
@ApiOperation("鑾峰彇鎵�鏈夊瓧鍏�")
private CommonResult<List<DataDictionary>> listAll() {
+ try {
+ PageResult<Camera> pageResult = videoUtil.callPostCameras(1, 20, "0");
+// System.out.println("娴峰悍瑙嗛鎴愬姛锛�" + pageResult.getTotal());
+ } catch (Exception ex) {
+ System.out.println("娴峰悍瑙嗛锛�" + ex.getMessage());
+ }
return CommonResult.success(iDatabaseDictionaryService.getAll());
}
@GetMapping("/queryByCode")
@ApiOperation(("鏍规嵁code鑾峰彇瀛楁淇℃伅"))
- private CommonResult<List<DataDictionary>> queryByCode(@RequestParam(value = "code") String code){
- List<DataDictionary> dataDictionary = iDatabaseDictionaryService.queryByCode(code);
+ private CommonResult<List<DataDictionary>> queryByCode(@RequestParam(value = "code") String code) {
+ List<DataDictionary> dataDictionary = iDatabaseDictionaryService.queryByCode(code, null);
return CommonResult.success(dataDictionary);
+ }
+
+ @GetMapping("/queryTypeCode")
+ @ApiOperation(("鑾峰彇瀛楀吀琛ㄦ墍鏈夌被鍨�"))
+ private CommonResult<Map<String, String>> queryTypeCode() {
+ Map<String, String> s = DictTypeEnum.getAllToMap();
+ return CommonResult.success(s);
}
@GetMapping("/query_user_type")
@ApiOperation("鏌ヨ鐢ㄦ埛绫诲瀷")
private CommonResult queryUserType() {
String level = "1";
- String typeCode = "07";
return CommonResult.success(iDatabaseDictionaryService
.list(new LambdaQueryWrapper<DataDictionary>()
.eq(DataDictionary::getLevel, level)
- .eq(DataDictionary::getTypeCode, typeCode)
+ .eq(DataDictionary::getTypeCode, DictTypeEnum.USER_TYPE.getCode())
));
}
@@ -60,11 +80,10 @@
@ApiOperation("鏌ヨ瑙掕壊绫诲瀷")
private CommonResult queryRoleType() {
String level = "1";
- String typeCode = "09";
return CommonResult.success(iDatabaseDictionaryService
.list(new LambdaQueryWrapper<DataDictionary>()
.eq(DataDictionary::getLevel, level)
- .eq(DataDictionary::getTypeCode, typeCode)
+ .eq(DataDictionary::getTypeCode, DictTypeEnum.ROLE_TYPE.getCode())
));
}
@@ -72,11 +91,10 @@
@ApiOperation("鏌ヨ閮ㄩ棬绫诲瀷")
private CommonResult queryDepartType() {
String level = "1";
- String typeCode = "08";
return CommonResult.success(iDatabaseDictionaryService
.list(new LambdaQueryWrapper<DataDictionary>()
.eq(DataDictionary::getLevel, level)
- .eq(DataDictionary::getTypeCode, typeCode)
+ .eq(DataDictionary::getTypeCode, DictTypeEnum.DEPART_TYPE.getCode())
));
}
@@ -84,7 +102,42 @@
@ApiOperation("鏌ヨ涔℃潙琛楅亾绫诲瀷")
private CommonResult queryStreetType() {
String level = "1";
- String typeCode = "10";
+ return CommonResult.success(iDatabaseDictionaryService
+ .list(new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getLevel, level)
+ .eq(DataDictionary::getTypeCode, DictTypeEnum.STREET_TYPE.getCode())
+ ));
+ }
+
+ @GetMapping("/query_social_type")
+ @ApiOperation("鏌ヨ鎵�杈栨潙锛堢ぞ鍖�")
+ private CommonResult querySocialTypeById(@RequestParam Integer id) {
+ return CommonResult.success(iDatabaseDictionaryService
+ .list(new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getParentId, id)
+ ));
+ }
+
+
+ @GetMapping("/query_social")
+ @ApiOperation("鏌ヨ鎵�杈栨潙锛堢ぞ鍖�")
+ private CommonResult querySocialType() {
+ String level = "1";
+ return CommonResult.success(iDatabaseDictionaryService
+ .list(new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getLevel, level)
+ .eq(DataDictionary::getTypeCode, DictTypeEnum.COMMUNITY_TYPE.getCode())
+ ));
+ }
+
+ @GetMapping("/query_type")
+ @ApiOperation("閫氳繃绫诲瀷缂栫爜鏌ヨ绫诲瀷")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "typeCode", value = "01杩濊 02 浜嬩欢绛夌骇 03璇佷欢绫诲瀷 04鏂囧寲 05鍚嶆棌 06杩濆缓 07鐢ㄦ埛绫诲瀷 08 閮ㄩ棬绫诲瀷 09 瑙掕壊绫诲瀷 10 涔℃潙琛楅亾 11 绀惧尯"),
+ @ApiImplicitParam(name = "level", value = "1 椤剁骇 2 涓�绾у瓙绾� 3 浜岀骇瀛愮骇 4涓夌骇瀛愮骇")
+ }
+ )
+ private CommonResult queryType(@RequestParam String typeCode, @RequestParam Integer level) {
return CommonResult.success(iDatabaseDictionaryService
.list(new LambdaQueryWrapper<DataDictionary>()
.eq(DataDictionary::getLevel, level)
@@ -92,12 +145,31 @@
));
}
- @GetMapping("/query_social_type")
- @ApiOperation("鏌ヨ鎵�杈栨潙锛堢ぞ鍖�")
- private CommonResult querySocialType(@RequestParam Integer id) {
+ @GetMapping("/query_tree_type")
+ @ApiOperation("閫氳繃绫诲瀷缂栫爜鏌ヨ鏍戝舰绫诲瀷-鍙湁涓ょ骇")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "typeCode", value = "01杩濊 02 浜嬩欢绛夌骇 03璇佷欢绫诲瀷 04鏂囧寲 05鍚嶆棌 06杩濆缓 07鐢ㄦ埛绫诲瀷 08 閮ㄩ棬绫诲瀷 09 瑙掕壊绫诲瀷 10 涔℃潙琛楅亾 11 绀惧尯"),
+ @ApiImplicitParam(name = "level", value = "1 椤剁骇 2 涓�绾у瓙绾� 3 浜岀骇瀛愮骇 4涓夌骇瀛愮骇")
+ }
+ )
+ private CommonResult queryTreeType(@RequestParam String typeCode, @RequestParam Integer level) {
+
+ List<DataDictionaryVo> list = iDatabaseDictionaryService.queryTreeType(typeCode, level);
+ return CommonResult.success(list);
+ }
+
+
+ @GetMapping("/addition")
+ @ApiOperation("閫氱敤娣诲姞")
+ private CommonResult queryType(@RequestBody DataDictionary dataDictionary) {
+ return CommonResult.success(iDatabaseDictionaryService.save(dataDictionary));
+ }
+
+ @GetMapping("/query")
+ @ApiOperation("閫氱敤id鏌ヨ璇︽儏")
+ private CommonResult queryDictById(@RequestParam Integer id) {
return CommonResult.success(iDatabaseDictionaryService
.list(new LambdaQueryWrapper<DataDictionary>()
- .eq(DataDictionary::getParentId, id)
- ));
+ .eq(DataDictionary::getParentId, id)));
}
}
--
Gitblit v1.8.0