dengsixing 1 年間 前
コミット
d1ccbd8e6f

+ 6 - 0
pom.xml

@@ -158,6 +158,12 @@
             <version>1.0.5</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.chinatower.reszyzx.common</groupId>
+            <artifactId>chinatower-main-res-common</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
     </dependencies>
 
     <dependencyManagement>

+ 12 - 0
src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -1,7 +1,9 @@
 package com.fdkankan.scene.controller;
 
 
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneInfoReqType;
+import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.scene.annotation.CheckPermit;
 import com.fdkankan.scene.service.ISceneService;
 import com.fdkankan.web.response.ResultData;
@@ -47,6 +49,16 @@ public class SceneController extends BaseController {
      **/
     @GetMapping(value = "/getInfo")
     public SceneInfoVO getInfo(@Validated SceneInfoParamVO param) throws Exception{
+        String token = this.getToken();
+        String sysCode = null;
+        String acctId = null;
+        String RSP = "-1";
+        // TODO: 2024/6/5 调用统一认证api,如果出参中返回的
+
+        if(!RSP.equals("0")){
+            throw new BusinessException(ErrorCode.AUTH_FAIL);
+        }
+
         param.setReqType(SceneInfoReqType.VIEW.code());
         return sceneEditInfoService.getSceneInfo(param);
     }

+ 10 - 14
src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -107,7 +107,7 @@ import org.springframework.web.multipart.MultipartFile;
  *  服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2022-01-18
  */
 @Slf4j
@@ -606,21 +606,17 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     private SceneInfoVO getSceneInfo4View(String num) throws Exception{
 
         //校验场景是否为空、封存、计算中
-        ScenePlus scenePlus = scenePlusService.checkSceneAvail(num);
-        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-
-        //访问量+1
-        scenePlusService.updateViewCount(num);
+//        ScenePlus scenePlus = scenePlusService.checkSceneAvail(num);
+//        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+//
+//        //访问量+1
+//        scenePlusService.updateViewCount(num);
 
-        String key = String.format(RedisKey.SCENE_JSON, num);
-        String sceneJson = redisUtil.get(key);
+//        String key = String.format(RedisKey.SCENE_JSON, num);
         SceneInfoVO sceneInfoVO = null;
-        //先查询redis
-        if(StrUtil.isEmpty(sceneJson)) {
-            String objectName = String.format(ConstantFilePath.SCENE_VIEW_DATA_DATA_SCENEJSON, num);
-            sceneJson = fYunFileService.getFileContent(scenePlusExt.getYunFileBucket(), objectName);
-            redisUtil.set(key, sceneJson);
-        }
+        String objectName = String.format(ConstantFilePath.SCENE_VIEW_DATA_DATA_SCENEJSON, num);
+        String sceneJson = fYunFileService.getFileContent(objectName);
+//            redisUtil.set(key, sceneJson);
         sceneInfoVO = JSON.parseObject(sceneJson, SceneInfoVO.class);
         sceneInfoVO.setScenePassword(null);
         if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){

+ 2 - 0
src/main/java/com/fdkankan/scene/vo/SceneInfoParamVO.java

@@ -32,5 +32,7 @@ public class SceneInfoParamVO {
      */
     private Byte reqType;
 
+    private String acctId;
+
 
 }