From 9bfd0f697d407902d9d80d95e5c23943a556b79f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 10 三月 2023 13:38:14 +0800
Subject: [PATCH] mysql5.7不能使用 with
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java
index eb5d673..678e003 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java
@@ -11,6 +11,7 @@
import com.ycl.util.VideoUtil;
import com.ycl.vo.cockpit.CockpitVO;
import com.ycl.vo.cockpit.aiIot.AIIotVO;
+import com.ycl.vo.cockpit.aiIot.EfficiencyVO;
import com.ycl.vo.cockpit.aiIot.VideoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -69,27 +70,34 @@
@GetMapping("/video")
public CommonResult video(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- return CommonResult.success(iVideoPointService.list(new LambdaQueryWrapper<VideoPoint>().eq(params.getStreetId()==null,VideoPoint::getStreetId,params.getStreetId())).stream().map(item -> {
+ /// TODO: 2022/12/13 瑙嗛鐐逛綅璁惧涓虹┖ 娌℃暟鎹�
+ List<VideoPoint> list = iVideoPointService.list(new LambdaQueryWrapper<VideoPoint>()
+ .eq(params.getStreetId() != null, VideoPoint::getStreetId, params.getStreetId())
+ .isNotNull(VideoPoint::getPlatResourceId));
+
+ List<VideoVO> vos = list.stream().map(item -> {
VideoVO videoVO = new VideoVO();
videoVO.setName(item.getName());
videoVO.setBrand(item.getEquipmentBrand());
videoVO.setModel(item.getEquipmentModel());
videoVO.setIp(item.getEquipmentIp());
- videoVO.setLatitude(item.getLatitude().toString());
- videoVO.setLongitude(item.getLongitude().toString());
+ videoVO.setLatitude(item.getLatitude() != null ? item.getLatitude().toString() : "");
+ videoVO.setLongitude(item.getLongitude() != null ? item.getLongitude().toString() : "");
videoVO.setResourceId(item.getPlatResourceId());
return videoVO;
- }).collect(Collectors.toList()));
+ }).collect(Collectors.toList());
+
+ return CommonResult.success(vos);
+
}
@ApiOperation(value = "AI绠楁硶鏁堣兘")
@GetMapping("/efficiency")
- public CommonResult<List<AIIotVO.EfficiencyVO>> efficiency(@Validated CockpitVO params) {
+ public CommonResult efficiency(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- List<AIIotVO.EfficiencyVO> efficiencyVOS = new ArrayList<>();
- AIIotVO.EfficiencyVO a = null;
+ List<EfficiencyVO> efficiencyVOS = new ArrayList<>();
for (int i = 0; i < 4; i++) {
- a = new AIIotVO.EfficiencyVO();
+ EfficiencyVO a = new EfficiencyVO();
a.setType("閬撹矾鐮存崯");
a.setCount(12);
a.setRatio(new BigDecimal("0.63").setScale(2, RoundingMode.HALF_UP));
--
Gitblit v1.8.0