project-zsy
/
gasWellWatch
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
wangshilong 2024-12-09 11:41:28 +08:00
parent 119e854f11 8c29732feb
commit 82b60d235c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/mapper/DeviceDao.xml
View File

@ -73,7 +73,7 @@
select t.collection_time,t.oil_pressure,t.cas_pressure,t.pre_pressure,t.status_end_time select t.collection_time,t.oil_pressure,t.cas_pressure,t.pre_pressure,t.status_end_time
<if test="deviceProduct!=null and deviceProduct=='knpc'">,t.run_mode,t.temperature,t.humidity,t.well_status,t.plug_status</if> <if test="deviceProduct!=null and deviceProduct=='knpc'">,t.run_mode,t.temperature,t.humidity,t.well_status,t.plug_status</if>
<if test="deviceProduct!=null and deviceProduct=='etc'"></if> <if test="deviceProduct!=null and deviceProduct=='etc'"></if>
<if test="deviceProduct!=null and deviceProduct=='scss'">,t.solarVoltage</if> <if test="deviceProduct!=null and deviceProduct=='scss'">t.ctl_model as runMode,t.solar_voltage</if>
from ${tableName} t from ${tableName} t
<where> <where>
t.device_id = #{deviceId} t.device_id = #{deviceId}