111

src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -11,14 +11,13 @@ import com.fdkankan.scene.httpclient.CustomHttpClient;
 import com.fdkankan.scene.service.SceneEditInfoService;
 import com.fdkankan.scene.service.SceneFileMappingService;
 import com.fdkankan.scene.service.SceneService;
+import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
@@ -76,6 +75,12 @@ public class SceneController extends BaseController{
         return ResultData.ok();
     }
 
+    @PostMapping(value = "/check/key")
+    public ResultData checkKey(@RequestBody @Validated SceneCheckKeyParamVO param) throws Exception {
+        param.setSubgroup(this.getSubgroup());
+        return sceneEditInfoService.checkKey(param);
+    }
+
 
 }
 

src/main/java/com/fdkankan/scene/service/SceneEditInfoService.java

@@ -70,7 +70,7 @@ public interface SceneEditInfoService extends IService<SceneEditInfo> {
 //
 //    ResultData sceneSync(String num, String type, String floorPlanJson, String ajkJson, String cameraJson, MultipartFile[] files) throws Exception;
 //
-//    ResultData checkKey(SceneCheckKeyParamVO param) throws Exception;
+    ResultData checkKey(SceneCheckKeyParamVO param) throws Exception;
 
     ResultData addMosaics(BaseDataParamVO param) throws Exception;
 

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -404,7 +404,9 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<SceneEditInfoMapper, S
                 return this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
             //如果是查看页面请求，查redis
             case VIEW:
-                return this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
+                SceneInfoVO sceneInfo = this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
+                sceneInfo.setScenePassword(null);
+                return sceneInfo;
         }
         return null;
     }
@@ -1809,28 +1811,20 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<SceneEditInfoMapper, S
 //        return ResultData.ok();
 //    }
 //
-//    @Override
-//    public ResultData checkKey(SceneCheckKeyParamVO param) throws Exception {
-//        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
-//        if(Objects.isNull(scenePlus)){
-//            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-//        }
-//        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-//        String bucket = scenePlusExt.getYunFileBucket();
-//        SceneJsonBean sceneJsonBean = null;
-//        String sceneJson = redisUtil.get(String.format(RedisKey.SCENE_JSON, param.getNum()));
-//        if(StrUtil.isEmpty(sceneJson)){
-//            sceneJson = fYunFileService.getFileContent(bucket,
-//                    String.format(UploadFilePath.DATA_VIEW_PATH, param.getNum()) + "scene.json");
-//        }
-//        sceneJsonBean = JSON.parseObject(sceneJson, SceneJsonBean.class);
-//
-//        if(!param.getPassword().equals(sceneJsonBean.getScenePassword())){
-//            throw new BusinessException(ErrorCode.FAILURE_CODE_5021);
-//        }
-//
-//        return ResultData.ok();
-//    }
+    @Override
+    public ResultData checkKey(SceneCheckKeyParamVO param) throws Exception {
+        Scene scenePlus = sceneService.getByNum(param.getNum(), param.getSubgroup());
+        if(Objects.isNull(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        SceneEditInfo sceneEditInfo = this.getByScenePlusId(scenePlus.getId());
+
+        if(!param.getPassword().equals(sceneEditInfo.getScenePassword())){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5021);
+        }
+
+        return ResultData.ok();
+    }
 
     @Override
     public ResultData addMosaics(BaseDataParamVO param) throws Exception {

src/main/java/com/fdkankan/scene/vo/SceneCheckKeyParamVO.java

@@ -0,0 +1,20 @@
+package com.fdkankan.scene.vo;
+
+import javax.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/3/19
+ **/
+@Data
+public class SceneCheckKeyParamVO extends BaseSceneParamVO{
+
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+}