同步安居客数据包 下载接口

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

@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.SceneInfoReqType;
+import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.scene.entity.SceneDataDownload;
 import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.service.*;
@@ -1577,43 +1579,13 @@ public class SceneController {
 //        return Result.success("修改了：" + list.size());
 //    }
 //
-//    /**
-//     * 获取数据对接下载信息
-//     */
-//    @ApiOperation("获取数据对接下载信息")
-//    @PostMapping(value = "/downLoadZSData")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "sceneNum", value = "场景码", dataType = "String")})
-//    public ResultData downLoadZSData(HttpServletRequest request) throws Exception{
-//        String sceneNum = request.getParameter("sceneNum");
-//        if(StringUtil.isEmpty(sceneNum)){
-//            throw new BaseRuntimeException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
-//        }
-//
-//        Result result = new Result();
-//
-//        SceneProEntity sceneProEntity = sceneProService.findBySceneNum(sceneNum);
-//        if(sceneProEntity == null){
-//            result.setCode(SceneConstant.FAILURE_CODE_5005);
-//            result.setMsg(SceneConstant.FAILURE_MSG_5005);
-//            result.setData(null);
-//            return result;
-//        }
-//
-//        SceneDataDownloadEntity sceneDataDownloadEntity = sceneDataDownloadService.findBySceneNum(sceneNum);
-//        if(sceneDataDownloadEntity == null){
-//            result.setCode(SceneConstant.FAILURE_CODE_5025);
-//            result.setMsg(SceneConstant.FAILURE_MSG_5025);
-//            result.setData(null);
-//            return result;
-//        }
-//
-//        ResponseSceneDataDownload responseSceneDataDownload = new ResponseSceneDataDownload();
-//        BeanUtils.copyProperties(sceneDataDownloadEntity, responseSceneDataDownload);
-////        responseSceneDataDownload.setDownloadPath(responseSceneDataDownload.getDownloadPath() +
-////                "?t=" + System.currentTimeMillis());
-//        return Result.success(responseSceneDataDownload);
-//    }
+    /**
+     * 获取数据对接下载信息
+     */
+    @PostMapping(value = "/downLoadZSData")
+    public ResultData downLoadZSData(@Validated BaseSceneParamVO param) throws Exception{
+        return sceneService.downLoadZSData(param);
+    }
 //
 //    /**
 //     * 增加场景下载次数

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

@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.scene.entity.Scene;
 import com.fdkankan.scene.entity.ScenePO;
 import com.fdkankan.scene.entity.SceneProPO;
+import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.SceneEditParamVO;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneVO;
 import com.fdkankan.common.response.ResultData;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -97,6 +99,8 @@ public interface ISceneService extends IService<Scene> {
 
     ResultData querySceneNum(SceneParamVO param);
 
+    ResultData downLoadZSData(BaseSceneParamVO param) throws Exception;
+
 
 
 }

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

@@ -212,7 +212,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }
 
         //处理热点数据，生成hot.json
-        this.publicHotData(sceneNum, sceneJson, sceneEditInfo);
+        this.publicHotData(sceneNum, sceneEditInfo);
 
         // TODO: 2022/3/2 这里的逻辑放在上传球幕视频接口中做了，这里先暂时注释掉，以后要删除
         //处理球幕视频
@@ -297,7 +297,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneEditInfo.setBuildVideoStatus(CommonStatus.NO.code());
     }
 
-    private void publicHotData(String sceneNum, SceneJsonBean sceneJson, SceneEditInfo sceneEditInfo) throws IOException {
+    private void publicHotData(String sceneNum, SceneEditInfo sceneEditInfo) throws IOException {
         String hotDataKey = String.format(RedisKey.SCENE_HOT_DATA, sceneNum);
         Map<String, String> hotMap = redisUtil.hmget(hotDataKey);
         List<String> hotList = Lists.newArrayList();

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

@@ -27,10 +27,12 @@ import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.entity.*;
 import com.fdkankan.scene.mapper.ISceneMapper;
 import com.fdkankan.scene.mapper.ISceneProMapper;
+import com.fdkankan.scene.service.ISceneDataDownloadService;
 import com.fdkankan.scene.service.ISceneExtService;
 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.SceneEditParamVO;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneVO;
@@ -88,6 +90,8 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     PlatformUserClient platformUserClient;
     @Autowired
     ISceneService sceneService;
+    @Autowired
+    private ISceneDataDownloadService sceneDataDownloadService;
 
     @Override
     public void updateUserIdByCameraId(Long userId, Long cameraId) {
@@ -1217,6 +1221,21 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         return ResultData.ok(sceneNum);
     }
 
+    @Override
+    public ResultData downLoadZSData(BaseSceneParamVO param) throws Exception {
+        String num = param.getNum();
+        ScenePro scenePro = sceneProService.findBySceneNum(num);
+        if(scenePro == null){
+            throw new BusinessException(ServerCode.PARAM_REQUIRED, "num");
+        }
+
+        SceneDataDownload sceneDataDownload = sceneDataDownloadService.findBySceneNum(num);
+        if(sceneDataDownload == null){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5025);
+        }
+
+        return ResultData.ok(sceneDataDownload);
+    }
 
 
 }