Merge branch 'fusion-v1.4.0'

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/controller/ArticleController.java
#	src/main/java/com/fdkankan/ucenter/entity/Case.java
#	src/main/java/com/fdkankan/ucenter/mapper/ICaseMapper.java
#	src/main/java/com/fdkankan/ucenter/service/ICaseService.java
#	src/main/java/com/fdkankan/ucenter/service/impl/CaseServiceImpl.java

src/main/java/com/fdkankan/ucenter/controller/fire/FdUserCameraController.java

@@ -50,6 +50,10 @@ public class FdUserCameraController extends BaseController {
             throw new BusinessException(-1,"缺少必要参数");
         }
         String snCode = param.getString("snCode");
+        String userName = param.getString("userName");
+        if(StringUtils.isEmpty(userName)){
+            userName = JwtUtil.getUsername(getToken());
+        }
         Camera cameraEntity = cameraService.getBySnCode(snCode);
         if(ObjectUtils.isEmpty(cameraEntity)){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
@@ -58,16 +62,16 @@ public class FdUserCameraController extends BaseController {
         if(ObjectUtils.isEmpty(cameraDetailEntity)){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
         }
-        if (ObjectUtils.isEmpty(cameraDetailEntity.getCompanyId())) {
-            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
-        }
+//        if (ObjectUtils.isEmpty(cameraDetailEntity.getCompanyId())) {
+//            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
+//        }
 
         if(cameraDetailEntity.getUserId() != null){
             throw new BusinessException(AppConstant.FAILURE_CODE_4011, AppConstant.FAILURE_MSG_4011);
         }
 
         // 绑定相机
-        cameraService.bind(cameraDetailEntity.getType(),cameraEntity.getSnCode(), JwtUtil.getUsername(getToken()));
+        cameraService.bind(cameraDetailEntity.getType(),cameraEntity.getSnCode(), userName);
 
         return Result.success();
     }
@@ -87,6 +91,9 @@ public class FdUserCameraController extends BaseController {
         List<CameraVo> list = new ArrayList<>();
         for (String childName : param.getChildNames()) {
             CameraVo vo = userService.findCameraDetailByChildName(getToken(), childName);
+            if(vo == null){
+                continue;
+            }
             vo.setUsedSpace(null);
             vo.setTotalSpace(null);
             list.add(vo);

src/main/java/com/fdkankan/ucenter/service/ICameraService.java

@@ -51,4 +51,6 @@ public interface ICameraService extends IService<Camera> {
     List<Camera> getAllList(String childName,String token);
 
     List<Camera> findLikeChildName(String searchKey);
+
+    List<Camera> getBySnCodes(List<String> snCodes);
 }

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

@@ -264,6 +264,9 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
     @Override
     public Long getTotalSpaceByCameraId(CameraDetail cameraDetail) {
+        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11){
+            return -1L;
+        }
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraDetail.getCameraId());
         if(userIncrement != null && userIncrement.getIsExpired() == 0){
             IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());

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

@@ -415,11 +415,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
 
     @Override
     public CameraVo getVoByChildName(String childName) {
-        CameraVo vo = new CameraVo();
+        CameraVo vo = null;
         Camera cameraEntity = this.getByChildName(childName);
         if (cameraEntity != null){
             CameraDetail detailEntity = cameraDetailService.getByCameraId(cameraEntity.getId());
             if (detailEntity != null){
+                vo = new CameraVo();
                 vo.setId(cameraEntity.getId());
                 vo.setUserId(detailEntity.getUserId());
                 vo.setActivatedTime(cameraEntity.getActivatedTime());
@@ -469,4 +470,14 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         wrapper.like(Camera::getSnCode,searchKey);
         return this.list(wrapper);
     }
+
+    @Override
+    public List<Camera> getBySnCodes(List<String> snCodes) {
+        LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
+        if(snCodes == null || snCodes.size()<=0){
+            return new ArrayList<>();
+        }
+        wrapper.in(Camera::getSnCode,snCodes);
+        return this.list(wrapper);
+    }
 }

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

@@ -56,7 +56,15 @@ public class FusionService implements IFusionService {
     @Override
     public PageInfo scenePageList(SceneParam param, String token) {
         LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
-
+        if(param.getSnCodes() != null && param.getSnCodes().size() >0){
+            List<Camera> cameras = cameraService.getBySnCodes(param.getSnCodes());
+            if(cameras.size() >0){
+                List<Long> cameraIds = cameras.stream().map(Camera::getId).collect(Collectors.toList());
+                wrapper.in(ScenePlus::getCameraId,cameraIds);
+            }else {
+                return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
+            }
+        }
         if(StringUtils.isNotBlank(token)){
             User user = userService.getByToken(token);
             if(user == null){

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

@@ -114,11 +114,13 @@ public class ScenePlusVoidServiceImpl extends ServiceImpl<IScenePlusVoidMapper,
 
     @Override
     public HashMap<Long, ScenePlusVoid> getByPlusIds(List<Long> plusIds) {
-        LambdaQueryWrapper<ScenePlusVoid> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(ScenePlusVoid::getPlusId,plusIds);
-        List<ScenePlusVoid> list = this.list(wrapper);
         HashMap<Long,ScenePlusVoid> map = new HashMap<>();
-        list.forEach(entity -> map.put(entity.getPlusId(),entity));
+        LambdaQueryWrapper<ScenePlusVoid> wrapper = new LambdaQueryWrapper<>();
+        if(plusIds.size()>0){
+            wrapper.in(ScenePlusVoid::getPlusId,plusIds);
+            List<ScenePlusVoid> list = this.list(wrapper);
+            list.forEach(entity -> map.put(entity.getPlusId(),entity));
+        }
         return map;
     }
 }

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

@@ -298,8 +298,11 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public CameraVo findCameraDetailByChildName(String token, String childName) {
-        User userVo = this.getByToken(token);
         CameraVo cameraVo = cameraService.getVoByChildName(childName);
+        if(cameraVo == null){
+            return null;
+        }
+        User userVo = this.getByToken(token);
         if(userVo != null && userVo.getId()!= null){
             User user = this.getById(userVo.getId());
             cameraVo.setNickName(user.getNickName());

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

@@ -17,6 +17,8 @@ public class SceneParam extends RequestBase {
 
     private String sceneName;       //场景名称
     private String snCode;          //相机snCode
+    private List<String> snCodes;
+
     private String userName;        //协作者名称
 
     private String sceneNum;

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

@@ -24,7 +24,7 @@
             </if>
             )
         </if>
-        UNION
+        UNION ALL
         SELECT  p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,p.create_time ,num,title as scene_name,description as scene_dec,
         scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type,p.scene_type
         FROM t_scene_plus p
@@ -80,7 +80,7 @@
          <if test= 'param.searchKey != null'>
           and s.scene_name like CONCAT('%',#{param.searchKey},'%') or s.num = #{param.searchKey}
          </if>
-    union
+        UNION ALL
         SELECT s.id,s.scene_name, s.scene_dec, s.web_site, s.thumb, s.scene_type,
         s.create_time, s.status, s.user_id, s.pay_status, s.camera_id, s.num, s.scene_scheme, s.shoot_count,
         s.rec_status, s.space, s.recommend, s.view_count, s.build_type,s.scene_source FROM `t_scene_pro` s

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

@@ -38,7 +38,7 @@
         <if test="param.isObj !=null ">
           and  p.is_obj  = #{param.isObj}
         </if>
-        UNION
+        UNION ALL
         SELECT  p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,e.algorithm_time as createTime ,num,title as scene_name,description as scene_dec,
         scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type
         FROM t_scene_plus p
@@ -87,7 +87,7 @@
             order by create_time desc
             limit 1000
             )as tb
-            UNION
+            UNION ALL
         </if>
     </sql>