From 72cd1e95fd2ba610a6a5e13f23c97bd0121f047b Mon Sep 17 00:00:00 2001 From: kerwincui <164770707@qq.com> Date: Fri, 10 Jun 2022 01:34:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E7=9A=84=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/iot/mapper/DeviceLogMapper.java | 3 +- .../com/ruoyi/iot/mapper/DeviceMapper.java | 2 +- .../com/ruoyi/iot/model/DeviceStatistic.java | 42 +++++++++---------- .../iot/service/impl/DeviceServiceImpl.java | 23 +++++++++- .../iot/tdengine/dao/TDDeviceLogDAO.java | 3 +- .../iot/tdengine/service/ILogService.java | 3 +- .../service/impl/MySqlLogServiceImpl.java | 5 ++- .../service/impl/TdengineLogServiceImpl.java | 5 ++- .../resources/mapper/iot/DeviceLogMapper.xml | 38 ++++++++++++++--- .../resources/mapper/iot/DeviceMapper.xml | 32 ++++++++++++-- .../mapper/tdengine/TDDeviceLogMapper.xml | 36 ++++++++++++++-- vue/src/assets/icons/svg/wifi_1.svg | 2 +- vue/src/assets/icons/svg/wifi_2.svg | 2 +- vue/src/assets/icons/svg/wifi_3.svg | 2 +- vue/src/assets/icons/svg/wifi_4.svg | 2 +- vue/src/views/index.vue | 1 - vue/src/views/iot/clientDetails/index.vue | 6 +-- vue/src/views/iot/device/device-edit.vue | 2 +- vue/src/views/iot/device/device-statistic.vue | 2 +- vue/src/views/iot/device/device-timer.vue | 10 ++--- vue/src/views/iot/device/device-user.vue | 8 ++-- vue/src/views/iot/device/index.vue | 4 +- vue/src/views/iot/device/product-list.vue | 2 +- vue/src/views/iot/group/index.vue | 7 ---- vue/src/views/iot/product/index.vue | 4 +- .../views/iot/product/product-firmware.vue | 2 +- 26 files changed, 173 insertions(+), 75 deletions(-) diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceLogMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceLogMapper.java index 02266647..6b72e720 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceLogMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceLogMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.iot.mapper; +import com.ruoyi.iot.domain.Device; import com.ruoyi.iot.domain.DeviceLog; import com.ruoyi.iot.model.DeviceStatistic; import com.ruoyi.iot.model.MonitorModel; @@ -30,7 +31,7 @@ public interface DeviceLogMapper * * @return 设备日志 */ - public DeviceStatistic selectCategoryLogCount(); + public DeviceStatistic selectCategoryLogCount(Device device); /** * 查询设备日志列表 diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java index 804f0cf1..b2266d1c 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java @@ -30,7 +30,7 @@ public interface DeviceMapper * * @return 设备 */ - public DeviceStatistic selectDeviceProductAlertCount(); + public DeviceStatistic selectDeviceProductAlertCount(Device device); /** * 根据设备编号查询设备 diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/model/DeviceStatistic.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/model/DeviceStatistic.java index 418b3e96..c957babb 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/model/DeviceStatistic.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/model/DeviceStatistic.java @@ -12,79 +12,79 @@ import org.apache.commons.lang3.builder.ToStringStyle; public class DeviceStatistic { /** 设备数量 **/ - private Long deviceCount; + private int deviceCount; /** 产品数量 **/ - private Long productCount; + private int productCount; /** 告警 **/ - private Long alertCount; + private int alertCount; /** 属性上报 **/ - private Long propertyCount; + private int propertyCount; /** 功能上报 **/ - private Long functionCount; + private int functionCount; /** 事件上报 **/ - private Long eventCount; + private int eventCount; /** 监测数据上报 **/ - private Long monitorCount; + private int monitorCount; - public Long getMonitorCount() { + public int getMonitorCount() { return monitorCount; } - public void setMonitorCount(Long monitorCount) { + public void setMonitorCount(int monitorCount) { this.monitorCount = monitorCount; } - public Long getDeviceCount() { + public int getDeviceCount() { return deviceCount; } - public void setDeviceCount(Long deviceCount) { + public void setDeviceCount(int deviceCount) { this.deviceCount = deviceCount; } - public Long getProductCount() { + public int getProductCount() { return productCount; } - public void setProductCount(Long productCount) { + public void setProductCount(int productCount) { this.productCount = productCount; } - public Long getAlertCount() { + public int getAlertCount() { return alertCount; } - public void setAlertCount(Long alertCount) { + public void setAlertCount(int alertCount) { this.alertCount = alertCount; } - public Long getPropertyCount() { + public int getPropertyCount() { return propertyCount; } - public void setPropertyCount(Long propertyCount) { + public void setPropertyCount(int propertyCount) { this.propertyCount = propertyCount; } - public Long getFunctionCount() { + public int getFunctionCount() { return functionCount; } - public void setFunctionCount(Long functionCount) { + public void setFunctionCount(int functionCount) { this.functionCount = functionCount; } - public Long getEventCount() { + public int getEventCount() { return eventCount; } - public void setEventCount(Long eventCount) { + public void setEventCount(int eventCount) { this.eventCount = eventCount; } } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java index 9e3ab282..42a57b5f 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java @@ -98,10 +98,29 @@ public class DeviceServiceImpl implements IDeviceService { */ @Override public DeviceStatistic selectDeviceStatistic() { + Device device=new Device(); + SysUser user = getLoginUser().getUser(); + List roles=user.getRoles(); + for(int i=0;i selectSTable(String database,DeviceLog deviceLog); diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/ILogService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/ILogService.java index f8e5d542..065b7210 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/ILogService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/ILogService.java @@ -1,5 +1,6 @@ package com.ruoyi.iot.tdengine.service; +import com.ruoyi.iot.domain.Device; import com.ruoyi.iot.domain.DeviceLog; import com.ruoyi.iot.model.DeviceStatistic; @@ -25,7 +26,7 @@ public interface ILogService { int deleteDeviceLogByDeviceId(Long deviceId); /** 设备属性、功能、事件总数 **/ - DeviceStatistic selectCategoryLogCount(); + DeviceStatistic selectCategoryLogCount(Device device); /** 查询物模型日志列表 **/ List selectDeviceLogList(DeviceLog deviceLog); diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java index bdf6efcd..0181e434 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.iot.tdengine.service.impl; +import com.ruoyi.iot.domain.Device; import com.ruoyi.iot.domain.DeviceLog; import com.ruoyi.iot.model.DeviceStatistic; import com.ruoyi.iot.tdengine.service.ILogService; @@ -45,8 +46,8 @@ public class MySqlLogServiceImpl implements ILogService { * @return */ @Override - public DeviceStatistic selectCategoryLogCount(){ - return deviceLogMapper.selectCategoryLogCount(); + public DeviceStatistic selectCategoryLogCount(Device device){ + return deviceLogMapper.selectCategoryLogCount(device); } /*** diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java index 62d97935..4f30be32 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.iot.tdengine.service.impl; +import com.ruoyi.iot.domain.Device; import com.ruoyi.iot.domain.DeviceLog; import com.ruoyi.iot.model.DeviceStatistic; import com.ruoyi.iot.tdengine.service.ILogService; @@ -61,8 +62,8 @@ public class TdengineLogServiceImpl implements ILogService { * @return */ @Override - public DeviceStatistic selectCategoryLogCount(){ - return tdDeviceLogDAO.selectCategoryLogCount(dbName); + public DeviceStatistic selectCategoryLogCount(Device device){ + return tdDeviceLogDAO.selectCategoryLogCount(dbName,device); } /*** diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml index 65b1605f..b4f04749 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml @@ -54,12 +54,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where log_id = #{logId} - SELECT - (select count(log_id) from iot_device_log where log_type=1) as propertyCount, - (select count(log_id) from iot_device_log where log_type=2) as functionCount, - (select count(log_id) from iot_device_log where log_type=3) as eventCount, - (select count(log_id) from iot_device_log where log_type=1 and is_monitor=1) as monitorCount + (select count(log_id) + from iot_device_log + + and log_type=1 + and user_id = #{userId} + and tenant_id = #{tenantId} + + ) as propertyCount, + (select count(log_id) + from iot_device_log + + and log_type=2 + and user_id = #{userId} + and tenant_id = #{tenantId} + + ) as functionCount, + (select count(log_id) + from iot_device_log + + and log_type=3 + and user_id = #{userId} + and tenant_id = #{tenantId} + + ) as eventCount, + (select count(log_id) + from iot_device_log + + and log_type=1 and is_monitor=1 + and user_id = #{userId} + and tenant_id = #{tenantId} + + ) as monitorCount from iot_device_log limit 1 diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml index d8ca6ff3..7ced73fb 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml @@ -214,11 +214,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where device_id = #{deviceId} - SELECT count(device_id) as deviceCount, - (select count(product_id) from iot_product) as productCount, - (select count(alert_log_id) from iot_alert_log) as alertCount + ( + + + select count(product_id) + from iot_device + where user_id = #{userId} + group by product_id + + + + select count(product_id) + from iot_product + + and tenant_id = #{tenantId} + + + ) as productCount, + (select count(alert_log_id) + from iot_alert_log + + and user_id = #{userId} + and tenant_id = #{tenantId} + + ) as alertCount from iot_device + + and user_id = #{userId} + and tenant_id = #{tenantId} + SELECT - (select count(log_id) from iot_device_log where log_type=1) as propertyCount, - (select count(log_id) from iot_device_log where log_type=2) as functionCount, - (select count(log_id) from iot_device_log where log_type=3) as eventCount, - (select count(log_id) from iot_device_log where log_type=1 and is_monitor=1) as monitorCount + (select count(log_id) + from iot_device_log + + and log_type=1 + and user_id = #{userId} + and tenant_id = #{tenantId} + + ) as propertyCount, + (select count(log_id) + from iot_device_log + + and log_type=2 + and user_id = #{userId} + and tenant_id = #{tenantId} + + ) as functionCount, + (select count(log_id) + from iot_device_log + + and log_type=3 + and user_id = #{userId} + and tenant_id = #{tenantId} + + ) as eventCount, + (select count(log_id) + from iot_device_log + + and log_type=1 and is_monitor=1 + and user_id = #{userId} + and tenant_id = #{tenantId} + + ) as monitorCount from ${database}.device_log limit 1 diff --git a/vue/src/assets/icons/svg/wifi_1.svg b/vue/src/assets/icons/svg/wifi_1.svg index ebb2d4ec..e78ac9aa 100644 --- a/vue/src/assets/icons/svg/wifi_1.svg +++ b/vue/src/assets/icons/svg/wifi_1.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/wifi_2.svg b/vue/src/assets/icons/svg/wifi_2.svg index ca1ae185..4cf889be 100644 --- a/vue/src/assets/icons/svg/wifi_2.svg +++ b/vue/src/assets/icons/svg/wifi_2.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/wifi_3.svg b/vue/src/assets/icons/svg/wifi_3.svg index e4a05f87..bfa8d27a 100644 --- a/vue/src/assets/icons/svg/wifi_3.svg +++ b/vue/src/assets/icons/svg/wifi_3.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/wifi_4.svg b/vue/src/assets/icons/svg/wifi_4.svg index 761c124e..f5b090ad 100644 --- a/vue/src/assets/icons/svg/wifi_4.svg +++ b/vue/src/assets/icons/svg/wifi_4.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue index 8a28e235..fa95634d 100644 --- a/vue/src/views/index.vue +++ b/vue/src/views/index.vue @@ -450,7 +450,6 @@ export default { getDeviceStatistic(){ getDeviceStatistic().then(response => { this.deviceStatistic = response.data; - console.log( this.deviceStatistic); }); }, /** 查询公告列表 */ diff --git a/vue/src/views/iot/clientDetails/index.vue b/vue/src/views/iot/clientDetails/index.vue index d3dc833c..e5c109ad 100644 --- a/vue/src/views/iot/clientDetails/index.vue +++ b/vue/src/views/iot/clientDetails/index.vue @@ -23,14 +23,14 @@ + + + - - -