code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-17 16:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(多数据源): 报错修改

Browse Source
This commit is contained in:
gx_ma
2025-04-23 17:04:02 +08:00
parent d681d4b22b
commit f5598f1663
5 changed files with 23 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
springboot/fastbee-service/fastbee-iot-service/pom.xml
View File

@@ -127,6 +127,22 @@
<version>8.1.1.49</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>8.4.1.jre8</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.5.0</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>19.3.0.0</version>
</dependency>
</dependencies>
</project>

6
springboot/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml
View File

@@ -297,7 +297,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDeviceProductAlertCount" parameterType="com.fastbee.iot.domain.Device" resultType="com.fastbee.iot.model.DeviceStatistic">
select
<!--设备数量-->
(select count(distinct d.device_id,d.user_id)
(select count(distinct concat(d.device_id, '|', d.tenant_id))
from iot_device d
inner join iot_device_user u on u.device_id = d.device_id
<where>
@@ -307,7 +307,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) as deviceCount,
<!--在线设备数量-->
(select count(distinct d.device_id,d.user_id)
(select count(distinct concat(d.device_id, '|', d.tenant_id))
from iot_device d
inner join iot_device_user u on u.device_id = d.device_id
<where>
@@ -320,7 +320,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
(
<!--普通用户查询设备中的产品数量-->
<if test="userId != null and userId != 0">
select count(distinct product_id)
select count(product_id)
from iot_device
where user_id = #{userId}
</if>