From e8dc9598b482830ca7fa60c6869687a32448137d Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期一, 17 三月 2025 10:57:37 +0800
Subject: [PATCH] 新增储罐管理，数据分析新增导出功能
---
src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java b/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java
index ce25004..b5e9335 100644
--- a/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java
+++ b/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java
@@ -1,8 +1,11 @@
package com.hxzkmonitor.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hxzkmonitor.mapper.TbBaidumapMapper;
+import com.hxzkmonitor.mapper.TbUserMapper;
import com.hxzkmonitor.pojo.*;
import com.hxzkmonitor.service.TbEquipmentService;
import com.hxzkmonitor.service.TbEvrydayweiyi2024Service;
@@ -43,6 +46,12 @@
@Autowired
TbEvrydayweiyi2024Service tbEvrydayweiyi2024Service;
+ @Autowired
+ TbBaidumapMapper tbBaidumapMapper;
+
+ @Autowired
+ TbUserMapper tbUserMapper;
+
@ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
@GetMapping("/api/everyday")
public R everyday(Page page , String username) {
@@ -50,6 +59,8 @@
return R.ok(ipage);
}
+
+ //鏍规嵁褰撳墠鐧诲綍浜烘煡璁惧锛岀劧鍚庢牴鎹椂闂存煡璇㈡墍鏌ュ埌鎵�鏈夎澶囧綋澶╃殑鏁版嵁浠ist杩斿洖缁欏墠绔�
@GetMapping("/api/searcheveryday")
public R searcheveryday(Page page, String keyword , String username) {
@@ -132,10 +143,34 @@
// list = tbEquipmentService.list(new QueryWrapper<TbEquipment>().eq("companyid",comId));
// }
List<TbSystem> list1 = tbSystemService.list( );
+ QueryWrapper queryWrapper2 = new QueryWrapper<>();
+ queryWrapper2.eq("username", username);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapper2);
+
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("companyname", tbUser.getCaname());
+ TbBaidumap tbBaidumap = tbBaidumapMapper.selectOne(queryWrapper);
result.put("dataList", list);
- result.put("view", list1.get(0).getView());
+ result.put("view", tbBaidumap.getCenter());
+ result.put("shijiao", tbBaidumap.getShijiao());
+// result.put("view", tbBaidumap.getCenter());
+// result.put("view", list1.get(0).getView());
return R.ok(result);
}
+ @GetMapping("/api/searchdevice")
+ public R search(String username, String query ) {
+
+ return R.ok(tbEquipmentService.search(username,query));
+ // 鎵ц鎼滅储閫昏緫锛屽苟杩斿洖缁撴灉
+ // List<Item> items = searchService.search(query);
+ // return items.stream().map(Item::getName).collect(Collectors.toList());
+
+ // 濡傛灉娌℃湁鏈嶅姟锛屽彲浠ヤ娇鐢ㄩ潤鎬佹暟鎹繘琛屾紨绀�
+// return Arrays.asList("Search Result 1", "Search Result 2", "Search Result 3").stream()
+// .filter(result -> result.contains(query))
+// .collect(Collectors.toList());
+ }
+
}
--
Gitblit v1.9.3