过滤已删除设备

This commit is contained in:
zy 2025-11-20 09:47:18 +08:00
parent 888135010b
commit 8b03698185
1 changed files with 7 additions and 5 deletions

View File

@ -43,7 +43,7 @@
</sql> </sql>
<select id="getDeviceList" resultType="org.jeecg.common.entity.SurvDeviceDeploy"> <select id="getDeviceList" resultType="org.jeecg.common.entity.SurvDeviceDeploy">
select ID,DEPLOY_TYPE,DEPLOY_CODE,DEPLOY_PIC,DEVICE_URL,DEVICE_CODE,DEPLOY_DES,SORT_NO,DEVICE_IOT_URL,DEVICE_REVERSE_IOT_URL,MAP_ICON,DEVICE_LONGLAT,DEPLOY_SECONDARY_TYPE,#{ysToken} as ysToken from surv_device_deploy where STATION_CODE = #{STATION_CODE} select ID,DEPLOY_TYPE,DEPLOY_CODE,DEPLOY_PIC,DEVICE_URL,DEVICE_CODE,DEPLOY_DES,SORT_NO,DEVICE_IOT_URL,DEVICE_REVERSE_IOT_URL,MAP_ICON,DEVICE_LONGLAT,DEPLOY_SECONDARY_TYPE,#{ysToken} as ysToken from surv_device_deploy where IS_DEL = 0 AND STATION_CODE = #{STATION_CODE}
<if test="deviceType != null and deviceType != ''"> <if test="deviceType != null and deviceType != ''">
AND DEPLOY_TYPE = #{deviceType} AND DEPLOY_TYPE = #{deviceType}
</if> </if>
@ -55,10 +55,12 @@
</select> </select>
<select id="getAllStationAndDevice" resultMap="extMap"> <select id="getAllStationAndDevice" resultMap="extMap">
select <include refid="baseSql" />,#{deviceType} as deviceType,#{token} as ysToken from surv_station_info where 1=1 select <include refid="baseSql" />,#{deviceType} as deviceType,#{token} as ysToken from surv_station_info
<if test="stationCode != null and stationCode != ''"> <where>
AND STATION_CODE = #{stationCode} <if test="stationCode != null and stationCode != ''">
</if> AND STATION_CODE = #{stationCode}
</if>
</where>
order by SORT_NO order by SORT_NO
</select> </select>
</mapper> </mapper>