Merge branch 'lyh-bug-36975'

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

@@ -35,6 +35,8 @@ public interface ICameraDetailService extends IService<CameraDetail> {
 
     void addUsedSpace(HashMap<Long, Long> cameraMap);
 
+    void addUsedSpace(Long id,Long space);
+
     List<CameraAppVo> getListByUserAndType(Long userId, Integer cameraType);
 
     List<CameraAppVo> getListByUserIdsAndType(List<Long> userId, Integer cameraType);

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

@@ -171,6 +171,14 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
 
     @Override
+    public void addUsedSpace(Long id,Long space) {
+        LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CameraDetail::getId,id);
+        wrapper.setSql("used_space =  used_space + " + space);
+        this.update(wrapper);
+    }
+
+    @Override
     public List<CameraAppVo> getListByUserAndType(Long userId, Integer cameraType) {
         return this.getBaseMapper().getListByUserAndType(userId,cameraType);
     }

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

@@ -104,6 +104,7 @@ public class FusionService implements IFusionService {
         HashMap<Long, ScenePlusExt> extMap = scenePlusExtService.getByPlusIds(plusIds);
         HashMap<Long, ScenePlusVoid> voidMap = scenePlusVoidService.getByPlusIds(plusIds);
         HashMap<Long, Camera> cameraMap = cameraService.getByIds(cameraIds);
+        HashMap<Long, User> userMap = userService.getByIds(page.getRecords().stream().map(ScenePlus::getUserId).collect(Collectors.toList()));
         for (ScenePlus record : page.getRecords()) {
             ScenePlusVo scenePlusVo = new ScenePlusVo();
             BeanUtils.copyProperties(record,scenePlusVo);
@@ -112,6 +113,7 @@ public class FusionService implements IFusionService {
             scenePlusVo.setSnCode(snCode);
             scenePlusVo.setSceneType(param.getType());
             scenePlusVo.setPlusVoid(voidMap.get(record.getId()));
+            scenePlusVo.setPhone(userMap.get(record.getUserId()) == null ?null : userMap.get(record.getUserId()).getUserName());
             list.add(scenePlusVo);
         }
         Page<ScenePlusVo> pageVo = new Page<>(param.getPageNum(),param.getPageSize());

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

@@ -267,8 +267,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 }
                 scenePlus.setSceneStatus(-2);
                 this.updateById(scenePlus);
-                cameraDetail.setUsedSpace(cameraDetail.getUsedSpace() + plusExt.getSpace());
-                cameraDetailService.updateById(cameraDetail);
+                cameraDetailService.addUsedSpace(cameraDetail.getId(),plusExt.getSpace());
                 sceneCopyLogService.saveByNum(oldNum,newNum,scenePlus.getUserId());
             }catch (Exception e){
                 log.error("复制场景失败-V4-sceneNum:{},error:{}",oldNum,e);

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

@@ -823,8 +823,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
                 scenePro.setStatus(-2);
                 this.updateById(scenePro);
-                cameraDetail.setUsedSpace(cameraDetail.getUsedSpace() + scenePro.getSpace());
-                cameraDetailService.updateById(cameraDetail);
+                cameraDetailService.addUsedSpace(cameraDetail.getId(),scenePro.getSpace());
                 sceneCopyLogService.saveByNum(oldNum,newNum,scenePro.getUserId());
 
             }catch ( Exception e){

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

@@ -253,11 +253,13 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public HashMap<Long, User> getByIds(List<Long> userIds) {
-        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(User::getId,userIds);
-        List<User> list = this.list(wrapper);
         HashMap<Long,User> map = new HashMap<>();
-        list.forEach(entity -> map.put(entity.getId(),entity));
+        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+        if(userIds.size() >0){
+            wrapper.in(User::getId,userIds);
+            List<User> list = this.list(wrapper);
+            list.forEach(entity -> map.put(entity.getId(),entity));
+        }
         return map;
     }
 

src/main/java/com/fdkankan/ucenter/vo/response/ScenePlusVo.java

@@ -10,4 +10,5 @@ public class ScenePlusVo extends ScenePlus {
     private String snCode;
     private ScenePlusExt plusExt;
     private ScenePlusVoid plusVoid;
+    private String phone;
 }

src/main/java/com/fdkankan/ucenter/vo/response/SceneProEntityVo.java

@@ -74,4 +74,6 @@ public class SceneProEntityVo  implements Serializable {
 
     private String recStatus;
 
+    private String phone;
+
 }