增加文件夹重命名

src/main/java/com/cdf/aop/SysLog.java

@@ -2,13 +2,6 @@ package com.cdf.aop;
 
 import java.lang.annotation.*;
 
-/**
- * 系统日志注解
- *
- * @author lipengjun
- * @email 939961241@qq.com
- * @date 2017年3月8日 上午10:19:56
- */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented

src/main/java/com/cdf/controller/api/PageDataApiController.java

@@ -25,24 +25,8 @@ public class PageDataApiController {
     @Autowired
     IPageDataService pageDataService;
 
-    @GetMapping("/inPage")
-    public ResultData inPage(@RequestParam(required = false) String userId,
-                             @RequestParam(required = false) String accessToken,
-                             @RequestParam(required = false) String cookieId,
-                             @RequestParam(required = false) String isMiniApp,
-                             @RequestParam(required = false) String whereUrl){
-        PageData pageData = new PageData();
-        pageData.setCdfUserId(userId);
-        pageData.setCdfToken(accessToken);
-        pageData.setCdfCookieId(cookieId);
-        pageData.setIsMiniApp(isMiniApp);
-        pageData.setDay(DateUtil.getDay(new Date()));
-        pageData.setUrl(whereUrl);
-        pageDataService.save(pageData);
-        return ResultData.ok();
-    }
 
-    @GetMapping("/inOrOutPage")
+    @GetMapping("/Point")
     public ResultData inOrOutPage(@RequestParam(required = false) String userId,
                                   @RequestParam(required = false) String accessToken,
                                   @RequestParam(required = false) String cookieId,
@@ -79,6 +63,12 @@ public class PageDataApiController {
         if(type == 3){
             pageData.setIsClickShop(1);
         }
+        if(type == 4){
+            pageData.setStepNum( pageData.getStepNum() + 1);
+        }
+        if(type == 5){
+            pageData.setVideoNum( pageData.getVideoNum() + 1);
+        }
         pageDataService.saveOrUpdate(pageData);
         return ResultData.ok();
     }

src/main/java/com/cdf/controller/back/SceneBackController.java

@@ -41,6 +41,12 @@ public class SceneBackController {
         fdkkSceneService.folderSave(param,token);
         return ResultData.ok();
     }
+    @PostMapping("/folderUpdate")
+    @SysLog(logType = "VR场景",value = "文件夹重命名")
+    public ResultData folderUpdate (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
+        fdkkSceneService.folderUpdate(param,token);
+        return ResultData.ok();
+    }
     @PostMapping("/move")
     @SysLog(logType = "VR场景",value = "移动")
     public ResultData move (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){

src/main/java/com/cdf/controller/back/TestController.java

@@ -37,6 +37,7 @@ public class TestController {
     public ResultData getCatNum(){
         return ResultData.ok(cdfClient.getCatNum());
     }
+
     @RequestMapping("/test/task")
     public ResultData statisticsH5Data(@RequestParam(required = false) String day){
         if(StringUtils.isNotBlank(day)){
@@ -46,4 +47,10 @@ public class TestController {
         ScheduleTask.day = null;
         return ResultData.ok();
     }
+
+    @RequestMapping("/test/one")
+    public ResultData test1() throws Exception{
+        System.out.println(1/0);
+        return ResultData.ok();
+    }
 }

src/main/java/com/cdf/controller/service/FdkkSceneEditController.java

@@ -20,13 +20,13 @@ public class FdkkSceneEditController {
     private FdkkSceneEditService fdkkSceneEditService;
 
     @PostMapping("/tag/save")
-    @SysLog("/热点新增编辑")
+    @SysLog(logType = "VR场景",value = "热点新增或编辑")
     public FdkkResponse save(@RequestBody FdkkHotRequest fdkkHotRequest, @RequestHeader String token){
         return fdkkSceneEditService.saveTag(fdkkHotRequest,token);
     }
 
     @PostMapping("/tag/delete")
-    @SysLog("/热点删除")
+    @SysLog(logType = "VR场景",value = "热点删除")
     public ResultData delete(@RequestBody FdkkHotRequest fdkkHotRequest, @RequestHeader String token){
         fdkkSceneEditService.deleteTag(fdkkHotRequest,token);
         return ResultData.ok();
@@ -43,7 +43,7 @@ public class FdkkSceneEditController {
     }
 
     @PostMapping("publicScene")
-    @SysLog("场景发布")
+    @SysLog(logType = "VR场景",value = "发布场景")
     public ResultData scenePublicScene(@RequestBody FdkkHotRequest fdkkHotRequest ,@RequestHeader String token){
         fdkkSceneEditService.publicScene(fdkkHotRequest,token);
         return ResultData.ok();

src/main/java/com/cdf/entity/PageData.java

@@ -52,6 +52,12 @@ public class PageData implements Serializable {
     @TableField("stop_time")
     private Long stopTime;
 
+    @TableField("step_num")
+    private Long stepNum;
+
+    @TableField("video_num")
+    private Long videoNum;
+
     @TableField("url")
     private String url;
 

src/main/java/com/cdf/httpClient/client/FdkkClient.java

@@ -49,6 +49,12 @@ public interface FdkkClient {
     @Address(source = FdkkLoginAddressSource.class)
     FdkkResponse folderSave(@JSONBody FdkkSceneFolderRequest fdkkSceneDeleteRequest , @Header("token")  String token);
     /**
+     * 文件夹重命名
+     */
+    @Post("/api/user/folder/update")
+    @Address(source = FdkkLoginAddressSource.class)
+    FdkkResponse folderUpdate(@JSONBody FdkkSceneFolderRequest fdkkSceneDeleteRequest , @Header("token")  String token);
+    /**
      * 移动场景，文件夹
      */
     @Post("/api/user/folder/move")

src/main/java/com/cdf/httpClient/request/FdkkSceneFolderRequest.java

@@ -14,4 +14,5 @@ public class FdkkSceneFolderRequest {
     private String folderIds;
     private String sceneIds;
     private String name;
+    private Integer id;
 }

src/main/java/com/cdf/service/impl/FdkkSceneService.java

@@ -75,4 +75,10 @@ public class FdkkSceneService {
             throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
         }
     }
+    public void folderUpdate(FdkkSceneFolderRequest param, String token) {
+        FdkkResponse fdkkResponse = fdkkClient.folderUpdate( param, getFdkkToken(token));
+        if(fdkkResponse.getCode() != ResultCode.SUCCESS.code){
+            throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
+        }
+    }
 }