From c386374de5ff4a65904124ef839e6862518d27fa Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期三, 16 四月 2025 09:12:30 +0800
Subject: [PATCH] v2.0.2，更新时间4.16
---
src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java | 100 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 78 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java b/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java
index b5e9335..3288e8d 100644
--- a/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java
+++ b/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java
@@ -7,10 +7,8 @@
import com.hxzkmonitor.mapper.TbBaidumapMapper;
import com.hxzkmonitor.mapper.TbUserMapper;
import com.hxzkmonitor.pojo.*;
-import com.hxzkmonitor.service.TbEquipmentService;
-import com.hxzkmonitor.service.TbEvrydayweiyi2024Service;
-import com.hxzkmonitor.service.TbSystemOperationLogService;
-import com.hxzkmonitor.service.TbSystemService;
+import com.hxzkmonitor.service.*;
+import com.hxzkmonitor.udp.Udp_Out;
import com.hxzkmonitor.util.DateUtil;
import com.hxzkmonitor.util.R;
import io.swagger.annotations.ApiOperation;
@@ -52,9 +50,12 @@
@Autowired
TbUserMapper tbUserMapper;
+ @Autowired
+ TbGuangboService tbGuangboService;
+
@ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
@GetMapping("/api/everyday")
- public R everyday(Page page , String username) {
+ public R everyday(Page page, String username) {
IPage<TbEquipment> ipage = tbEquipmentService.everyday(page, username);
return R.ok(ipage);
@@ -63,7 +64,7 @@
//鏍规嵁褰撳墠鐧诲綍浜烘煡璁惧锛岀劧鍚庢牴鎹椂闂存煡璇㈡墍鏌ュ埌鎵�鏈夎澶囧綋澶╃殑鏁版嵁浠ist杩斿洖缁欏墠绔�
@GetMapping("/api/searcheveryday")
- public R searcheveryday(Page page, String keyword , String username) {
+ public R searcheveryday(Page page, String keyword, String username) {
return R.ok(tbEquipmentService.searcheveryday(page, keyword, username));
}
@@ -76,7 +77,7 @@
}
@PostMapping("/api/addorupEquipment")
- public R addorupEquipment(TbEquipment tbEquipment) throws Exception{
+ public R addorupEquipment(TbEquipment tbEquipment) throws Exception {
if (tbEquipmentService.addorupEquipment(tbEquipment) == -1) {
return R.failed("褰撳墠缂栧彿宸插瓨鍦�");
} else {
@@ -107,32 +108,37 @@
}
@GetMapping("/api/getEquipment")
- public R getEquipment(Integer type,String username,String phone) {
- return R.ok(tbEquipmentService.getEquipment(type,username,phone));
+ public R getEquipment(Integer type, String username, String phone) {
+ return R.ok(tbEquipmentService.getEquipment(type, username, phone));
}
@GetMapping("/api/getEquipmentmonitor")
- public R getEquipmentmonitor(String username,String phone) {
- return R.ok(tbEquipmentService.getEquipmentmonitor( username, phone));
+ public R getEquipmentmonitor(String username, String phone) {
+ return R.ok(tbEquipmentService.getEquipmentmonitor(username, phone));
}
@GetMapping("/api/getEquipmenttwo")
- public R getEquipmenttwo(String username,String phone) {
- return R.ok(tbEquipmentService.getEquipmenttwo( username, phone));
+ public R getEquipmenttwo(String username, String phone) {
+ return R.ok(tbEquipmentService.getEquipmenttwo(username, phone));
}
-
-
-
@PostMapping("/api/alldevice")
- public R alldevice(String username,String phone) {
+ public R alldevice(String username, String phone) {
// TbUser user = tbUserService.getByUsername(SeachRole.name());
Map<String, Object> result = new HashMap<>();
List<TbEquipment> list = new ArrayList<>();
// TbCompany tbCompany = new TbCompany();
// if (user.getRole().equals("瓒呯骇绠＄悊鍛�")) {
- list = tbEquipmentService.getalldevice( username, phone);
+ list = tbEquipmentService.getalldevice(username, phone);
+
+ Map<String, Object> resultg = new HashMap<>();
+ List<TbGuangbo> listg = new ArrayList<>();
+// TbCompany tbCompany = new TbCompany();
+// if (user.getRole().equals("瓒呯骇绠＄悊鍛�")) {
+ listg = tbGuangboService.getallguangbo(username, phone);
+
+
// } else {
// //鑾峰彇鐧婚檰浜哄叕鍙稿悕绉帮紝
// String SeachName = user.getCaname();
@@ -142,15 +148,17 @@
// Integer comId = tbCompany.getId();
// list = tbEquipmentService.list(new QueryWrapper<TbEquipment>().eq("companyid",comId));
// }
- List<TbSystem> list1 = tbSystemService.list( );
+ 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);
+ TbBaidumap tbBaidumap = tbBaidumapMapper.selectOne(queryWrapper);
result.put("dataList", list);
+ result.put("gbList", listg);
+
result.put("view", tbBaidumap.getCenter());
result.put("shijiao", tbBaidumap.getShijiao());
// result.put("view", tbBaidumap.getCenter());
@@ -159,9 +167,9 @@
}
@GetMapping("/api/searchdevice")
- public R search(String username, String query ) {
+ public R search(String username, String query) {
- return R.ok(tbEquipmentService.search(username,query));
+ return R.ok(tbEquipmentService.search(username, query));
// 鎵ц鎼滅储閫昏緫锛屽苟杩斿洖缁撴灉
// List<Item> items = searchService.search(query);
// return items.stream().map(Item::getName).collect(Collectors.toList());
@@ -172,5 +180,53 @@
// .collect(Collectors.toList());
}
+ @GetMapping("/api/resetinitv")
+ public R resetinitv(String tagid, String initv) {
+
+ String xieyi = "$setbegvalue," + tagid + "," + initv + ",END";
+ Udp_Out.udp_to_cs(xieyi);
+ return R.ok();
+ }
+
+ @GetMapping("/api/resetzuobiao")
+ public R resetzuobiao(String tagid ) {
+
+ String xieyi = "$setbaselock," + tagid + ",END";
+ Udp_Out.udp_to_cs(xieyi);
+ return R.ok();
+ }
+
+ @GetMapping("/api/jzsearch")
+ public R jzsearch( String query,String type) {
+
+ return R.ok(tbEquipmentService.jzsearch(query,type));
+ // 鎵ц鎼滅储閫昏緫锛屽苟杩斿洖缁撴灉
+ // 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());
+ }
+
+ @GetMapping("/api/jzsearchfive")
+ public R jzsearchfive(String type ) {
+
+ return R.ok(tbEquipmentService.jzsearchfive(type));
+ // 鎵ц鎼滅储閫昏緫锛屽苟杩斿洖缁撴灉
+ // 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