相机登录场景列表

src/main/java/com/fdkankan/ucenter/controller/DeviceSceneController.java

@@ -3,9 +3,11 @@ package com.fdkankan.ucenter.controller;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.IScenePlusService;
+import com.fdkankan.ucenter.service.ISceneProService;
 import com.fdkankan.ucenter.service.impl.AppSceneService;
 import com.fdkankan.ucenter.vo.request.AppSceneParam;
 import com.fdkankan.ucenter.vo.request.DeviceListParam;
+import com.fdkankan.ucenter.vo.request.SceneParam;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +25,8 @@ import org.springframework.web.bind.annotation.RestController;
 public class DeviceSceneController extends BaseController {
 
     @Autowired
-    AppSceneService appSceneService;
+    ISceneProService sceneProService;
+
 
     /**
      * 获取相机场景记录
@@ -31,9 +34,10 @@ public class DeviceSceneController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result getScenes(@RequestBody AppSceneParam param) throws Exception {
-        param.setCameraType(null);
-        return Result.success(appSceneService.pageList(param));
+    public Result getScenes(@RequestBody SceneParam param) throws Exception {
+        param.setHasFolder(0);
+        sceneProService.newList(param,null);
+        return Result.success();
     }
 
     /**
@@ -43,7 +47,7 @@ public class DeviceSceneController extends BaseController {
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public Result deleteScene(@RequestBody AppSceneParam param) throws Exception {
         param.setCameraType(null);
-        appSceneService.deleteScene(param.getSceneNum());
+        sceneProService.delete(param.getSceneNum());
         return Result.success();
     }
 

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -479,9 +479,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public JSONObject newList(SceneParam param, String username) {
-        User user = userService.getByUserName(username);
         param.setSourceList(getSceneSource(param.getSceneSource()));
-        param.setUserId(user.getId());
+        if(StringUtils.isNotBlank(username)){
+            User user = userService.getByUserName(username);
+            param.setUserId(user.getId());
+        }
 
         Page<SceneVo> sceneVoPage = getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
 
@@ -497,8 +499,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     vo.setSceneNum(sceneNum);
                     vo.setCreateTimeStr(vo.getCreateTime());
                 }else if(vo.getIsFolder() == 1 && vo.getType()!= null && vo.getType() == 3){
-                    Integer count = sceneService.getCountByUserId(user.getId());
-                    vo.setSceneNum(Long.valueOf(count));
+                    if(param.getUserId()!= null){
+                        Integer count = sceneService.getCountByUserId(param.getUserId());
+                        vo.setSceneNum(Long.valueOf(count));
+                    }
                 }
             }
         }
@@ -536,13 +540,17 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         sceneVoPage.setRecords(folderList);
         if(param.getFolderId() == null && param.getIsObj() == null ){
             List<String> sourceList = param.getSourceList();
-            totalSceneNum = this.getCountByUserId(user.getId(),sourceList);
-            totalSceneNum += scenePlusService.getCountByUserId(user.getId(),sourceList);
-            totalSceneNum += sceneService.getCountByUserId(user.getId());
+            if(param.getUserId()!= null){
+                totalSceneNum = this.getCountByUserId(param.getUserId(),sourceList);
+                totalSceneNum += scenePlusService.getCountByUserId(param.getUserId(),sourceList);
+                totalSceneNum += sceneService.getCountByUserId(param.getUserId());
+            }
         }else if(param.getFolderId() != null ){
             totalSceneNum = folderSceneService.getCountByFolderAndSon(param.getFolderId());
         }else if(param.getIsObj() != null && param.getIsObj() ==1){
-            totalSceneNum = this.getCountByLaserAndIsObj(user.getId());
+            if(param.getUserId()!= null){
+                totalSceneNum = this.getCountByLaserAndIsObj(param.getUserId());
+            }
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("pageInfo",PageInfo.PageInfo(sceneVoPage));

src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -326,6 +326,11 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             BeanUtils.copyProperties(userIncrement,responseUserIncrement);
             cameraVo.setResponseUserIncrement(responseUserIncrement);
         }
+//        if("10".equals(cameraVo.getCameraType()) ){ //深时权益
+//            ResponseUserIncrement responseUserIncrement = new ResponseUserIncrement();
+//            responseUserIncrement.setIsExpire(false);
+//            cameraVo.setResponseUserIncrement(responseUserIncrement);
+//        }
         return cameraVo;
     }
 

src/main/java/com/fdkankan/ucenter/vo/request/SceneParam.java

@@ -33,4 +33,5 @@ public class SceneParam extends RequestBase {
     private String num;
 
     private String searchKey;
+    private Integer cameraId;
 }

src/main/resources/mapper/ucenter/SceneProMapper.xml

@@ -100,9 +100,12 @@
     </sql>
 
     <sql id="commonWhere">
-        <if test="param.numList == null ">
+        <if test="param.numList == null and param.userId != null ">
            and p.user_id =#{param.userId}
         </if>
+        <if test="param.camaraId != null ">
+           and p.camera_id =#{param.camaraId}
+        </if>
     </sql>
 
     <sql id="commonSceneWhere">