过滤已删除设备
This commit is contained in:
parent
888135010b
commit
8b03698185
|
|
@ -43,7 +43,7 @@
|
|||
</sql>
|
||||
|
||||
<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 != ''">
|
||||
AND DEPLOY_TYPE = #{deviceType}
|
||||
</if>
|
||||
|
|
@ -55,10 +55,12 @@
|
|||
</select>
|
||||
|
||||
<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
|
||||
<where>
|
||||
<if test="stationCode != null and stationCode != ''">
|
||||
AND STATION_CODE = #{stationCode}
|
||||
</if>
|
||||
</where>
|
||||
order by SORT_NO
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue