Reapply "feat(): 添加摄像头类型查询全部功能"

This reverts commit 7c503bd0de.

web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectCameraQueryExe.java

@@ -59,6 +59,9 @@ public class KeyProjectCameraQueryExe {
         if(KeyProjectCameraTypeEnum.MOBILE_CAMERA.getCode().equals(cameraListCmd.getCameraType())){
             pageResponse = keyProjectCameraRepository.listMobileCameraAll(params);
         }
+        if(KeyProjectCameraTypeEnum.ALL_CAMERA.getCode().equals(cameraListCmd.getCameraType())){
+            pageResponse = keyProjectCameraRepository.listAllCamera(params);
+        }
         List<CameraInfoCO> examCenterCOS = keyProjectCameraCoConvertor.converCameraDOsToCOs(pageResponse.getData());
 
         return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());

web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java

@@ -19,8 +19,8 @@ public class CameraInfoCO implements Serializable {
     //摄像头id
     @ApiModelProperty(value = "摄像头id")
     private String cameraId;
-    //摄像头类型,1:固定摄像头,2:移动摄像头
+    //摄像头类型,0：查全部,1:固定摄像头,2:移动摄像头
-    @ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头")
+    @ApiModelProperty(value = "摄像头类型,0：查全部,1:固定摄像头,2:移动摄像头")
     private Integer cameraType;
 
     @ApiModelProperty(value = "摄像头名称")

web-client/src/main/java/com/zcloud/key/project/dto/project/CameraListCmd.java

@@ -26,7 +26,7 @@ public class CameraListCmd extends PageQuery {
      * - `le`: 小于等于比较查询
      * - `ne`: 不等比较查询，对应SQL的!=操作符
      */
-    @ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头")
+    @ApiModelProperty(value = "摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头")
     @NotNull(message = "摄像头类型不能为空")
     private Integer cameraType;
 

web-domain/src/main/java/com/zcloud/key/project/domain/enums/KeyProjectCameraTypeEnum.java

@@ -7,6 +7,7 @@ import lombok.Getter;
  */
 @Getter
 public enum KeyProjectCameraTypeEnum {
+    ALL_CAMERA(0, "全部摄像头"),
     FIXED_CAMERA(1, "固定摄像头"),
     MOBILE_CAMERA(2, "移动摄像头");
 

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java

@@ -19,8 +19,8 @@ public class CameraInfoDO implements Serializable {
     //摄像头id
     @ApiModelProperty(value = "摄像头id")
     private String cameraId;
-    //摄像头类型,1:固定摄像头,2:移动摄像头
+    //摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头
-    @ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头")
+    @ApiModelProperty(value = "摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头")
     private Integer cameraType;
 
     @ApiModelProperty(value = "摄像头名称")

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java

@@ -30,6 +30,8 @@ public interface KeyProjectCameraMapper extends BaseMapper<KeyProjectCameraDO> {
 
     IPage<CameraInfoDO> listMobileCameraAll(IPage<CameraInfoDO> iPage, Map<String, Object> params);
 
+    IPage<CameraInfoDO> listAllCamera(IPage<CameraInfoDO> iPage, Map<String, Object> params);
+
 
     List<KeyProjectCameraAiDO> listCameraByProjectId(@Param("params") Map<String, Object> params);
 }

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java

@@ -64,5 +64,12 @@ public class KeyProjectCameraRepositoryImpl extends BaseRepositoryImpl<KeyProjec
         IPage<CameraInfoDO> result = keyProjectCameraMapper.listMobileCameraAll(iPage, params);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
+
+    @Override
+    public PageResponse<CameraInfoDO> listAllCamera(Map<String, Object> params) {
+        IPage<CameraInfoDO> iPage = new Query<CameraInfoDO>().getPage(params);
+        IPage<CameraInfoDO> result = keyProjectCameraMapper.listAllCamera(iPage, params);
+        return PageHelper.pageToResponse(result, result.getRecords());
+    }
 }
 

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java

@@ -26,5 +26,7 @@ public interface KeyProjectCameraRepository extends BaseRepository<KeyProjectCam
     PageResponse<CameraInfoDO> listFixedCameraAll(Map<String, Object> params);
 
     PageResponse<CameraInfoDO> listMobileCameraAll(Map<String, Object> params);
+
+    PageResponse<CameraInfoDO> listAllCamera(Map<String, Object> params);
 }
 

web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml

@@ -71,6 +71,35 @@
         )
     </select>
 
+    <select id="listAllCamera" resultType="com.zcloud.key.project.persistence.dataobject.project.CameraInfoDO">
+        SELECT mc.fixed_camera_id as cameraId, mc.video_name as cameraName, 1 as cameraType
+        FROM fixed_camera mc
+        WHERE mc.delete_enum = 'FALSE'
+        AND NOT EXISTS (SELECT 1
+            FROM key_project_camera kpc
+            INNER JOIN key_project kp ON kpc.key_project_id = kp.key_project_id
+            WHERE kpc.camera_id = mc.fixed_camera_id
+            AND kp.delete_enum = 'FALSE'
+            AND kpc.delete_enum = 'FALSE'
+            AND kp.apply_status != 6
+        )
+        UNION ALL
+        SELECT mc.mobile_camera_id as cameraId, mc.video_name as cameraName, 2 as cameraType
+        FROM mobile_camera mc
+        WHERE mc.delete_enum = 'FALSE'
+        <if test="params.corpinfoId != null">
+            and mc.xgf_id = #{params.corpinfoId}
+        </if>
+        AND NOT EXISTS (SELECT 1
+            FROM key_project_camera kpc
+            INNER JOIN key_project kp ON kpc.key_project_id = kp.key_project_id
+            WHERE kpc.camera_id = mc.mobile_camera_id
+            AND kp.delete_enum = 'FALSE'
+            AND kpc.delete_enum = 'FALSE'
+            AND kp.apply_status != 6
+        )
+    </select>
+
     <select id="listCameraByProjectId" resultType="com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraAiDO">
 
         SELECT