From 252b4943e54f7ef930f7f7ea01ad1a8a29655dcf Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 23 十月 2023 21:15:09 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 ec98475..cea3bbb 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,13 +4,18 @@
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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -31,17 +36,25 @@
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);
+ List<DataDictionary> dataDictionary = iDatabaseDictionaryService.queryByCode(code, null);
return CommonResult.success(dataDictionary);
}
@@ -132,6 +145,20 @@
));
}
+ @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) {
--
Gitblit v1.8.0