111

4dkankan-center-scene/pom.xml

@@ -82,6 +82,13 @@
             <version>6.8.1</version>
         </dependency>
 
+        <!--hibernate-validator-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+
     </dependencies>
 
     <build>

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneAppController.java

@@ -1,14 +1,10 @@
 package com.fdkankan.scene.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.controller.BaseController;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.service.ISceneFileBuildService;
 import com.fdkankan.scene.service.ISceneProAppService;
-import com.fdkankan.scene.vo.BuildSceneParamVO;
 import com.fdkankan.scene.vo.SceneParamVO;
-import com.fdkankan.scene.vo.SceneVO;
-import com.fdkankan.scene.vo.UserParamVO;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,9 +12,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by Hb_zzZ on 2019/6/10.
  */
@@ -33,80 +26,6 @@ public class SceneAppController extends BaseController {
     private ISceneFileBuildService sceneFileBuildService;
 
     /**
-     * <p>
-     获取相机的所有场景（分页）
-     * </p>      
-     * @author dengsixing
-     * @date 2022/1/13 
-     * @param param 
-     *  <p>appUserName: 相机设备码</p>
-     *  <p>appPassword: 相机密码</p>
-     *  <p>phoneNum: 用户手机号</p>
-     *  <p>cameraType: 1表示双目，4表示8目</p>
-     *  <p>orderBy: 排序，如（create_time desc）</p>
-     *  <p>sceneType：0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居</p>
-     *  <p>sceneName: 场景名称，模糊搜索</p>
-     *  <p>pageNum: 页码</p>
-     *  <p>pageSize: 页大小</p>
-     * @return com.fdkankan.common.response.ResultData<com.fdkankan.scene.vo.SceneVO>
-     *     
-     **/
-    @PostMapping(value = "/getAppAllSceneByPage")
-    public Page<SceneVO> getAllSceneByPage(@RequestBody UserParamVO param) throws Exception {
-        return sceneProAppService.getAllSceneByPage(param);
-    }
-
-    /**
-     * 获取相机的所有场景
-     * @param user
-     * @return
-     */
-    @PostMapping(value = "/getAllForCameraName")
-    public List<SceneVO> getAllForCameraName(@RequestBody UserParamVO user){
-        return sceneProAppService.getAllForCameraName(user);
-    }
-
-    /**
-     * 获取相机的场景数量
-     * @param user
-     * @return
-     */
-    @PostMapping(value = "/getSceneCount")
-    public Long getSceneCount(@RequestBody UserParamVO user) throws Exception {
-        return sceneProAppService.getSceneCount(user);
-    }
-
-    /**
-     * 获取场景的状态
-     * @param user
-     * @return
-     */
-    @PostMapping(value = "/getSceneStatus")
-    public Integer getSceneStatus(@RequestBody UserParamVO user) throws Exception {
-        return sceneProAppService.getSceneStatus(user);
-    }
-
-    /**
-     * 获取8目场景的状态
-     * @param user
-     * @return
-     */
-    @PostMapping(value = "/getSceneStatusByUnicode")
-    public Map<String, Object> getSceneStatusByUnicode(@RequestBody UserParamVO user) throws Exception {
-        return sceneProAppService.getSceneStatusByUnicode(user);
-    }
-
-    /**
-     * 删除某个场景
-     * @param user
-     * @return
-     */
-    @PostMapping(value = "/deleteForCameraName")
-    public ResultData deleteForCameraName(@RequestBody UserParamVO user) throws Exception {
-        return sceneProAppService.deleteForCameraName(user);
-    }
-
-    /**
      * app保存录屏音频文件
      * @param scene
      * @return
@@ -115,33 +34,4 @@ public class SceneAppController extends BaseController {
     public ResultData getScreencapVoice(@RequestBody SceneParamVO scene) throws Exception {
         return sceneProAppService.getScreencapVoice(scene);
     }
-
-    /**
-     * app获取用户所有场景
-     * @param user
-     * @return
-     */
-    @PostMapping(value = "/getAllSceneByUserName")
-    public List<SceneVO> getAllSceneByUserName(@RequestBody UserParamVO user) throws Exception {
-        return sceneProAppService.getAllSceneByUserName(user);
-    }
-
-    /**
-     * 场景建模
-     */
-    @PostMapping(value = "/buildScene")
-    public ResultData buildScene(@RequestBody BuildSceneParamVO buildScene) throws Exception {
-        return sceneFileBuildService.buildScene(buildScene);
-    }
-
-    /**
-     * 协作的场景
-     * @return
-     */
-    @PostMapping(value = "/cooperationSceneList")
-    public ResultData cooperationSceneList(@RequestBody UserParamVO user) throws Exception{
-        return sceneProAppService.cooperationSceneList(user);
-    }
-
-
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneCooperationController.java

@@ -1,28 +1,17 @@
 package com.fdkankan.scene.controller;
 
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.controller.BaseController;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.user.SSOLoginHelper;
-import com.fdkankan.common.user.SSOUser;
-import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.common.util.PageInfoUtils;
 import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.service.IFolderService;
 import com.fdkankan.scene.service.ISceneCooperationService;
-import com.fdkankan.scene.vo.SceneCooperationParamVO;
-import com.fdkankan.scene.vo.SceneParamVO;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -44,46 +33,6 @@ public class SceneCooperationController extends BaseController {
     @Autowired
     private IFolderService folderService;
 
-    /**
-     * 协作者根据场景码获取场景资源集合
-     * @return
-     */
-    @RequestMapping(value = "/sceneResourceBySceneNum")
-    public ResultData sceneResourceBySceneNum(@RequestBody SceneCooperationParamVO param) throws Exception{
-        SSOUser ssoUser = ssoLoginHelper.loginCheck(getToken());
-
-        if(StrUtil.isEmpty(param.getNum())){
-            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-        }
-
-        // 解密获得username，用于和数据库进行对比
-        String username = JwtUtil.getUsername(getToken());
-
-        param.setUserId(ssoUser.getId());
-        param.setUserName(username);
-
-        return sceneCooperationService.sceneResourceBySceneNum(param);
-    }
-
-    /**
-     * 协作的场景--文件夹形式
-     * @return
-     */
-    @RequestMapping(value = "/cooperationSceneListNew", method = RequestMethod.POST)
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(name = "pageNum", value = "分页", dataType = "number"),
-//        @ApiImplicitParam(name = "sceneSource", value = "1表示八目，2双目", dataType = "number"),
-//        @ApiImplicitParam(name = "sceneType", value = "场景类型,0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居", dataType = "number"),
-//        @ApiImplicitParam(name = "folderType", value = "文件夹类型：0场景，1协作场景", dataType = "String"),
-//        @ApiImplicitParam(name = "startTime", value = "开始时间", dataType = "String"),
-//        @ApiImplicitParam(name = "endTime", value = "结束时间", dataType = "String"),
-//        @ApiImplicitParam(name = "pageSize", value = "每页大小", dataType = "number")})
-    public Page cooperationSceneListNew(@RequestBody SceneParamVO param) throws Exception{
-        Long userId = this.getUserId();
-        param.setUserId(userId);
-        return sceneCooperationService.cooperationSceneListNew(param);
-    }
-
 
     @PostMapping("/test")
     public Page test(int pageNum, int pageSize){

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneFileController.java

@@ -1,15 +1,13 @@
 package com.fdkankan.scene.controller;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fdkankan.common.controller.BaseController;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.redis.util.RedisLockUtil;
-import com.fdkankan.scene.service.*;
+import com.fdkankan.scene.service.ISceneFileBuildService;
 import com.fdkankan.scene.vo.ResponseSceneFile;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -104,39 +102,6 @@ public class SceneFileController extends BaseController {
     }
 
     /**
-     * 更新fileid文件的上传状态  -- 作废
-     *
-     * @param params
-     * @return
-     */
-    @PostMapping("uploadSuccess")
-    public ResultData uploadSuccess(String params) throws Exception {
-        return sceneFileBuildService.uploadSuccess(params);
-    }
-
-    /**
-     * 更新fileid文件的上传状态  - 后端八目上传逻辑
-     *
-     * @param params
-     * @return
-     */
-    @PostMapping("uploadSuccessBuild")
-    public ResultData uploadSuccessBuild(String params) throws Exception {
-        return sceneFileBuildService.uploadSuccessBuild(params);
-    }
-
-    /**
-     *
-     *
-     * @param params
-     * @return
-     */
-    @PostMapping("turntableUploadSuccess")
-    public ResultData turntableUploadSuccess(String params) throws Exception {
-        return sceneFileBuildService.turntableUploadSuccess(params);
-    }
-
-    /**
      * 获取亚马逊S3文件上传url
      *
      * @return
@@ -146,37 +111,4 @@ public class SceneFileController extends BaseController {
         return sceneFileBuildService.getS3UploadUrl(params);
     }
 
-    /**
-     * 计算双目场景 - 新双目相机上传 小红屋
-     *
-     * @return
-     */
-//    @ApiOperation("计算双目场景 - 新双目相机上传 小红屋")
-    @PostMapping("buildLiteScene")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "prefix", value = "文件下载前缀,结尾不加/", dataType = "String"),
-//            @ApiImplicitParam(name = "dataFdage", value = "dataFdage", dataType = "String"),
-//            @ApiImplicitParam(name = "zipName", value = "zip文件包名称", dataType = "String"),
-//            @ApiImplicitParam(name = "password", value = "密码", dataType = "String"),
-//            @ApiImplicitParam(name = "userName", value = "用户名", dataType = "String")})
-    public ResultData buildLiteScene(String prefix, String dataFdage, String zipName, String userName, String password, String oldNum) throws Exception{
-        return sceneFileBuildService.buildLiteScene(prefix, dataFdage, zipName, userName, password, oldNum);
-
-
-    }
-
-    /**
-     * 获取亚马逊S3文件上传url
-     * @return
-     */
-    @PostMapping("buildScene")
-//    @ApiOperation("获取亚马逊S3文件上传url")
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(name = "unicode", value = "unicode文件夹", dataType = "String"),
-//            @ApiImplicitParam(name = "zip", value = "zip包的名称", dataType = "String"),
-//            @ApiImplicitParam(name = "dataFdage", value = "dataFdage名称", dataType = "String")})
-    public ResultData buildScene(String prefix, String unicode, String zip, String dataFdage) throws Exception{
-        return sceneFileBuildService.buildScene(prefix, unicode, zip, dataFdage);
-    }
-
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/TestController.java

@@ -1,228 +0,0 @@
-package com.fdkankan.scene.controller;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.constant.UploadFilePath;
-import com.fdkankan.common.controller.BaseController;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.SpringUtil;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.platform.api.dto.Camera;
-import com.fdkankan.platform.api.dto.Company;
-import com.fdkankan.platform.api.dto.User;
-import com.fdkankan.platform.api.feign.PlatformGoodsClient;
-import com.fdkankan.platform.api.feign.PlatformUserClient;
-import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
-import com.fdkankan.rabbitmq.config.ModelingQueueConfig;
-import com.fdkankan.rabbitmq.util.RabbitMqProducer;
-import com.fdkankan.redis.util.RedisLockUtil;
-import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.scene.service.IFolderService;
-import com.fdkankan.scene.service.IScene3dNumService;
-import com.fdkankan.scene.service.ISceneService;
-import com.google.common.collect.Lists;
-import com.yomahub.tlog.task.spring.SpringScheduledTaskAop;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.sql.DataSource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RefreshScope
-@RestController
-@RequestMapping("/service/scene/test")
-@Slf4j
-public class TestController extends BaseController {
-
-
-
-    @Autowired
-    RedisUtil redisUtil;
-
-    @Autowired
-    IFolderService folderService;
-
-    @GetMapping("/testdb")
-    public List testdb(){
-        return folderService.list();
-    }
-
-    @Autowired
-    private PlatformUserClient platformUserClient;
-
-    @Autowired
-    private PlatformGoodsClient platformGoodsClient;
-
-    @Autowired
-    private IScene3dNumService scene3dNumService;
-
-    @Autowired
-    RedisTemplate redisTemplate;
-
-    @Autowired
-    RedisLockUtil redisLockUtil;
-
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
-
-    @Autowired
-    ModelingQueueConfig modelingQueueConfig;
-    @Autowired
-    private RabbitMqProducer rabbitMqProducer;
-
-    @Autowired
-    private UploadToOssUtil uploadToOssUtil;
-
-
-
-    @GetMapping("/test")
-    public ResultData test() throws Exception {
-
-        uploadToOssUtil.deleteFile("test_dsx");
-
-        return ResultData.ok();
-
-    }
-
-    public static void main(String[] args) throws Exception {
-
-//        MatrixToImageWriterUtil.createQRCode("http://baidu.com" + "123123", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+"123123"+".png",
-//                ConstantFilePath.SCENE_PATH + "images/images" + "123123" + "/QRShareLogo.png");
-    }
-
-    @GetMapping("/testSetStr")
-    public void testSetStr() throws Exception {
-        redisUtil.set("testIncr", "1");
-        redisUtil.incr("testIncr",1);
-        String testIncr = redisUtil.get("testIncr");
-        System.out.println(testIncr);
-
-
-    }
-
-    @GetMapping("/testGetStr")
-    public String testGetStr() throws Exception {
-        boolean b = redisUtil.hasKey("90c82bdac_202201050951313830");
-        String abc = (String)redisUtil.get("abc");
-        return "123";
-    }
-
-    @GetMapping("/testSetObject")
-    public boolean testSetObject() throws Exception {
-//        User user = new User();
-//        user.setCity("珠海");
-//        user.setId(123l);
-//
-//        String jsons = JSON.toJSONString(user);
-//
-//        redisTemplate.opsForValue().set("test:66", jsons);
-//        redisTemplate.opsForValue().set("test:67", jsons);
-
-        ResultData<Camera>  cameraById = platformGoodsClient.getCameraById(111L);
-
-        Camera data = cameraById.getData();
-
-        ResultData<Company> companyById = platformUserClient.getCompanyById(111L);
-
-
-
-
-
-
-        return true;
-    }
-
-//
-    @GetMapping("/testGetObject")
-    public User testGetObject() throws Exception {
-        String test12 = redisUtil.get("test66");
-        User user = JSONObject.parseObject(test12, User.class);
-        return user;
-    }
-
-
-    @GetMapping("/testSetList")
-    public boolean testSetList() throws Exception {
-
-        List<String> users = Lists.newArrayList();
-        users.add("sdfsdf");
-        users.add("dfgdfg");
-        return redisUtil.lRightPushAll("test5595jj", users);
-    }
-
-    @GetMapping("/testGetList")
-    public List<String> testGetList() throws Exception {
-        return redisUtil.lGet("test5595jj", 0, -1);
-    }
-
-    @GetMapping("/testSetMap")
-    public boolean testSetMap() throws Exception {
-
-        Map<String, User> userMap = new HashMap<>();
-
-        User user1 = new User();
-        user1.setCity("珠海");
-        user1.setId(123l);
-
-        User user2 = new User();
-        user2.setCity("广州");
-        user2.setId(124l);
-
-        userMap.put("user1", user1);
-        userMap.put("user2", user2);
-
-
-        return redisUtil.hmset("userMap", userMap);
-    }
-
-    @GetMapping("/testGetMap")
-    public Map<String ,User> testGetMap() throws Exception {
-        return redisUtil.hmget("userMap");
-    }
-
-    @Autowired
-    ISceneService sceneService;
-
-    @GetMapping("/testSchedule")
-    public void testSchedule(){
-        sceneService.updatePv();
-    }
-
-    @RefreshScope
-    @GetMapping("/testResult")
-    public void testResult(){
-//        rocketMQProducer.sendOneWay("topic_modeling_a_result", BuildSceneResultMqMessage.builder().buildSuccess(true).cameraType("3").build());
-        String dsfsdf = (String) redisUtil.get("dsfsdf");
-        System.out.println(2134);
-
-    }
-
-    @Autowired
-    DataSource dataSource;
-
-    @GetMapping("/testDatasource")
-    public void testDatasource() throws SQLException {
-//        Connection connection = dataSource.getConnection();
-//        System.out.println(connection);
-
-        System.out.println(dataSource.getClass());
-        DruidDataSource druidDataSource = (DruidDataSource) dataSource;
-        System.out.println(druidDataSource.getName());
-        System.out.println("druidDataSource 数据源最大连接数：" + druidDataSource.getMaxActive());
-        System.out.println("druidDataSource 数据源初始化连接数：" + druidDataSource.getInitialSize());
-
-//        connection.close();
-
-    }
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/UserSceneController.java

@@ -1,13 +1,9 @@
 package com.fdkankan.scene.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.controller.BaseController;
-import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.service.IUserSceneService;
 import com.fdkankan.scene.vo.SceneDownloadParamVO;
-import com.fdkankan.scene.vo.SceneParamVO;
-import com.fdkankan.scene.vo.SceneVO;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -27,17 +23,6 @@ public class UserSceneController extends BaseController {
 
     @Autowired
     private IUserSceneService userSceneService;
-    /**
-     * 获取用户场景记录
-     * pageNum          分页
-     * searchKey        搜索条件
-     * pageSize         每页大小
-     */
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Page<SceneVO> getScenes(@RequestBody SceneParamVO param) throws Exception {
-        return userSceneService.getScenes(getToken(), param);
-
-    }
 
     /**
      * 获取我的场景和协作场景数量
@@ -49,17 +34,6 @@ public class UserSceneController extends BaseController {
     }
 
     /**
-     * 获取用户场景记录
-     * @param param
-     * @return
-     */
-    @RequestMapping(value = "/newList", method = RequestMethod.POST)
-    public ResultData<PageInfo<SceneVO>> getNewScenes(@RequestBody SceneParamVO param) throws Exception {
-        param.setUserId(this.getUserId());
-        return userSceneService.getNewScenes( param);
-    }
-
-    /**
      * 校验该场景有无下载资格
      * @param param
      * @return
@@ -69,15 +43,6 @@ public class UserSceneController extends BaseController {
         return userSceneService.checkDownload(this.getUserId(), param);
     }
 
-    /**
-     * 场景下载
-     * @param param
-     * @return
-     */
-    @PostMapping(value = "/downloadScene")
-    public ResultData downloadScene(@RequestBody @Validated SceneDownloadParamVO param) throws Exception{
-        return userSceneService.downloadScene(this.getUserId(), param);
-    }
 
     /**
      * 获取下载进度

4dkankan-center-scene/src/main/java/com/fdkankan/scene/feign/UserSceenFeign.java

@@ -1,217 +0,0 @@
-package com.fdkankan.scene.feign;
-
-import com.aliyuncs.utils.StringUtils;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.scene.api.dto.SceneCntDTO;
-import com.fdkankan.scene.api.dto.SceneInfoDTO;
-import com.fdkankan.scene.api.dto.ScenePODTO;
-import com.fdkankan.scene.api.dto.SceneProDTO;
-import com.fdkankan.scene.entity.SceneCooperation;
-import com.fdkankan.scene.entity.ScenePO;
-import com.fdkankan.scene.entity.SceneProPO;
-import com.fdkankan.scene.service.*;
-import com.fdkankan.scene.vo.SceneInfoParamVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 提供计算调用
- */
-@RestController
-@RequestMapping("/feign/user/scene")
-@Slf4j
-public class UserSceenFeign {
-
-    @Autowired
-    IUserSceneService userSceneService;
-    @Autowired
-    ISceneDownloadLogService sceneDownloadLogService;
-    @Autowired
-    ISceneEditInfoService sceneEditInfoService;
-    @Autowired
-    ISceneService sceneService;
-    @Autowired
-    ISceneProService sceneProService;
-    @Autowired
-    ISceneResourceCameraService sceneResourceCameraService;
-    @Autowired
-    ISceneResourceCooperationService sceneResourceCooperationService;
-    @Autowired
-    ISceneCooperationService sceneCooperationService;
-    @Autowired
-    IFdkkLaserService fdkkLaserService;
-    @Autowired
-    ISceneProEditService sceneProEditService;
-    @Autowired
-    ISceneResourceService sceneResourceService;
-
-    @PostMapping("/getSceneCnt")
-    ResultData<SceneCntDTO> getSceneCnt(@RequestParam(value = "userId") Long userId, Long cameraId){
-        SceneCntDTO sceneCntDTO = userSceneService.getSceneCnt(userId, cameraId);
-        return ResultData.ok(sceneCntDTO);
-    }
-
-    @PostMapping("/getSceneNumByCameraId")
-    ResultData<Integer> getSceneNumByCameraId(@RequestParam(value = "cameraId") Long cameraId,
-                                              @RequestParam(value = "cameraType")Integer cameraType,
-                                              @RequestParam(value = "snCode")String snCode) {
-        Integer sceneNum = userSceneService.getSceneNumByCameraId(cameraId,cameraType,snCode);
-        return ResultData.ok(sceneNum);
-    }
-
-    @PostMapping("/getLastSceneByCameraId")
-    ResultData<SceneProDTO> getLastSceneByCameraId(@RequestParam(value = "cameraId") Long cameraId){
-        return ResultData.ok(userSceneService.getLastSceneByCameraId(cameraId));
-    }
-
-    @PostMapping("/updateSceneDownloadLog")
-    ResultData updateSceneDownloadLog(@RequestParam(value = "num") String num,
-        @RequestParam(value = "status") Integer status, String url, String reason){
-        sceneDownloadLogService.updateSceneDownloadLog(num, status, url, reason);
-        return ResultData.ok();
-    }
-
-    @PostMapping("/getSceneViewInfo")
-    ResultData<SceneInfoDTO> getSceneViewInfo(@RequestParam(value = "num") String num) throws Exception{
-        return ResultData.ok(
-            sceneEditInfoService.getSceneInfo4Download(
-                SceneInfoParamVO.builder().num(num).build()));
-    }
-    @Autowired
-    private ISceneProAppService sceneProAppService;
-
-    @PostMapping("/lockBeyondSpaceScenes")
-    ResultData lockBeyondSpaceScenes(@RequestParam(value = "usedSpace")Long usedSpace,
-                                     @RequestParam(value = "totalSpace")Long totalSpace,
-                                     @RequestParam(value = "cameraId")Long cameraId) throws Exception{
-        sceneProAppService.lockBeyondSpaceScenes(usedSpace,totalSpace,cameraId);
-        return ResultData.ok();
-    }
-
-    @PostMapping("/unlockBeyondSpaceScenes")
-    ResultData unlockBeyondSpaceScenes(@RequestParam(value = "usedSpace")Long usedSpace,
-                                       @RequestParam(value = "cameraId")Long cameraId) throws Exception{
-        sceneProAppService.unlockBeyondSpaceScenes(usedSpace,cameraId);
-        return ResultData.ok();
-    }
-    @PostMapping("/findAllByYesterday")
-    ResultData<List<ScenePO>> findAllByYesterday() throws Exception{
-        List<ScenePO> allByYesterday = sceneService.findAllByYesterday();
-        List<ScenePODTO> List = new ArrayList<>();
-        for (ScenePO scenePO : allByYesterday) {
-            ScenePODTO scenePODTO = new ScenePODTO();
-            BeanUtils.copyProperties(scenePO,scenePODTO);
-            List.add(scenePODTO);
-        }
-        return ResultData.ok(List);
-    }
-
-    @PostMapping("/updatePayStatus")
-    ResultData updatePayStatus(@RequestParam(value = "num")String num ,
-                               @RequestParam(value = "payStatus")Integer payStatus){
-        sceneService.updatePayStatus(num,payStatus);
-        return ResultData.ok();
-    }
-
-    @PostMapping("/updateUserIdByCameraId")
-    ResultData updateUserIdByCameraId(@RequestParam(value = "userId")Long userId,
-                                      @RequestParam(value = "cameraId")Long cameraId) throws Exception{
-
-        sceneService.updateUserIdByCameraId(userId,cameraId);
-        sceneProService.updateUserIdByCameraId(userId,cameraId);
-        return ResultData.ok();
-    }
-
-    @PostMapping("/getSceneCount")
-    ResultData getSceneCount(@RequestParam(value = "cameraId")Long cameraId,
-                             @RequestParam(value = "userId")Long userId ,
-                             @RequestParam(value = "cameraType")Integer cameraType ) throws Exception{
-        if(cameraId!=null){
-            return ResultData.ok(sceneProService.getSceneCount(cameraId,null));
-        }
-        if(cameraType == null || cameraType != 4){
-            return ResultData.ok(sceneService.getSceneCount(null,userId));
-        }
-        return ResultData.ok(sceneProService.getSceneCount(null,userId));
-    }
-
-
-    @PostMapping("/disableCooperation")
-    ResultData disableCooperation(@RequestParam(value = "cameraId")Long cameraId,
-                                 @RequestParam(value = "snCode")String snCode,
-                                 @RequestParam(value = "cooperationUserName")String cooperationUserName){
-
-        sceneResourceCameraService.deleteByCameraId(cameraId);
-        deleteCooperation(cameraId);
-        if(StringUtils.isEmpty(snCode)){
-            fdkkLaserService.disableCooperation(snCode,cooperationUserName);
-        }
-        return ResultData.ok();
-    }
-
-
-    @PostMapping("/saveCooperation")
-    ResultData saveCooperation(@RequestParam(value = "cameraId") Long cameraId,
-                               @RequestParam(value = "resourceIds") String resourceIds,
-                               @RequestParam(value = "userId") Long userId,
-                               @RequestParam(value = "snCode")String snCode,
-                               @RequestParam(value = "cooperationUserName")String cooperationUserName){
-        sceneResourceCameraService.saveByResourceIds(cameraId,resourceIds);
-        List<SceneProPO> sceneProPOS = deleteCooperation(cameraId);
-        sceneCooperationService.saveByResourceIds(sceneProPOS,cameraId,resourceIds,userId);
-
-        if(StringUtils.isEmpty(snCode)){
-            fdkkLaserService.disableCooperation(snCode,cooperationUserName);
-            fdkkLaserService.enableCameraCooperation(snCode,cooperationUserName);
-        }
-        return ResultData.ok();
-    }
-
-    private List<SceneProPO>  deleteCooperation(Long cameraId){
-        List<SceneProPO> sceneProList = sceneProService.findByCameraIdPro(cameraId);
-        if(!CollectionUtils.isEmpty(sceneProList)) {
-            List<String> numList = sceneProList.stream().map(SceneProPO::getNum).collect(Collectors.toList());
-            List<SceneCooperation> list = sceneCooperationService.getListByNums(numList);
-            List<Long> cooIds = list.parallelStream().map(SceneCooperation::getId).collect(Collectors.toList());
-            if(cooIds.size() >0){
-                //删除相机下每个场景的关联关系
-                sceneResourceCooperationService.deleteByCooperationIds(cooIds);
-                sceneCooperationService.updateRecStatusList(cooIds);
-            }
-        }
-        return sceneProList;
-    }
-
-    @PostMapping("/updateImageVersionFromSceneProEdit")
-    ResultData updateImageVersionFromSceneProEdit(@RequestParam(value = "num" ) String num){
-        sceneProEditService.updateImageVersionByNum(num);
-        return ResultData.ok();
-    }
-
-    @PostMapping("/getSceneResourceByCameraId")
-    ResultData getSceneResourceByCameraId(@RequestParam(value = "cameraId" ) Long cameraId){
-        return ResultData.ok(sceneResourceService.findByCameraId(cameraId));
-    }
-    @PostMapping("/checkDownLoad")
-    ResultData checkDownLoad(@RequestParam(value = "sceneNum") String sceneNum){
-        return sceneProService.checkDownLoad(sceneNum);
-    }
-
-    @PostMapping("/findByCameraIds")
-    ResultData findByCameraIds(@RequestParam(value = "cameraIds") String cameraIds,
-                                      @RequestParam(value = "startTime") String startTime,
-                                      @RequestParam(value = "endTime")   String endTime){
-        return ResultData.ok( sceneProService.findByCameraIds(cameraIds,startTime,endTime));
-    }
-}
-

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneCooperationService.java

@@ -26,12 +26,8 @@ public interface ISceneCooperationService extends IService<SceneCooperation> {
 
     SceneCooperation findBySceneNum(String sceneNum);
 
-    ResultData sceneResourceBySceneNum(SceneCooperationParamVO param) throws Exception;
-
     List<SceneCooperation> getListByUserId(List<Long> userIds);
 
-    Page cooperationSceneListNew(SceneParamVO param) throws Exception;
-
     List<SceneCooperation> getListByNums(List<String> numList);
 
     void updateRecStatusList(List<Long> ids);

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneEditInfoService.java

@@ -1,10 +1,24 @@
 package com.fdkankan.scene.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.scene.api.dto.SceneInfoDTO;
 import com.fdkankan.scene.entity.SceneEditInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.scene.vo.*;
+import com.fdkankan.scene.vo.BallScreenVideoParamVO;
+import com.fdkankan.scene.vo.BaseDataParamVO;
+import com.fdkankan.scene.vo.DeleteLinkPanParamVO;
+import com.fdkankan.scene.vo.DeleteLinkSceneStylesParamVO;
+import com.fdkankan.scene.vo.DeleteSidParamVO;
+import com.fdkankan.scene.vo.DownloadVO;
+import com.fdkankan.scene.vo.FileNameAndDataParamVO;
+import com.fdkankan.scene.vo.FileParamVO;
+import com.fdkankan.scene.vo.RenameCadParamVO;
+import com.fdkankan.scene.vo.SaveLinkPanParamVO;
+import com.fdkankan.scene.vo.SaveUploadParamVO;
+import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
+import com.fdkankan.scene.vo.SceneEditInfoParamVO;
+import com.fdkankan.scene.vo.SceneEditInfoVO;
+import com.fdkankan.scene.vo.SceneInfoParamVO;
+import com.fdkankan.scene.vo.SceneInfoVO;
 import java.io.IOException;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,8 +44,6 @@ public interface ISceneEditInfoService extends IService<SceneEditInfo> {
 
     SceneInfoVO getSceneInfo(SceneInfoParamVO param) throws Exception;
 
-    SceneInfoDTO getSceneInfo4Download(SceneInfoParamVO param) throws Exception;
-
     ResultData saveUpload(SaveUploadParamVO param) throws Exception;
 
     ResultData saveCad(BaseDataParamVO param) throws Exception;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneFileBuildService.java

@@ -33,23 +33,8 @@ public interface ISceneFileBuildService extends IService<SceneFileBuild> {
 
     ResponseSceneFile getProgress(String params) throws Exception;
 
-    ResultData uploadSuccess(String params) throws Exception;
-
-    ResultData uploadSuccessBuild(String params) throws Exception;
-
-    ResultData turntableUploadSuccess(String params) throws Exception;
-
     ResultData getS3UploadUrl(String params) throws Exception;
 
-    ResultData buildLiteScene(String prefix, String dataFdage, String zipName, String userName,
-                              String password, String oldNum) throws Exception;
-
-    ResultData buildScene(String prefix, String unicode, String zip, String dataFdage) throws Exception;
-
-    ResultData buildScene(@RequestBody BuildSceneParamVO buildScene) throws Exception;
-
-    ResultData rebuildScene(String num) throws Exception;
-
     ResultData rebuildVideoScene(RebuildVedioSceneParamVO param) throws Exception;
 
     ResultData rebuildPicScene(@RequestBody RebuildVedioSceneParamVO param) throws Exception;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IScenePlusService.java

@@ -21,8 +21,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     ScenePlus getScenePlusByNum(String num);
 
-    ResultData resetSpace(String num) throws Exception;
-
     ResultData checkKey(SceneCheckKeyParamVO param) throws Exception;
 
     ResultData updateScenePlusUserIdByCameraId(List<Long> cameraIdList, Long userId);

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneProAppService.java

@@ -65,18 +65,6 @@ public interface ISceneProAppService extends IService<ScenePro> {
 
     ResultData deleteUploadBgMusic(String sceneNum) throws Exception;
 
-    Page<SceneVO> getAllSceneByPage(UserParamVO param);
-
-    List<SceneVO> getAllForCameraName(UserParamVO user);
-
-    Long getSceneCount(UserParamVO user);
-
-    Integer getSceneStatus(@RequestBody UserParamVO user);
-
-    Map<String, Object> getSceneStatusByUnicode(UserParamVO user);
-
-    ResultData deleteForCameraName(UserParamVO user) throws Exception;
-
     ResultData deleteScene(String sceneNum) throws Exception;
 
     List<SceneVO> findScenesByUserIdAndSceneScheme(Long cameraId, String orderBy, Integer payStatus);
@@ -88,8 +76,4 @@ public interface ISceneProAppService extends IService<ScenePro> {
 
     ResultData getScreencapVoice(SceneParamVO scene) throws Exception;
 
-    List<SceneVO> getAllSceneByUserName(@RequestBody UserParamVO user) throws Exception;
-
-    ResultData cooperationSceneList(UserParamVO user);
-
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneProService.java

@@ -174,8 +174,6 @@ public interface ISceneProService extends IService<ScenePro> {
 
     SceneVO getInfo(String sceneNum);
 
-    ResultData rebuildReduceSpaceBySceneNum(String sceneNum) throws Exception;
-
     void tempScenes(List<Long> ids);
 
     ResultData getRecordAudioFromBrowser(FileParamVO param, MultipartFile file) throws IOException;
@@ -196,5 +194,4 @@ public interface ISceneProService extends IService<ScenePro> {
 
     List<SceneProPO> findByCameraIds(String cameraIds, String startTime, String endTime);
 
-    ResultData getScenesBySnCode(String snCode, String token);
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneService.java

@@ -85,10 +85,6 @@ public interface ISceneService extends IService<Scene> {
 
     void updatePv();
 
-    Page search(SceneParamVO param);
-
-    Page loadScene(SceneParamVO param);
-
     Page loadAllScene2(SceneParamVO param);
 
     ResultData querySceneDataSource(SceneParamVO param);

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IUserSceneService.java

@@ -1,12 +1,8 @@
 package com.fdkankan.scene.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.scene.api.dto.SceneCntDTO;
-import com.fdkankan.scene.api.dto.SceneProDTO;
 import com.fdkankan.scene.vo.SceneDownloadParamVO;
 import com.fdkankan.scene.vo.SceneParamVO;
-import com.fdkankan.scene.vo.SceneVO;
 
 /**
  * <p>
@@ -18,20 +14,10 @@ import com.fdkankan.scene.vo.SceneVO;
  **/
 public interface IUserSceneService {
 
-    Page<SceneVO> getScenes(String token, SceneParamVO param);
-
-    SceneCntDTO getSceneCnt(Long userId, Long cameraId);
-
     ResultData findSceneNumber(String token) throws Exception;
 
-    ResultData getNewScenes(SceneParamVO param) throws Exception;
-
     Integer getSceneNumByCameraId(Long cameraId,Integer cameraType,String snCode);
 
-    SceneProDTO getLastSceneByCameraId( Long cameraId);
-
-    ResultData downloadScene(Long userId, SceneDownloadParamVO param) throws Exception;
-
     ResultData getSceneDownloadProcess(Long userId, SceneDownloadParamVO param);
 
     ResultData checkDownload(Long userId, SceneDownloadParamVO param) throws Exception;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneCooperationServiceImpl.java

@@ -1,31 +1,31 @@
 package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.user.SSOLoginHelper;
-import com.fdkankan.common.util.PageInfoUtils;
-import com.fdkankan.platform.api.dto.Camera;
-import com.fdkankan.platform.api.feign.PlatformGoodsClient;
-import com.fdkankan.scene.entity.*;
+import com.fdkankan.scene.entity.SceneCooperation;
+import com.fdkankan.scene.entity.SceneProPO;
+import com.fdkankan.scene.entity.SceneResourceCooperation;
 import com.fdkankan.scene.mapper.ISceneCooperationMapper;
 import com.fdkankan.scene.mapper.ISceneProMapper;
-import com.fdkankan.scene.service.*;
-import com.fdkankan.scene.util.ParamConvertUtil;
-import com.fdkankan.scene.vo.SceneCooperationParamVO;
-import com.fdkankan.scene.vo.SceneParamVO;
-import com.fdkankan.scene.vo.SceneVO;
+import com.fdkankan.scene.service.IFolderSceneService;
+import com.fdkankan.scene.service.IFolderService;
+import com.fdkankan.scene.service.ISceneCooperationService;
+import com.fdkankan.scene.service.ISceneEditInfoExtService;
+import com.fdkankan.scene.service.ISceneProService;
+import com.fdkankan.scene.service.ISceneResourceCooperationService;
+import com.fdkankan.scene.service.ISceneResourceService;
+import com.fdkankan.scene.service.ISceneService;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.util.*;
 
 /**
  * <p>
@@ -41,8 +41,6 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
     @Autowired
     SSOLoginHelper ssoLoginHelper;
     @Autowired
-    PlatformGoodsClient platformGoodsClient;
-    @Autowired
     ISceneProService sceneProService;
     @Autowired
     ISceneResourceService sceneResourceService;
@@ -91,126 +89,12 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
     }
 
     @Override
-    public ResultData sceneResourceBySceneNum(SceneCooperationParamVO param) throws Exception{
-
-        ResultData<Camera> cameraResult = platformGoodsClient.getCameraByChildName(param.getUserName());
-        Camera camera = cameraResult.getData();
-        if(camera != null){
-            return ResultData.ok();
-        }
-
-        SceneCooperation sceneCooperation = this.findBySceneNum(param.getNum());
-        //若数据为空表示可操作全部资源
-        if(sceneCooperation == null || !sceneCooperation.getUserId().equals(param.getUserId())){
-            return ResultData.ok();
-        }
-
-        ScenePro scenePro= sceneProService.findBySceneNum(param.getNum());
-        if(scenePro != null && scenePro.getUserId().equals(sceneCooperation.getUserId())){
-            return ResultData.ok();
-        }
-
-        return ResultData.ok(sceneResourceService.findByCooperationId(sceneCooperation.getId()));
-    }
-
-    @Override
     public List<SceneCooperation> getListByUserId(List<Long> userIds) {
         LambdaQueryWrapper<SceneCooperation> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(SceneCooperation::getUserId,userIds);
         return this.list(queryWrapper);
     }
 
-    @Override
-    public Page cooperationSceneListNew(SceneParamVO param) throws Exception{
-
-        //查询该用户所有的协作场景
-        List<SceneCooperation> list = this.list(
-            new LambdaQueryWrapper<SceneCooperation>()
-                .select(SceneCooperation::getNum)
-                .eq(SceneCooperation::getUserId, param.getUserId())
-                .orderByDesc(SceneCooperation::getId));
-        if(CollUtil.isEmpty(list)){
-            return new Page(param.getPageNum(), param.getPageSize());
-        }
-
-
-        //获取所有协作场景的场景码集合
-        List<String> sceneNumList = new ArrayList<>();
-        for(SceneCooperation cooperation: list){
-            if(Objects.isNull(cooperation.getNum())){
-                continue;
-            }
-            sceneNumList.add(cooperation.getNum());
-        }
-
-        if(sceneNumList.size() <= 0){
-            return new Page(param.getPageNum(), param.getPageSize());
-        }
-
-        List<Object> result = new ArrayList<>();
-        List<SceneProPO> sceneList = new ArrayList<>();
-        List<Folder> folderList = new ArrayList<>();
-
-        if(StringUtil.isNotBlank(param.getSceneSource())){
-            param.setSceneSourceList(ParamConvertUtil.getSceneSource(param.getSceneSource()));
-        }
-
-        //根目录时，需要排除已经归类的场景
-        if(ObjectUtils.isEmpty(param.getFolderId())){
-            sceneList = sceneProMapper.selectCooperationSceneList(param);
-
-        }else {
-            //获取文件夹数量
-            folderList= folderService.list(
-                new LambdaQueryWrapper<Folder>().eq(Folder::getUserId, param.getUserId())
-                    .eq(Folder::getParentId, param.getFolderId())
-                    .orderByDesc(Folder::getId));
-
-            //进入目录层级后，根据目录获取当前目录的所有场景
-            List<Long> sceneIdList = folderSceneService
-                .getSceneIdListByFolderId(param.getFolderId());
-
-            if(CollUtil.isNotEmpty(sceneIdList)){
-                param.setSceneIdList(sceneIdList);
-                sceneList = sceneProMapper.selectCooperationSceneList(param);
-            }
-        }
-        List<SceneVO> responseScenes = sceneService.convertPro(sceneList);
-
-        if(Objects.isNull(param.getSceneSource())&& StrUtil.isEmpty(param.getSceneType()) &&
-                param.getStartTime() == null && param.getEndTime() == null){
-
-            result.addAll(folderService.convert(folderList));
-        }
-
-        result.addAll(responseScenes);
-
-        Page<Object> page  = PageInfoUtils.list2PageInfo(result, param.getPageNum(), param.getPageSize());
-        if(CollUtil.isEmpty(page.getRecords())){
-            return new Page(param.getPageNum(), param.getPageSize());
-        }
-        page.getRecords().parallelStream().filter(object -> object instanceof SceneVO).forEach(object -> {
-            SceneVO responseScene = (SceneVO) object;
-            if (responseScene.getCameraId() != null) {
-                ResultData<Camera> cameraResult = platformGoodsClient
-                    .getCameraById(responseScene.getCameraId());
-                Camera camera = cameraResult.getData();
-                if (camera != null) {
-                    responseScene.setChildName(camera.getChildName());
-                    responseScene.setSnCode(camera.getSnCode());
-                }
-            }
-            // 获取VrThumb
-            SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getOne(
-                new LambdaQueryWrapper<SceneEditInfoExt>()
-                    .select(SceneEditInfoExt::getVrNum)
-                    .eq(SceneEditInfoExt::getSceneProId, responseScene.getId()));
-            if (Objects.nonNull(sceneEditInfoExt)) {
-                responseScene.setVrNum(sceneEditInfoExt.getVrNum());
-            }
-        });
-        return page;
-    }
 
     @Override
     public List<SceneCooperation> getListByNums(List<String> numList) {

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -24,17 +24,11 @@ import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.SceneUtil;
 import com.fdkankan.fyun.constant.StorageType;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.platform.api.feign.PlatformGoodsClient;
-import com.fdkankan.platform.api.feign.PlatformUserClient;
-import com.fdkankan.platform.api.dto.CameraDetail;
-import com.fdkankan.platform.api.dto.Company;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.scene.api.dto.SceneInfoDTO;
 import com.fdkankan.scene.bean.BoxPhotoBean;
-import com.fdkankan.scene.bean.IconBean;
 import com.fdkankan.scene.bean.RequestSceneProV4;
 import com.fdkankan.scene.bean.SceneJsonBean;
 import com.fdkankan.scene.bean.StyleBean;
@@ -145,10 +139,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     @Autowired
     ISceneDataDownloadService sceneDataDownloadService;
     @Autowired
-    PlatformGoodsClient platformGoodsClient;
-    @Autowired
-    PlatformUserClient platformUserClient;
-    @Autowired
     private ISceneEditInfoExtService sceneEditInfoExtService;
     @Autowired
     IScenePlusService scenePlusService;
@@ -407,18 +397,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         return null;
     }
 
-    @Override
-    public SceneInfoDTO getSceneInfo4Download(SceneInfoParamVO param) throws Exception{
-        SceneInfoVO sceneInfo4View = this.getSceneInfo4View(param.getNum());
-        if(Objects.isNull(sceneInfo4View)){
-            return null;
-        }
-        SceneInfoDTO sceneInfoDTO = BeanUtil.copyProperties(sceneInfo4View, SceneInfoDTO.class);
-        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
-        sceneInfoDTO.setSceneSource(scenePlus.getSceneSource());
-        return sceneInfoDTO;
-    }
-
     /**
      * <p>
             编辑页面获取场景详情信息
@@ -492,37 +470,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
     /**
      * <p>
-            getInfo接口返回字段扩展
-     * </p>
-     * @author dengsixing
-     * @date 2022/3/9
-     **/
-    private void setExtData(SceneInfoVO sceneInfoVO, Long cameraId) throws Exception{
-
-        ResultData<CameraDetail> cameraResultData = platformGoodsClient.getCameraDetailByCameraId(cameraId);
-        if(!cameraResultData.getSuccess()){
-            throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
-        }
-        CameraDetail camera = cameraResultData.getData();
-        if(Objects.isNull(camera)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_7010);
-        }
-        if(Objects.isNull(camera.getCompanyId())){
-            return;
-        }
-        ResultData<Company> companyResultData = platformUserClient.getCompanyById(camera.getCompanyId());
-        if(!companyResultData.getSuccess()){
-            throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
-        }
-        Company company = companyResultData.getData();
-        if(Objects.isNull(company)){
-            return;
-        }
-        sceneInfoVO.setDataSync(company.getDataSync());
-    }
-
-    /**
-     * <p>
      查看页面获取场景详情信息
      * </p>
      * @author dengsixing

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -1,30 +1,20 @@
 package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.CommonStatus;
-import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.SceneStatus;
-import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.Result;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.DateExtUtil;
-import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.platform.api.feign.PlatformGoodsClient;
-import com.fdkankan.platform.api.feign.PlatformUserClient;
-import com.fdkankan.scene.bean.CameraBean;
-import com.fdkankan.scene.bean.UserIncrementBean;
 import com.fdkankan.scene.callback.FdkkMiniReqErrorCallback;
 import com.fdkankan.scene.callback.FdkkMiniReqSuccessCallback;
 import com.fdkankan.scene.entity.ScenePlus;
@@ -41,21 +31,16 @@ import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.DeleteFileParamVO;
 import com.fdkankan.scene.vo.LocalesParamVO;
 import com.fdkankan.scene.vo.SceneAuthVO;
-import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 
 /**
  * <p>
@@ -78,10 +63,6 @@ public class SceneEditServiceImpl implements ISceneEditService {
     @Autowired
     ISceneProService sceneProService;
     @Autowired
-    PlatformGoodsClient platformGoodsClient;
-    @Autowired
-    PlatformUserClient platformUserClient;
-    @Autowired
     IScenePlusService scenePlusService;
     @Autowired
     private UploadToOssUtil uploadToOssUtil;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -2,23 +2,18 @@ package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.platform.api.feign.PlatformGoodsClient;
 import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.entity.ScenePlusExt;
-import com.fdkankan.scene.entity.ScenePro;
-import com.fdkankan.scene.entity.SceneProExt;
 import com.fdkankan.scene.mapper.IScenePlusMapper;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusExtService;
 import com.fdkankan.scene.service.IScenePlusService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
-import java.util.Calendar;
 import java.util.List;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
@@ -40,8 +35,6 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     @Autowired
     private IScenePlusExtService scenePlusExtService;
     @Autowired
-    private PlatformGoodsClient platformGoodsClient;
-    @Autowired
     private IScenePlusService scenePlusService;
     @Autowired
     ISceneEditInfoService sceneEditInfoService;
@@ -52,26 +45,6 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
-    public ResultData resetSpace(String num) throws Exception{
-        ScenePlus scenePlus = this.getScenePlusByNum(num);
-        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-        if(Objects.isNull(scenePlus)){
-            log.info("该场景不存在无法重置容量，场景码为：" + num);
-            return ResultData.error(ErrorCode.FAILURE_CODE_5058);
-        }
-        if (scenePlusExt.getSceneScheme() < 4){
-            log.info("该场景不属于八目相机无法重置容量，场景码为：" + num);
-            return ResultData.error(ErrorCode.FAILURE_CODE_5057);
-        }
-        platformGoodsClient.updateCameraDetailByCameraIdAndSpace(scenePlus.getCameraId(), -scenePlusExt.getSpace());
-
-        scenePlusExt.setSpace(Long.parseLong("0"));
-        scenePlusExtService.updateById(scenePlusExt);
-
-        return ResultData.ok();
-    }
-
-    @Override
     public ResultData checkKey(SceneCheckKeyParamVO param) throws Exception {
 //        ScenePro scenePro = sceneProService.getOne(
 //            new LambdaQueryWrapper<ScenePro>()

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProAppServiceImpl.java

@@ -1,31 +1,65 @@
 package com.fdkankan.scene.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.*;
+import com.fdkankan.common.constant.ConstantFileName;
+import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.common.constant.ConstantUrl;
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.PayStatus;
+import com.fdkankan.common.constant.SceneEditType;
+import com.fdkankan.common.constant.SceneStatus;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.*;
+import com.fdkankan.common.util.ConvertUtils;
+import com.fdkankan.common.util.CreateObjUtil;
+import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.common.util.OkHttpUtils;
+import com.fdkankan.common.util.WeiXinUtils;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.platform.api.dto.Camera;
-import com.fdkankan.platform.api.dto.CameraDetail;
-import com.fdkankan.platform.api.dto.User;
-import com.fdkankan.platform.api.feign.PlatformGoodsClient;
-import com.fdkankan.platform.api.feign.PlatformUserClient;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
-import com.fdkankan.scene.entity.*;
+import com.fdkankan.scene.entity.Scene;
+import com.fdkankan.scene.entity.ScenePO;
+import com.fdkankan.scene.entity.ScenePro;
+import com.fdkankan.scene.entity.SceneProEdit;
+import com.fdkankan.scene.entity.SceneProEditExt;
+import com.fdkankan.scene.entity.SceneProExt;
 import com.fdkankan.scene.mapper.ISceneProMapper;
-import com.fdkankan.scene.service.*;
-import com.fdkankan.scene.vo.*;
+import com.fdkankan.scene.service.IFolderSceneService;
+import com.fdkankan.scene.service.ISceneCooperationService;
+import com.fdkankan.scene.service.ISceneProAppService;
+import com.fdkankan.scene.service.ISceneProEditExtService;
+import com.fdkankan.scene.service.ISceneProEditService;
+import com.fdkankan.scene.service.ISceneProExtService;
+import com.fdkankan.scene.service.ISceneProService;
+import com.fdkankan.scene.service.ISceneService;
+import com.fdkankan.scene.vo.FileParamVO;
+import com.fdkankan.scene.vo.SceneEditParamVO;
+import com.fdkankan.scene.vo.SceneParamVO;
+import com.fdkankan.scene.vo.SceneVO;
+import java.io.File;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import net.coobird.thumbnailator.Thumbnails;
 import org.apache.commons.lang3.StringUtils;
@@ -35,19 +69,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.*;
-import java.util.stream.Collectors;
-
 /**
  * <p>
  * pro场景表 服务实现类
@@ -84,10 +108,6 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
     @Autowired
     ISceneProEditExtService sceneProEditExtService;
     @Autowired
-    private PlatformGoodsClient platformGoodsClient;
-    @Autowired
-    private PlatformUserClient platformUserClient;
-    @Autowired
     private ISceneCooperationService sceneCooperationService;
     @Autowired
     ISceneService sceneService;
@@ -1951,280 +1971,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         return sid;
     }
 
-    @Override
-    public Page<SceneVO> getAllSceneByPage(@RequestBody UserParamVO param) {
-        if(StrUtil.isEmpty(param.getAppUserName()) && StrUtil.isEmpty(param.getPhoneNum()) ){
-            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-        }
-
-        Long cameraId = null;
-        Long userId = null;
-        Integer cameraType = null;
-
-        //获取相机id
-        if(!StrUtil.isEmpty(param.getAppUserName()) && !StrUtil.isEmpty(param.getAppPassword())){
-            ResultData<Camera> cameraResult = platformGoodsClient.getByChildNameAndChildPassword(param.getAppUserName(), param.getAppPassword());
-            Camera camera = cameraResult.getData();
-            if (camera == null) {
-                throw new BusinessException(ErrorCode.FAILURE_CODE_3014);
-            }
-            cameraId = camera.getId();
-        }
-
-        //获取该用户id协作者的场景码集合
-        List<String> sceneCodeList = null;
-        if (StrUtil.isNotEmpty(param.getPhoneNum())) {
-            ResultData<User> userResult = platformUserClient.getUserByName(param.getPhoneNum());
-            User user = userResult.getData();
-            if (user == null) {
-                throw new BusinessException(ErrorCode.FAILURE_CODE_3015);
-            }
-            userId = user.getId();
-
-            List<SceneCooperation> list = sceneCooperationService.list(
-                    new LambdaQueryWrapper<SceneCooperation>()
-                            .eq(SceneCooperation::getTbStatus, TbStatus.VALID.code())
-                            .eq(SceneCooperation::getUserId, userId)
-                            .orderByDesc(SceneCooperation::getId));
-
-            if(CollUtil.isNotEmpty(list)){
-                sceneCodeList = list.parallelStream().map(co -> {
-                    return co.getNum();
-                }).collect(Collectors.toList());
-            }
-        }
-
-        if(param.getCameraType() != null){
-            cameraType = param.getCameraType();
-        }
-
-        Camera camera = null;
-        CameraDetail cameraDetail = null;
-        Page<SceneVO> sceneVOPage =
-                sceneProService.getAppAllSceneByPage(cameraId, userId, cameraType,
-                        param.getPageNum(), param.getPageSize(), param.getOrderBy(),
-                        param.getSceneType(), sceneCodeList, param.getSceneName());
-        if(sceneVOPage.getCurrent() == 0){
-            return sceneVOPage;
-        }
-        for(SceneVO sceneVO : sceneVOPage.getRecords()){
-            // 当计算时，返回给前端的状态为计算中
-            if (!ObjectUtils.isEmpty(sceneVO)) {
-                if (sceneVO.getStatus() == -1) {
-                    sceneVO.setStatus(0);
-                } else if (sceneVO.getStatus() == 500) {
-                    sceneVO.setStatus(-1);
-                }
-            }
-            //相机id为空是123看房的场景
-            if(sceneVO.getCameraId() == null){
-                //当场景用户id等于该用户id，为用户场景，其余未协作场景
-                if(sceneVO.getUserId().longValue() == userId.longValue()){
-                    sceneVO.setSceneSourceType(1);
-                }else {
-                    sceneVO.setSceneSourceType(2);
-                }
-            }else {
-                ResultData<Camera> cameraResult = platformGoodsClient.getCameraById(sceneVO.getCameraId());
-                camera = cameraResult.getData();
-                if(Objects.isNull(camera)){
-                    continue;
-                }
-                    sceneVO.setChildName(camera.getChildName());
-                    sceneVO.setSnCode(camera.getSnCode());
-
-                ResultData<CameraDetail> cameraDetailResult = platformGoodsClient.getCameraDetailByCameraId(camera.getId());
-                cameraDetail = cameraDetailResult.getData();
-                if(cameraDetail != null){
-                    //相机的userId为空，表示相机的场景
-                    if(cameraDetail.getUserId() == null || userId == null){
-                        sceneVO.setSceneSourceType(0);
-                    }else if(userId != null && cameraDetail.getUserId().longValue() == userId.longValue()){
-                        //相机用户id等于该用户id，既为用户的场景
-                        sceneVO.setSceneSourceType(1);
-                    }else if(cameraId != null && cameraDetail.getCameraId() != null && cameraDetail.getCameraId().longValue() == cameraId.longValue()
-                            && cameraDetail.getCooperationUser() == null){
-                        //场景相机id等于该相机id
-                        sceneVO.setSceneSourceType(0);
-                    }else if(cameraId != null && cameraDetail.getCameraId().longValue() == cameraId.longValue()
-                            && cameraDetail.getCooperationUser() != null){
-                        if(userId != null && cameraDetail.getCooperationUser().longValue() == userId.longValue()){
-                            sceneVO.setSceneSourceType(2);
-                        }else {
-                            sceneVO.setSceneSourceType(0);
-                        }
-                    }else {
-                        //最后不等于则为协作者场景
-                        sceneVO.setSceneSourceType(2);
-                    }
-                }
-            }
-        }
-
-        return sceneVOPage;
-    }
-
-    @Override
-    public List<SceneVO> getAllForCameraName(@RequestBody UserParamVO user){
-        if(StrUtil.isEmpty(user.getAppUserName()) || StrUtil.isEmpty(user.getAppPassword())){
-            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-        }
-        ResultData<Camera> cameraResult = platformGoodsClient.getByChildNameAndChildPassword(user.getAppUserName(), user.getAppPassword());
-        Camera camera = cameraResult.getData();
-        if (camera == null) {
-            throw new BusinessException(ErrorCode.FAILURE_CODE_3014);
-        }
-
-        List<ScenePro> list = sceneProService.list(
-                new LambdaQueryWrapper<ScenePro>()
-                        .eq(ScenePro::getTbStatus, TbStatus.VALID.code())
-                        .eq(ScenePro::getCameraId, camera.getId())
-                        .ne(ScenePro::getSceneType, SceneType.YJHZXNFY.code())
-                        .in(ScenePro::getSceneStatus, SceneStatus.SUCCESS, SceneStatus.NO_DISPLAY).orderByDesc(ScenePro::getId));
-
-        List<SceneVO> sceneList = sceneProService.convert(list);
-        for(SceneVO sceneVO : sceneList){
-            sceneVO.setChildName(user.getAppUserName());
-        }
-        return sceneList;
-    }
-
-    @Override
-    public Long getSceneCount(@RequestBody UserParamVO user) {
-
-        if(StrUtil.isEmpty(user.getAppUserName()) || StrUtil.isEmpty(user.getAppPassword())){
-            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-        }
-        ResultData<Camera> CameraResult = platformGoodsClient.getByChildNameAndChildPassword(user.getAppUserName(), user.getAppPassword());
-        Camera camera = CameraResult.getData();
-        if(camera == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_3014);
-        }
-
-        return sceneProService.getSceneCount(camera.getId(), null);
-    }
-
-    @Override
-    public Integer getSceneStatus(@RequestBody UserParamVO user) {
 
-        if(StrUtil.isEmpty(user.getAppUserName()) || StrUtil.isEmpty(user.getAppPassword())
-                || StrUtil.isEmpty(user.getNum())){
-            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-        }
-        ResultData<Camera> CameraResult = platformGoodsClient.getByChildNameAndChildPassword(user.getAppUserName(), user.getAppPassword());
-        Camera camera = CameraResult.getData();
-        if(camera == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_3014);
-        }
-
-        ScenePro scene = sceneProService.findBySceneNum(user.getNum());
-        if(scene == null){
-            scene = sceneProService.findDeleteSceneBySceneNum(user.getNum());
-            if(scene == null){
-                throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
-            }
-            throw new BusinessException(SceneConstant.FAILURE_CODE_5006, SceneConstant.FAILURE_MSG_5006);
-        }
-
-        return scene.getSceneStatus();
-    }
-
-    @Override
-    public Map<String, Object> getSceneStatusByUnicode(@RequestBody UserParamVO user){
-        if(StrUtil.isEmpty(user.getAppUserName()) || StrUtil.isEmpty(user.getAppPassword())
-                || StrUtil.isEmpty(user.getUnicode())){
-            log.info("appUserName:" + user.getAppUserName() + ",appPassword:" + user.getAppPassword() +
-                    ",unicode:" + user.getUnicode());
-            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-        }
-        ResultData<Camera> CameraResult = platformGoodsClient.getByChildNameAndChildPassword(user.getAppUserName(), user.getAppPassword());
-        Camera camera = CameraResult.getData();
-        if(camera == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_3014);
-        }
-
-        SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode(user.getUnicode(), TbStatus.VALID.code());
-        if(sceneProPO == null){
-            sceneProPO = sceneProService.getSceneStatusByUnicode(user.getUnicode(), TbStatus.DELETE.code());
-            if(sceneProPO == null){
-                throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
-            }
-            throw new BusinessException(SceneConstant.FAILURE_CODE_5009, SceneConstant.FAILURE_MSG_5009);
-        }
-        if(sceneProPO.getPayStatus() == -2){
-            throw new BusinessException(SceneConstant.FAILURE_CODE_5006, SceneConstant.FAILURE_MSG_5006);
-        }
-        // 当计算时，返回给前端的状态为计算中
-        if (sceneProPO.getSceneStatus() == -1) {
-            sceneProPO.setSceneStatus(0);
-        } else if (sceneProPO.getSceneStatus() == 500) {
-            sceneProPO.setSceneStatus(-1);
-        }
-        Map<String, Object> map = new HashMap<>();
-        //临时将-2改成1，app还没完全更新
-        map.put("status", sceneProPO.getSceneStatus() == -2? 1 : sceneProPO.getSceneStatus());
-        map.put("webSite", sceneProPO.getWebSite());
-        map.put("sceneNum", sceneProPO.getNum());
-        map.put("thumb", sceneProPO.getThumb());
-        map.put("dataSource", sceneProPO.getDataSource());
-        map.put("payStatus", sceneProPO.getPayStatus());
-        map.put("recStatus", sceneProPO.getRecStatus());
-
-        return map;
-    }
-
-    @Override
-    public ResultData deleteForCameraName(@RequestBody UserParamVO user) throws Exception {
-        if (user.getCameraId() == null || StrUtil.isEmpty(user.getNum())) {
-            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-        }
-        ResultData<CameraDetail> detailResult = platformGoodsClient.getCameraDetailByCameraId(user.getCameraId());
-        CameraDetail detail = detailResult.getData();
-        if (detail == null) {
-            throw new BusinessException(CameraConstant.FAILURE_6003);
-        }
-
-        ScenePro scenePro = sceneProService.findBySceneNum(user.getNum());
-        if(scenePro == null){
-            throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
-        }
-
-        if(scenePro.getCameraId().longValue() != user.getCameraId().longValue()){
-            throw new BusinessException(SceneConstant.FAILURE_CODE_5010, SceneConstant.FAILURE_MSG_5010);
-        }
-
-        String[] nums = user.getNum().split(",");
-        for (String num : nums) {
-            SceneVO sceneVO = this.getSceneDetail(num);
-            if (sceneVO == null){
-                return ResultData.error(ErrorCode.FAILURE_CODE_5005);
-            }
-            ResultData resultData = this.deleteScene(num);
-            if (sceneVO.getSceneScheme() >= 3 && sceneVO.getSpace() != null){
-
-                ResultData<CameraDetail> cameraDetailResultData = platformGoodsClient.updateCameraDetailByCameraIdAndSpace(sceneVO.getCameraId(), -sceneVO.getSpace());
-                CameraDetail detail2 = cameraDetailResultData.getData();
-                if(detail2 != null){
-                    //计算该相机所有扣费成功的场景容量总和
-                    List<SceneVO> scenes = this.findScenesByUserIdAndSceneScheme(sceneVO.getCameraId(), "create_time", 1);
-                    Long accumulateSpace = new Long("0");
-                    for(SceneVO vo : scenes){
-                        accumulateSpace = accumulateSpace + vo.getSpace();
-                    }
-                    //相机总容量 - 所有扣费成功的容量 = 可恢复场景的容量
-                    if (detail2.getTotalSpace().compareTo(accumulateSpace) != -1){
-                        this.unlockBeyondSpaceScenes(detail2.getTotalSpace() - accumulateSpace, sceneVO.getCameraId());
-                    }
-                }
-            }
-
-            //删除文件夹里面的场景关联
-            folderSceneService.deleteBySceneId(sceneVO.getId());
-        }
-
-
-        return ResultData.ok();
-    }
 
     public void lockBeyondSpaceScenes(Long usedSpace, Long totalSpace, Long cameraId) throws Exception{
         Long beyondSpace = usedSpace - totalSpace;
@@ -2455,81 +2202,5 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         return ResultData.ok();
     }
 
-    public List<SceneVO> getAllSceneByUserName(UserParamVO user) throws Exception {
-        if (StrUtil.isEmpty(user.getPhoneNum())) {
-            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-        }
-
-        ResultData<User> userResult = platformUserClient.getUserByName(user.getPhoneNum());
-        User ssoUser = userResult.getData();
-
-        if (ssoUser == null) {
-            throw new BusinessException(ErrorCode.FAILURE_CODE_3015);
-        }
-
-        if(user.getCameraType() == null){
-            user.setCameraType(4);
-        }
-        List<SceneProPO> list = sceneProService.findByUserIdAndCameraType(ssoUser.getId(), user.getCameraType());
-
-        List<SceneVO> sceneList = sceneProService.convert2(list);
-        for(SceneVO vo : sceneList){
-            ResultData<Camera> cameraResult = platformGoodsClient.getCameraById(vo.getCameraId());
-            Camera camera = cameraResult.getData();
-            if(camera != null){
-                vo.setChildName(camera.getChildName());
-            }
-        }
-        return sceneList;
-    }
-
-    @Override
-    public ResultData cooperationSceneList(@RequestBody UserParamVO user){
-        if (StrUtil.isEmpty(user.getPhoneNum())) {
-            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-        }
-
-        ResultData<User> userResult = platformUserClient.getUserByName(user.getPhoneNum());
-        User ssoUser = userResult.getData();
-
-        if (ssoUser == null) {
-            throw new BusinessException(ErrorCode.FAILURE_CODE_3015);
-        }
-
-        if(user.getCameraType() == null){
-            user.setCameraType(4);
-        }
-
-        List<SceneCooperation> list = sceneCooperationService.list(
-                    new LambdaQueryWrapper<SceneCooperation>()
-                            .eq(SceneCooperation::getTbStatus, TbStatus.VALID.code())
-                            .eq(SceneCooperation::getUserId, ssoUser.getId())
-                            .orderByDesc(SceneCooperation::getId));
-
-        if(list == null || list.size() <= 0){
-            return ResultData.ok();
-        }
-
-        List<String> sceneCodeList = list.parallelStream().map(sc -> {
-            return sc.getNum();
-        }).collect(Collectors.toList());
-
-        List<SceneProPO>  sceneProPOList = sceneProService.findBySceneNums(sceneCodeList, user.getCameraType());
-
-        List<SceneVO> sceneVOList = sceneProService.convert2(sceneProPOList);
-        for(SceneVO responseScene : sceneVOList){
-            ResultData<Camera> cameraResult = platformGoodsClient.getCameraById(responseScene.getCameraId());
-            Camera camera = cameraResult.getData();
-            if(camera != null){
-                responseScene.setChildName(camera.getChildName());
-                responseScene.setSnCode(camera.getSnCode());
-            }
-        }
-
-        return ResultData.ok(sceneVOList);
-    }
-
-
-
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
-import com.alibaba.csp.sentinel.util.StringUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.CameraConstant;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ConstantFileName;
 import com.fdkankan.common.constant.ConstantFilePath;
@@ -33,7 +31,6 @@ import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.user.SSOLoginHelper;
-import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.common.util.ComputerUtil;
 import com.fdkankan.common.util.ConvertUtils;
 import com.fdkankan.common.util.CreateObjUtil;
@@ -44,9 +41,6 @@ import com.fdkankan.common.util.MatrixToImageWriterUtil;
 import com.fdkankan.common.util.OkHttpUtils;
 import com.fdkankan.fyun.constant.StorageType;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.platform.api.dto.Camera;
-import com.fdkankan.platform.api.dto.CameraDetail;
-import com.fdkankan.platform.api.feign.PlatformGoodsClient;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
@@ -86,14 +80,12 @@ import com.fdkankan.scene.vo.FileParamVO;
 import com.fdkankan.scene.vo.HotParamVO;
 import com.fdkankan.scene.vo.SaveTagsParamVO;
 import com.fdkankan.scene.vo.SaveTagsVisibleParamVO;
-import com.fdkankan.scene.vo.SceneBySnCodeVo;
 import com.fdkankan.scene.vo.SceneEditParamVO;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneProVO;
 import com.fdkankan.scene.vo.SceneVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import java.nio.charset.StandardCharsets;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -182,8 +174,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Autowired
     ISceneDataDownloadService sceneDataDownloadService;
     @Autowired
-    PlatformGoodsClient platformGoodsClient;
-    @Autowired
     ISceneProService sceneProService;
     @Autowired
     ISceneEditInfoService sceneEditInfoService;
@@ -4545,28 +4535,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
-    public ResultData rebuildReduceSpaceBySceneNum(String sceneNum) throws Exception{
-        ScenePro scenePro = this.findBySceneNum(sceneNum);
-        if(scenePro == null){
-            log.info("该场景不存在无法扣除容量，场景码为：" + sceneNum);
-            return ResultData.error(ErrorCode.FAILURE_CODE_5054);
-        }
-        if (scenePro.getSceneScheme() < 4){
-            log.info("该场景不属于八目相机无法扣除容量，场景码为：" + sceneNum);
-            return ResultData.error(ErrorCode.FAILURE_CODE_5055);
-        }
-        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
-
-        platformGoodsClient.updateCameraDetailByCameraIdAndSpace(scenePro.getCameraId(), -sceneProExt.getSpace());
-
-        sceneProExt.setSpace(Long.parseLong("0"));
-        sceneProExt.setUpdateTime(Calendar.getInstance().getTime());
-        sceneProExtService.updateById(sceneProExt);
-
-        return ResultData.ok();
-    }
-
-    @Override
     public void tempScenes(List<Long> lockedIds) {
         if (lockedIds == null || lockedIds.size() == 0){
             return;
@@ -5153,36 +5121,4 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return  this.baseMapper.findByCameraIds(cameraIds, startTime, endTime);
     }
 
-    @Override
-    public ResultData getScenesBySnCode(String snCode, String token) {
-        if(StringUtils.isEmpty(token)){
-            throw new BusinessException(3004, "无token参数");
-        }
-
-        SSOUser ssoUser = ssoLoginHelper.loginCheck(token);
-        if(ssoUser == null){
-            throw new BusinessException(3004, "token参数不正确");
-        }
-
-        if(StringUtil.isEmpty(snCode)){
-            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
-        }
-        Camera cameraEntity = platformGoodsClient.getCameraBySnCode(snCode).getData();
-        if(cameraEntity == null ){
-            throw new BusinessException(CameraConstant.FAILURE_6018);
-        }
-        CameraDetail cameraDetailEntity = platformGoodsClient.getCameraDetailByCameraId(cameraEntity.getId()).getData();
-        if(cameraDetailEntity == null ){
-            throw new BusinessException(CameraConstant.FAILURE_6018);
-        }
-        if(!cameraDetailEntity.getUserId().equals(ssoUser.getId())){
-            return ResultData.ok();
-        }
-        if(cameraDetailEntity.getCameraType() == 10 ){    //激光场景
-            List<SceneBySnCodeVo> scenesBySnCode = fdkkLaserService.getScenesBySnCode(snCode, token);
-            return ResultData.ok(scenesBySnCode);
-        }
-        List<SceneBySnCodeVo> sceneVo = sceneProMapper.getNumAndNameByCameraId(cameraEntity.getId(), ssoUser.getId());
-        return ResultData.ok(sceneVo);
-    }
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -13,7 +13,16 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.*;
+import com.fdkankan.common.constant.ConstantFileName;
+import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.common.constant.ConstantUrl;
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.PayStatus;
+import com.fdkankan.common.constant.SceneStatus;
+import com.fdkankan.common.constant.SceneType;
+import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
+import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.ConvertUtils;
@@ -21,17 +30,50 @@ import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.fyun.qiniu.QiniuUpload;
-import com.fdkankan.platform.api.dto.User;
-import com.fdkankan.platform.api.feign.PlatformUserClient;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.scene.entity.*;
+import com.fdkankan.scene.entity.Scene;
+import com.fdkankan.scene.entity.SceneDataDownload;
+import com.fdkankan.scene.entity.SceneEditControls;
+import com.fdkankan.scene.entity.SceneEditInfo;
+import com.fdkankan.scene.entity.SceneEditInfoExt;
+import com.fdkankan.scene.entity.SceneExt;
+import com.fdkankan.scene.entity.ScenePO;
+import com.fdkankan.scene.entity.ScenePlus;
+import com.fdkankan.scene.entity.ScenePlusExt;
+import com.fdkankan.scene.entity.ScenePro;
+import com.fdkankan.scene.entity.SceneProExt;
+import com.fdkankan.scene.entity.SceneProPO;
 import com.fdkankan.scene.mapper.ISceneMapper;
 import com.fdkankan.scene.mapper.ISceneProMapper;
-import com.fdkankan.scene.service.*;
-import com.fdkankan.scene.vo.*;
+import com.fdkankan.scene.service.ISceneDataDownloadService;
+import com.fdkankan.scene.service.ISceneEditControlsService;
+import com.fdkankan.scene.service.ISceneEditInfoExtService;
+import com.fdkankan.scene.service.ISceneEditInfoService;
+import com.fdkankan.scene.service.ISceneExtService;
+import com.fdkankan.scene.service.IScenePlusExtService;
+import com.fdkankan.scene.service.IScenePlusService;
+import com.fdkankan.scene.service.ISceneProExtService;
+import com.fdkankan.scene.service.ISceneProService;
+import com.fdkankan.scene.service.ISceneService;
+import com.fdkankan.scene.vo.BaseSceneParamVO;
+import com.fdkankan.scene.vo.CopySceneParamVO;
+import com.fdkankan.scene.vo.DeviceSceneParamVO;
+import com.fdkankan.scene.vo.SceneDataDownloadVO;
+import com.fdkankan.scene.vo.SceneEditParamVO;
+import com.fdkankan.scene.vo.SceneParamVO;
+import com.fdkankan.scene.vo.SceneVO;
+import java.io.File;
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -41,15 +83,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
-
 /**
  * <p>
  * 场景表 服务实现类
@@ -84,8 +119,6 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     @Autowired
     ISceneProExtService sceneProExtService;
     @Autowired
-    PlatformUserClient platformUserClient;
-    @Autowired
     ISceneService sceneService;
 
     @Autowired
@@ -1103,58 +1136,6 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     }
 
     @Override
-    public Page search(@RequestBody SceneParamVO param) {
-
-        param.setOrderBy("view_count desc");
-
-        Page<ScenePO> scenePOPage = this.unionSearchBySceneName(param);
-        if(CollUtil.isEmpty(scenePOPage.getRecords())){
-            return scenePOPage;
-        }
-        List<SceneVO> voList = this.convert(scenePOPage.getRecords());
-        for (SceneVO vo : voList){
-            if (vo.getUserId() != null){
-                ResultData<User> nickNameResult = platformUserClient.getUserByUserId(vo.getUserId());
-                String nickName = nickNameResult.getData().getNickName();
-                vo.setNickName(nickName);
-            }
-        }
-        Page<SceneVO> result= new Page<>(param.getPageNum(), param.getPageSize());
-        result.setTotal(scenePOPage.getTotal());
-        result.setRecords(voList);
-        return result;
-    }
-
-    @Override
-    public Page loadScene(SceneParamVO param){
-        String orderBy = null;
-        if (StringUtils.isEmpty(param.getSceneInterest()) || "1".equals(param.getSceneInterest())){
-            orderBy = " recommend desc, create_time  ";
-        }else if ("2".equals(param.getSceneInterest())){
-            orderBy = " create_time desc ";
-        }else if ("3".equals(param.getSceneInterest())){
-            orderBy = " view_count desc ";
-        }
-        param.setOrderBy(orderBy);
-
-        Page<SceneProPO> page = this.findAllScene(param);
-        if(CollUtil.isEmpty(page.getRecords())){
-            return page;
-        }
-
-        List<SceneVO> voList = this.convertPro(page.getRecords());
-        for (SceneVO vo : voList){
-            ResultData<User> nickNameResult = platformUserClient.getUserByUserId(vo.getUserId());
-            vo.setNickName(nickNameResult.getData().getNickName());
-        }
-
-        Page<SceneVO> result = new Page<>(param.getPageNum(), param.getPageSize());
-        result.setTotal(page.getTotal());
-        result.setRecords(voList);
-        return result;
-    }
-
-    @Override
     public Page loadAllScene2(SceneParamVO param) {
         param.setOrderBy("create_time desc");
         if(param.getSceneScheme()!= null && param.getSceneScheme() == 4){

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/UserSceneServiceImpl.java

@@ -1,42 +1,41 @@
 package com.fdkankan.scene.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.bean.DownLoadProgressBean;
-import com.fdkankan.common.bean.DownLoadTaskBean;
-import com.fdkankan.common.constant.*;
+import com.fdkankan.common.constant.DownloadStatus;
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.SceneDownloadProgressStatus;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.user.SSOLoginHelper;
 import com.fdkankan.common.user.SSOUser;
-import com.fdkankan.common.util.PageInfoUtils;
-import com.fdkankan.platform.api.dto.Camera;
-import com.fdkankan.platform.api.dto.User;
-import com.fdkankan.platform.api.feign.PlatformGoodsClient;
-import com.fdkankan.platform.api.feign.PlatformUserClient;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.scene.api.dto.SceneCntDTO;
-import com.fdkankan.scene.api.dto.SceneProDTO;
-import com.fdkankan.scene.entity.*;
-import com.fdkankan.scene.mapper.ISceneProMapper;
-import com.fdkankan.scene.service.*;
-import com.fdkankan.scene.util.ParamConvertUtil;
-import com.fdkankan.scene.vo.*;
+import com.fdkankan.scene.entity.Scene;
+import com.fdkankan.scene.entity.SceneDownloadLog;
+import com.fdkankan.scene.entity.SceneEditInfo;
+import com.fdkankan.scene.entity.ScenePlus;
+import com.fdkankan.scene.service.IFdkkLaserService;
+import com.fdkankan.scene.service.ISceneCooperationService;
+import com.fdkankan.scene.service.ISceneDownloadLogService;
+import com.fdkankan.scene.service.ISceneEditInfoService;
+import com.fdkankan.scene.service.IScenePlusService;
+import com.fdkankan.scene.service.ISceneProService;
+import com.fdkankan.scene.service.ISceneService;
+import com.fdkankan.scene.service.IUserSceneService;
+import com.fdkankan.scene.vo.SceneDownloadParamVO;
+import com.fdkankan.scene.vo.SceneNumVo;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -45,26 +44,12 @@ public class UserSceneServiceImpl implements IUserSceneService {
     @Autowired
     private SSOLoginHelper ssoLoginHelper;
     @Autowired
-    private PlatformGoodsClient platformGoodsClient;
-    @Autowired
-    private PlatformUserClient platformUserClient;
-    @Autowired
     private ISceneCooperationService sceneCooperationService;
     @Autowired
     private ISceneService sceneService;
     @Autowired
     private ISceneProService sceneProService;
     @Autowired
-    private ISceneProExtService sceneProExtService;
-    @Autowired
-    private IFolderService folderService;
-    @Autowired
-    private IFolderSceneService folderSceneService;
-    @Autowired
-    private ISceneProMapper sceneProMapper;
-    @Autowired
-    private ISceneEditInfoExtService sceneEditInfoExtService;
-    @Autowired
     private IScenePlusService scenePlusService;
     @Autowired
     private RedisUtil redisUtil;
@@ -76,105 +61,6 @@ public class UserSceneServiceImpl implements IUserSceneService {
     private IFdkkLaserService fdkkLaserService;
 
     @Override
-    public Page<SceneVO> getScenes(String token, SceneParamVO param) {
-        SSOUser ssoUser = ssoLoginHelper.loginCheck(token);
-        if(ssoUser == null){
-            throw new BusinessException(ErrorCode.USER_NOT_LOGIN);
-        }
-        Long userId = ssoUser.getId();
-        param.setUserId(userId);
-        String cameraId = null;
-        String nums = null;
-        log.info("搜索条件是："+ param.getSearchKey());
-        //type为12表示一键换装的请求，不查询相机数据
-        if(StringUtils.isNotEmpty(param.getSearchKey()) && !"11".equals(param.getType())){
-            List<Camera> cameraEntityList = platformGoodsClient.getCameraLikeSnCode(param.getSearchKey()).getData();
-            cameraId = cameraEntityList.parallelStream().map(entity->"'"+entity.getId()+"'").collect(Collectors.joining(","));
-
-            List<User> userList  = platformUserClient.getUserLikeUserName(param.getSearchKey()).getData();
-            List<Long> userIds =  userList.parallelStream().map(User::getId).collect(Collectors.toList());
-
-            if(userIds.size() > 0){
-                List<SceneCooperation> cooperationList = sceneCooperationService.getListByUserId(userIds);
-                nums = cooperationList.parallelStream().map(entity->"'"+entity.getNum()+"'").collect(Collectors.joining(","));
-                param.setNums(nums);
-            }
-        }
-        param.setCameraIds(cameraId);
-        Page<SceneProPO> proPOPage = sceneService.findAllScene( param);
-
-        Page<SceneVO> pageInfo = new Page<>(proPOPage.getCurrent(),proPOPage.getSize());
-        pageInfo.setTotal(proPOPage.getTotal());
-        pageInfo.setRecords(proPOPage.getRecords().stream().map(sceneProPO -> {
-            SceneVO sceneVO = new SceneVO();
-            BeanUtils.copyProperties(sceneProPO,sceneVO);
-            return sceneVO;
-        }).collect(Collectors.toList()));
-
-        List<SceneVO> list = pageInfo.getRecords();
-        list.parallelStream().forEach(responseScene->{
-            if(responseScene.getCameraId() != null){
-                Camera cameraEntity = platformGoodsClient.getCameraById(responseScene.getCameraId()).getData();
-                if(cameraEntity != null){
-                    responseScene.setChildName(cameraEntity.getChildName());
-                    responseScene.setSnCode(cameraEntity.getSnCode());
-                }
-            }
-
-            if(responseScene.getUserId()!=null){
-                String username = platformUserClient.getUserByUserId(responseScene.getUserId()).getData().getUserName();
-                responseScene.setUserName(username);
-            }
-
-            SceneCooperation sceneCooperationEntity = sceneCooperationService.findBySceneNum(responseScene.getNum());
-            if(sceneCooperationEntity != null){
-                responseScene.setCooperationUserId(String.valueOf(sceneCooperationEntity.getUserId()));
-                responseScene.setCooperationUserName(sceneCooperationService.findUserName(responseScene.getNum()));
-            }
-        });
-        return pageInfo;
-    }
-
-    @Override
-    public SceneCntDTO getSceneCnt(Long userId, Long cameraId) {
-
-        //双目场景数量
-        LambdaQueryWrapper<Scene> sceneWrapper =
-            new LambdaQueryWrapper<Scene>()
-                .eq(Scene::getUserId, userId);
-        if(Objects.nonNull(cameraId)){
-            sceneWrapper.eq(Scene::getCameraId, cameraId);
-        }
-        long sceneCount = sceneService.count(sceneWrapper);
-
-        //八目场景数量
-        LambdaQueryWrapper<ScenePro> sceneProWrapper =
-            new LambdaQueryWrapper<ScenePro>()
-                .select(ScenePro::getId)
-                .eq(ScenePro::getUserId, userId);
-        if(Objects.nonNull(cameraId)){
-            sceneWrapper.eq(Scene::getCameraId, cameraId);
-        }
-        List<ScenePro> SceneProList = sceneProService.list(sceneProWrapper);
-        long sceneProCount = 0;
-        if(CollUtil.isNotEmpty(SceneProList)){
-            List<Long> proIdList = SceneProList.stream().map(pro -> {
-                return pro.getId();
-            }).collect(Collectors.toList());
-            sceneProCount = sceneProExtService.count(
-                new LambdaQueryWrapper<SceneProExt>()
-                    .eq(SceneProExt::getSceneSource,SceneSource.YJHZ.code())
-                    .in(SceneProExt::getSceneProId, proIdList));
-        }
-
-        //协作场景数量
-        long cooperaCount = sceneCooperationService.count(
-            new LambdaQueryWrapper<SceneCooperation>().eq(SceneCooperation::getUserId, userId));
-
-        return SceneCntDTO.builder().sceneCnt(sceneCount).sceneProCnt(sceneProCount).CooperSceneCnt(cooperaCount).build();
-    }
-
-    @Override
     public ResultData findSceneNumber(String token) throws Exception{
         SSOUser ssoUser = ssoLoginHelper.loginCheck(token);
         SceneNumVo sceneNumVoKk = getSceneNumVoByType(Arrays.asList(1,2,12,13,14), ssoUser.getId());
@@ -208,76 +94,6 @@ public class UserSceneServiceImpl implements IUserSceneService {
         return Math.toIntExact(sceneService.count(queryWrapper));
     }
 
-    @Override
-    public ResultData getNewScenes(SceneParamVO param) throws Exception {
-
-        Long userId = param.getUserId();
-        if(param.getKeywordType().equals("userName") && StringUtils.isNotEmpty(param.getSearchKey())){
-
-            ResultData<List<User>> userLikeUserName = platformUserClient
-                .getUserLikeUserName("%" + param.getSearchKey() + "%");
-            if(!userLikeUserName.getSuccess()){
-                throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
-            }
-            List<User> userList = userLikeUserName.getData();
-            List<Long> userIds = userList.parallelStream().map(User::getId).collect(Collectors.toList());
-
-            List<SceneCooperation> sceneCooperationList = sceneCooperationService.list(
-                new LambdaQueryWrapper<SceneCooperation>()
-                    .select(SceneCooperation::getNum)
-                    .in(SceneCooperation::getUserId, userIds));
-
-            //获取所有协作场景的场景码集合
-            param.setNumList(sceneCooperationList.parallelStream().map(SceneCooperation::getNum).collect(Collectors.toList()));
-
-        }
-
-
-        Map<String, Object> map = this.getNewScenesPagerByUserId(userId, param);
-        Page<Object> page = (Page<Object>) map.get("pageInfo");
-        List<Object> list = page.getRecords();
-        list.parallelStream().filter(object -> object instanceof SceneVO).forEach(object -> {
-
-            SceneVO responseScene = (SceneVO) object;
-            // 当计算时，返回给前端的状态为计算中
-            if (responseScene.getStatus() == -1) {
-                responseScene.setStatus(0);
-            } else if (responseScene.getStatus() == 500) {
-                responseScene.setStatus(-1);
-            }
-            // 获取VrThumb
-            SceneEditInfoExt sceneEditInfoExt
-                = sceneEditInfoExtService.getOne(
-                    new LambdaQueryWrapper<SceneEditInfoExt>()
-                        .select(SceneEditInfoExt::getVrNum)
-                        .eq(SceneEditInfoExt::getSceneProId, responseScene.getId()));
-
-            if (!ObjectUtils.isEmpty(sceneEditInfoExt)) {
-                responseScene.setVrNum(sceneEditInfoExt.getVrNum());
-            }
-            if (responseScene.getCameraId() != null) {
-                ResultData<Camera> cameraResultData = platformGoodsClient
-                    .getCameraById(responseScene.getCameraId());
-                if(!cameraResultData.getSuccess()){
-                    throw new BusinessException(ErrorCode.SYSTEM_BUSY);
-                }
-                Camera camera = cameraResultData.getData();
-                if (camera != null) {
-                    responseScene.setChildName(camera.getChildName());
-                    responseScene.setSnCode(camera.getSnCode());
-                }
-            }
-            SceneCooperation sceneCooperation = sceneCooperationService.findBySceneNum(responseScene.getNum());
-            if (sceneCooperation != null) {
-                responseScene.setCooperationUserId(String.valueOf(sceneCooperation.getUserId()));
-                responseScene.setCooperationUserName(sceneCooperationService.findUserName(responseScene.getNum()));
-            }
-        });
-
-        map.put("pageInfo", PageInfo.PageInfo(page));
-
-        return ResultData.ok(map);
-    }
 
     @Override
     public Integer getSceneNumByCameraId(Long cameraId,Integer cameraType,String snCode) {
@@ -289,58 +105,6 @@ public class UserSceneServiceImpl implements IUserSceneService {
     }
 
     @Override
-    public SceneProDTO getLastSceneByCameraId(Long cameraId) {
-        SceneProPO sceneProPO = sceneProService.findLastSceneByCameraId(cameraId);
-        return BeanUtil.copyProperties(sceneProPO, SceneProDTO.class);
-    }
-
-    @Override
-    public ResultData downloadScene(Long userId, SceneDownloadParamVO param) throws Exception {
-
-        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getSceneNum());
-        if(scenePlus == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-        }
-
-        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
-        if(sceneEditInfo == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-        }
-        SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfo.getId());
-
-        Map<String, Object> result = new HashMap<>();
-
-        ResultData<User> userResultData = platformUserClient.getUserByUserId(userId);
-        if(!userResultData.getSuccess()){
-            throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
-        }
-        User user = userResultData.getData();
-
-        if(user != null || user.getDownloadNumTotal().compareTo(user.getDownloadNum()) < 1){
-            result.put("downloadStatus", -1);
-            ResultData.ok(result);
-        }
-
-        // 存储redis 开始下载任务
-        String downLoadTaskJson = JSON.toJSONString(
-            DownLoadTaskBean.builder()
-                .num(param.getSceneNum())
-                .type("local")
-                .userId(userId).build());
-        redisUtil.lRightPush(RedisKey.SCENE_DOWNLOADS_TASK_V4, downLoadTaskJson);
-
-        SceneDownloadLog sceneDownloadLog = new SceneDownloadLog();
-        sceneDownloadLog.setUserId(userId);
-        sceneDownloadLog.setNum(param.getSceneNum());
-        sceneDownloadLog.setSceneVersion(sceneEditInfo.getVersion());
-        sceneDownloadLog.setDownloadStatus(DownloadStatus.DOWNLOADING.code());
-        sceneDownloadLogService.save(sceneDownloadLog);
-
-        result.put("downloadStatus", 1);
-        return ResultData.ok(result);
-    }
-
-    @Override
     public ResultData getSceneDownloadProcess(Long userId, SceneDownloadParamVO param) {
         // 获取下载进度
         String processStr = redisUtil.get(String.format(RedisKey.PREFIX_DOWNLOAD_PROGRESS_V4, param.getSceneNum()));
@@ -401,148 +165,4 @@ public class UserSceneServiceImpl implements IUserSceneService {
         return ResultData.ok(result);
 
     }
-
-    public Map<String, Object> getNewScenesPagerByUserId(Long userId, SceneParamVO param) throws Exception {
-
-        List<SceneProPO> sceneList = new ArrayList<>();
-        List<Folder> folderList = new ArrayList<>();
-
-        boolean searchCamera = false;
-        List<Camera> cameraList = new ArrayList<>();
-
-        String sceneName = "";
-        if (StringUtils.isNotEmpty(param.getKeywordType())) {
-            if (param.getKeywordType().equals("sceneName")) {
-                sceneName = param.getSearchKey();
-            } else if (param.getKeywordType().equals("snCode") && Objects
-                .nonNull(param.getSearchKey())) {
-                ResultData<List<Camera>> cameraResult = platformGoodsClient
-                    .getCameraLikeSnCode(param.getSearchKey());
-                if (!cameraResult.getSuccess())
-                    throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
-                cameraList = cameraResult.getData();
-                searchCamera = true;
-
-            }
-
-        }
-
-        //根目录时，需要排除已经归类的场景
-        if(param.getFolderId() == null){
-            //查出所有已经归类的场景id
-            List<Folder> allFolderList = folderService.list(
-                                    new LambdaQueryWrapper<Folder>()
-                                        .eq(Folder::getUserId, param.getUserId())
-                                        .eq(Folder::getFolderType, param.getFolderType()));
-
-            folderList = allFolderList.parallelStream().filter(folder->ObjectUtils.isEmpty(folder.getParentId())).collect(Collectors.toList());
-            // 查找所有的文件夹
-            List<Long> folderIds = allFolderList.parallelStream().map(Folder::getId).collect(Collectors.toList());
-            List<Long> sceneIdList = new ArrayList<>();
-            if(CollUtil.isNotEmpty(folderIds)){
-                List<FolderScene> folderSceneList = folderSceneService.list(
-                            new LambdaQueryWrapper<FolderScene>()
-                                .select(FolderScene::getSceneId)
-                                .in(FolderScene::getFolderId, folderIds));
-                sceneIdList = folderSceneList.parallelStream().map(FolderScene::getSceneId).collect(Collectors.toList());
-            }
-
-            if(sceneIdList.size() > 0){
-                param.setSceneIdList(sceneIdList);
-            }
-
-            //协作者 检索
-            if(param.getKeywordType().equals("userName") && StringUtils.isNotEmpty(param.getSearchKey())){
-                if(CollUtil.isEmpty(param.getNumList())){
-                    param.setNum("");
-                }
-            }
-
-            if(StrUtil.isNotBlank(param.getSceneSource())){
-                param.setSceneSourceList(ParamConvertUtil.getSceneSource(param.getSceneSource()));
-            }
-
-            if(searchCamera){
-                if(CollUtil.isEmpty(cameraList)){
-                    sceneList = new ArrayList<>();
-                }else{
-                    param.setCameraIdList(cameraList.stream().map(Camera::getId).collect(Collectors.toList()));
-                    sceneList = sceneProMapper.selectSceneList(param);
-                }
-            }else{
-                sceneList = sceneProMapper.selectSceneList(param);
-            }
-
-        }else {
-            //进入目录层级后，根据目录获取当前目录的所有场景
-            List<Long> sceneIdList = folderSceneService
-                .getSceneIdListByFolderId(param.getFolderId());
-
-            if(StrUtil.isNotBlank(param.getSceneSource())){
-                param.setSceneSourceList(ParamConvertUtil.getSceneSource(param.getSceneSource()));
-            }
-            if(CollUtil.isNotEmpty(sceneIdList)){
-                param.setSceneIdList(sceneIdList);
-                if(searchCamera){
-                    if(CollUtil.isEmpty(cameraList)){
-                        sceneList = new ArrayList<>();
-                    }else{
-                        param.setCameraIdList(cameraList.stream().map(Camera::getId).collect(Collectors.toList()));
-                        sceneList = sceneProMapper.selectSceneList(param);
-                    }
-                }else{
-                    sceneList = sceneProMapper.selectSceneList(param);
-                }
-            }
-
-            //获取文件夹数量
-            folderList= folderService.list(
-                new LambdaQueryWrapper<Folder>().eq(Folder::getUserId, param.getUserId())
-                    .eq(Folder::getParentId, param.getFolderId())
-                    .orderByDesc(Folder::getId));
-        }
-        List<SceneVO> responseScenes = sceneService.convertPro(sceneList);
-
-        //当前文件夹所包含的所有场景数量
-        Long sceneNum = 0L;
-        List<FolderVO> responseFolderList = new ArrayList<>();
-
-        List<Object> result = new ArrayList<>();
-        if(Objects.nonNull(param.getSceneSource()) && StrUtil.isEmpty(param.getSceneType()) &&
-            param.getStartTime() == null && param.getEndTime() == null){
-
-            responseFolderList = folderService.convert(folderList);
-            result.addAll(responseFolderList);
-
-            //根目录判断是否有双目文件夹
-            if(param.getFolderId() == null && param.getSceneSource().contains("1")){
-                //判断是否有双目场景，有则增加双目的文件夹
-                Long sceneCnt = sceneService
-                    .count(new LambdaQueryWrapper<Scene>().eq(Scene::getUserId, userId));
-
-                if(sceneCnt > 0){
-                    FolderVO sceneFolder = new FolderVO();
-                    sceneFolder.setName("双目文件夹");
-                    //type为3，表示旧版双目相机场景
-                    sceneFolder.setType(3);
-                    sceneFolder.setIsFolder(1);
-                    sceneFolder.setSceneNum(Integer.parseInt(String.valueOf(sceneCnt)));
-                    result.add(sceneFolder);
-                }
-            }
-        }
-
-        //统计当前目录所有场景数量
-        sceneNum += responseFolderList.parallelStream().mapToLong(FolderVO::getSceneNum).sum();
-        sceneNum += sceneList.size();
-        sceneNum += responseScenes.size();
-        result.addAll(responseScenes);
-
-        Page<Object> data = PageInfoUtils.list2PageInfo(result, param.getPageNum(), param.getPageSize());
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("sceneNum",  sceneNum);
-        map.put("pageInfo", data);
-        return map;
-    }
 }

4dkankan-center-scene/src/main/resources/bootstrap-test.yml

@@ -33,7 +33,7 @@ spring:
             refresh: true
       discovery:
         server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-test
+        namespace: 4dkankan-dev
     sentinel:
       transport:
         dashboard: 120.24.144.164:8888