更改sql

unis-plugin/unis-plugin-biz/src/main/java/com/unis/equipmentOnlineRateAssessment/modular/monitorNvr/mapper/mapping/MonitorNvrMapper.xml

@@ -24,26 +24,23 @@
 
     <select id="selectByNVRDates" resultType="java.util.HashMap" parameterType="java.util.Map" >
         SELECT
-        camera.id camera_id,
-        camera.alias,
-        camera.factory,
-        camera.live,
-        camera.ip camera_ip,
-        camera.username camera_name,
-        camera.password camera_password,
-        camera.port camera_port,
-        camera.type camera_type,
-        nvr.ip nvr_ip,
-        nvr.username nvr_name,
-        nvr. PASSWORD nvr_password,
-        nvr. PORT nvr_port,
-        nvr.factory nvr_factory,
-        camera.channel_number,
-        camera.org_id
+            camera.id camera_id,
+            camera.alias,
+            camera.factory,
+            camera.live,
+            camera.ip camera_ip,
+            camera.username camera_name,
+            camera.password camera_password,
+            camera.port camera_port,
+            camera.type camera_type,
+            camera.channel_number,
+            camera.org_id,
+            camera.camera_index_code cameraIndexCode,
+            s.storehouse_id storehouseId
         FROM
-        depot_qh.monitor_camera camera
-        LEFT JOIN depot_qh.monitor_nvr nvr ON nvr.id = camera.nvr_id
-        WHERE camera.isremove = '1' AND nvr.delete_mark = '1' AND camera.org_id = #{orgId,jdbcType=VARCHAR} AND nvr.org_id = #{orgId,jdbcType=VARCHAR}
+            monitor_camera camera
+                LEFT JOIN camera_storehouse s on s.camera_id = camera.id
+        WHERE camera.isremove = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR}
         group by camera.id
     </select>
 </mapper>