Newspaper 1 ano atrás
pai
commit
1e8e0d85de

+ 2 - 2
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/SysCameraServiceImpl.java

@@ -116,8 +116,8 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
         final String farmAppPort = "8081";
         final String farmVideoApp = "/appleVideo/play?";
         final String hlsMediaPort = "85";
-        for (SysCamera camera : list) {
-            for (Integer cameraId : cameraIds) {
+        for (Integer cameraId : cameraIds) {
+            for (SysCamera camera : list) {
                 if (cameraId.equals(camera.getId())) {
 
                     String cameraAccount = camera.getAccount();

+ 1 - 1
huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDataMapper.xml

@@ -81,7 +81,7 @@
                  GROUP BY unit_id
             )
         ) d ON b.id = d.unit_id
-        WHERE b.parent_id = 0 AND b.farm_id = #{farmId}
+        WHERE b.parent_id = 0 AND b.farm_id = #{farmId} AND b.build_name &lt;&gt; '10号舍'
     </select>
 
     <select id="getOneData" resultType="com.huimv.guowei.admin.entity.vo.EnvDataGetOneVo">