From bb0f7c0a494f7d60b88fb2a7268d8920c723fe1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
<7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 9 Aug 2024 02:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/application.yml | 2 +-
.../java/com/ruoyi/quartz/task/RyTask.java | 2 +-
.../views/device/towerDataCollide/index.vue | 4 +-
.../src/views/device/towerDataLimit/index.vue | 4 +-
.../src/views/device/towerDataLocal/index.vue | 2 +-
.../src/views/device/towerDataRound/index.vue | 4 +-
.../src/views/device/towerDataRun/index.vue | 4 +-
.../views/device/towerProjectConfig/index.vue | 28 +++++
.../src/main/resources/application.yml | 2 +-
.../web/controller/TowerCraneController.java | 103 ++++++++++++++++++
.../ruoyi/api/TowerCraneApiController.java | 18 ++-
.../jh/device/domain/DevTowerDataRound.java | 24 ++++
.../jh/device/domain/DevTowerDataRun.java | 12 ++
.../device/domain/DevTowerProjectConfig.java | 68 +++++++++++-
.../mapper/DevTowerDataRoundMapper.java | 8 ++
.../device/mapper/DevTowerDataRunMapper.java | 10 ++
.../mapper/DevTowerProjectConfigMapper.java | 9 ++
.../service/IDevTowerDataRunService.java | 8 ++
.../IDevTowerProjectConfigService.java | 9 ++
.../impl/DevTowerDataRunServiceImpl.java | 60 +++++++++-
.../DevTowerProjectConfigServiceImpl.java | 10 ++
.../mapper/device/DevTowerDataRoundMapper.xml | 21 +++-
.../mapper/device/DevTowerDataRunMapper.xml | 16 ++-
.../device/DevTowerProjectConfigMapper.xml | 30 ++++-
24 files changed, 438 insertions(+), 20 deletions(-)
create mode 100644 yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/TowerCraneController.java
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 73a50cfe..8cdba68b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -24,7 +24,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
- active: druid
+ active: prod
# 文件上传
servlet:
multipart:
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index c7b38564..84e085d0 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -55,7 +55,7 @@ public class RyTask
}
/**
- * 检查塔基设备状态
+ * 监测塔基设备状态
*/
public void findDeviceTowerOnline()
{
diff --git a/ruoyi-ui/src/views/device/towerDataCollide/index.vue b/ruoyi-ui/src/views/device/towerDataCollide/index.vue
index a3eab7f5..07b080a6 100644
--- a/ruoyi-ui/src/views/device/towerDataCollide/index.vue
+++ b/ruoyi-ui/src/views/device/towerDataCollide/index.vue
@@ -101,9 +101,9 @@
-
+
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
diff --git a/ruoyi-ui/src/views/device/towerDataLimit/index.vue b/ruoyi-ui/src/views/device/towerDataLimit/index.vue
index 57c8bba2..5f5e5ce4 100644
--- a/ruoyi-ui/src/views/device/towerDataLimit/index.vue
+++ b/ruoyi-ui/src/views/device/towerDataLimit/index.vue
@@ -124,9 +124,9 @@
-
+
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
diff --git a/ruoyi-ui/src/views/device/towerDataLocal/index.vue b/ruoyi-ui/src/views/device/towerDataLocal/index.vue
index 7359e4ff..541f1a0b 100644
--- a/ruoyi-ui/src/views/device/towerDataLocal/index.vue
+++ b/ruoyi-ui/src/views/device/towerDataLocal/index.vue
@@ -112,7 +112,7 @@
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
diff --git a/ruoyi-ui/src/views/device/towerDataRound/index.vue b/ruoyi-ui/src/views/device/towerDataRound/index.vue
index 648cabec..b6e29de5 100644
--- a/ruoyi-ui/src/views/device/towerDataRound/index.vue
+++ b/ruoyi-ui/src/views/device/towerDataRound/index.vue
@@ -259,9 +259,9 @@
-
+
- {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}
+ {{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
-
+
- {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}
+ {{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
+
+
+ {{scope.row.driName}}
+ {{scope.row.driPhone}}
+
+
+
+
+ {{scope.row.safName}}
+ {{scope.row.safPhone}}
+
+
@@ -206,6 +218,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
> list = devTowerProjectConfigService.findtowerConfigGroupOnline(devTowerProjectConfig);
+ redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+ return success(list);
+ }
+
+ /**
+ * 查询塔基配置列表
+ */
+ @GetMapping("/findtowerConfigListByProjectId")
+ public AjaxResult findtowerConfigListByProjectId(String deptId, String projectId)
+ {
+ String key = "bgscreen.tower.findtowerConfigListByProjectId."+projectId;
+ Object obj=redisCache.getCacheObject(key);
+ if(obj!=null){
+ return AjaxResult.success(obj);
+ }
+ DevTowerProjectConfig devTowerProjectConfig = new DevTowerProjectConfig();
+ devTowerProjectConfig.setProjectId(Convert.toLong(projectId));
+ devTowerProjectConfig.setIsDel(Convert.toLong(PublicStateEnum.OK.getCode()));
+ List list = devTowerProjectConfigService.selectDevTowerProjectConfigList(devTowerProjectConfig);
+ redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+ return success(list);
+ }
+
+ /**
+ * 查询塔基运行数据
+ */
+ @GetMapping("/findtowerStatisticsView")
+ public AjaxResult findtowerStatisticsView(String deviceSn)
+ {
+ String key = "bgscreen.tower.findtowerStatisticsView."+deviceSn;
+ Object obj=redisCache.getCacheObject(key);
+ if(obj!=null){
+ return AjaxResult.success(obj);
+ }
+ Map data = devTowerDataRunService.findtowerStatisticsView(deviceSn);
+ redisCache.setCacheObject(key, data, Constants.BIGSCREEN_QUERY_CACHE*5, TimeUnit.MINUTES);
+ return success(data);
+ }
+}
diff --git a/yanzhu-deviceApi/src/main/java/com/ruoyi/api/TowerCraneApiController.java b/yanzhu-deviceApi/src/main/java/com/ruoyi/api/TowerCraneApiController.java
index 5d317f4d..d40795bc 100644
--- a/yanzhu-deviceApi/src/main/java/com/ruoyi/api/TowerCraneApiController.java
+++ b/yanzhu-deviceApi/src/main/java/com/ruoyi/api/TowerCraneApiController.java
@@ -57,9 +57,6 @@ public class TowerCraneApiController {
@Autowired
private IDevTowerDataCollideService devTowerDataCollideService;
- @Autowired
- private IDevTowerDataWarningService devTowerDataWarningService;
-
@Autowired
private IDevTowerProjectConfigService devTowerProjectConfigService;
@@ -148,6 +145,12 @@ public class TowerCraneApiController {
if(dataContent.get("warnings")!=null){
List warnings = (List)dataContent.get("warnings");
devTowerDataRun.setWarnings(String.join(",", warnings));
+ for(String warning:warnings){
+ Integer alarm = Convert.toInt(warning);
+ if(alarm>100 && alarm<120){
+ devTowerDataRun.setIsAlarm(1L);
+ }
+ }
}
devTowerDataRunService.insertDevTowerDataRun(devTowerDataRun);
}
@@ -191,6 +194,15 @@ public class TowerCraneApiController {
if(dataContent.get("warning")!=null){
List warnings = (List)dataContent.get("warning");
devTowerDataRound.setWarnings(String.join(",", warnings));
+ for(String warning:warnings){
+ Integer alarm = Convert.toInt(warning);
+ if(alarm>6 && alarm<10){
+ devTowerDataRound.setIsOverload(1L);
+ }
+ if(alarm>100 && alarm<120){
+ devTowerDataRound.setIsAlarm(1L);
+ }
+ }
}
devTowerDataRoundService.insertDevTowerDataRound(devTowerDataRound);
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerDataRound.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerDataRound.java
index c8a4f260..72ee75a3 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerDataRound.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerDataRound.java
@@ -147,6 +147,14 @@ public class DevTowerDataRound extends BaseEntity
@Excel(name = "警报信息")
private String warnings;
+ /** 是否告警 */
+ @Excel(name = "是否告警")
+ private Long isAlarm;
+
+ /** 是否告警 */
+ @Excel(name = "是否告警")
+ private Long isOverload;
+
/** 是否有效 */
@Excel(name = "是否有效")
private Long isDel;
@@ -465,6 +473,22 @@ public class DevTowerDataRound extends BaseEntity
this.deptName = deptName;
}
+ public Long getIsAlarm() {
+ return isAlarm;
+ }
+
+ public void setIsAlarm(Long isAlarm) {
+ this.isAlarm = isAlarm;
+ }
+
+ public Long getIsOverload() {
+ return isOverload;
+ }
+
+ public void setIsOverload(Long isOverload) {
+ this.isOverload = isOverload;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerDataRun.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerDataRun.java
index e3d9b2cc..d1a20e79 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerDataRun.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerDataRun.java
@@ -127,6 +127,10 @@ public class DevTowerDataRun extends BaseEntity
@Excel(name = "时间戳")
private Long timeLongs;
+ /** 是否告警 */
+ @Excel(name = "是否告警")
+ private Long isAlarm;
+
/** 是否有效 */
@Excel(name = "是否有效")
private Long isDel;
@@ -400,6 +404,14 @@ public class DevTowerDataRun extends BaseEntity
this.deptName = deptName;
}
+ public Long getIsAlarm() {
+ return isAlarm;
+ }
+
+ public void setIsAlarm(Long isAlarm) {
+ this.isAlarm = isAlarm;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerProjectConfig.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerProjectConfig.java
index 20b4c242..c242b458 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerProjectConfig.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/DevTowerProjectConfig.java
@@ -36,6 +36,10 @@ public class DevTowerProjectConfig extends BaseEntity
@Excel(name = "设备序列号")
private String deviceSn;
+ /** 设备名称 */
+ @Excel(name = "设备名称")
+ private String deviceName;
+
/** 设备来源 */
@Excel(name = "设备来源")
private String deviceSource;
@@ -80,6 +84,22 @@ public class DevTowerProjectConfig extends BaseEntity
@Excel(name = "设备状态")
private String online;
+ /** 司机名称 */
+ @Excel(name = "司机名称")
+ private String driName;
+
+ /** 司机电话 */
+ @Excel(name = "司机电话")
+ private String driPhone;
+
+ /** 安全员名称 */
+ @Excel(name = "安全员名称")
+ private String safName;
+
+ /** 安全员电话 */
+ @Excel(name = "安全员电话")
+ private String safPhone;
+
/** 是否有效 */
@Excel(name = "是否有效")
private Long isDel;
@@ -120,7 +140,16 @@ public class DevTowerProjectConfig extends BaseEntity
{
return deviceSn;
}
- public void setDeviceSource(String deviceSource)
+
+ public String getDeviceName() {
+ return deviceName;
+ }
+
+ public void setDeviceName(String deviceName) {
+ this.deviceName = deviceName;
+ }
+
+ public void setDeviceSource(String deviceSource)
{
this.deviceSource = deviceSource;
}
@@ -219,6 +248,38 @@ public class DevTowerProjectConfig extends BaseEntity
this.online = online;
}
+ public String getDriName() {
+ return driName;
+ }
+
+ public void setDriName(String driName) {
+ this.driName = driName;
+ }
+
+ public String getDriPhone() {
+ return driPhone;
+ }
+
+ public void setDriPhone(String driPhone) {
+ this.driPhone = driPhone;
+ }
+
+ public String getSafName() {
+ return safName;
+ }
+
+ public void setSafName(String safName) {
+ this.safName = safName;
+ }
+
+ public String getSafPhone() {
+ return safPhone;
+ }
+
+ public void setSafPhone(String safPhone) {
+ this.safPhone = safPhone;
+ }
+
public void setIsDel(Long isDel)
{
this.isDel = isDel;
@@ -252,6 +313,7 @@ public class DevTowerProjectConfig extends BaseEntity
.append("projectId", getProjectId())
.append("deptId", getDeptId())
.append("deviceSn", getDeviceSn())
+ .append("deviceName", getDeviceName())
.append("deviceSource", getDeviceSource())
.append("towerType", getTowerType())
.append("coordinateX", getCoordinateX())
@@ -262,6 +324,10 @@ public class DevTowerProjectConfig extends BaseEntity
.append("towerCapHeight", getTowerCapHeight())
.append("towerSectionHeight", getTowerSectionHeight())
.append("online", getOnline())
+ .append("driName", getDriName())
+ .append("driPhone", getDriPhone())
+ .append("safName", getSafName())
+ .append("safPhone", getSafPhone())
.append("isDel", getIsDel())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerDataRoundMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerDataRoundMapper.java
index 0a63d38d..40b2aad4 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerDataRoundMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerDataRoundMapper.java
@@ -58,4 +58,12 @@ public interface DevTowerDataRoundMapper
* @return 结果
*/
public int deleteDevTowerDataRoundByIds(Long[] ids);
+
+ /**
+ * 查询塔机工作循环数据
+ *
+ * @param devTowerDataRound 设备循环信息
+ * @return 结果
+ */
+ public int findRoundCountByDeviceKey(DevTowerDataRound devTowerDataRound);
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerDataRunMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerDataRunMapper.java
index 82a068bc..1095f78f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerDataRunMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerDataRunMapper.java
@@ -1,6 +1,8 @@
package com.yanzhu.jh.device.mapper;
import java.util.List;
+
+import com.yanzhu.jh.device.domain.DevTowerDataRound;
import com.yanzhu.jh.device.domain.DevTowerDataRun;
/**
@@ -58,4 +60,12 @@ public interface DevTowerDataRunMapper
* @return 结果
*/
public int deleteDevTowerDataRunByIds(Long[] ids);
+
+ /**
+ * 查询塔机实时数据
+ *
+ * @param DevTowerDataRound 设备循环信息
+ * @return 结果
+ */
+ public int findRunCountByDeviceKey(DevTowerDataRound DevTowerDataRound);
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerProjectConfigMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerProjectConfigMapper.java
index 5dd2165b..dc3077ea 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerProjectConfigMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerProjectConfigMapper.java
@@ -1,6 +1,8 @@
package com.yanzhu.jh.device.mapper;
import java.util.List;
+import java.util.Map;
+
import com.yanzhu.jh.device.domain.DevTowerProjectConfig;
/**
@@ -58,4 +60,11 @@ public interface DevTowerProjectConfigMapper
* @return 结果
*/
public int deleteDevTowerProjectConfigByIds(Long[] ids);
+
+ /**
+ * 根据设备状态统计设备
+ * @param devTowerProjectConfig
+ * @return
+ */
+ public List> findtowerConfigGroupOnline(DevTowerProjectConfig devTowerProjectConfig);
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IDevTowerDataRunService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IDevTowerDataRunService.java
index 32cdf75d..8cc9a186 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IDevTowerDataRunService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IDevTowerDataRunService.java
@@ -1,6 +1,8 @@
package com.yanzhu.jh.device.service;
import java.util.List;
+import java.util.Map;
+
import com.yanzhu.jh.device.domain.DevTowerDataRun;
/**
@@ -58,4 +60,10 @@ public interface IDevTowerDataRunService
* @return 结果
*/
public int deleteDevTowerDataRunById(Long id);
+
+ /**
+ * 查询塔机运行数据
+ * @return
+ */
+ public Map findtowerStatisticsView(String deviceSn);
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IDevTowerProjectConfigService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IDevTowerProjectConfigService.java
index 767b72fd..5fb9f236 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IDevTowerProjectConfigService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IDevTowerProjectConfigService.java
@@ -1,6 +1,8 @@
package com.yanzhu.jh.device.service;
import java.util.List;
+import java.util.Map;
+
import com.yanzhu.jh.device.domain.DevTowerProjectConfig;
/**
@@ -71,4 +73,11 @@ public interface IDevTowerProjectConfigService
* @return 结果
*/
public int deleteDevTowerProjectConfigById(Long id);
+
+ /**
+ * 根据设备状态统计设备
+ * @param devTowerProjectConfig
+ * @return
+ */
+ public List> findtowerConfigGroupOnline(DevTowerProjectConfig devTowerProjectConfig);
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/DevTowerDataRunServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/DevTowerDataRunServiceImpl.java
index 4ee6bccf..7b83d258 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/DevTowerDataRunServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/DevTowerDataRunServiceImpl.java
@@ -1,7 +1,11 @@
package com.yanzhu.jh.device.service.impl;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
import com.ruoyi.common.utils.DateUtils;
+import com.yanzhu.jh.device.domain.DevTowerDataRound;
+import com.yanzhu.jh.device.mapper.DevTowerDataRoundMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.yanzhu.jh.device.mapper.DevTowerDataRunMapper;
@@ -20,6 +24,9 @@ public class DevTowerDataRunServiceImpl implements IDevTowerDataRunService
@Autowired
private DevTowerDataRunMapper devTowerDataRunMapper;
+ @Autowired
+ private DevTowerDataRoundMapper devTowerDataRoundMapper;
+
/**
* 查询塔机实时数据
*
@@ -95,4 +102,55 @@ public class DevTowerDataRunServiceImpl implements IDevTowerDataRunService
{
return devTowerDataRunMapper.deleteDevTowerDataRunById(id);
}
+
+ /**
+ * 查询塔机运行数据
+ * @return
+ */
+ @Override
+ public Map findtowerStatisticsView(String deviceSn){
+ Map dataMap = new HashMap<>();
+ DevTowerDataRound devTowerDataRound = new DevTowerDataRound();
+ devTowerDataRound.setDeviceKey(deviceSn);
+ int a0 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+ dataMap.put("a0",a0);
+ devTowerDataRound.setActiveName("cz");
+ int b0 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+ dataMap.put("b0",b0);
+ devTowerDataRound.setActiveName("gj");
+ int c0 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+ int d0 = devTowerDataRunMapper.findRunCountByDeviceKey(devTowerDataRound);
+ dataMap.put("c0",c0+d0);
+ Calendar cale = Calendar.getInstance();
+ // 获取当月第一天和最后一天
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ // 第一天
+ String firstDay = "";
+ cale = Calendar.getInstance();
+ cale.add(Calendar.MONTH, 0);
+ cale.set(Calendar.DAY_OF_MONTH, 1);
+ firstDay = format.format(cale.getTime());
+ // 最后一天
+ String lastDay = "";
+ cale = Calendar.getInstance();
+ cale.add(Calendar.MONTH, 1);
+ cale.set(Calendar.DAY_OF_MONTH, 0);
+ lastDay = format.format(cale.getTime());
+ Map params = new HashMap<>();
+ params.put("beginCreateTime",firstDay);
+ params.put("endCreateTime",lastDay);
+ devTowerDataRound.setParams(params);
+ int a1 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+ dataMap.put("a1",a1);
+ devTowerDataRound.setActiveName("cz");
+ int b1 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+ dataMap.put("b1",b1);
+ devTowerDataRound.setActiveName("gj");
+ int c1 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+ int d1 = devTowerDataRunMapper.findRunCountByDeviceKey(devTowerDataRound);
+ dataMap.put("c1",c1+d1);
+ return dataMap;
+ }
+
+
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/DevTowerProjectConfigServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/DevTowerProjectConfigServiceImpl.java
index 98f85b0e..128db6e9 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/DevTowerProjectConfigServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/DevTowerProjectConfigServiceImpl.java
@@ -2,6 +2,7 @@ package com.yanzhu.jh.device.service.impl;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
@@ -157,4 +158,13 @@ public class DevTowerProjectConfigServiceImpl implements IDevTowerProjectConfigS
this.loadingDevTowerProjectConfigCache();
return res;
}
+
+ /**
+ * 根据设备状态统计设备
+ * @param devTowerProjectConfig
+ * @return
+ */
+ public List> findtowerConfigGroupOnline(DevTowerProjectConfig devTowerProjectConfig){
+ return devTowerProjectConfigMapper.findtowerConfigGroupOnline(devTowerProjectConfig);
+ }
}
diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
index 8bc6515c..8953005a 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
@@ -39,6 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -48,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select dtdr.id, dtdr.cfg_id, dtdr.project_id, dtdr.dept_id, sp.projectName, sd.dept_name, dtdr.device_key, dtdr.device_source, dtdr.tower_id, dtdr.work_start_time, dtdr.work_end_time, dtdr.min_height, dtdr.max_height, dtdr.min_range, dtdr.max_range, dtdr.start_height, dtdr.end_height, dtdr.start_range, dtdr.end_range, dtdr.start_rotation, dtdr.end_rotation, dtdr.max_load, dtdr.max_load_percent, dtdr.max_moment, dtdr.max_moment_percent, dtdr.start_wind_speed, dtdr.end_wind_speed, dtdr.start_wind_speed_percent, dtdr.end_wind_speed_percent, dtdr.start_lean_angle_x, dtdr.end_lean_angle_x, dtdr.start_lean_angle_y, dtdr.end_lean_angle_y, dtdr.warnings, dtdr.is_del, dtdr.create_by, dtdr.create_time, dtdr.update_by, dtdr.update_time, dtdr.remark from dev_tower_data_round dtdr
+ select dtdr.id, dtdr.cfg_id, dtdr.project_id, dtdr.dept_id, sp.projectName, sd.dept_name, dtdr.device_key, dtdr.device_source, dtdr.tower_id, dtdr.work_start_time, dtdr.work_end_time, dtdr.min_height, dtdr.max_height, dtdr.min_range, dtdr.max_range, dtdr.start_height, dtdr.end_height, dtdr.start_range, dtdr.end_range, dtdr.start_rotation, dtdr.end_rotation, dtdr.max_load, dtdr.max_load_percent, dtdr.max_moment, dtdr.max_moment_percent, dtdr.start_wind_speed, dtdr.end_wind_speed, dtdr.start_wind_speed_percent, dtdr.end_wind_speed_percent, dtdr.start_lean_angle_x, dtdr.end_lean_angle_x, dtdr.start_lean_angle_y, dtdr.end_lean_angle_y, dtdr.warnings, dtdr.is_alarm, dtdr.is_del, dtdr.create_by, dtdr.create_time, dtdr.update_by, dtdr.update_time, dtdr.remark from dev_tower_data_round dtdr
left join sur_project sp on sp.id = dtdr.project_id
left join sys_dept sd on sd.dept_id = dtdr.dept_id
@@ -108,6 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
start_lean_angle_y,
end_lean_angle_y,
warnings,
+ is_alarm,
+ is_overload,
is_del,
create_by,
create_time,
@@ -147,6 +151,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{startLeanAngleY},
#{endLeanAngleY},
#{warnings},
+ #{isAlarm},
+ #{isOverload},
#{isDel},
#{createBy},
#{createTime},
@@ -190,6 +196,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
start_lean_angle_y = #{startLeanAngleY},
end_lean_angle_y = #{endLeanAngleY},
warnings = #{warnings},
+ is_alarm = #{isAlarm},
+ is_overload = #{isOverload},
is_del = #{isDel},
create_by = #{createBy},
create_time = #{createTime},
@@ -210,4 +218,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
+
+
+
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
index 8850250d..03795120 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select dtdr.id, dtdr.cfg_id, dtdr.project_id, dtdr.dept_id, sp.projectName, sd.dept_name, dtdr.device_key, dtdr.device_source, dtdr.height, dtdr.range, dtdr.rotation, dtdr.load, dtdr.wind_speed, dtdr.lean_angle_x, dtdr.lean_angle_y, dtdr.load_percent, dtdr.moment_percent, dtdr.wind_speed_percent, dtdr.lean_angle_percent, dtdr.warnings, dtdr.rate, dtdr.rotation_sensor_state, dtdr.load_sensor_state, dtdr.wind_speed_sensor_state, dtdr.lean_angle_sensor_state, dtdr.range_sensor_state, dtdr.height_sensor_state, dtdr.braking_status, dtdr.time_longs, dtdr.is_del, dtdr.create_by, dtdr.create_time, dtdr.update_by, dtdr.update_time, dtdr.remark from dev_tower_data_run dtdr
+ select dtdr.id, dtdr.cfg_id, dtdr.project_id, dtdr.dept_id, sp.projectName, sd.dept_name, dtdr.device_key, dtdr.device_source, dtdr.height, dtdr.range, dtdr.rotation, dtdr.load, dtdr.wind_speed, dtdr.lean_angle_x, dtdr.lean_angle_y, dtdr.load_percent, dtdr.moment_percent, dtdr.wind_speed_percent, dtdr.lean_angle_percent, dtdr.warnings, dtdr.rate, dtdr.rotation_sensor_state, dtdr.load_sensor_state, dtdr.wind_speed_sensor_state, dtdr.lean_angle_sensor_state, dtdr.range_sensor_state, dtdr.height_sensor_state, dtdr.braking_status, dtdr.time_longs, dtdr.is_alarm, dtdr.is_del, dtdr.create_by, dtdr.create_time, dtdr.update_by, dtdr.update_time, dtdr.remark from dev_tower_data_run dtdr
left join sur_project sp on sp.id = dtdr.project_id
left join sys_dept sd on sd.dept_id = dtdr.dept_id
@@ -97,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
height_sensor_state,
braking_status,
time_longs,
+ is_alarm,
is_del,
create_by,
create_time,
@@ -131,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{heightSensorState},
#{brakingStatus},
#{timeLongs},
+ #{isAlarm},
#{isDel},
#{createBy},
#{createTime},
@@ -169,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
height_sensor_state = #{heightSensorState},
braking_status = #{brakingStatus},
time_longs = #{timeLongs},
+ is_alarm = #{isAlarm},
is_del = #{isDel},
create_by = #{createBy},
create_time = #{createTime},
@@ -189,4 +193,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
+
+
+
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
index 34260c99..4fb0d0ab 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -22,6 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
@@ -31,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select dtpc.id, dtpc.project_id, dtpc.dept_id, sp.projectName, sd.dept_name, dtpc.device_sn, dtpc.device_source, dtpc.tower_id, dtpc.tower_type, dtpc.coordinate_x, dtpc.coordinate_y, dtpc.front_brachium, dtpc.after_brachium, dtpc.tower_body_height, dtpc.tower_cap_height, dtpc.tower_section_height, dtpc.online, dtpc.is_del, dtpc.create_by, dtpc.create_time, dtpc.update_by, dtpc.update_time, dtpc.remark from dev_tower_project_config dtpc
+ select dtpc.id, dtpc.project_id, dtpc.dept_id, sp.projectName, sd.dept_name, dtpc.device_sn, dtpc.device_name, dtpc.device_source, dtpc.tower_id, dtpc.tower_type, dtpc.coordinate_x, dtpc.coordinate_y, dtpc.front_brachium, dtpc.after_brachium, dtpc.tower_body_height, dtpc.tower_cap_height, dtpc.tower_section_height, dtpc.online, dtpc.dri_name, dtpc.dri_phone, dtpc.saf_name, dtpc.saf_phone, dtpc.is_del, dtpc.create_by, dtpc.create_time, dtpc.update_by, dtpc.update_time, dtpc.remark from dev_tower_project_config dtpc
left join sur_project sp on sp.id = dtpc.project_id
left join sys_dept sd on sd.dept_id = dtpc.dept_id
@@ -44,9 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and dtpc.dept_id = #{deptId}
and sd.dept_name like concat('%', #{deptName}, '%')
and dtpc.device_sn = #{deviceSn}
+ and dtpc.device_name like concat('%', #{deviceName}, '%')
and dtpc.device_source = #{deviceSource}
and dtpc.tower_id = #{towerId}
and dtpc.tower_type = #{towerType}
+ and dtpc.is_del = #{isDel}
order by dtpc.id desc
@@ -62,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
project_id,
dept_id,
device_sn,
+ device_name,
device_source,
tower_type,
tower_id,
@@ -73,6 +81,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tower_cap_height,
tower_section_height,
online,
+ dri_name,
+ dri_phone,
+ saf_name,
+ saf_phone,
is_del,
create_by,
create_time,
@@ -84,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{projectId},
#{deptId},
#{deviceSn},
+ #{deviceName},
#{deviceSource},
#{towerType},
#{towerId},
@@ -95,6 +108,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{towerCapHeight},
#{towerSectionHeight},
#{online},
+ #{driName},
+ #{driPhone},
+ #{safName},
+ #{safPhone},
#{isDel},
#{createBy},
#{createTime},
@@ -110,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
project_id = #{projectId},
dept_id = #{deptId},
device_sn = #{deviceSn},
+ device_name = #{deviceName},
device_source = #{deviceSource},
tower_type = #{towerType},
tower_id = #{towerId},
@@ -141,4 +159,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
+
+
+
\ No newline at end of file