From 4806b676dbbab4675e5ee43b4018f2cd9d43797f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 23 十月 2023 17:15:09 +0800
Subject: [PATCH] 1. 将sdk动态链接库dll集成到项目内,提升部署便捷性； 2. 增加设备断线重连回调方法，打印相关日志； 3. 删除多余依赖，减小jar包体积； 4. 处理SDK日志打印；
---
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java | 90 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 23 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java b/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
index d655e27..24b034c 100644
--- a/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
@@ -21,8 +21,8 @@
import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
import com.ruoyi.device.radar.domain.ArdEquipRadar;
import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
-import com.ruoyi.statistical.domain.PumpStatus;
-import com.ruoyi.statistical.mapper.PumpStatusMapper;
+import com.ruoyi.statistical.domain.ArdPumpStatus;
+import com.ruoyi.statistical.mapper.ArdPumpStatusMapper;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.param.Para;
import com.ruoyi.statistical.service.StatisticalService;
@@ -74,7 +74,7 @@
@Autowired
private ArdCamerasMapper camerasMapper;
@Autowired
- private PumpStatusMapper pumpStatusMapper;
+ private ArdPumpStatusMapper ardPumpStatusMapper;
@Override
@@ -212,67 +212,67 @@
@Override
public List<CountVo> stealelecMonth(ESParam esParam) {
List<CountVo> list = stealelecMapper.stealelecMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
public List<CountVo> cameraMonth(ESParam esParam) {
List<CountVo> list = cameraMapper.cameraMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
public List<CountVo> moveMonth(ESParam esParam) {
List<CountVo> list = moveMapper.moveMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
public List<CountVo> fireMonth(ESParam esParam) {
List<CountVo> list = fireMapper.fileMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
public List<CountVo> externalMonth(ESParam esParam) {
List<CountVo> list = externalMapper.externalMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
public List<CountVo> accessMonth(ESParam esParam) {
List<CountVo> list = accessMapper.accessMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
public List<CountVo> apponekeyMonth(ESParam esParam) {
List<CountVo> list = apponekeyMapper.apponekeyMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
public List<CountVo> pumpMonth(ESParam esParam) {
List<CountVo> list = pumpMapper.pumpMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
public List<CountVo> wallMonth(ESParam esParam) {
List<CountVo> list = wallMapper.wallMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
public List<CountVo> digitizationMonth(ESParam esParam) {
List<CountVo> list = digitization3Mapper.digitizationMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
public List<CountVo> tubeMonth(ESParam esParam) {
List<CountVo> list = tubeMapper.tubeMonth(esParam);
- return esMonth(list,esParam.getEnd());
+ return esMonth(list,esParam);
}
@Override
@@ -380,21 +380,65 @@
@Override
public List<TenVo> pump() {
List<TenVo> list = new ArrayList<>();
- QueryWrapper<PumpStatus> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<ArdPumpStatus> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alarm_type","杩愯");
- int y = pumpStatusMapper.selectCount(queryWrapper);
+ int y = ardPumpStatusMapper.selectCount(queryWrapper);
TenVo tenVo = new TenVo();
tenVo.setName("杩愯");
tenVo.setValue(y);
list.add(tenVo);
- QueryWrapper<PumpStatus> queryWrapper1 = new QueryWrapper<>();
+ QueryWrapper<ArdPumpStatus> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("alarm_type","鍋滄満");
- int t = pumpStatusMapper.selectCount(queryWrapper1);
+ int t = ardPumpStatusMapper.selectCount(queryWrapper1);
TenVo tenVo1 = new TenVo();
tenVo1.setName("鍋滄満");
tenVo1.setValue(t);
list.add(tenVo1);
return list;
+ }
+
+ @Override
+ public void data(String msg) {
+ JSONObject jsonObject = JSONObject.parseObject(msg);
+ String alarmTime = jsonObject.getString("alarmTime");
+ List<JSONObject> list = (List<JSONObject>) jsonObject.get("ardAlarmRadars");
+ if(list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ JSONObject j = list.get(i);
+ QueryWrapper<ArdPumpStatus> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("target_id",j.getInteger("targetId")).eq("name",j.getString("name"));
+ ArdPumpStatus ardPumpStatus1 = ardPumpStatusMapper.selectOne(queryWrapper);
+ if(ardPumpStatus1 ==null){
+ ArdPumpStatus ardPumpStatus = new ArdPumpStatus();
+ ardPumpStatus.setTargetId(j.getInteger("targetId"));
+ ardPumpStatus.setName(j.getString("name"));
+ if(j.containsKey("alarmType")){
+ ardPumpStatus.setAlarmType(j.getString("alarmType"));
+ }else if(j.containsKey("alarm")){
+ ardPumpStatus.setAlarmType(j.getString("alarm"));
+ }
+ ardPumpStatus.setAlarmTime(alarmTime);
+ ardPumpStatusMapper.insert(ardPumpStatus);
+ }else {
+ String alarmType = ardPumpStatus1.getAlarmType();
+ Boolean bo = false;
+ if(j.containsKey("alarmType")){
+ if(alarmType.equals(j.getString("alarmType"))){
+ bo = true;
+ }
+ }else if(j.containsKey("alarm")){
+ if(alarmType.equals(j.getString("alarm"))){
+ bo = true;
+ }
+ }
+ if(!bo){
+ ardPumpStatus1.setAlarmType(j.getString("alarmType"));
+ ardPumpStatus1.setAlarmTime(alarmTime);
+ ardPumpStatusMapper.updateById(ardPumpStatus1);
+ }
+ }
+ }
+ }
}
public List<CountVo> es(List<CountVo> list){
@@ -421,17 +465,17 @@
return countVoList;
}
- public List<CountVo> esMonth(List<CountVo> list,String end){
+ public List<CountVo> esMonth(List<CountVo> list,ESParam esParam){
List<CountVo> countVoList = new ArrayList<>();
- Integer day = Integer.valueOf(end.substring(end.length() - 2));
- String month = end.substring(5,7);
+ Integer day = Integer.valueOf(esParam.getEnd().substring(esParam.getEnd().length() - 2));
+ Integer month = esParam.getMonth();
for (int i = 1; i <= day ; i++) {
CountVo vo = new CountVo();
- String d = month + "鏈�" + i + "鏃�";
+ String d = month + "-" + i ;
Boolean bo = false;
for (int j = 0; j < list.size(); j++) {
CountVo countVo = list.get(j);
- String mon = month + "鏈�" + Integer.valueOf(countVo.getDate()) + "鏃�";
+ String mon = month + "-" + Integer.valueOf(countVo.getDate());
if(mon.equals(d)){
bo = true;
vo.setDate(mon);
--
Gitblit v1.9.3