1

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

@@ -81,12 +81,10 @@ public interface ISceneProService extends IService<ScenePro> {
 
     ResponseScene getSceneDetail(String sceneNum);
 
-    Page<SceneVo> pageListAndFolder(Page<Object> page, SceneParam param);
 
     Object getScenes(String username, RequestScene param);
 
 
-    Integer getSceneSourceByNum(String sceneNum);
 
     List<SimpleSceneVo> getSimpleSceneVo(CameraDetail cameraDetail);
 

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

@@ -477,10 +477,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     }
 
-    @Override
-    public Page<SceneVo> pageListAndFolder(Page<Object> page, SceneParam param) {
-       return  getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
-    }
 
     @Override
     public Object getScenes(String username, RequestScene param) {
@@ -521,6 +517,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Override
     public JSONObject newList(SceneParam param, String username) {
         param.setSourceList(getSceneSource(param.getSceneSource()));
+        param.setIsLaser(SceneSourceUtil.isLaser(param.getSourceList()) ?1:0);
         if(StringUtils.isNotBlank(username)){
             User user = userService.getByUserName(username);
             param.setUserId(user.getId());
@@ -562,8 +559,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //设置协作者信息
         if(sceneVoPage.getRecords().size() >0){
             List<String> numList = sceneVoPage.getRecords().parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
-            //HashMap<String,List<User>> cooMap = sceneCooperationService.getByNumList(numList, param.getIsObj() ==1 ?"mesh":"laser");
-            HashMap<String,List<User>> cooMap = sceneCooperationService.getByNumList(numList,"mesh");
+            HashMap<String,List<User>> cooMap = sceneCooperationService.getByNumList(numList, param.getIsObj() ==1 ?"mesh":"laser");
+            //HashMap<String,List<User>> cooMap = sceneCooperationService.getByNumList(numList,"mesh");
             for (SceneVo vo : sceneVoPage.getRecords()) {
                 if (StringUtils.isNotBlank(vo.getNum())) {
                     List<User> userVos = cooMap.get(vo.getNum());
@@ -604,7 +601,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(param.getFolderId() == null ){
                 List<String> sourceList = param.getSourceList();
                 if(param.getUserId()!= null){
-                    totalSceneNum = scenePlusService.getCountByAndIsObj(param.getUserId(),sourceList,param.getIsObj(), SceneSourceUtil.isLaser(sourceList) ?1:0);
+                    totalSceneNum = scenePlusService.getCountByAndIsObj(param.getUserId(),sourceList,param.getIsObj(), param.getIsLaser());
                     if(sourceList.isEmpty() || sourceList.contains("1")){
                         totalSceneNum += sceneService.getCountByUserId(param.getUserId());
                     }
@@ -1092,21 +1089,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return null;
     }
 
-    @Override
-    public Integer getSceneSourceByNum(String sceneNum) {
-        Integer sceneSource = null;
-        ScenePro scenePro = this.getByNum(sceneNum);
-        if(scenePro != null){
-            sceneSource = scenePro.getSceneSource();
-        }
-        if(scenePro == null){
-            ScenePlus scenePlus = scenePlusService.getByNum(sceneNum);
-            if(scenePlus != null){
-                sceneSource = scenePlus.getSceneSource();
-            }
-        }
-        return sceneSource;
-    }
 
 
     @Override

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

@@ -29,6 +29,7 @@ public class SceneParam extends RequestBase {
     private Integer status;
 
     private Integer isObj = 1;
+    private Integer isLaser;
 
     private String startTime;
     private String endTime;

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

@@ -35,7 +35,7 @@
         <if test="param.sceneName !=null and param.sceneName !=''">
           and  p.scene_name like CONCAT('%',#{param.sceneName},'%')
         </if>
-        <if test="param.isObj !=null and param.isObj ==1">
+        <if test="param.isObj !=null and param.isObj ==1 and param.isLaser==1">
           and  p.is_obj  = #{param.isObj}
         </if>
         UNION ALL
@@ -51,7 +51,7 @@
         <if test="param.sceneName !=null and param.sceneName !=''">
           and  p.title like CONCAT('%',#{param.sceneName},'%')
         </if>
-        <if test="param.isObj !=null and param.isObj ==1">
+        <if test="param.isObj !=null and param.isObj ==1 and param.isLaser==1">
             and  e.is_obj  = #{param.isObj}
         </if>
         ORDER BY create_time desc ,id desc