From f059de0b3cfe92ba2980c8ce4c5772637c64e9d2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 十二月 2023 17:03:34 +0800
Subject: [PATCH] 权限
---
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 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 2275bda..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
@@ -380,16 +380,16 @@
@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);
@@ -397,6 +397,50 @@
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){
List<CountVo> countVoList = new ArrayList<>();
for (int i = 1; i <= 12 ; i++) {
--
Gitblit v1.9.3