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

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/dao/CameraManageMapper.java

@@ -1,6 +1,7 @@
 package com.bz.zoneiot.water.core.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.bz.zoneiot.core.oauth2.pojo.LoginUser;
 import com.bz.zoneiot.water.core.entity.CameraManage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -40,6 +41,16 @@ public interface CameraManageMapper {
      */
     List<CameraManage> selectList(CameraManage cameraManage);
 
+    /**
+    * 查询场景下的摄像头
+    * @author Andy
+    * @date 15:06 2021/11/16
+    * @param sceneIds:
+    * @param currentUser:
+    * @return java.util.List<com.bz.zoneiot.water.core.entity.CameraManage>
+    **/
+    List<CameraManage> selectListBySceneId(@Param("sceneIds") List<Long> sceneIds, @Param("user") LoginUser currentUser);
+
     /**
      * 新增数据
      *

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/mapper/CameraManageMapper.xml

@@ -138,6 +138,49 @@
         </where>
     </select>
 
+    <select id="selectListBySceneId" resultMap="CameraManageMap">
+        select
+        <include refid="Base_Column_List"/>
+        from sms_camera_manage a
+        <where>
+            a.status = 1
+            <if test="user.permissonType == 5 or user.permissonType == 2">
+                and ( a.DEPT_ORG_ID in
+                <foreach collection="user.programItemList" item="item" open="(" close=")" separator=",">
+                    #{item.orgId}
+                </foreach>
+                or
+                a.COMPANY_ORG_ID in
+                <foreach collection="user.programItemList" item="item" open="(" close=")" separator=",">
+                    #{item.orgId}
+                </foreach>
+                )
+            </if>
+            <if test="user.permissonType == 4 or user.permissonType == 3">
+                and a.DEPT_ORG_ID in
+                <foreach collection="user.programItemList" item="item" open="(" close=")" separator=",">
+                    #{item.orgId}
+                </foreach>
+            </if>
+            <if test="user.permissonType == 1">
+                and a.COMPANY_ORG_ID in
+                <foreach collection="user.programItemList" item="item" open="(" close=")" separator=",">
+                    #{item.orgId}
+                </foreach>
+                and (a.DEPT_ORG_ID is null or a.DEPT_ORG_ID =0)
+            </if>
+            <if test="user.tenantId != null and user.tenantId != ''">
+                and TENANT_ID = #{user.tenantId}
+            </if>
+            <if test="sceneIds != null">
+                and SCENE_ID in
+                <foreach collection="sceneIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
     <!-- 新增所有列 -->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into sms_camera_manage(ID, TENANT_ID, COMPANY_ORG_ID, DEPT_ORG_ID, SCENE_ID, address, geo, PALY_URL,

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/CameraManageController.java

@@ -9,12 +9,14 @@ import com.bz.zoneiot.water.web.service.CameraManageService;
 import com.bz.zoneiot.water.core.entity.CameraManage;
 import com.bz.zoneiot.core.common.pojo.AjaxMessage;
 import com.bz.zoneiot.core.common.util.BeanCopyUtils;
+import com.bz.zoneiot.water.web.service.impl.SceneService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -31,6 +33,9 @@ public class CameraManageController {
     @Autowired
     private CameraManageService cameraManageService;
 
+    @Resource
+    private SceneService sceneService;
+
     @RequestMapping(value = "insert", method = RequestMethod.POST)
     @ApiOperation(value = "增加摄像头",notes = "stauts为300009，公司/部门信息错误")
     public AjaxMessage<Integer> insert(@ApiParam(value = "新增摄像头", required = true) @RequestBody CameraManage cameraManage) {
@@ -84,10 +89,20 @@ public class CameraManageController {
     public AjaxMessage selectBySceneId(@RequestParam(required = false) Integer sceneId) {
         CameraManage cameraManage = new CameraManage();
         cameraManage.setSceneId(sceneId);
+
         List<CameraManage> cameraManages = cameraManageService.selectList(cameraManage);
         return AjaxMessage.success(cameraManages);
     }
 
+    @RequestMapping(value = "listBySceneId", method = RequestMethod.POST)
+    @ApiOperation(value = "查询场景树下的摄像头")
+    public AjaxMessage listBySceneId(@RequestParam(required = false) Long sceneId) {
+        List<Long> sceneIds = sceneService.findByParentIdsLike(sceneId);
+        List<CameraManage> cameraManages = cameraManageService.selectListBySceneId(sceneIds);
+        return AjaxMessage.success(cameraManages);
+    }
+
+
     @RequestMapping(value = "get", method = RequestMethod.POST)
     @ApiOperation(value = "获取单个摄像头信息")
     public AjaxMessage selectById(@RequestParam(required = false) Integer id) {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/CameraManageService.java

@@ -41,6 +41,15 @@ public interface CameraManageService {
     **/
     List<CameraManage> selectList(CameraManage cameraManage);
 
+    /**
+    * 查询摄像头
+    * @author Andy
+    * @date 15:10 2021/11/16
+    * @param sceneIds:
+    * @return java.util.List<com.bz.zoneiot.water.core.entity.CameraManage>
+    **/
+    List<CameraManage> selectListBySceneId( List<Long> sceneIds);
+
     /**
     * 新增数据
     * @author Andy

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/AlarmTypeDetailsServiceImpl.java

@@ -106,13 +106,13 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
         for (AlarmDetailsEntity entity : entities) {
             if (entity.getId() != null) {
                 alarmTypeDetailMapper.update(entity);
-                builder.append(",").append(entity.getId());
+                builder.append(" ").append(entity.getId());
             } else {
                 addList.add(entity);
             }
         }
         if (builder.length() > 0 ){
-            log.info("【接收告警信息】：更新数：{}", builder.toString());
+            log.info("【接收告警信息】：更新ID：{}", builder.toString());
         }
         if (addList.size() > 0){
             alarmTypeDetailMapper.batchInsert(addList);

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/CameraManageServiceImpl.java

@@ -106,6 +106,12 @@ public class CameraManageServiceImpl implements CameraManageService {
         return this.cameraManageMapper.selectList(cameraManage);
     }
 
+    @Override
+    public List<CameraManage> selectListBySceneId(List<Long> sceneId) {
+        return this.cameraManageMapper.selectListBySceneId(sceneId, UserUtil.getCurrentUser());
+    }
+
+
 
     /**
      * 新增数据