1

src/main/java/com/fdkankan/manage/controller/CaseController.java

@@ -2,6 +2,8 @@ package com.fdkankan.manage.controller;
 
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.*;
@@ -10,12 +12,11 @@ import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.vo.request.CaseNumType;
 import com.fdkankan.manage.vo.request.CaseParam;
 import com.sun.corba.se.spi.oa.OADestroyed;
+import io.netty.util.internal.UnstableApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -44,24 +45,73 @@ public class CaseController {
     IScenePlusService scenePlusService;
     @Autowired
     IJySceneAuthService jySceneAuthService;
+    @Autowired
+    ISysUserService sysUserService;
+    @Autowired
+    IJyPlatformService jyPlatformService;
+
     @PostMapping("/list")
     public ResultData pageList(@RequestBody CaseParam param){
-        if(param.getIsShare() == 0){
-            return ResultData.ok(caseService.pageList(param));
-        }
-        List<JySceneAuth> sceneAuths = sceneAuthService.getAllCase();
-        List<Integer> caseIds = sceneAuths.stream().map(JySceneAuth::getCaseId).collect(Collectors.toList());
 
+        List<Integer> caseIdAll = new ArrayList<>();
+
+        SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
         JyUser jyUser = jyUserService.getBySysId(StpUtil.getLoginId());
+        if(jyUser == null){
+            throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
+        }
+        //过滤本平台的案件
+        if(byId.getRoleId() == 45L || byId.getRoleId() == 48L){
+            List<JyUser> userIds = jyUserService.getByUserPlatform(jyUser.getPlatformId());
+            List<Long> sysUserIds = userIds.stream().map(JyUser::getSysUserId).collect(Collectors.toList());
+            param.setSysUserIds(sysUserIds);
+        }
+        if(byId.getRoleId() == 47L){
+            param.setSysUserIds(Arrays.asList(byId.getId()));
+        }
 
-        List<JySceneUserAuth> jySceneUserAuths = jySceneUserAuthService.getByJyUserId(jyUser.getId());
-        List<Integer> caseIds2 = jySceneUserAuths.stream().map(JySceneUserAuth::getCaseId).collect(Collectors.toList());
+        List<Integer> openCaseIds = new ArrayList<>();
+        List<Integer> authCaseIds = new ArrayList<>();
+        HashMap<Integer,JySceneUserAuth> authHashMap = new HashMap<>();
+        if(param.getIsShare() == 1){
+            if(byId.getRoleId() !=1 && jyUser.getPlatformId() != null ){
+                openCaseIds = jySceneAuthService.getCaseIdListByPlatform(jyUser.getPlatformId(), 1);
+                if(!openCaseIds.isEmpty()){
+                    caseIdAll.addAll(openCaseIds);
+                }
+            }
+            List<JySceneUserAuth> jySceneUserAuths = jySceneUserAuthService.getByJyUserId(jyUser.getId());
+            jySceneUserAuths.stream().filter(e ->e.getCaseId() != null).forEach( e-> authHashMap.put(e.getCaseId(),e));
+            authCaseIds = jySceneUserAuths.stream().map(JySceneUserAuth::getCaseId).collect(Collectors.toList());
+            if(!authCaseIds.isEmpty()){
+                caseIdAll.addAll(authCaseIds);
+            }
+            param.setCaseIds(caseIdAll);
+            if(caseIdAll.isEmpty()){
+                return ResultData.ok(PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize())));
+            }
+        }
+        Page<Case> page = caseService.pageList(param);
+        Date date = new Date();
+        for (Case record : page.getRecords()) {
+            if(openCaseIds.contains(record.getCaseId())){
+                record.setIsOpen(true);
+            }
 
-        List<Integer> caseIdAll = new ArrayList<>();
-        caseIdAll.addAll(caseIds);
-        caseIdAll.addAll(caseIds2);
-        param.setCaseIds(caseIdAll);
-        return ResultData.ok(caseService.pageList(param));
+            if(authHashMap.containsKey(record.getCaseId())){
+                JySceneUserAuth jySceneUserAuth = authHashMap.get(record.getCaseId());
+                if(jySceneUserAuth.getIsAuthor() == 1 || jySceneUserAuth.getCanAuthLook() == 1 || jySceneUserAuth.getCanEditLook() == 1){
+                    record.setIsAuth(true);
+                }
+                if(jySceneUserAuth.getEditAuth() == 1 ||
+                        (jySceneUserAuth.getEditAuth() == 2 && jySceneUserAuth.getEditEndTime().getTime() >date.getTime())){
+                    record.setIsEdit(true);
+                }
+            }
+
+        }
+
+        return ResultData.ok(PageInfo.PageInfo(page));
     }
 
     @GetMapping("/sceneList")

src/main/java/com/fdkankan/manage/controller/DictController.java

@@ -4,6 +4,8 @@ package com.fdkankan.manage.controller;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.Dict;
 import com.fdkankan.manage.service.IDictService;
+import com.fdkankan.manage.vo.request.DictFileParam;
+import com.fdkankan.manage.vo.request.DictParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,6 +29,12 @@ public class DictController extends BaseController{
         return ResultData.ok(dictService.getByKey(dictKey));
     }
 
+    @PostMapping("/pageList/{dictKey}")
+    public ResultData pageList(@RequestBody DictParam param, @PathVariable String dictKey){
+        param.setDictKey(dictKey);
+        return ResultData.ok(dictService.pageList(param));
+    }
+
     @PostMapping("/addOrUpdate/{dictKey}")
     public ResultData addOrUpdate(@RequestBody Dict dict,@PathVariable String dictKey){
         dict.setSysUserId(getUserId());

src/main/java/com/fdkankan/manage/entity/Case.java

@@ -116,5 +116,12 @@ public class Case implements Serializable {
     @TableField("criminal_case")
     private Integer criminalCase;
 
+    @TableField(exist = false)
+    private Boolean isOpen = false;
 
+    @TableField(exist = false)
+    private Boolean isEdit = false;
+
+    @TableField(exist = false)
+    private Boolean isAuth = false;
 }

src/main/java/com/fdkankan/manage/mapper/IJySceneAuthMapper.java

@@ -19,4 +19,5 @@ import java.util.List;
 public interface IJySceneAuthMapper extends BaseMapper<JySceneAuth> {
 
     List<JySceneAuth> getNumListByPlatform(@Param("platformId") Integer platformId,@Param("authType") Integer authType);
+    List<JySceneAuth> getCaseIdListByPlatform(@Param("platformId") Integer platformId,@Param("authType") Integer authType);
 }

src/main/java/com/fdkankan/manage/service/ICaseService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.Case;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.CaseParam;
@@ -18,7 +19,7 @@ import java.util.List;
 
 public interface ICaseService extends IService<Case> {
 
-    Object pageList(CaseParam param);
+    Page<Case> pageList(CaseParam param);
 
     void addOrUpdate(CaseParam param);
 

src/main/java/com/fdkankan/manage/service/IDictFileService.java

@@ -20,4 +20,6 @@ public interface IDictFileService extends IService<DictFile> {
     void addOrUpdate(DictFile dictFile);
 
     void del(DictFile dictFile);
+
+    void updateDictId(Integer dictId, Integer UpDictId);
 }

src/main/java/com/fdkankan/manage/service/IDictService.java

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service;
 
 import com.fdkankan.manage.entity.Dict;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.DictParam;
 
 import java.util.List;
 
@@ -20,4 +21,6 @@ public interface IDictService extends IService<Dict> {
     void addOrUpdate(Dict dict);
 
     void del(Dict dict);
+
+    Object pageList(DictParam param);
 }

src/main/java/com/fdkankan/manage/service/IJySceneAuthService.java

@@ -31,6 +31,7 @@ public interface IJySceneAuthService extends IService<JySceneAuth> {
     List<JySceneAuth> getAllCase();
 
     List<String> getNumListByPlatform(Integer platformId, Integer authType);
+    List<Integer> getCaseIdListByPlatform(Integer platformId, Integer authType);
 
     void delByNumList(List<String> numList);
 }

src/main/java/com/fdkankan/manage/service/IJyUserService.java

@@ -44,6 +44,7 @@ public interface IJyUserService extends IService<JyUser> {
     void updatePlatformIdByPlatformId(Integer id, Integer id1);
 
     List<Long> getByUserIdPlatform(Integer loginPlatformId);
+    List<JyUser> getByUserPlatform(Integer loginPlatformId);
 
     void del(Integer id);
 

src/main/java/com/fdkankan/manage/service/impl/CaseServiceImpl.java

@@ -19,6 +19,7 @@ import com.fdkankan.manage.vo.request.CaseParam;
 import com.fdkankan.manage.vo.response.SceneAuthVo;
 import com.fdkankan.manage.vo.response.UserAuthSceneVo;
 import org.apache.commons.lang3.StringUtils;
+import org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,23 +47,21 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, Case> implements I
 
 
     @Override
-    public Object pageList(CaseParam param) {
+    public Page<Case> pageList(CaseParam param) {
         LambdaQueryWrapper<Case> wrapper = new LambdaQueryWrapper<>();
-        if(param.getIsShare() == 0){
-            wrapper.eq(Case::getSysUserId,StpUtil.getLoginId());
-        }
         if(StringUtils.isNotBlank(param.getCaseTitle())){
             wrapper.like(Case::getCaseTitle,param.getCaseTitle());
         }
-        if(param.getIsShare() == 1){
-            if(param.getCaseIds().isEmpty()){
-                return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
-            }
+        if(param.getCaseIds() != null && !param.getCaseIds().isEmpty()){
             wrapper.in(Case::getCaseId,param.getCaseIds());
+        }else {
+            if(param.getSysUserIds() != null && !param.getSysUserIds().isEmpty()){
+                wrapper.in(Case::getSysUserId,param.getSysUserIds());
+            }
         }
         wrapper.orderByDesc(Case::getCaseId);
         Page<Case> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
-        return PageInfo.PageInfo(page);
+        return page;
     }
 
     @Override

src/main/java/com/fdkankan/manage/service/impl/CommonServiceImpl.java

@@ -142,6 +142,9 @@ public class CommonServiceImpl implements ICommonService {
         if(FileWriterUtil.isChinese(modelFile.getName())){
             throw new BusinessException(ResultCode.FILE_TYPE_ERROR2);
         }
+        if(FileWriterUtil.isChinese(modelFile.getPath())){
+            throw new BusinessException(ResultCode.FILE_TYPE_ERROR2);
+        }
         String modelFileFormat = modelFile.getName().split("\\.")[1].toLowerCase();
         String url = null;
         String resultFormat = modelFileFormat;

src/main/java/com/fdkankan/manage/service/impl/DictFileServiceImpl.java

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
@@ -70,4 +71,12 @@ public class DictFileServiceImpl extends ServiceImpl<IDictFileMapper, DictFile>
         }
         this.removeById(dictFile.getId());
     }
+
+    @Override
+    public void updateDictId(Integer dictId, Integer UpDictId) {
+        LambdaUpdateWrapper<DictFile> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(DictFile::getDictId,dictId);
+        wrapper.set(DictFile::getDictId,UpDictId);
+        this.update(wrapper);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/DictServiceImpl.java

@@ -2,13 +2,18 @@ package com.fdkankan.manage.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.Dict;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IDictMapper;
+import com.fdkankan.manage.service.IDictFileService;
 import com.fdkankan.manage.service.IDictService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.vo.request.DictParam;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -24,6 +29,9 @@ import java.util.List;
 @Service
 public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements IDictService {
 
+    @Autowired
+    IDictFileService dictFileService;
+
     @Override
     public List<Dict> getByKey(String dictKey) {
         if(StringUtils.isBlank(dictKey)){
@@ -38,6 +46,23 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
     }
 
     @Override
+    public Object pageList(DictParam param) {
+        if(StringUtils.isBlank(param.getDictKey())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        LambdaQueryWrapper<Dict> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Dict::getDictKey,param.getDictKey());
+        if(StringUtils.isNotBlank(param.getDictName())){
+            wrapper.like(Dict::getDictName,param.getDictName());
+        }
+        wrapper.eq(Dict::getSysUserId, StpUtil.getLoginId());
+        wrapper.orderByAsc(Dict::getSort);
+        wrapper.orderByDesc(Dict::getId);
+        Page<Dict> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        return PageInfo.PageInfo(page);
+    }
+
+    @Override
     public void addOrUpdate(Dict dict) {
         if(StringUtils.isBlank(dict.getDictName()) || StringUtils.isBlank(dict.getDictKey())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -50,6 +75,8 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
         if(dict.getId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        dictFileService.updateDictId(dict.getId(),null);
         this.removeById(dict.getId());
+
     }
 }

src/main/java/com/fdkankan/manage/service/impl/JySceneAuthServiceImpl.java

@@ -64,6 +64,11 @@ public class JySceneAuthServiceImpl extends ServiceImpl<IJySceneAuthMapper, JySc
         List<JySceneAuth>  list = this.getBaseMapper().getNumListByPlatform(platformId,authType);
         return list.stream().map(JySceneAuth::getNum).collect(Collectors.toList());
     }
+    @Override
+    public List<Integer> getCaseIdListByPlatform(Integer platformId, Integer authType) {
+        List<JySceneAuth>  list = this.getBaseMapper().getCaseIdListByPlatform(platformId,authType);
+        return list.stream().map(JySceneAuth::getCaseId).collect(Collectors.toList());
+    }
 
     @Override
     public void updateAuthTypeByNum(String num, Integer authType) {
@@ -105,6 +110,7 @@ public class JySceneAuthServiceImpl extends ServiceImpl<IJySceneAuthMapper, JySc
     @Override
     public List<JySceneAuth> getAllCase() {
         LambdaQueryWrapper<JySceneAuth> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JySceneAuth::getAuthType,1);
         wrapper.isNotNull(JySceneAuth::getCaseId);
         return this.list(wrapper);
     }

src/main/java/com/fdkankan/manage/service/impl/JySceneUserAuthServiceImpl.java

@@ -550,7 +550,13 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         JyUser jyUser = jyUserService.getBySysId(byId.getId());
         //if(jySceneAuth != null  && jySceneAuth.getAuthType() == 0){
         if(jySceneAuth != null  ){
-            JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), num,jySceneAuth.getAuthType());
+            JySceneUserAuth jySceneUserAuth = null;
+            if(StringUtils.isNotBlank(num)){
+                jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), num,jySceneAuth.getAuthType());
+            }
+            if(caseId != null){
+                jySceneUserAuth = jySceneUserAuthService.getByCaseIdAndJyUserId(jyUser.getId(), caseId,jySceneAuth.getAuthType());
+            }
             setFlag(jySceneUserAuth,sceneAuthVo);
             if(caseList != null && !caseList.isEmpty()){
                 for (Case aCase : caseList) {

src/main/java/com/fdkankan/manage/service/impl/JyUserServiceImpl.java

@@ -150,6 +150,16 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
         }
         return list.stream().map(JyUser::getUserId).collect(Collectors.toList());
     }
+    @Override
+    public List<JyUser> getByUserPlatform(Integer loginPlatformId) {
+        LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyUser::getPlatformId,loginPlatformId);
+        List<JyUser> list = this.list(wrapper);
+        if(list.isEmpty()){
+            return new ArrayList<>();
+        }
+        return list;
+    }
 
     @Override
     public void del(Integer id) {

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

@@ -376,19 +376,23 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         HashMap<String,SceneCopyLog> map =  copyLogService.getByNewNumList(numList);
 
         for (SceneVo record : page.getRecords()) {
-            if(record.getSceneSource() == 4 || record.getSceneSource() == 5){
-                JSONObject ssObj = laserMap.get(record.getNum());
-                if(ssObj!=null){
-                    record.setId(ssObj.getInteger("id"));
-                    record.setSceneName(ssObj.getString("title"));
-                    record.setThumb(ssObj.getString("thumb"));
-                    record.setWebSite(ssObj.getString("web_site"));
-                    record.setViewCount(ssObj.getInteger("view_count"));
-                    record.setStatus(laserService.toFdStatus(ssObj.getInteger("status")));
-                    record.setAlgorithmTime(ssObj.getString("algorithm_time"));
-                }else if(record.getStatus() != 0){
-                    record.setStatus(-1);
-                    record.setWebSite(null);
+            if( param.getType() == null || param.getType() == 2 || param.getType() == 6 ){
+                if(param.getIsObj() == null || param.getIsObj() == 0){
+                    if(record.getSceneSource() == 4 || record.getSceneSource() == 5){
+                        JSONObject ssObj = laserMap.get(record.getNum());
+                        if(ssObj!=null){
+                            record.setId(ssObj.getInteger("id"));
+                            record.setSceneName(ssObj.getString("title"));
+                            record.setThumb(ssObj.getString("thumb"));
+                            record.setWebSite(ssObj.getString("web_site"));
+                            record.setViewCount(ssObj.getInteger("view_count"));
+                            record.setStatus(laserService.toFdStatus(ssObj.getInteger("status")));
+                            record.setAlgorithmTime(ssObj.getString("algorithm_time"));
+                        }else if(record.getStatus() != 0){
+                            record.setStatus(-1);
+                            record.setWebSite(null);
+                        }
+                    }
                 }
             }
 
@@ -429,11 +433,24 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }else {
                 record.setIsShare(true);
             }
-
+            record.setType( param.getType() == null ?setSceneType(record.getSceneSource(),record.getThreeCamType()) : param.getType());
         }
         return PageInfo.PageInfo(page);
     }
 
+    private Integer setSceneType(Integer sceneSource,String threeCamType) {
+        if(sceneSource == 3 ){
+            return 1;
+        }
+        if(sceneSource == 4 ){
+            return 2;
+        }
+        if(sceneSource == 5 ){
+            return 6;
+        }
+        return StringUtils.isBlank(threeCamType) ? 0 : 8;
+    }
+
 
     @Override
     public Object sceneCount() {

src/main/java/com/fdkankan/manage/vo/request/CaseParam.java

@@ -26,6 +26,7 @@ public class CaseParam extends RequestBase{
     private Integer isShare =0;
 
     private List<Integer> caseIds;
+    private List<Long> sysUserIds;
 
     private String ryId;
 }

src/main/java/com/fdkankan/manage/vo/request/DictParam.java

@@ -0,0 +1,9 @@
+package com.fdkankan.manage.vo.request;
+
+import lombok.Data;
+
+@Data
+public class DictParam extends RequestBase{
+    private String dictName;
+    private String dictKey;
+}

src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -47,4 +47,8 @@ public class SceneVo {
 
     private Integer sceneSource;
 
+    private Integer type;
+
+    private String threeCamType;
+
 }

src/main/resources/mapper/manage/JySceneAuthMapper.xml

@@ -15,4 +15,18 @@
         </if>
 
     </select>
+
+    <select id="getCaseIdListByPlatform" resultType="com.fdkankan.manage.entity.JySceneAuth">
+        SELECT au.* from 4dkankan_v4.jy_scene_auth au
+        LEFT JOIN fd_fusion.t_case s on au.case_id = s.case_id
+        LEFT JOIN 4dkankan_v4.jy_user ju on s.sys_user_id = ju.sys_user_id
+        WHERE au.rec_status = 'A'
+        <if test="platformId != null">
+            and  ju.platform_id = #{platformId}
+        </if>
+        <if test="authType != null">
+            and  au.auth_type = #{authType}
+        </if>
+
+    </select>
 </mapper>

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

@@ -30,7 +30,7 @@
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.SceneVo">
         select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
         ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site , e.thumb
-        ,algorithm_time,s.user_id,jy.platform_id,s.scene_source
+        ,algorithm_time,s.user_id,jy.platform_id,s.scene_source,s.three_cam_type
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         left join t_user u on s.user_id = u.id
@@ -105,6 +105,7 @@
         </if>
         <if test="param.type !=null and param.type == 0 ">
             and s.scene_source in (1,2,12,13,14)
+            and s.three_cam_type is null
         </if>
         <if test="param.type !=null and param.type == 8 ">
             and s.scene_source = 1