Merge remote-tracking branch 'origin/developer' into developer

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

@@ -11,10 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
@@ -50,9 +47,9 @@ public class BuildingVideoController extends AbstractBaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("消防建筑视屏监控分页列表")
-    @GetMapping(value = "/page")
-    public Page<BuildingVideoVO> buildingList(Page page, BuildingVideoListVO dto) {
-        return buildService.buildingVideoList(page, dto);
+    @PostMapping(value = "/page")
+    public Page<BuildingVideoVO> buildingList(@RequestParam(required = false) Page page,@RequestParam(required = false) BuildingVideoListVO dto, @RequestParam(required = false) List<String> ids) {
+        return buildService.buildingVideoList(page, dto,ids);
     }
 
     @GetMapping(value = "/fire/equip")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/VideoMapper.java

@@ -21,7 +21,7 @@ import java.util.Map;
 public interface VideoMapper extends BaseMapper<Video> {
     Page<PageVideoVO> pageVideo(@Param("page") IPage<Video> page, @Param("video") Video video);
 
-    Page<BuildingVideoVO> pageBuildingVideo(@Param("page") Page page, @Param("dto") BuildingVideoListVO dto);
+    Page<BuildingVideoVO> pageBuildingVideo(@Param("page") Page page, @Param("dto") BuildingVideoListVO dto, @Param("ids") List<String> ids);
 
     /**
      * 视屏监控绑定的消防设备查询

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

@@ -207,7 +207,7 @@ public interface IBuilldService extends IService<Building> {
      * @param dto
      * @return
      */
-    Page<BuildingVideoVO> buildingVideoList(Page page, BuildingVideoListVO dto);
+    Page<BuildingVideoVO> buildingVideoList(Page page, BuildingVideoListVO dto,List<String> ids);
 
     /**
      * 通过监控视频 查看 绑定的 消防设备

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

@@ -27,7 +27,7 @@ public interface IVideoService extends IService<Video> {
 
     VideoSaveDto detail(Long id);
 
-    Page<BuildingVideoVO> pageBuildingVideo(Page page, BuildingVideoListVO dto);
+    Page<BuildingVideoVO> pageBuildingVideo(Page page, BuildingVideoListVO dto,List<String> ids);
 
     /**
      * 视屏监控绑定的消防设备查询

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

@@ -37,6 +37,7 @@ import com.yeejoin.equipmanage.operation.SyncRiskOperator;
 import com.yeejoin.equipmanage.operation.factory.PageOperatorFactory;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
+import liquibase.pro.packaged.S;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -866,8 +867,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     @Override
-    public Page<BuildingVideoVO> buildingVideoList(Page page, BuildingVideoListVO dto) {
-        Page<BuildingVideoVO> pages = videoService.pageBuildingVideo(page, dto);
+    public Page<BuildingVideoVO> buildingVideoList(Page page, BuildingVideoListVO dto,List<String> ids) {
+        Page<BuildingVideoVO> pages = videoService.pageBuildingVideo(page, dto,ids);
         pages.getRecords().forEach(x -> {
             if (StringUtil.isNotEmpty(x.getLocation()) && StringUtil.isNotEmpty(x.getAddress())) {
                 x.setLocation(x.getLocation() + '-' + x.getAddress());

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

@@ -252,8 +252,8 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
     }
 
     @Override
-    public Page<BuildingVideoVO> pageBuildingVideo(Page page, BuildingVideoListVO dto) {
-        return this.baseMapper.pageBuildingVideo(page, dto);
+    public Page<BuildingVideoVO> pageBuildingVideo(Page page, BuildingVideoListVO dto,List<String> ids) {
+        return this.baseMapper.pageBuildingVideo(page, dto,ids);
     }
 
     @Override

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

@@ -463,6 +463,8 @@
             wws.full_name
         FROM
             wl_warehouse_structure wws
+        WHERE
+            wws.parent_id is not null
     </select>
 
     <select id="getEquipBySourceIdBycount" resultType="java.lang.Long">

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

@@ -80,6 +80,12 @@
             <if test="dto.code!=null and dto.code!=''">
                 and v.code like concat('%',#{dto.code},'%')
             </if>
+            <if test ="ids != null and ids.size()>0">
+            and
+            <foreach collection="ids" index="index" item="id" open="(" close=")" separator=",">
+                FIND_IN_SET(#{ids}, vc.parent_source_ids)
+            </foreach>
+            </if>
         </where>
         order by v.create_date
     </select>