From 87a2fe3e6f1472a7e87e02d3fd956eee17b85352 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 12 十月 2023 15:28:33 +0800
Subject: [PATCH] 抽油机状态入库
---
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java | 101 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 85 insertions(+), 16 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 9f43a69..f5b13e3 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
@@ -1,6 +1,7 @@
package com.ruoyi.statistical.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.alarm.access.mapper.ArdAlarmAccessMapper;
import com.ruoyi.alarm.apponekey.mapper.ArdAlarmApponekeyMapper;
@@ -21,6 +22,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.param.ESParam;
import com.ruoyi.statistical.param.Para;
import com.ruoyi.statistical.service.StatisticalService;
@@ -71,6 +74,8 @@
private ArdEquipRadarMapper radarMapper;
@Autowired
private ArdCamerasMapper camerasMapper;
+ @Autowired
+ private PumpStatusMapper pumpStatusMapper;
@Override
@@ -208,67 +213,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
@@ -373,6 +378,70 @@
return moveMapper.ten();
}
+ @Override
+ public List<TenVo> pump() {
+ List<TenVo> list = new ArrayList<>();
+ QueryWrapper<PumpStatus> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("alarm_type","杩愯");
+ int y = pumpStatusMapper.selectCount(queryWrapper);
+ TenVo tenVo = new TenVo();
+ tenVo.setName("杩愯");
+ tenVo.setValue(y);
+ list.add(tenVo);
+ QueryWrapper<PumpStatus> queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("alarm_type","鍋滄満");
+ int t = pumpStatusMapper.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<PumpStatus> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("target_id",j.getInteger("targetId")).eq("name",j.getString("name"));
+ PumpStatus pumpStatus1 = pumpStatusMapper.selectOne(queryWrapper);
+ if(pumpStatus1==null){
+ PumpStatus pumpStatus = new PumpStatus();
+ pumpStatus.setTargetId(j.getInteger("targetId"));
+ pumpStatus.setName(j.getString("name"));
+ if(j.containsKey("alarmType")){
+ pumpStatus.setAlarmType(j.getString("alarmType"));
+ }else if(j.containsKey("alarm")){
+ pumpStatus.setAlarmType(j.getString("alarm"));
+ }
+ pumpStatus.setAlarmTime(alarmTime);
+ pumpStatusMapper.insert(pumpStatus);
+ }else {
+ String alarmType = pumpStatus1.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){
+ pumpStatus1.setAlarmType(j.getString("alarmType"));
+ pumpStatus1.setAlarmTime(alarmTime);
+ pumpStatusMapper.updateById(pumpStatus1);
+ }
+ }
+ }
+ }
+ }
+
public List<CountVo> es(List<CountVo> list){
List<CountVo> countVoList = new ArrayList<>();
for (int i = 1; i <= 12 ; i++) {
@@ -397,17 +466,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