相机树开发

business-service/src/main/resources/mapper/service/BaseCameraManagementMapper.xml

@@ -33,6 +33,7 @@
         base_camera_management a join base_railway_management r
         on a.railway_code=r.railway_code
         LEFT JOIN base_device_dynamic_management AS man ON a.camera_code = man.camera_code
+        LEFT JOIN msg_alarm AS msg ON a.camera_code = msg.camera_code
         <where>
             <if test="railwayCode != null and railwayCode != ''">
                 and a.railway_code=#{railwayCode}
@@ -86,7 +87,7 @@
             </if>
         </where>
         ORDER BY
-        CONVERT (r.railway_name USING gbk),a.install_mile
+        CONVERT (r.railway_name USING gbk),a.install_mile,msg.is_lock,man.is_disable
     </select>
 
     <select id="countCamera" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="java.lang.Integer">