From 27b794328e4c9b34f98083e668a45be1eb61d97e Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Sat, 28 Sep 2024 14:10:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A7=E5=B1=8FX=E8=BD=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/base/entity/DevAttributeVo.java | 5 +++ .../impl/ProjectDetailsViewServiceImpl.java | 35 +++++++++++++++++++ .../resources/mapper/base/TbPeopleMapper.xml | 4 +-- .../screen/TbDeviceDataRecordMapper.xml | 2 +- 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/entity/DevAttributeVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/entity/DevAttributeVo.java index d64c320..d748339 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/entity/DevAttributeVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/entity/DevAttributeVo.java @@ -40,6 +40,11 @@ public class DevAttributeVo { */ private String jcTime; + /** + * x轴时间 + */ + private String xTime; + private String devJson; private String attributeId; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java index 74bebfd..e1e5d9c 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java @@ -44,6 +44,13 @@ public class ProjectDetailsViewServiceImpl { if (records.isEmpty()) { return AjaxResult.error("暂无数据"); } + for (DevAttributeVo record : records) { + // 截取时间 定义x轴 + if (record != null && record.getJcTime() != null) { + // 从yyyy-MM-dd hh:mm:ss 截取小时分钟 + record.setXTime(record.getJcTime().substring(11, 16)); + } + } Map> listMap = records.stream().collect(Collectors.groupingBy(DevAttributeVo::getJcName)); return AjaxResult.success(listMap); } @@ -53,6 +60,13 @@ public class ProjectDetailsViewServiceImpl { if (records.isEmpty()) { return AjaxResult.error("暂无数据"); } + for (DevAttributeVo record : records) { + // 截取时间 定义x轴 + if (record != null && record.getJcTime() != null) { + // 从yyyy-MM-dd hh:mm:ss 截取小时分钟 + record.setXTime(record.getJcTime().substring(11, 16)); + } + } Map> listMap = records.stream().collect(Collectors.groupingBy(DevAttributeVo::getJcName)); return AjaxResult.success(listMap); } @@ -62,6 +76,13 @@ public class ProjectDetailsViewServiceImpl { if (records.isEmpty()) { return AjaxResult.error("暂无数据"); } + for (DevAttributeVo record : records) { + // 截取时间 定义x轴 + if (record != null && record.getJcTime() != null) { + // 从yyyy-MM-dd hh:mm:ss 截取小时分钟 + record.setXTime(record.getJcTime().substring(11, 16)); + } + } return AjaxResult.success(records); } @@ -74,6 +95,13 @@ public class ProjectDetailsViewServiceImpl { if (records.isEmpty()) { return AjaxResult.success("暂无数据"); } + for (DevAttributeVo record : records) { + // 截取时间 定义x轴 + if (record != null && record.getJcTime() != null) { + // 从yyyy-MM-dd hh:mm:ss 截取小时分钟 + record.setXTime(record.getJcTime().substring(11, 16)); + } + } return AjaxResult.success(records); } @@ -82,6 +110,13 @@ public class ProjectDetailsViewServiceImpl { if (records.isEmpty()) { return AjaxResult.success("暂无数据"); } + for (DevAttributeVo record : records) { + // 截取时间 定义x轴 + if (record != null && record.getJcTime() != null) { + // 从yyyy-MM-dd hh:mm:ss 截取小时分钟 + record.setXTime(record.getJcTime().substring(11, 16)); + } + } return AjaxResult.success(records); } diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml index 70fde6e..7dc0091 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml @@ -27,9 +27,9 @@ /** * 班组长条件筛选，一个班组长只可带领一个组,班组员条件筛选，一个组员只可在一个班组 - */ + */ - and (tp.team_id is null and tp.id not in (select rel_id from tb_team where del_flag = '0' and js_time is null)) + and (tp.team_id is null and tp.id not in (select rel_id from tb_team where del_flag = '0' and rel_id is not null and js_time is null)) ORDER BY CASE WHEN tp.id = tt.rel_id THEN 0 ELSE 1 END, tp.id diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml index cd64762..a7775aa 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml @@ -25,7 +25,7 @@ ANY_VALUE( td.dev_code) AS devCode FROM tb_dev_data_record tddr LEFT JOIN tb_device td ON tddr.dev_id = td.id - LEFT JOIN tb_bd_device_record tbdr ON td.dev_code = tbdr.dev_code + LEFT JOIN tb_bd_device_record tbdr ON td.bd_id = tbdr.id LEFT JOIN tb_project tp ON tbdr.pro_id = tp.id WHERE tddr.is_warn = 1