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/TbCompanyController.java | 14
src/main/java/com/hxzkmonitor/util/MyFile.java | 237 +++++++++
src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java | 581 ++++++++++++++----------
src/main/java/com/hxzkmonitor/udp/Udp_Out.java | 78 +++
src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java | 100 +++
src/main/java/com/hxzkmonitor/controller/TbSystemController.java | 122 ++++
src/main/java/com/hxzkmonitor/service/TbCompanyService.java | 2
src/main/java/com/hxzkmonitor/service/impl/TbAlarmsystemServiceImpl.java | 42 +
src/main/java/com/hxzkmonitor/service/impl/TbAlarmrecordServiceImpl.java | 7
src/main/java/com/hxzkmonitor/service/TbSystemService.java | 6
src/main/java/com/hxzkmonitor/service/impl/TbSystemServiceImpl.java | 11
src/main/java/com/hxzkmonitor/service/impl/TbCompanyServiceImpl.java | 11
src/main/java/com/hxzkmonitor/service/TbEquipmentService.java | 5
src/main/java/com/hxzkmonitor/pojo/TbAlarmsystem.java | 15
src/main/java/com/hxzkmonitor/config/SggCodeGenerator.java | 2
src/main/java/com/hxzkmonitor/pojo/TbEquipment.java | 11
src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java | 17
src/main/java/com/hxzkmonitor/service/TbAlarmrecordService.java | 4
src/main/java/com/hxzkmonitor/controller/TbAlarmrecordController.java | 5
src/main/java/com/hxzkmonitor/service/TbDuanxinService.java | 7
src/main/java/com/hxzkmonitor/util/imagesFiler.java | 66 ++
src/main/java/com/hxzkmonitor/service/impl/TbDuanxinServiceImpl.java | 30 +
src/main/java/com/hxzkmonitor/controller/TbDuanxinController.java | 12
src/main/java/com/hxzkmonitor/controller/TbEvrydayweiyi2024Controller.java | 22
src/main/resources/application.yml | 10
25 files changed, 1,104 insertions(+), 313 deletions(-)
diff --git a/src/main/java/com/hxzkmonitor/config/SggCodeGenerator.java b/src/main/java/com/hxzkmonitor/config/SggCodeGenerator.java
index 3b1ec71..2800887 100644
--- a/src/main/java/com/hxzkmonitor/config/SggCodeGenerator.java
+++ b/src/main/java/com/hxzkmonitor/config/SggCodeGenerator.java
@@ -35,7 +35,7 @@
// 3銆佹暟鎹簮閰嶇疆
DataSourceConfig dsc = new DataSourceConfig();
- dsc.setUrl("jdbc:mysql://192.168.31.109:3306/hxzksm?serverTimezone=GMT%2B8");
+ dsc.setUrl("jdbc:mysql://192.168.5.121:3306/hxzksm?serverTimezone=GMT%2B8");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername("root");
dsc.setPassword("123456");
diff --git a/src/main/java/com/hxzkmonitor/controller/TbAlarmrecordController.java b/src/main/java/com/hxzkmonitor/controller/TbAlarmrecordController.java
index 1de2d71..ef913de 100644
--- a/src/main/java/com/hxzkmonitor/controller/TbAlarmrecordController.java
+++ b/src/main/java/com/hxzkmonitor/controller/TbAlarmrecordController.java
@@ -47,6 +47,11 @@
return R.ok(tbAlarmrecordService.delAlarmrecord(id));
}
+ @GetMapping("/api/delAlarmrecordAll")
+ public R delAlarmrecordAll(TbAlarmrecord tbAlarmrecord) {
+ return R.ok(tbAlarmrecordService.delAlarmrecordAll());
+ }
+
@GetMapping("/api/recordsall")
public R recordsall(TbAlarmrecord tbAlarmrecord) {
return R.ok(tbAlarmrecordService.recordsall(tbAlarmrecord));
diff --git a/src/main/java/com/hxzkmonitor/controller/TbCompanyController.java b/src/main/java/com/hxzkmonitor/controller/TbCompanyController.java
index 7f85af1..0a62235 100644
--- a/src/main/java/com/hxzkmonitor/controller/TbCompanyController.java
+++ b/src/main/java/com/hxzkmonitor/controller/TbCompanyController.java
@@ -65,5 +65,19 @@
// .collect(Collectors.toList());
}
+ @GetMapping("/api/searchfive")
+ public R searchfive( ) {
+
+ return R.ok(tbCompanyService.searchfive());
+ // 鎵ц鎼滅储閫昏緫锛屽苟杩斿洖缁撴灉
+ // 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());
+ }
+
}
diff --git a/src/main/java/com/hxzkmonitor/controller/TbDuanxinController.java b/src/main/java/com/hxzkmonitor/controller/TbDuanxinController.java
index d0c96ba..20d5249 100644
--- a/src/main/java/com/hxzkmonitor/controller/TbDuanxinController.java
+++ b/src/main/java/com/hxzkmonitor/controller/TbDuanxinController.java
@@ -52,5 +52,17 @@
return R.ok(tbDuanxinService.searchDuanxin(page,keyword));
}
+
+ @GetMapping("/api/getDuanxin")
+ public R getDuanxin(String query) {
+ return R.ok(tbDuanxinService.getDuanxin(query));
+ }
+
+ @GetMapping("/api/getDuanxinfive")
+ public R getDuanxinfive() {
+ return R.ok(tbDuanxinService.getDuanxinfive());
+ }
+
+
}
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());
+ }
+
+
+
}
+
+
diff --git a/src/main/java/com/hxzkmonitor/controller/TbEvrydayweiyi2024Controller.java b/src/main/java/com/hxzkmonitor/controller/TbEvrydayweiyi2024Controller.java
index 424f706..2902fcf 100644
--- a/src/main/java/com/hxzkmonitor/controller/TbEvrydayweiyi2024Controller.java
+++ b/src/main/java/com/hxzkmonitor/controller/TbEvrydayweiyi2024Controller.java
@@ -176,30 +176,8 @@
@GetMapping("/api/gettagidweiyi")
public R gettagidweiyi(String tagid) {
-// Map<String, Object> data = new ArrayList<>();
Map<String, Object> data = tbEvrydayweiyi2024Service.gettagidweiyi( tagid);
- JSONObject json = new JSONObject();
-// if (data.size()>0){
-// int size = data.size();
-// String[] hd = new String[size];
-// String[] ed = new String[size];
-// String[] nd = new String[size];
-// String[] x = new String[size];
-// for (int i = 0; i < size; i++) {
-// hd[i] = data.get(i).getTdmm();
-// ed[i] = data.get(i).getEdmm();
-// nd[i] = data.get(i).getNdmm();
-// x[i] = data.get(i).getFilename();
-// }
-// Map<String, Object> result = new HashMap<>();
-// result.put("ed", ed);
-// result.put("nd", nd);
-// result.put("hd", hd);
-// result.put("x", x);
return R.ok(data);
-// }
-
-// return R.ok(json);
}
}
diff --git a/src/main/java/com/hxzkmonitor/controller/TbSystemController.java b/src/main/java/com/hxzkmonitor/controller/TbSystemController.java
index 2936ffe..807a47b 100644
--- a/src/main/java/com/hxzkmonitor/controller/TbSystemController.java
+++ b/src/main/java/com/hxzkmonitor/controller/TbSystemController.java
@@ -1,28 +1,43 @@
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.TbDuanxinMapper;
+import com.hxzkmonitor.pojo.TbDuanxin;
+import com.hxzkmonitor.pojo.TbDuanxinlog;
import com.hxzkmonitor.pojo.TbEquipment;
import com.hxzkmonitor.pojo.TbSystem;
+import com.hxzkmonitor.service.TbDuanxinlogService;
import com.hxzkmonitor.service.TbSystemService;
import com.hxzkmonitor.util.R;
+import com.tencentcloudapi.common.Credential;
+import com.tencentcloudapi.common.exception.TencentCloudSDKException;
+import com.tencentcloudapi.common.profile.ClientProfile;
+import com.tencentcloudapi.common.profile.HttpProfile;
+import com.tencentcloudapi.sms.v20210111.SmsClient;
+import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
+import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author wangfei
@@ -30,17 +45,24 @@
*/
@RestController
@RequestMapping("/")
+@Component
public class TbSystemController {
@Autowired
com.hxzkmonitor.service.TbSystemService TbSystemService;
-
+ @Autowired
+ TbDuanxinMapper tbDuanxinMapper;
+ private String SecretId = "AKIDrjZOI4e6KLZu9FAsSRN8eOwSt52lbMBz";
+ private String SecretKey = "xnRtHUL3YqdMyOLVSBjKkz1pQoxujS4d";
+ @Autowired
+ TbDuanxinlogService tbDuanxinlogService;
+ Integer st = -1;
@ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
@GetMapping("/api/getSystemPage")
public R getSystem(Page page) {
- IPage<TbSystem> ipage = TbSystemService.getSystemPage( page);
+ IPage<TbSystem> ipage = TbSystemService.getSystemPage(page);
return R.ok(ipage);
}
@@ -52,9 +74,91 @@
@GetMapping("/api/getSystemOne")
public R getSystemOne() {
- List<TbSystem> list1 = TbSystemService.list();
+
+ List<TbSystem> list1 = TbSystemService.findsystem();
return R.ok(list1);
}
-
+
+ public static boolean isDifferenceGreaterThan60Seconds(String timeStr) {
+ // 瀹氫箟鏃ユ湡鏃堕棿鏍煎紡
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ // 灏嗗瓧绗︿覆鏃堕棿瑙ｆ瀽涓� LocalDateTime 瀵硅薄
+ LocalDateTime givenTime = LocalDateTime.parse(timeStr, formatter);
+ // 鑾峰彇褰撳墠鏃堕棿
+ LocalDateTime currentTime = LocalDateTime.now();
+ // 璁＄畻涓や釜鏃堕棿涔嬮棿鐨勫樊鍊�
+ Duration duration = Duration.between(givenTime, currentTime);
+ // 鍒ゆ柇宸�兼槸鍚﹀ぇ浜� 60 绉�
+ return duration.getSeconds() > 60;
+ }
+
+// @Scheduled(cron = "0 24 15 * * ?")
+@Scheduled(cron = "*/10 * * * * ?")//娴嬭瘯10涓�娆�
+// @Scheduled(cron = "0 0/10 8-22 * * ?")//8鐐瑰埌10鐐规瘡10鍒嗛挓鎵ц涓�娆�
+ public void sms() throws Exception {
+ System.out.println("鐭俊瀹氭椂鍣ㄦ墽琛�============銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��");
+ //鏌ヨ鏁版嵁搴撲腑鎵�鏈夌殑鍏徃鏁版嵁
+ List<TbSystem> list1 = TbSystemService.list();
+
+ System.out.println(list1.get(0).getAlerttime());//褰撳墠鏃堕棿-鑾峰彇鏃堕棿澶т簬60
+ boolean result = isDifferenceGreaterThan60Seconds(list1.get(0).getAlerttime());
+ System.out.println("鏃堕棿宸槸鍚﹀ぇ浜� 60 绉�: " + result);
+ //鑾峰彇褰撳墠骞存湀鏃ユ椂闂�
+ if (result) {
+ if (st == 1){
+ try {
+ Credential cred = new Credential(this.SecretId, this.SecretKey);
+ HttpProfile httpProfile = new HttpProfile();
+ httpProfile.setEndpoint("sms.tencentcloudapi.com");
+ ClientProfile clientProfile = new ClientProfile();
+ clientProfile.setHttpProfile(httpProfile);
+ SmsClient client = new SmsClient(cred, "ap-beijing", clientProfile);
+ SendSmsRequest req = new SendSmsRequest();
+// String[] phoneNumberSet1 = new String[]{GsPhone.split("[,锛宂")[p]};
+ QueryWrapper sms = new QueryWrapper();
+ sms.eq("type", "寮曟搸绂荤嚎鎶ヨ");
+ List<TbDuanxin> managerList = tbDuanxinMapper.selectList(sms);
+ for (int s = 0; s < managerList.size(); s++) {
+// System.out.println(managerList.get(s).getPhone());
+// phoneNumberSet1[s] = managerList.get(s).getPhone();
+ String[] phoneNumberSet12 = {managerList.get(s).getPhone()};
+ System.out.println(phoneNumberSet12);
+ req.setPhoneNumberSet(phoneNumberSet12);
+
+ req.setSmsSdkAppId("1400838975");
+ req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
+ req.setTemplateId("2082020");
+
+// String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
+ String[] templateParamSet1 = new String[]{managerList.get(s).getDuanxin()};
+ req.setTemplateParamSet(templateParamSet1);
+ // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
+ SendSmsResponse resp = client.SendSms(req);
+ TbDuanxinlog duanxinlog = new TbDuanxinlog();
+ duanxinlog.setName(managerList.get(s).getManager());
+ duanxinlog.setPhone(managerList.get(s).getPhone());
+
+ duanxinlog.setMsg("鍛婅鎻愮ず:" + managerList.get(s).getDuanxin() + ",璇峰敖蹇鐞嗭紝濡傚凡澶勭悊璇峰拷鐣ヨ鎻愮ず淇℃伅锛屽闇�閫�璁㈢煭淇″彲鑱旂郴绠＄悊鍛樺垹闄�");
+ tbDuanxinlogService.addorupDuanxinlog(duanxinlog);
+ }
+// req.setPhoneNumberSet(phoneNumberSet1);
+// req.setSmsSdkAppId("1400838975");
+// req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
+// req.setTemplateId("1908206");
+// String[] templateParamSet1 = new String[]{cardNum, "150MB"};
+// req.setTemplateParamSet(templateParamSet1);
+// SendSmsResponse resp = client.SendSms(req);
+// System.out.println(SendSmsResponse.toJsonString(resp));
+ } catch (TencentCloudSDKException var15) {
+ System.out.println(var15.toString());
+ }
+ st = 0;
+ }
+
+
+ }else{
+ st=1;
+ }
+ }
}
diff --git a/src/main/java/com/hxzkmonitor/pojo/TbAlarmsystem.java b/src/main/java/com/hxzkmonitor/pojo/TbAlarmsystem.java
index 12fb51e..b915ecd 100644
--- a/src/main/java/com/hxzkmonitor/pojo/TbAlarmsystem.java
+++ b/src/main/java/com/hxzkmonitor/pojo/TbAlarmsystem.java
@@ -78,6 +78,21 @@
@TableField("hdav")
private String hdav;
+ @ApiModelProperty(value = "缁х數鍣╥d")
+ @TableField("guangboid")
+ private String guangboid;
+
+ @ApiModelProperty(value = "鍛婅鎵嬫満鍙�")
+ @TableField("phone")
+ private String phone;
+
+
+
@TableField(exist = false)
private String company;
+
+ @TableField(exist = false)
+ private String guangboname;
+
+
}
diff --git a/src/main/java/com/hxzkmonitor/pojo/TbEquipment.java b/src/main/java/com/hxzkmonitor/pojo/TbEquipment.java
index b288427..b8af788 100644
--- a/src/main/java/com/hxzkmonitor/pojo/TbEquipment.java
+++ b/src/main/java/com/hxzkmonitor/pojo/TbEquipment.java
@@ -150,4 +150,15 @@
@TableField(exist = false)
private String company;
+
+ @TableField(exist = false)
+ private String ed;
+
+ @TableField(exist = false)
+ private String nd;
+
+ @TableField(exist = false)
+ private String td;
+
+
}
diff --git a/src/main/java/com/hxzkmonitor/service/TbAlarmrecordService.java b/src/main/java/com/hxzkmonitor/service/TbAlarmrecordService.java
index 46f2c5c..9bd2a58 100644
--- a/src/main/java/com/hxzkmonitor/service/TbAlarmrecordService.java
+++ b/src/main/java/com/hxzkmonitor/service/TbAlarmrecordService.java
@@ -18,6 +18,10 @@
IPage<TbAlarmrecord> searchAlarmrecord(Page page, String keyword ,String username);
Integer delAlarmrecord(Integer id);
+ Integer delAlarmrecordAll();
+
+
+
Integer addorupAlarmrecord(TbAlarmrecord tbEquipment);
Integer recordsall(TbAlarmrecord tbAlarmrecord);
diff --git a/src/main/java/com/hxzkmonitor/service/TbCompanyService.java b/src/main/java/com/hxzkmonitor/service/TbCompanyService.java
index 433f89f..7f256de 100644
--- a/src/main/java/com/hxzkmonitor/service/TbCompanyService.java
+++ b/src/main/java/com/hxzkmonitor/service/TbCompanyService.java
@@ -26,5 +26,7 @@
List<TbCompany> search(String query);
+ List<TbCompany> searchfive();
+
}
diff --git a/src/main/java/com/hxzkmonitor/service/TbDuanxinService.java b/src/main/java/com/hxzkmonitor/service/TbDuanxinService.java
index aad9375..8c3a2a6 100644
--- a/src/main/java/com/hxzkmonitor/service/TbDuanxinService.java
+++ b/src/main/java/com/hxzkmonitor/service/TbDuanxinService.java
@@ -6,6 +6,8 @@
import com.hxzkmonitor.pojo.TbDuanxin;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -23,4 +25,9 @@
IPage<TbDuanxin> getDuanxinPage(Page page );
+ List<String> getDuanxin(String query);
+
+ List<String> getDuanxinfive();
+
}
+
diff --git a/src/main/java/com/hxzkmonitor/service/TbEquipmentService.java b/src/main/java/com/hxzkmonitor/service/TbEquipmentService.java
index cc719f8..693b240 100644
--- a/src/main/java/com/hxzkmonitor/service/TbEquipmentService.java
+++ b/src/main/java/com/hxzkmonitor/service/TbEquipmentService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.pojo.Tb24jiancedata;
+import com.hxzkmonitor.pojo.TbCompany;
import com.hxzkmonitor.pojo.TbEquipment;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hxzkmonitor.pojo.TbTank;
@@ -41,4 +42,8 @@
TbEquipment getByTagid(String tagid);
List<TbEquipment> search(String username,String query);
+
+ List<TbEquipment> jzsearch(String query,String type);
+
+ List<TbEquipment> jzsearchfive(String type);
}
diff --git a/src/main/java/com/hxzkmonitor/service/TbSystemService.java b/src/main/java/com/hxzkmonitor/service/TbSystemService.java
index 381a588..5f02f43 100644
--- a/src/main/java/com/hxzkmonitor/service/TbSystemService.java
+++ b/src/main/java/com/hxzkmonitor/service/TbSystemService.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.hxzkmonitor.pojo.TbSystem;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -17,5 +19,9 @@
public interface TbSystemService extends IService<TbSystem> {
Integer addorupSystem(TbSystem tbSystem);
+ List<TbSystem> findsystem();
+
IPage<TbSystem> getSystemPage(Page page );
+
+
}
diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbAlarmrecordServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbAlarmrecordServiceImpl.java
index 0b48015..53df7ba 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbAlarmrecordServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbAlarmrecordServiceImpl.java
@@ -132,6 +132,13 @@
}
@Override
+ public Integer delAlarmrecordAll() {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+// queryWrapper.eq("id", id);
+ return baseMapper.delete(queryWrapper);
+ }
+
+ @Override
public Integer recordsall(TbAlarmrecord tbAlarmrecord) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status", "鏈鐞�");
diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbAlarmsystemServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbAlarmsystemServiceImpl.java
index 813531d..c5b84df 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbAlarmsystemServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbAlarmsystemServiceImpl.java
@@ -4,12 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.mapper.TbCompanyMapper;
+import com.hxzkmonitor.mapper.TbGuangboMapper;
import com.hxzkmonitor.mapper.TbUserMapper;
-import com.hxzkmonitor.pojo.TbAlarmsystem;
+import com.hxzkmonitor.pojo.*;
import com.hxzkmonitor.mapper.TbAlarmsystemMapper;
import com.hxzkmonitor.pojo.TbAlarmsystem;
-import com.hxzkmonitor.pojo.TbCompany;
-import com.hxzkmonitor.pojo.TbUser;
import com.hxzkmonitor.service.TbAlarmsystemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
@@ -34,6 +33,9 @@
public class TbAlarmsystemServiceImpl extends ServiceImpl<TbAlarmsystemMapper, TbAlarmsystem> implements TbAlarmsystemService {
private final TbCompanyMapper tbCompanyMapper;
private final TbUserMapper tbUserMapper;
+
+ private final TbGuangboMapper tbGuangboMapper;
+
@Override
public IPage<TbAlarmsystem> searchAlarmsystem(Page page, String keyword,String username) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
@@ -113,11 +115,20 @@
@Override
public Integer addorupAlarmsystem(TbAlarmsystem tbAlarmsystem) {
- if (tbAlarmsystem.getId() != null) {
- return baseMapper.updateById(tbAlarmsystem);
- } else {
- return baseMapper.insert(tbAlarmsystem);
+
+ if (tbAlarmsystem.getId() != null) {
+ return baseMapper.updateById(tbAlarmsystem);
+ } else {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("tagid", tbAlarmsystem.getTagid());
+ baseMapper.selectList(queryWrapper);
+ if ( baseMapper.selectList(queryWrapper).size()>0){
+ return -1;
+ }else{
+ return baseMapper.insert(tbAlarmsystem);
+ }
}
+
}
@Override
@@ -133,6 +144,14 @@
queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
+
+ QueryWrapper queryWrapper2 = new QueryWrapper<>();
+ queryWrapper2.eq("tagid",userPage.getRecords().get(i).getGuangboid());
+ TbGuangbo tbGuangbo = tbGuangboMapper.selectOne(queryWrapper2);
+ if (tbGuangbo!=null){
+ userPage.getRecords().get(i).setGuangboname(tbGuangbo.getName());
+ }
+
}
return userPage;
}else{
@@ -144,6 +163,15 @@
queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
+
+ QueryWrapper queryWrapper2 = new QueryWrapper<>();
+ queryWrapper2.eq("tagid",userPage.getRecords().get(i).getGuangboid());
+ TbGuangbo tbGuangbo = tbGuangboMapper.selectOne(queryWrapper2);
+ if (tbGuangbo!=null){
+ userPage.getRecords().get(i).setGuangboname(tbGuangbo.getName());
+ }
+
+// guangboname
}
return userPage;
}
diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbCompanyServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbCompanyServiceImpl.java
index 4a4ce16..cb83aeb 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbCompanyServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbCompanyServiceImpl.java
@@ -93,6 +93,17 @@
queryWrapper.like("companyname", query);
queryWrapper.orderByDesc("addtime");
+// queryWrapper.last("LIMIT 5");
+ return baseMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public List<TbCompany> searchfive() {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+
+// queryWrapper.like("companyname", query);
+ queryWrapper.orderByDesc("addtime");
+ queryWrapper.last("LIMIT 5");
return baseMapper.selectList(queryWrapper);
}
diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbDuanxinServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbDuanxinServiceImpl.java
index b208679..ac16e16 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbDuanxinServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbDuanxinServiceImpl.java
@@ -6,11 +6,13 @@
import com.hxzkmonitor.pojo.TbDuanxin;
import com.hxzkmonitor.pojo.TbDuanxin;
import com.hxzkmonitor.mapper.TbDuanxinMapper;
+import com.hxzkmonitor.pojo.TbGuangbo;
import com.hxzkmonitor.service.TbDuanxinService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -73,4 +75,32 @@
IPage<TbDuanxin> userPage = baseMapper.selectPage(page, queryWrapper);
return userPage;
}
+
+ @Override
+ public List<String> getDuanxin(String query) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like("phone", query);
+ List<TbDuanxin> voicetips = baseMapper.selectList(queryWrapper);
+ List<String> strings = new ArrayList<>();
+ for (int i = 0; i < voicetips.size(); i++) {
+ strings.add(voicetips.get(i).getPhone());
+ }
+
+ return strings;
+ }
+
+ @Override
+ public List<String> getDuanxinfive( ) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+// queryWrapper.like("phone", query);
+ queryWrapper.orderByDesc("addtime");
+ queryWrapper.last("LIMIT 5");
+ List<TbDuanxin> voicetips = baseMapper.selectList(queryWrapper);
+ List<String> strings = new ArrayList<>();
+ for (int i = 0; i < voicetips.size(); i++) {
+ strings.add(voicetips.get(i).getPhone());
+ }
+
+ return strings;
+ }
}
diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java
index 6bd7247..8510bca 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java
@@ -8,6 +8,7 @@
import com.hxzkmonitor.service.TbEquipmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hxzkmonitor.service.TbSystemService;
+import com.hxzkmonitor.util.DateUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,7 +18,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wangfei
@@ -35,263 +36,265 @@
private final TbUserMapper tbUserMapper;
+ private final TbEvrydayweiyi2024Mapper tbEvrydayweiyi2024Mapper;
+
+ private final TbAlarmsystemMapper tbAlarmsystemMapper;
+
+
+
@Autowired
TbSystemService tbSystemService;
@Override
- public IPage<TbEquipment> searcheveryday(Page page,String keyword ,String username) {
+ public IPage<TbEquipment> searcheveryday(Page page, String keyword, String username) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
- if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
+ queryWrapperu.eq("username", username);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
+ if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("tagid",keyword);
- queryWrapper.eq("type",1);
+ queryWrapper.eq("tagid", keyword);
+ queryWrapper.eq("type", 1);
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("anchorname",keyword);
- queryWrapper2.eq("type",1);
+ queryWrapper2.eq("anchorname", keyword);
+ queryWrapper2.eq("type", 1);
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
- queryWrapper3.eq("cid",keyword);
- queryWrapper3.eq("type",1);
+ queryWrapper3.eq("cid", keyword);
+ queryWrapper3.eq("type", 1);
queryWrapper.orderByDesc("addtime");
- List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
+ List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
- List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
- if (tagid1.size()>0){
- IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
+ List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
+ if (tagid1.size() > 0) {
+ IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < tagid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return tagid;
- }else if (anchorname1.size()>0){
- IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
+ } else if (anchorname1.size() > 0) {
+ IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
for (int i = 0; i < anchorname.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return anchorname;
- }else if (cid1.size()>0){
- IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
+ } else if (cid1.size() > 0) {
+ IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
for (int i = 0; i < cid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return cid;
- }else{
+ } else {
return null;
}
- }else{
+ } else {
QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("tagid",keyword);
- queryWrapper.eq("type",1);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper.eq("tagid", keyword);
+ queryWrapper.eq("type", 1);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("anchorname",keyword);
- queryWrapper2.eq("type",1);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper2.eq("anchorname", keyword);
+ queryWrapper2.eq("type", 1);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
- queryWrapper3.eq("cid",keyword);
- queryWrapper3.eq("type",1);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper3.eq("cid", keyword);
+ queryWrapper3.eq("type", 1);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
- List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
+ List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
- List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
- if (tagid1.size()>0){
- IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
+ List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
+ if (tagid1.size() > 0) {
+ IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < tagid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return tagid;
- }else if (anchorname1.size()>0){
- IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
+ } else if (anchorname1.size() > 0) {
+ IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
for (int i = 0; i < anchorname.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return anchorname;
- }else if (cid1.size()>0){
- IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
+ } else if (cid1.size() > 0) {
+ IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
for (int i = 0; i < cid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return cid;
- }else{
+ } else {
return null;
}
}
-
-
}
@Override
- public IPage<TbEquipment> searchEquipment(Page page,String keyword,String type,String username) {
+ public IPage<TbEquipment> searchEquipment(Page page, String keyword, String type, String username) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
- if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
+ queryWrapperu.eq("username", username);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
+ if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("tagid",keyword);
- queryWrapper.eq("type",type);
+ queryWrapper.eq("tagid", keyword);
+ queryWrapper.eq("type", type);
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("anchorname",keyword);
- queryWrapper2.eq("type",type);
+ queryWrapper2.eq("anchorname", keyword);
+ queryWrapper2.eq("type", type);
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
- queryWrapper3.eq("cid",keyword);
- queryWrapper3.eq("type",type);
+ queryWrapper3.eq("cid", keyword);
+ queryWrapper3.eq("type", type);
queryWrapper.orderByDesc("addtime");
- List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
+ List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
- List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
- if (tagid1.size()>0){
- IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
+ List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
+ if (tagid1.size() > 0) {
+ IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < tagid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return tagid;
- }else if (anchorname1.size()>0){
- IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
+ } else if (anchorname1.size() > 0) {
+ IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
for (int i = 0; i < anchorname.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return anchorname;
- }else if (cid1.size()>0){
- IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
+ } else if (cid1.size() > 0) {
+ IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
for (int i = 0; i < cid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return cid;
- }else{
+ } else {
return null;
}
- }else{
+ } else {
QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("tagid",keyword);
- queryWrapper.eq("type",type);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper.eq("tagid", keyword);
+ queryWrapper.eq("type", type);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("anchorname",keyword);
- queryWrapper2.eq("type",type);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper2.eq("anchorname", keyword);
+ queryWrapper2.eq("type", type);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
- queryWrapper3.eq("cid",keyword);
- queryWrapper3.eq("type",type);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper3.eq("cid", keyword);
+ queryWrapper3.eq("type", type);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
- List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
+ List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
- List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
- if (tagid1.size()>0){
- IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
+ List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
+ if (tagid1.size() > 0) {
+ IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < tagid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return tagid;
- }else if (anchorname1.size()>0){
- IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
+ } else if (anchorname1.size() > 0) {
+ IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
for (int i = 0; i < anchorname.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return anchorname;
- }else if (cid1.size()>0){
- IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
+ } else if (cid1.size() > 0) {
+ IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
for (int i = 0; i < cid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return cid;
- }else{
+ } else {
return null;
}
}
-
-
}
@@ -299,7 +302,7 @@
@Override
public TbEquipment delEquipment(Integer id) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",id);
+ queryWrapper.eq("id", id);
baseMapper.delete(queryWrapper);
return baseMapper.selectOne(queryWrapper);
}
@@ -309,16 +312,16 @@
Date date = new Date();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
tbEquipment.setAddtime(formatter.format(date));
- if (tbEquipment.getId()!=null){
+ if (tbEquipment.getId() != null) {
return baseMapper.updateById(tbEquipment);
- }else{
+ } else {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",tbEquipment.getType());
- queryWrapper.eq("tagid",tbEquipment.getTagid());
+ queryWrapper.eq("type", tbEquipment.getType());
+ queryWrapper.eq("tagid", tbEquipment.getTagid());
// baseMapper.selectOne(queryWrapper);
- if (baseMapper.selectList(queryWrapper).size()>0){
+ if (baseMapper.selectList(queryWrapper).size() > 0) {
return -1;
- }else{
+ } else {
return baseMapper.insert(tbEquipment);
}
@@ -326,37 +329,118 @@
}
@Override
- public IPage<TbEquipment> everyday(Page page,String username) {
+ public IPage<TbEquipment> everyday(Page page, String username) {
QueryWrapper queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("username",username);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapper2);
- if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
+ queryWrapper2.eq("username", username);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapper2);
+ if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",1);
+ queryWrapper.eq("type", 1);
queryWrapper.orderByDesc("addtime");
- IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
+ IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < userPage.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
+ userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
+ }
+// userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
+ Calendar calendar = Calendar.getInstance();
+ String datey = DateUtil.formatDate4(calendar.getTime(), "yyyy");
+// Calendar date = Calendar.getInstance();
+// String date1 = DateUtil.formatDate(calendar.getTime(), "yyyy-MM-dd");
+ Date date = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+
+// Calendar calendar = Calendar.getInstance();
+ String dated = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
+ int i1 = (Integer.parseInt(dated.split("-")[2]) - 1);
+ String s = dated.split("-")[0] + "-" + dated.split("-")[1] + "-" + i1;
+ System.out.println(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s));
+ if (tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s) != null) {
+ userPage.getRecords().get(i).setEd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getEd());
+ userPage.getRecords().get(i).setNd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getNd());
+ userPage.getRecords().get(i).setTd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getTd());
+ } else {
+ userPage.getRecords().get(i).setEd("0");
+ userPage.getRecords().get(i).setNd("0");
+ userPage.getRecords().get(i).setTd("0");
+ }
+
+ }
+
+ return userPage;
+ } else {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type", 1);
+ queryWrapper.eq("companyid", tbUser.getCsname());
+ queryWrapper.orderByDesc("addtime");
+ IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
+ for (int i = 0; i < userPage.getRecords().size(); i++) {
+ QueryWrapper queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
+ userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
+ }
+ Calendar calendar = Calendar.getInstance();
+ String datey = DateUtil.formatDate4(calendar.getTime(), "yyyy");
+// Calendar date = Calendar.getInstance();
+// String date1 = DateUtil.formatDate(calendar.getTime(), "yyyy-MM-dd");
+ Date date = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+
+// Calendar calendar = Calendar.getInstance();
+ String dated = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
+ int i1 = (Integer.parseInt(dated.split("-")[2]) - 1);
+ String s = dated.split("-")[0] + "-" + dated.split("-")[1] + "-" + i1;
+ System.out.println(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s));
+ if (tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s)!=null){
+ userPage.getRecords().get(i).setEd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getEd());
+ userPage.getRecords().get(i).setNd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getNd());
+ userPage.getRecords().get(i).setTd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getTd());
+ }
+
+ }
+ return userPage;
+ }
+
+
+ }
+
+ @Override
+ public IPage<TbEquipment> getEquipmentPage(Page page, String type, String username) {
+ QueryWrapper queryWrapper2 = new QueryWrapper<>();
+ queryWrapper2.eq("username", username);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapper2);
+ if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type", type);
+ queryWrapper.orderByDesc("addtime");
+ IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
+ for (int i = 0; i < userPage.getRecords().size(); i++) {
+ QueryWrapper queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return userPage;
- }else{
+ } else {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",1);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper.eq("type", type);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
- IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
+ IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < userPage.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
@@ -367,86 +451,44 @@
}
- @Override
- public IPage<TbEquipment> getEquipmentPage(Page page,String type,String username) {
- QueryWrapper queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("username",username);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapper2);
- if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",type);
- queryWrapper.orderByDesc("addtime");
- IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
- for (int i = 0; i < userPage.getRecords().size(); i++) {
- QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
- userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
- }
-// userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
-
- }
- return userPage;
- }else{
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",type);
- queryWrapper.eq("companyid",tbUser.getCsname());
- queryWrapper.orderByDesc("addtime");
- IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
- for (int i = 0; i < userPage.getRecords().size(); i++) {
- QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
- userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
- }
-// userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
- }
- return userPage;
- }
-
-
- }
-
@Override
- public Map<String,Object> getEquipment(Integer type,String username,String phone) {
+ public Map<String, Object> getEquipment(Integer type, String username, String phone) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- queryWrapperu.eq("adminphone",phone);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
+ queryWrapperu.eq("username", username);
+ queryWrapperu.eq("adminphone", phone);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
QueryWrapper queryWrapper = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper.eq("companyid", tbUser.getCsname());
}
- queryWrapper.eq("type",'1');
+ queryWrapper.eq("type", '1');
queryWrapper.orderByDesc("addtime");
List<TbEquipment> monitorNum = baseMapper.selectList(queryWrapper);
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper1.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper1.eq("companyid", tbUser.getCsname());
}
- queryWrapper1.eq("type",'0');
+ queryWrapper1.eq("type", '0');
queryWrapper1.orderByDesc("addtime");
List<TbEquipment> standardNum = baseMapper.selectList(queryWrapper1);
QueryWrapper queryWrapper2 = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper2.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper2.eq("companyid", tbUser.getCsname());
}
- queryWrapper2.eq("onlie",'0');
+ queryWrapper2.eq("onlie", '0');
queryWrapper2.orderByDesc("addtime");
List<TbEquipment> offlineNum = baseMapper.selectList(queryWrapper2);
QueryWrapper queryWrapper3 = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper3.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper3.eq("companyid", tbUser.getCsname());
}
- queryWrapper3.eq("status","鏈鐞�");
+ queryWrapper3.eq("status", "鏈鐞�");
queryWrapper3.orderByDesc("alarmtime");
List<TbAlarmrecord> alarmNum = tbAlarmrecordMapper.selectList(queryWrapper3);
@@ -455,44 +497,71 @@
List<TbSystem> messageNum = tbSystemMapper.selectList(queryWrapper4);
List<TbSystem> list1 = tbSystemService.list();
- Map<String,Object> map = new HashMap<>();
- map.put("monitorNumList",monitorNum);
- map.put("monitorNum",monitorNum.size());
- map.put("standardNumList",standardNum);
- map.put("standardNum",standardNum.size());
- map.put("offlineNumList",offlineNum);
- map.put("offlineNum",offlineNum.size());
- map.put("alarmNumList",alarmNum);
- map.put("alarmNum",alarmNum.size());
- map.put("alerttime",list1.get(0).getAlerttime());
- map.put("messageNum",Integer.parseInt(messageNum.get(0).getDatanum()));
+ Map<String, Object> map = new HashMap<>();
+ map.put("monitorNumList", monitorNum);
+ map.put("monitorNum", monitorNum.size());
+ map.put("standardNumList", standardNum);
+ map.put("standardNum", standardNum.size());
+ map.put("offlineNumList", offlineNum);
+ map.put("offlineNum", offlineNum.size());
+ map.put("alarmNumList", alarmNum);
+ map.put("alarmNum", alarmNum.size());
+ map.put("alerttime", list1.get(0).getAlerttime());
+ map.put("messageNum", Integer.parseInt(messageNum.get(0).getDatanum()));
return map;
- }
- @Override
- public List<TbEquipment> getEquipmentmonitor(String username,String phone) {
- QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- queryWrapperu.eq("adminphone",phone);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
- QueryWrapper queryWrapper = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper.eq("companyid",tbUser.getCsname());
- }
- queryWrapper.eq("type",1);
- return baseMapper.selectList(queryWrapper);
}
@Override
- public List<TbEquipment> getEquipmenttwo(String username,String phone) {
+ public List<TbEquipment> getEquipmentmonitor(String username, String phone) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- queryWrapperu.eq("adminphone",phone);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
+ queryWrapperu.eq("username", username);
+ queryWrapperu.eq("adminphone", phone);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
QueryWrapper queryWrapper = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper.eq("companyid", tbUser.getCsname());
}
- queryWrapper.eq("type",1);
+ queryWrapper.eq("type", 1);
+ List<TbEquipment> tbEquipments = baseMapper.selectList(queryWrapper);
+ for (int i = 0; i < tbEquipments.size(); i++) {
+ QueryWrapper queryWrapperas = new QueryWrapper<>();
+ queryWrapperas.eq("tagid", tbEquipments.get(i).getTagid());
+ tbAlarmsystemMapper.selectOne(queryWrapperas);
+ String ed = "N";
+ String nd = "N";
+ String hd = "N";
+ if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getEdsv()!=null){
+ ed = tbAlarmsystemMapper.selectOne(queryWrapperas).getEdsv();
+ }
+ if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getNdsv()!=null){
+ nd = tbAlarmsystemMapper.selectOne(queryWrapperas).getNdsv();
+ }
+ if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getHdsv()!=null){
+ hd = tbAlarmsystemMapper.selectOne(queryWrapperas).getHdsv();
+ }
+//if (tbEquipments.get(i).getEdmm()!=null){
+ tbEquipments.get(i).setEdmm(tbEquipments.get(i).getEdmm()+"/"+ed );
+ tbEquipments.get(i).setNdmm(tbEquipments.get(i).getNdmm()+"/"+ nd);
+ tbEquipments.get(i).setHdmm(tbEquipments.get(i).getHdmm()+"/"+hd );
+//}
+
+ }
+
+
+ return tbEquipments;
+ }
+
+ @Override
+ public List<TbEquipment> getEquipmenttwo(String username, String phone) {
+ QueryWrapper queryWrapperu = new QueryWrapper<>();
+ queryWrapperu.eq("username", username);
+ queryWrapperu.eq("adminphone", phone);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper.eq("companyid", tbUser.getCsname());
+ }
+ queryWrapper.eq("type", 1);
queryWrapper.orderByDesc("jxtime");
queryWrapper.last("LIMIT 20");
return baseMapper.selectList(queryWrapper);
@@ -500,14 +569,14 @@
@Override
- public List<TbEquipment> getalldevice(String username,String phone) {
+ public List<TbEquipment> getalldevice(String username, String phone) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- queryWrapperu.eq("adminphone",phone);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
+ queryWrapperu.eq("username", username);
+ queryWrapperu.eq("adminphone", phone);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
QueryWrapper queryWrapper = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper.eq("companyid", tbUser.getCsname());
}
// queryWrapper.eq("type",1);
// queryWrapper.orderByDesc("jxtime");
@@ -518,25 +587,53 @@
@Override
public TbEquipment getByTagid(String tagid) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("tagid",tagid);
+ queryWrapper.eq("tagid", tagid);
TbEquipment standardNum = baseMapper.selectOne(queryWrapper);
+ if (standardNum != null) {
+ QueryWrapper queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("id", standardNum.getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ standardNum.setCompany(tbCompany.getCompanyname());
+ }
+
return standardNum;
}
@Override
- public List<TbEquipment> search(String username,String query) {
+ public List<TbEquipment> search(String username, String query) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
+ queryWrapperu.eq("username", username);
// queryWrapperu.eq("adminphone",phone);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
QueryWrapper queryWrapper = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper.eq("companyid", tbUser.getCsname());
}
- queryWrapper.eq("type",1);
+ queryWrapper.eq("type", 1);
queryWrapper.like("tagid", query);
queryWrapper.orderByDesc("addtime");
return baseMapper.selectList(queryWrapper);
}
+
+
+ @Override
+ public List<TbEquipment> jzsearch(String query,String type) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type", type);
+ queryWrapper.like("tagid", query);
+ queryWrapper.orderByDesc("addtime");
+// queryWrapper.last("LIMIT 5");
+ return baseMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public List<TbEquipment> jzsearchfive(String type) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+
+ queryWrapper.eq("type", type);
+ queryWrapper.orderByDesc("addtime");
+ queryWrapper.last("LIMIT 5");
+ return baseMapper.selectList(queryWrapper);
+ }
}
diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java
index ef66e7d..0ee3a1a 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java
@@ -373,16 +373,21 @@
String dated = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
int i1 = (Integer.parseInt(dated.split("-")[2])-1) ;
String s = dated.split("-")[0] + "-" + dated.split("-")[1] + "-" + i1;
- if (tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s)!=null){
- hd[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getTdmm();
- ed[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getEdmm();
- nd[i] =tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getNdmm();
- x[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getFilename();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("tagid", tagid.split(",")[i]);
+ TbEquipment tbEquipment = tbEquipmentMapper.selectOne(queryWrapper);
+
+ if (tbEquipment!=null){
+
+ hd[i] = tbEquipment.getHdmm();
+ ed[i] = tbEquipment.getEdmm();
+ nd[i] =tbEquipment.getNdmm();
+// x[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getFilename();
}else{
hd[i] = "0";
ed[i] = "0";
nd[i] ="0";
- x[i] = "0";
+// x[i] = "0";
}
}
result.put("ed", ed);
diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbSystemServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbSystemServiceImpl.java
index d1612ca..a35a08c 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbSystemServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbSystemServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.mapper.TbCompanyMapper;
+import com.hxzkmonitor.mapper.TbDuanxinMapper;
import com.hxzkmonitor.mapper.TbUserMapper;
import com.hxzkmonitor.pojo.TbCompany;
import com.hxzkmonitor.pojo.TbSystem;
@@ -14,6 +15,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -31,6 +34,7 @@
@Autowired
TbCompanyMapper tbCompanyMapper;
+
@Override
public Integer addorupSystem(TbSystem tbSystem) {
// QueryWrapper queryWrapper = new QueryWrapper<>();
@@ -62,4 +66,11 @@
return userPage;
}
+ @Override
+ public List<TbSystem> findsystem() {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ return baseMapper.selectList(queryWrapper);
+ }
+
+
}
diff --git a/src/main/java/com/hxzkmonitor/udp/Udp_Out.java b/src/main/java/com/hxzkmonitor/udp/Udp_Out.java
new file mode 100644
index 0000000..c09a905
--- /dev/null
+++ b/src/main/java/com/hxzkmonitor/udp/Udp_Out.java
@@ -0,0 +1,78 @@
+package com.hxzkmonitor.udp;
+
+
+import com.hxzkmonitor.pojo.TbSystem;
+import com.hxzkmonitor.service.TbSystemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.*;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+
+/** 璇ョ被鐢ㄤ簬UDP杞彂鏁版嵁鍒版寚瀹氱鍙ｅ湴鍧� */
+@Component
+public class Udp_Out {
+
+ @Autowired
+ private TbSystemService systemService;
+ public static Udp_Out udpout;
+
+ @PostConstruct //鍏抽敭鍥涳細閫氳繃@PostConstruct娉ㄨВ瀹炵幇娉ㄥ叆
+ public void init() {
+ udpout = this;
+ }
+ /**
+ * 瀹炵幇UDP杞彂
+ *
+ * @param data
+ * 闇�瑕佽浆鍙戠殑鏁版嵁
+ * @param lenth闇�瑕佽浆鍙戠殑鏁版嵁闀垮害
+ * @param type闇�瑕佽浆鍙戠殑鏁伴噺绫诲瀷
+ * @throws IOException
+ */
+
+ /**灏嗘暟鎹彂閫乧s绔�*/
+ public static void udp_to_cs(String message) {
+ DatagramPacket packet=null;
+ DatagramSocket socket =null;
+ InetAddress address=null;
+ List<TbSystem> system = udpout.systemService.findsystem();
+ int port = Integer.parseInt(system.get(0).getUdpport());
+ String ip = "127.0.0.1";
+ byte[] data = null;
+ try {
+ data = message.getBytes(StandardCharsets.UTF_8);
+ } catch (Exception e1) {
+ // TODO 鑷姩鐢熸垚鐨� catch 鍧�
+ e1.printStackTrace();
+ }
+ int length=data.length;
+
+ try {
+ address=InetAddress.getByName(ip);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ //濡傛灉鏁版嵁绫诲瀷鐩稿悓
+ try {
+ socket = new DatagramSocket();
+ } catch (SocketException e) {
+ e.printStackTrace();
+ }
+ packet=new DatagramPacket(data, length, address, port);
+
+
+ try {
+ socket.send(packet);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ socket.close();
+ }
+
+}
diff --git a/src/main/java/com/hxzkmonitor/util/MyFile.java b/src/main/java/com/hxzkmonitor/util/MyFile.java
new file mode 100644
index 0000000..6681197
--- /dev/null
+++ b/src/main/java/com/hxzkmonitor/util/MyFile.java
@@ -0,0 +1,237 @@
+package com.hxzkmonitor.util;
+
+import org.apache.commons.io.IOUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class MyFile {
+ //娣诲姞绯荤粺鍥炬爣
+ public static String addImage(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
+ ServletContext context = request.getSession().getServletContext();
+ String uploadDirectory = context.getRealPath("/Icon"); // 鑾峰彇椤圭洰涓殑缁濆璺緞
+ if (!fileicon.isEmpty()) {
+ String originalFileName = fileicon.getOriginalFilename();
+ String fileExtension = getFileExtension(originalFileName);
+ String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+ Path filePath = Paths.get(uploadDirectory, newFileName);
+
+
+ Files.write(filePath, fileicon.getBytes());
+ }
+// 閮ㄧ讲鍓嶏紝闇�瑕佹妸涓嬫柟浠ｇ爜杩涜娉ㄩ噴
+// ServletContext context1 = request.getSession().getServletContext();
+// String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA椤圭洰绌洪棿\\NewBs\\src\\main\\webapp\\Icon"; // 鑾峰彇椤圭洰涓殑缁濆璺緞
+// if (!fileicon.isEmpty()) {
+// String originalFileName = fileicon.getOriginalFilename();
+// String fileExtension = getFileExtension(originalFileName);
+// String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+// Path filePath = Paths.get(uploadDirectory1, newFileName);
+// Files.write(filePath, fileicon.getBytes());
+// }
+ return "success";
+ }
+
+ public static String addWeichatImage(MultipartFile fileicon) throws IOException {
+// ServletContext context = request.getSession().getServletContext();
+// String uploadDirectory = context.getRealPath("/Icon"); // 鑾峰彇椤圭洰涓殑缁濆璺緞
+// if (!fileicon.isEmpty()) {
+// String originalFileName = fileicon.getOriginalFilename();
+// String fileExtension = getFileExtension(originalFileName);
+// String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+// Path filePath = Paths.get(uploadDirectory, newFileName);
+// Files.write(filePath, fileicon.getBytes());
+// }C:\Users\Administrator\Desktop\wechat\img
+// 閮ㄧ讲鍓嶏紝闇�瑕佹妸涓嬫柟浠ｇ爜杩涜娉ㄩ噴
+// ServletContext context = request.getSession().getServletContext();
+// String uploadDirectory = context.getRealPath("/img");
+// D:\hxzkboot\hxzkwechat\src\main\resources\static
+// String uploadDirectory = "D:\\hxzkboot\\hxzkwechat\\src\\main\\resources\\static";
+ String uploadDirectory = "D:\\hxzkMonitor\\hxzkMonitor-boot\\src\\main\\resources\\static"; // 鑾峰彇椤圭洰涓殑缁濆璺緞
+ if (!fileicon.isEmpty()) {
+ String originalFileName = fileicon.getOriginalFilename();
+ String fileExtension = getFileExtension(originalFileName);
+ String newFileName = "11111111111"+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+ Path filePath = Paths.get(uploadDirectory, newFileName);
+
+ byte[] data = imagesFiler.compressUnderSize(fileicon.getBytes(), 600 * 1024);
+// Assert.assertTrue(data.length < 600 * 1024);
+ Files.write(filePath, data);
+// FileUtils.writeByteArrayToFile(fileicon.getBytes(), data);
+// Thumbnails.of(uploadDirectory)
+// .size(200,150)
+// .keepAspectRatio(false)
+// .toFile(uploadDirectory);
+ }
+ return "success";
+ }
+ private byte[] readInByteArray(File imgFile) {
+ try {
+ return IOUtils.toByteArray(new FileInputStream(imgFile));
+
+ } catch (IOException e) {
+ throw new IllegalStateException("璇诲彇寰呭帇缂╁浘鐗囪繃绋嬩腑鍑洪敊锛岃鍙婃椂鑱旂郴绠＄悊鍛橈紒", e);
+
+ }
+ }
+
+
+ private static String getFileExtension(String fileName) {
+ int dotIndex = fileName.lastIndexOf(".");
+ if (dotIndex > 0 && dotIndex < fileName.length() - 1) {
+ return fileName.substring(dotIndex);
+ }
+ return "";
+ }
+
+ //娣诲姞鍦板浘
+ public static String addMap(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
+ ServletContext context = request.getSession().getServletContext();
+ String uploadDirectory = context.getRealPath("/Home/HomePingMian"); // 鑾峰彇椤圭洰涓殑缁濆璺緞
+ if (!fileicon.isEmpty()) {
+ String originalFileName = fileicon.getOriginalFilename();
+ String fileExtension = getFileExtension(originalFileName);
+ String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+ Path filePath = Paths.get(uploadDirectory, newFileName);
+ Files.write(filePath, fileicon.getBytes());
+ }
+ //閮ㄧ讲鍓嶏紝闇�瑕佹妸涓嬫柟浠ｇ爜杩涜娉ㄩ噴
+// ServletContext context1 = request.getSession().getServletContext();
+// String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA椤圭洰绌洪棿\\NewBs\\src\\main\\webapp\\Home\\HomePingMian"; // 鑾峰彇椤圭洰涓殑缁濆璺緞
+// if (!fileicon.isEmpty()) {
+// String originalFileName = fileicon.getOriginalFilename();
+// String fileExtension = getFileExtension(originalFileName);
+// String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+// Path filePath = Paths.get(uploadDirectory1, newFileName);
+// Files.write(filePath, fileicon.getBytes());
+// }
+ return "success";
+ }
+ //娣诲姞浜哄憳鐓х墖
+ public static String addPerson(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
+ ServletContext context = request.getSession().getServletContext();
+ String uploadDirectory = context.getRealPath("/Icon/浜哄憳鐓х墖"); // 鑾峰彇椤圭洰涓殑缁濆璺緞
+ if (!fileicon.isEmpty()) {
+ String originalFileName = fileicon.getOriginalFilename();
+ String fileExtension = getFileExtension(originalFileName);
+ String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+ Path filePath = Paths.get(uploadDirectory, newFileName);
+ Files.write(filePath, fileicon.getBytes());
+ }
+// 閮ㄧ讲鍓嶏紝闇�瑕佹妸涓嬫柟浠ｇ爜杩涜娉ㄩ噴
+// ServletContext context1 = request.getSession().getServletContext();
+// String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA椤圭洰绌洪棿\\NewBs\\src\\main\\webapp\\Icon\\浜哄憳鐓х墖"; // 鑾峰彇椤圭洰涓殑缁濆璺緞
+// if (!fileicon.isEmpty()) {
+// String originalFileName = fileicon.getOriginalFilename();
+// String fileExtension = getFileExtension(originalFileName);
+// String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+// Path filePath = Paths.get(uploadDirectory1, newFileName);
+// Files.write(filePath, fileicon.getBytes());
+// }
+ return "success";
+ }
+
+
+ //娣诲姞杞﹁締鐓х墖
+ public static String addCar(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
+ ServletContext context = request.getSession().getServletContext();
+ String uploadDirectory = context.getRealPath("/Icon/杞﹁締鐓х墖"); // 鑾峰彇椤圭洰涓殑缁濆璺緞
+ if (!fileicon.isEmpty()) {
+ String originalFileName = fileicon.getOriginalFilename();
+ String fileExtension = getFileExtension(originalFileName);
+ String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+ Path filePath = Paths.get(uploadDirectory, newFileName);
+ Files.write(filePath, fileicon.getBytes());
+ }
+// 閮ㄧ讲鍓嶏紝闇�瑕佹妸涓嬫柟浠ｇ爜杩涜娉ㄩ噴
+// ServletContext context1 = request.getSession().getServletContext();
+// String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA椤圭洰绌洪棿\\NewBs\\src\\main\\webapp\\Icon\\杞﹁締鐓х墖"; // 鑾峰彇椤圭洰涓殑缁濆璺緞
+// if (!fileicon.isEmpty()) {
+// String originalFileName = fileicon.getOriginalFilename();
+// String fileExtension = getFileExtension(originalFileName);
+// String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+// Path filePath = Paths.get(uploadDirectory1, newFileName);
+// Files.write(filePath, fileicon.getBytes());
+// }
+ return "success";
+ }
+
+
+ //娣诲姞鐗╄祫鐓х墖
+ public static String addWuZi(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
+ ServletContext context = request.getSession().getServletContext();
+ String uploadDirectory = context.getRealPath("/Icon/鐗╄祫鐓х墖"); // 鑾峰彇椤圭洰涓殑缁濆璺緞
+ if (!fileicon.isEmpty()) {
+ String originalFileName = fileicon.getOriginalFilename();
+ String fileExtension = getFileExtension(originalFileName);
+ String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+ Path filePath = Paths.get(uploadDirectory, newFileName);
+ Files.write(filePath, fileicon.getBytes());
+ }
+// 閮ㄧ讲鍓嶏紝闇�瑕佹妸涓嬫柟浠ｇ爜杩涜娉ㄩ噴
+// ServletContext context1 = request.getSession().getServletContext();
+// String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA椤圭洰绌洪棿\\NewBs\\src\\main\\webapp\\Icon\\鐗╄祫鐓х墖"; // 鑾峰彇椤圭洰涓殑缁濆璺緞
+// if (!fileicon.isEmpty()) {
+// String originalFileName = fileicon.getOriginalFilename();
+// String fileExtension = getFileExtension(originalFileName);
+// String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+// Path filePath = Paths.get(uploadDirectory1, newFileName);
+// Files.write(filePath, fileicon.getBytes());
+// }
+ return "success";
+ }
+
+ //娣诲姞涓婚鍜屽湴鍥�
+ public static String addZhuTiMap(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
+ ServletContext context = request.getSession().getServletContext();
+ String uploadDirectory = context.getRealPath("/Icon/涓婚鍦板浘/鍦板浘"); // 鑾峰彇椤圭洰涓殑缁濆璺緞
+ if (!fileicon.isEmpty()) {
+ String originalFileName = fileicon.getOriginalFilename();
+ String fileExtension = getFileExtension(originalFileName);
+ String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+ Path filePath = Paths.get(uploadDirectory, newFileName);
+ Files.write(filePath, fileicon.getBytes());
+ }
+ //閮ㄧ讲鍓嶏紝闇�瑕佹妸涓嬫柟浠ｇ爜杩涜娉ㄩ噴
+// ServletContext context1 = request.getSession().getServletContext();
+// String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA椤圭洰绌洪棿\\NewBs\\src\\main\\webapp\\Icon\\涓婚鍦板浘\\鍦板浘"; // 鑾峰彇椤圭洰涓殑缁濆璺緞
+// if (!fileicon.isEmpty()) {
+// String originalFileName = fileicon.getOriginalFilename();
+// String fileExtension = getFileExtension(originalFileName);
+// String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+// Path filePath = Paths.get(uploadDirectory1, newFileName);
+// Files.write(filePath, fileicon.getBytes());
+// }
+ return "success";
+ }
+
+ public static String addZhuTiMap1(MultipartFile fileicon, HttpServletRequest request,String newName) throws IOException {
+ ServletContext context = request.getSession().getServletContext();
+ String uploadDirectory = context.getRealPath("/Icon/涓婚鍦板浘/涓婚"); // 鑾峰彇椤圭洰涓殑缁濆璺緞
+ if (!fileicon.isEmpty()) {
+ String originalFileName = fileicon.getOriginalFilename();
+ String fileExtension = getFileExtension(originalFileName);
+ String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+ Path filePath = Paths.get(uploadDirectory, newFileName);
+ Files.write(filePath, fileicon.getBytes());
+ }
+ //閮ㄧ讲鍓嶏紝闇�瑕佹妸涓嬫柟浠ｇ爜杩涜娉ㄩ噴
+// ServletContext context1 = request.getSession().getServletContext();
+// String uploadDirectory1 = "C:\\Users\\Dell\\Desktop\\IDEA椤圭洰绌洪棿\\NewBs\\src\\main\\webapp\\Icon\\涓婚鍦板浘\\涓婚"; // 鑾峰彇椤圭洰涓殑缁濆璺緞
+// if (!fileicon.isEmpty()) {
+// String originalFileName = fileicon.getOriginalFilename();
+// String fileExtension = getFileExtension(originalFileName);
+// String newFileName = newName+ fileExtension; // 鏂扮殑鏂囦欢鍚嶏紝灏嗕繚鐣欏師濮嬫枃浠舵牸寮�
+// Path filePath = Paths.get(uploadDirectory1, newFileName);
+// Files.write(filePath, fileicon.getBytes());
+// }
+ return "success";
+ }
+}
diff --git a/src/main/java/com/hxzkmonitor/util/imagesFiler.java b/src/main/java/com/hxzkmonitor/util/imagesFiler.java
new file mode 100644
index 0000000..abce187
--- /dev/null
+++ b/src/main/java/com/hxzkmonitor/util/imagesFiler.java
@@ -0,0 +1,66 @@
+package com.hxzkmonitor.util;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+public class imagesFiler {
+
+ /**
+ * 灏嗗浘鐗囧帇缂╁埌鎸囧畾澶у皬浠ュ唴
+ *
+ * @param srcImgData 婧愬浘鐗囨暟鎹�
+ * @param maxSize 鐩殑鍥剧墖澶у皬
+ * @return 鍘嬬缉鍚庣殑鍥剧墖鏁版嵁
+ */
+ public static byte[] compressUnderSize(byte[] srcImgData, long maxSize) {
+ double scale = 0.15f;
+ byte[] imgData = Arrays.copyOf(srcImgData, srcImgData.length);
+
+ if (imgData.length > maxSize) {
+ do {
+ try {
+ imgData = compress(imgData, scale);
+
+ } catch (IOException e) {
+ throw new IllegalStateException("鍘嬬缉鍥剧墖杩囩▼涓嚭閿欙紝璇峰強鏃惰仈绯荤鐞嗗憳锛�", e);
+ }
+
+ } while (imgData.length > maxSize);
+ }
+
+ return imgData;
+ }
+
+ /**
+ * 鎸夌収 瀹介珮 姣斾緥鍘嬬缉
+ *
+ * @param imgIs 寰呭帇缂╁浘鐗囪緭鍏ユ祦
+ * @param scale 鍘嬬缉鍒诲害
+ * @param out 杈撳嚭
+ * @return 鍘嬬缉鍚庡浘鐗囨暟鎹�
+ * @throws IOException 鍘嬬缉鍥剧墖杩囩▼涓嚭閿�
+ */
+ public static byte[] compress(byte[] srcImgData, double scale) throws IOException {
+ BufferedImage bi = ImageIO.read(new ByteArrayInputStream(srcImgData));
+ int width = (int) (bi.getWidth() * scale); // 婧愬浘瀹藉害
+ int height = (int) (bi.getHeight() * scale); // 婧愬浘楂樺害
+
+ Image image = bi.getScaledInstance(width, height, Image.SCALE_SMOOTH);
+ BufferedImage tag = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+
+ Graphics g = tag.getGraphics();
+ g.setColor(Color.RED);
+ g.drawImage(image, 0, 0, null); // 缁樺埗澶勭悊鍚庣殑鍥�
+ g.dispose();
+
+ ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+ ImageIO.write(tag, "JPEG", bOut);
+
+ return bOut.toByteArray();
+ }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9e0ec8e..921da95 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -48,11 +48,13 @@
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.5.56:3306/hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql:///hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://192.168.5.121:3306/hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://127.0.0.1:3307/hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql:///hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
+
username: root
-# password: hxzk20151102
- password: 123456
+ password: hxzk20151102
+# password: 123456
# password: blueiot
jackson:
date-format: yyyy-MM-dd HH:mm:ss
--
Gitblit v1.9.3