From 263f1193092ca1f63aa53d8ae9dbd14b6dcd592c Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Mon, 30 Jun 2025 15:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9D=A1=E4=BB=B6=E6=9C=BA=E6=9E=84=E6=98=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/dept/vo/dept/DeptSimpleRespVO.java | 3 ++ .../alertmessage/AlertMessageMapper.java | 7 ++-- .../system/dal/mysql/device/DeviceMapper.java | 11 ------ .../alertmessage/AlertMessageMapper.xml | 13 ++++++- .../resources/mapper/device/DeviceMapper.xml | 35 ++++++++++++++++++- .../resources/mapper/person/PersonMapper.xml | 7 +++- 6 files changed, 57 insertions(+), 19 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java index 31c15d56b8..7d42e6d45b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java @@ -20,4 +20,7 @@ public class DeptSimpleRespVO { @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long parentId; + private Integer orgid; + + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/alertmessage/AlertMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/alertmessage/AlertMessageMapper.java index 58749dcfa0..90a0d48785 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/alertmessage/AlertMessageMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/alertmessage/AlertMessageMapper.java @@ -94,12 +94,9 @@ public interface AlertMessageMapper extends BaseMapperX { /** - * 获取预警统计数据 首页 + * 获取预警统计数据 首页 传递的oraid是0 则表示管理员 */ - @Select("SELECT " + - "COUNT(*) as alertTotal, " + - "SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) as alertUnhandled " + - "FROM tb_alert_message WHERE orgid = #{orgid}") + AlertStatisticsVO getAlertStatistics(@Param("orgid") Integer orgid); } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java index 9be7cd733f..fb3ba58bb4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java @@ -59,22 +59,11 @@ public interface DeviceMapper extends BaseMapperX { /** * 获取设备基础统计 */ - @Select("SELECT " + - "COUNT(*) as totalCount, " + - "SUM(CASE WHEN devicestatus = 1 THEN 1 ELSE 0 END) as onlineCount, " + - "SUM(CASE WHEN devicestatus = 2 THEN 1 ELSE 0 END) as offlineCount " + - "FROM tb_device WHERE orgid = #{orgid}") DeviceStatistics getDeviceStatistics(@Param("orgid") Integer orgid); /** * 获取省份设备数量统计 */ - @Select("SELECT " + - "SUBSTRING_INDEX(location, '/', 1) as province, " + - "COUNT(*) as count " + - "FROM tb_device " + - "WHERE orgid = #{orgid} " + - "GROUP BY SUBSTRING_INDEX(location, '/', 1)") List getProvinceDeviceCount(@Param("orgid") Integer orgid); /** diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/alertmessage/AlertMessageMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/alertmessage/AlertMessageMapper.xml index a1dc57fef2..2ebe2b2e54 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/alertmessage/AlertMessageMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/alertmessage/AlertMessageMapper.xml @@ -8,5 +8,16 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - + \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/device/DeviceMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/device/DeviceMapper.xml index ab0ca09abe..6914e2cdfe 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/device/DeviceMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/device/DeviceMapper.xml @@ -14,6 +14,39 @@ SUM(CASE WHEN devicestatus = 1 THEN 1 ELSE 0 END) AS onlineCount, SUM(CASE WHEN devicestatus = 2 THEN 1 ELSE 0 END) AS offlineCount FROM tb_device - WHERE orgid = #{orgid} + + + + AND orgid = #{orgid} + + + + + + + \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/person/PersonMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/person/PersonMapper.xml index b805e4af96..8795c30850 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/person/PersonMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/person/PersonMapper.xml @@ -36,7 +36,12 @@ COUNT(*) AS count FROM tb_user WHERE isvip = 1 - AND orgid = #{orgid} + + + + AND orgid = #{orgid} + + AND vipstarttime >= DATE_SUB(CURDATE(), INTERVAL 6 DAY) AND vipstarttime < DATE_ADD(CURDATE(), INTERVAL 1 DAY) GROUP BY DATE(vipstarttime)