Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/BuildingTreeVo.java

@@ -5,12 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Enumeration;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BuildingVideoController.java

@@ -35,14 +35,14 @@ public class BuildingVideoController extends AbstractBaseController {
     IBuilldService buildService;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation("消防建筑视屏监控树")
+    @ApiOperation("消防建筑视频监控树")
     @GetMapping(value = "/tree")
     public List<BuildingTreeVo> getBuildingTree() {
         return buildService.getBuildingVideoTree();
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation("消防建筑视屏监控树")
+    @ApiOperation("物联监控->单位建筑树（视频节点数量）")
     @GetMapping(value = "/getBuildingVideoTree")
     public List<BuildingTreeVo> getBuildingVideoTree() {
         return buildService.getBuildingVideoTreeNew();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/AreaServiceImpl.java

@@ -279,7 +279,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
     }
 
     private List<UnitAreaTreeVo> getChildrenFromData(Long parentId, List<UnitAreaTreeVo> areaTreeList) {
-        return areaTreeList.stream().filter(a->a.getParentId().equals(parentId)).peek(e-> e.setChildren(getChildrenFromData(e.getId(),areaTreeList))).collect(Collectors.toList());
+        return areaTreeList.stream().filter(a->parentId.equals(a.getParentId())).peek(e-> e.setChildren(getChildrenFromData(e.getId(),areaTreeList))).collect(Collectors.toList());
     }
 
 

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -663,13 +663,13 @@
             <if test="equipTypeAmountPage.iotCode!=null and equipTypeAmountPage.iotCode!=''">
                 AND wles.iot_code LIKE CONCAT('%',#{equipTypeAmountPage.iotCode},'%')
             </if>
-               )s1 
+               )s1  WHERE 1=1
               <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">
-                 where  s1.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
+                  AND   s1.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
             </if>
 
             <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
-                where  s1.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
+                AND  s1.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
             </if>
 
 
@@ -745,7 +745,7 @@
             </if>
               )s2
               <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">
-                 where  s2.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
+                  AND  s2.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
             </if>
             <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
                 where  s2.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
@@ -1844,13 +1844,13 @@ FROM
             <if test="equipTypeAmountPage.iotCode!=null and equipTypeAmountPage.iotCode!=''">
                 AND wles.iot_code LIKE CONCAT('%',#{equipTypeAmountPage.iotCode},'%')
             </if>
-            )s1
+            )s1  WHERE 1=1
             <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">
-                where  s1.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
+                AND  s1.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
             </if>
 
             <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
-                where  s1.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
+                AND  s1.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
             </if>
         order by createDate DESC
     </select>
@@ -1960,13 +1960,13 @@ FROM
             <if test="equipTypeAmountPage.iotCode!=null and equipTypeAmountPage.iotCode!=''">
                 AND wles.iot_code LIKE CONCAT('%',#{equipTypeAmountPage.iotCode},'%')
             </if>
-            )s1
+            )s1 WHERE 1=1
             <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">
-                where  s1.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
+                and  s1.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
             </if>
 
             <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
-                where  s1.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
+                and  s1.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
             </if>
 
 

amos-boot-system-equip/src/main/resources/mapper/FormInstanceMapper.xml

@@ -502,7 +502,7 @@ WHERE
         COUNT( vs.video_id ) AS total
     FROM
         get_building_tree b
-        LEFT JOIN wl_video_source vs ON FIND_IN_SET( vs.source_id, getBuildChildIdsByRootId ( b.instanceId ) )
+        LEFT JOIN wl_video_source vs ON FIND_IN_SET( b.instanceId, vs.parent_source_ids )
     GROUP BY
         b.instanceId
 </select>