2.3.0增加修改场景访问密码/密码有效期接口

src/main/java/com/fdkankan/openApi/controller/www/GaSceneController.java

@@ -31,5 +31,13 @@ public class GaSceneController {
         return ResultData.ok();
     }
 
+    @SaIgnore
+    @ValidateApi(method = "gaScene:getSceneViewPassword")
+    @ValidateIp
+    @PostMapping("getSceneViewPassword")
+    public ResultData getSceneViewPassword(@Valid @RequestBody BaseSceneParamVo dto) {
+        return gaSceneService.getSceneViewPassword(dto);
+    }
+
 
 }

src/main/java/com/fdkankan/openApi/entity/www/SceneEditInfo.java

@@ -76,8 +76,8 @@ public class SceneEditInfo implements Serializable {
     /**
      * 浏览密码
      */
-    @TableField("password_expir_time")
-    private String passwordExpirTime;
+    @TableField("password_expire_time")
+    private String passwordExpireTime;
 
     /**
      * 场景标题

src/main/java/com/fdkankan/openApi/service/www/GaSceneService.java

@@ -1,9 +1,14 @@
 package com.fdkankan.openApi.service.www;
 
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.openApi.vo.BaseSceneParamVo;
 import com.fdkankan.openApi.vo.www.SaveScenePasswordDto;
+import com.fdkankan.web.response.ResultData;
 
 import javax.validation.Valid;
 
 public interface GaSceneService {
     void saveSceneViewPassword(@Valid SaveScenePasswordDto dto);
+
+    ResultData getSceneViewPassword(@Valid BaseSceneParamVo dto);
 }

src/main/java/com/fdkankan/openApi/service/www/impl/GaSceneServiceImpl.java

@@ -19,9 +19,11 @@ import com.fdkankan.openApi.service.www.GaSceneService;
 import com.fdkankan.openApi.service.www.ISceneEditControlsService;
 import com.fdkankan.openApi.service.www.ISceneEditInfoService;
 import com.fdkankan.openApi.service.www.IScenePlusService;
+import com.fdkankan.openApi.vo.BaseSceneParamVo;
 import com.fdkankan.openApi.vo.www.SaveScenePasswordDto;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -74,7 +76,7 @@ public class GaSceneServiceImpl implements GaSceneService {
         }
         SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
         sceneEditInfo.setScenePassword(dto.getPassword());
-        sceneEditInfo.setPasswordExpirTime(expireTimeStr);
+        sceneEditInfo.setPasswordExpireTime(expireTimeStr);
         sceneEditInfo.setUpdateTime(null);
         sceneEditInfoService.updateById(sceneEditInfo);
 
@@ -88,7 +90,7 @@ public class GaSceneServiceImpl implements GaSceneService {
         String sceneJson = fYunFileService.getFileContent(sceneJsonPath);
         JSONObject jsonObject = JSON.parseObject(sceneJson);
         jsonObject.put("scenePassword", dto.getPassword());
-        jsonObject.put("passwordExpirTime", sceneEditInfo.getPasswordExpirTime());
+        jsonObject.put("passwordExpireTime", sceneEditInfo.getPasswordExpireTime());
         JSONObject controls = jsonObject.getJSONObject("controls");
         controls.put("showLock", showLock);
         fYunFileService.uploadFile(jsonObject.toJSONString().getBytes(StandardCharsets.UTF_8), sceneJsonPath);
@@ -105,4 +107,21 @@ public class GaSceneServiceImpl implements GaSceneService {
         return PATTERN.matcher(password).matches();
     }
 
+    @Override
+    public ResultData getSceneViewPassword(BaseSceneParamVo dto) {
+        ScenePlus scenePlus = scenePlusService.getByNum(dto.getSceneCode());
+        if(scenePlus == null){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+
+        //发布 scenePassword
+        String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH, dto.getSceneCode()) + "scene.json";
+        String sceneJson = fYunFileService.getFileContent(sceneJsonPath);
+        JSONObject jsonObject = JSON.parseObject(sceneJson);
+        JSONObject result = new JSONObject();
+        result.put("showLock", jsonObject.getJSONObject("controls").getIntValue("showLock"));
+        result.put("password", jsonObject.getString("scenePassword"));
+        result.put("expireTime", jsonObject.getString("scenePassword"));
+        return ResultData.ok(result);
+    }
 }