item：视频监控左侧树与分页接口调整

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/OrgUsrDto.java

@@ -44,4 +44,7 @@ public class OrgUsrDto extends BaseDto {
 
     @ApiModelProperty(value = "省市区名称,用逗号分隔")
     private String pczName;
+
+    @ApiModelProperty(value = "建筑ID")
+    private String buildId;
 }

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

@@ -73,5 +73,8 @@ public class BuildingTreeVo {
 
     @ApiModelProperty("建筑地址")
     private String address;
+
+    @ApiModelProperty("机构编码")
+    private String bizOrgCode;
     
 }

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

 package com.yeejoin.equipmanage.controller;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.equipmanage.common.entity.vo.BuildingListVO;
+import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
+import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoVO;
+import com.yeejoin.equipmanage.common.vo.BuildingTreeVo;
+import com.yeejoin.equipmanage.service.IBuilldService;
+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;
@@ -11,15 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.equipmanage.common.entity.vo.BuildingListVO;
-import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
-import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoVO;
-import com.yeejoin.equipmanage.common.vo.BuildingTreeVo;
-import com.yeejoin.equipmanage.service.IBuilldService;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
 
 /**
  * @Description: 消防建筑视屏监控
@@ -32,71 +31,78 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping(value = "/building/video", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 public class BuildingVideoController extends AbstractBaseController {
 
-	@Autowired
-	IBuilldService buildService;
+    @Autowired
+    IBuilldService buildService;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("消防建筑视屏监控树")
+    @GetMapping(value = "/tree")
+    public List<BuildingTreeVo> getBuildingTree() {
+        return buildService.getBuildingVideoTree();
+    }
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation("消防建筑视屏监控树")
-	@GetMapping(value = "/tree")
-	public List<BuildingTreeVo> getBuildingTree() {
-		return buildService.getBuildingVideoTree();
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("消防建筑视屏监控树")
+    @GetMapping(value = "/treeByBizOrgTypeCode")
+    public List<BuildingTreeVo> getBuildingTreeByBizOrgTypeCode(@RequestParam(required = false) String orgTypes) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+        String bizOrgCode = personIdentity.getBizOrgCode();
+        return buildService.getBuildingTreeByBizOrgTypeCode(orgTypes, bizOrgCode);
+    }
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation("消防建筑视屏监控分页列表")
-	@GetMapping(value = "/page")
-	public Page<BuildingVideoVO> buildingList(Page page, BuildingVideoListVO dto) {
-		if ("0".equals(dto.getBuildingId())) {
-			dto.setBuildingId(null);
-		}
-		return buildService.buildingVideoList(page, dto);
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("消防建筑视屏监控分页列表")
+    @GetMapping(value = "/page")
+    public Page<BuildingVideoVO> buildingList(Page page, BuildingVideoListVO dto) {
+        return buildService.buildingVideoList(page, dto);
+    }
 
-	@GetMapping(value = "/fire/equip")
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(value = "摄像头关联消防设备")
-	public List<BuildingListVO> getFireEquip(@RequestParam Long videoId) {
-		return buildService.getFireEquipByVideoId(videoId);
-	}
+    @GetMapping(value = "/fire/equip")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "摄像头关联消防设备")
+    public List<BuildingListVO> getFireEquip(@RequestParam Long videoId) {
+        return buildService.getFireEquipByVideoId(videoId);
+    }
 
-	@GetMapping(value = "/power/equip")
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(value = "摄像头关联电力设备")
-	public List<BuildingListVO> getEquipBySceneId(@RequestParam Long videoId) {
-		return buildService.getPowerEquipByVideoId(videoId);
-	}
+    @GetMapping(value = "/power/equip")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "摄像头关联电力设备")
+    public List<BuildingListVO> getEquipBySceneId(@RequestParam Long videoId) {
+        return buildService.getPowerEquipByVideoId(videoId);
+    }
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation("安防消防建筑视屏监控树")
-	@GetMapping(value = "/cola/tree")
-	public List<BuildingTreeVo> getBuildingColaTree() {
-		return buildService.getBuildingVideoColaTree();
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("安防消防建筑视屏监控树")
+    @GetMapping(value = "/cola/tree")
+    public List<BuildingTreeVo> getBuildingColaTree() {
+        return buildService.getBuildingVideoColaTree();
+    }
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation("可乐视屏监控分页列表")
-	@GetMapping(value = "/cola/page")
-	public Page<BuildingVideoVO> buildingColaList(Page page, BuildingVideoListVO dto) {
-		if ("0".equals(dto.getBuildingId())) {
-			dto.setBuildingId(null);
-		}
-		String orgCode = getOrgCode();
-		dto.setOrgCode(orgCode);
-		return buildService.buildingColaVideoList(page, dto);
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("可乐视屏监控分页列表")
+    @GetMapping(value = "/cola/page")
+    public Page<BuildingVideoVO> buildingColaList(Page page, BuildingVideoListVO dto) {
+        if ("0".equals(dto.getBuildingId())) {
+            dto.setBuildingId(null);
+        }
+        String orgCode = getOrgCode();
+        dto.setOrgCode(orgCode);
+        return buildService.buildingColaVideoList(page, dto);
+    }
 
-	@GetMapping(value = "/cola/fire/equip")
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(value = "摄像头关联消防设备")
-	public List<BuildingListVO> getFireEquipment(@RequestParam Long id) {
-		return buildService.getFireEquipment(id);
-	}
+    @GetMapping(value = "/cola/fire/equip")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "摄像头关联消防设备")
+    public List<BuildingListVO> getFireEquipment(@RequestParam Long id) {
+        return buildService.getFireEquipment(id);
+    }
 
-	@GetMapping(value = "/cola/security/equip")
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(value = "摄像头关联安防设备")
-	public List<BuildingListVO> getSecurityEquipment(@RequestParam Long id) {
-		return buildService.getSecurityEquipment(id);
-	}
+    @GetMapping(value = "/cola/security/equip")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "摄像头关联安防设备")
+    public List<BuildingListVO> getSecurityEquipment(@RequestParam Long id) {
+        return buildService.getSecurityEquipment(id);
+    }
 
 }

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

@@ -103,8 +103,9 @@ public interface FormInstanceMapper extends BaseMapper<FormInstance> {
     /**
      * 消防建筑视屏监控统计树
      * @return
+     * @param bizOrgCodeList
      */
-    List<Map<String, Object>> getBuildVideoListCount();
+    List<Map<String, Object>> getBuildVideoListCount(@Param("list") List<String> bizOrgCodeList);
 
     /**
      * 可乐建筑视屏监控统计树

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

@@ -208,6 +208,14 @@ public interface IBuilldService extends IService<Building> {
     List<BuildingTreeVo> getBuildingVideoTree();
 
     /**
+     * 消防建筑视屏监控统计树
+     * @param orgTypes
+     * @param bizOrgCode
+     * @return
+     */
+    List<BuildingTreeVo> getBuildingTreeByBizOrgTypeCode(String orgTypes, String bizOrgCode);
+
+    /**
      * 消防建筑视屏监控分页列表
      * @param page
      * @param dto
@@ -299,4 +307,5 @@ public interface IBuilldService extends IService<Building> {
  * @return
  */
 	Map<String, String> getBuildingToLongitudeAndLatitude(String instanceId);
+
 }

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

@@ -136,8 +136,9 @@ public interface IFormInstanceService extends IService<FormInstance> {
     /**
      * 消防建筑视屏监控统计树
      * @return
+     * @param bizOrgCodeList
      */
-    List<Map<String, Object>> getBuildVideoListCount();
+    List<Map<String, Object>> getBuildVideoListCount(List<String> bizOrgCodeList);
 
     /**
      * 安防消防建筑视屏监控统计树

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

@@ -479,8 +479,8 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
     }
 
     @Override
-    public List<Map<String, Object>> getBuildVideoListCount() {
-        return formInstanceMapper.getBuildVideoListCount();
+    public List<Map<String, Object>> getBuildVideoListCount(List<String> bizOrgCodeList) {
+        return formInstanceMapper.getBuildVideoListCount(bizOrgCodeList);
     }
 
     @Override

amos-boot-system-equip/src/main/resources/application.properties

@@ -36,7 +36,7 @@ dutyMode.fegin.name=AMOS-DUTYMODE
 riskSource.feign.name=AMOS-AUTOSYS
 equipManage.name=AMOS-EQUIPMANAGE
 iot.vehicle.track=AMOS-API-IOT
-jcs.fegin.name=JCS-SHG
+jcs.fegin.name=JCS
 video.fegin.name=VIDEO
 #项目初始化画布id
 morphic.projectSeq=1390314016458514433
@@ -92,4 +92,6 @@ auth-key-fire-system=fire_system_info;
 # 权限标识-消防装备
 auth-key-fire-equip=fire_equip_info;
 # 权限标识-消防视频
-auth-key-fire-video=fire_video_info;
\ No newline at end of file
+auth-key-fire-video=fire_video_info;
+# 权限标识-消防视频
+auth-key-fire-build-video=fire_build_video_info;
\ No newline at end of file

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

@@ -259,6 +259,7 @@
     </select>
     <!--  消防建筑视屏监控统计树  -->
     <select id="getBuildVideoListCount" resultType="hashmap">
+        SELECT  *  FROM(
         SELECT
             sa.*,
             b.total
@@ -269,7 +270,8 @@
                 a.group_code AS groupCode,
                 a.group_type AS groupType,
                 MAX( CASE WHEN a.field_name = 'parentId' THEN a.field_value END ) AS parentId,
-                MAX( CASE WHEN a.field_name = 'name' THEN a.field_value END ) AS instanceName
+                MAX( CASE WHEN a.field_name = 'name' THEN a.field_value END ) AS instanceName,
+                MAX( CASE WHEN a.field_name = 'biz_org_code' THEN a.field_value END ) AS bizOrgCode
             FROM
                 `wl_form_instance` a
             GROUP BY
@@ -283,9 +285,19 @@
             'else' as groupType,
              0 as parentId,
             '其他' as instanceName,
+            NULL AS bizOrgCode,
             count(1) as total
             from
             wl_video where id not in (select video_id from wl_video_source)
+            ) tmp
+            <where>
+                <if test="list != null and list.size() >0">
+                    AND tmp.bizOrgCode IN
+                    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
+            </where>
     </select>
 
     <select id="getColaBuildVideoListCount" resultType="hashmap">

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

@@ -70,6 +70,12 @@
             <if test="dto.buildingId!=null and dto.buildingId!=''">
                 FIND_IN_SET(vc.source_id, getChildrenIdsByRootId(#{dto.buildingId}))
             </if>
+            <if test="dto.buildIdList != null and dto.buildIdList.size > 0">
+                AND
+                <foreach collection="dto.buildIdList" item="item" index="index" open="(" close=")" separator=" OR ">
+                    FIND_IN_SET(vc.source_id, getChildrenIdsByRootId(#{item, jdbcType=INTEGER}))
+                </foreach>
+            </if>
             <if test="dto.equipmentName!=null and dto.equipmentName!=''">
                 and v.name like concat('%',#{dto.equipmentName},'%')
             </if>