日志记录修改

README.md

@@ -10,4 +10,9 @@
 ~~~~
 1,優化功能—在店鋪管理中的“店鋪名稱”，可按音序來自動排序
 2,店鋪管理中的“店鋪名稱”模糊查询
+~~~~
+
+###**v1.0.3** 
+~~~~
+1,操作日志，操作记录完善
 ~~~~

src/main/java/com/cdf/common/LogInfoKey.java

@@ -0,0 +1,6 @@
+package com.cdf.common;
+
+public class LogInfoKey {
+
+    public static String baseInfo = "%s【%s】%s";
+}

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

@@ -0,0 +1,31 @@
+package com.cdf.controller.back;
+
+
+import com.cdf.util.IPUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class BaseLogController {
+
+    @Autowired
+    protected HttpServletRequest request;
+
+    @Autowired
+    protected HttpServletResponse response;
+
+
+    protected String getToken(){
+        return request.getHeader("token");
+    }
+
+    protected String getIp(){
+        return IPUtils.getIpAddr(request);
+    }
+
+    protected String getPath(){
+        return request.getServletPath();
+    }
+
+}

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

@@ -16,7 +16,7 @@ public class LoginController {
     private LoginService loginService;
 
     @PostMapping("/login")
-    @SysLog(value = "登录",logType = "登录")
+    @SysLog(value = "登录系统",logType = "登录")
     ResultData login(@RequestBody LoginRequest param){
         return ResultData.ok(loginService.login(param));
     }

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

@@ -22,9 +22,11 @@ public class SceneBackController {
     private FdkkSceneService fdkkSceneService;
 
     @PostMapping("/list")
+    @SysLog(logType = "查看场景列表",value = "场景管理")
     public ResultData list (@RequestBody FdkkSceneListRequest param, @RequestHeader String token ){
         return ResultData.ok(fdkkSceneService.list(param,token));
     }
+
     @PostMapping("/allList")
     public ResultData allList(@RequestBody FdkkSceneListRequest param, @RequestHeader String token ){
         FdkkResponse fdkkResponse = fdkkSceneService.allList(param,token);
@@ -33,7 +35,7 @@ public class SceneBackController {
     }
 
     @PostMapping("/delete")
-    @SysLog(logType = "VR场景",value = "删除")
+    @SysLog(logType = "场景管理",value = "删除")
     public ResultData delete (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
         fdkkSceneService.delete(param,token);
         return ResultData.ok();
@@ -46,25 +48,25 @@ public class SceneBackController {
     }
 
     @PostMapping("/folderSave")
-    @SysLog(logType = "VR场景",value = "新建文件夹")
+    @SysLog(logType = "场景管理",value = "新建文件夹")
     public ResultData folderSave (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
         fdkkSceneService.folderSave(param,token);
         return ResultData.ok();
     }
     @PostMapping("/folderUpdate")
-    @SysLog(logType = "VR场景",value = "文件夹重命名")
+    @SysLog(logType = "场景管理",value = "文件夹重命名")
     public ResultData folderUpdate (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
         fdkkSceneService.folderUpdate(param,token);
         return ResultData.ok();
     }
     @PostMapping("/folderDelete")
-    @SysLog(logType = "VR场景",value = "文件夹删除")
+    @SysLog(logType = "场景管理",value = "文件夹删除")
     public ResultData folderDelete (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
         fdkkSceneService.folderDelete(param,token);
         return ResultData.ok();
     }
     @PostMapping("/move")
-    @SysLog(logType = "VR场景",value = "移动")
+    @SysLog(logType = "场景管理",value = "移动")
     public ResultData move (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
         fdkkSceneService.move(param,token);
         return ResultData.ok();

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

@@ -4,17 +4,22 @@ package com.cdf.controller.back;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cdf.aop.SysLog;
+import com.cdf.common.LogInfoKey;
 import com.cdf.common.PageInfo;
+import com.cdf.common.ResultCode;
 import com.cdf.common.ResultData;
 import com.cdf.entity.Dept;
 import com.cdf.entity.Shop;
 import com.cdf.entity.ShopCategory;
+import com.cdf.exception.BusinessException;
 import com.cdf.request.ShopRequest;
 import com.cdf.response.ShopVo;
 import com.cdf.service.IDeptService;
+import com.cdf.service.ILogService;
 import com.cdf.service.IShopCategoryService;
 import com.cdf.service.IShopService;
 import org.apache.commons.lang3.StringUtils;
@@ -31,7 +36,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/back/shop")
-public class ShopBackController {
+public class ShopBackController extends BaseLogController{
 
     @Autowired
     IShopService shopService;
@@ -39,25 +44,41 @@ public class ShopBackController {
     IDeptService deptService;
     @Autowired
     IShopCategoryService categoryService;
+    @Autowired
+    ILogService logService;
 
     @PostMapping("/saveOrUpdate")
-    @SysLog(logType = "店铺管理",value = "新增或修改")
     public ResultData saveOrUpdate(@RequestBody Shop shop){
-        shop.setCreateTime(null);
-        shop.setUpdateTime(null);
+        String info = null;
+        if(shop.getId()== null){
+            info = String.format(LogInfoKey.baseInfo,"新增",shop.getShopName(),"店铺");
+        }else {
+            info = String.format(LogInfoKey.baseInfo,"编辑",shop.getShopName(),"店铺");
+            shop.setCreateTime(null);
+            shop.setUpdateTime(null);
+        }
+        logService.addLog("店铺管理",info,getIp(),getToken());
         shopService.saveOrUpdate(shop);
         return ResultData.ok();
     }
     @PostMapping("/list")
+    @SysLog(logType = "店铺管理",value = "查看店铺列表")
     public ResultData list(@RequestBody ShopRequest param){
         PageInfo pageInfo = shopService.pageList(param);
         return ResultData.ok(pageInfo);
     }
 
     @PostMapping("/delete")
-    @SysLog(logType = "店铺管理",value = "删除")
     public ResultData delete(@RequestBody ShopRequest param){
-        shopService.removeById(param.getId());
+        if(param.getId() == null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        Shop shop = shopService.getById(param.getId());
+        if(shop!=null){
+            shopService.removeById(param.getId());
+            String info = String.format(LogInfoKey.baseInfo,"删除",shop.getShopName(),"店铺");
+            logService.addLog("店铺管理",info,getIp(),getToken());
+        }
         return ResultData.ok();
     }
 

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

@@ -1,13 +1,16 @@
 package com.cdf.controller.back;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cdf.aop.SysLog;
+import com.cdf.common.LogInfoKey;
 import com.cdf.common.PageInfo;
 import com.cdf.common.ResultCode;
 import com.cdf.common.ResultData;
 import com.cdf.entity.ShopCategory;
 import com.cdf.exception.BusinessException;
 import com.cdf.request.BaseRequest;
+import com.cdf.service.ILogService;
 import com.cdf.service.IShopCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,29 +22,42 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/back/category")
-public class ShopCategoryController {
+public class ShopCategoryController extends BaseLogController{
 
     @Autowired
     private IShopCategoryService shopCategoryService;
+    @Autowired
+    private ILogService logService;
 
     @PostMapping("/saveOrUpdate")
-    @SysLog(logType = "店铺分类",value = "新增或修改")
     public ResultData saveOrUpdate(@RequestBody ShopCategory shopCategory){
-        shopCategory.setCreateTime(null);
-        shopCategory.setUpdateTime(null);
+        String info = null;
+        if(shopCategory.getId()== null){
+            info = String.format(LogInfoKey.baseInfo,"新增",shopCategory.getCategoryName(),"分类");
+        }else {
+            info = String.format(LogInfoKey.baseInfo,"编辑",shopCategory.getCategoryName(),"分类");
+            shopCategory.setCreateTime(null);
+            shopCategory.setUpdateTime(null);
+        }
+        logService.addLog("店铺分类",info,getIp(),getToken());
         shopCategoryService.saveOrUpdate(shopCategory);
         return ResultData.ok();
     }
     @PostMapping("/delete")
-    @SysLog(logType = "店铺分类",value = "删除")
     public ResultData delete(@RequestBody ShopCategory shopCategory){
         if(shopCategory.getId() == null){
             throw new BusinessException(ResultCode.PARAM_MISS);
         }
-        shopCategoryService.removeById(shopCategory);
+        ShopCategory shopCategory1 = shopCategoryService.getById(shopCategory.getId());
+        if(shopCategory1!=null){
+            shopCategoryService.removeById(shopCategory.getId());
+            String info = String.format(LogInfoKey.baseInfo,"删除",shopCategory1.getCategoryName(),"分类");
+            logService.addLog("店铺分类",info,getIp(),getToken());
+        }
         return ResultData.ok();
     }
     @PostMapping("/list")
+    @SysLog(logType = "店铺分类",value = "查看分类列表")
     public ResultData list(@RequestBody BaseRequest param){
         Page<ShopCategory> page = shopCategoryService.page(new Page<>(param.getPageNum(), param.getPageSize()));
         return ResultData.ok(PageInfo.PageInfo(page));

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

@@ -3,6 +3,7 @@ package com.cdf.controller.back;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cdf.aop.SysLog;
+import com.cdf.common.LogInfoKey;
 import com.cdf.common.ResultCode;
 import com.cdf.common.ResultData;
 import com.cdf.entity.Dept;
@@ -13,6 +14,7 @@ import com.cdf.exception.BusinessException;
 import com.cdf.response.DeptVo;
 import com.cdf.response.MenuVo;
 import com.cdf.service.IDeptService;
+import com.cdf.service.ILogService;
 import com.cdf.service.IShopService;
 import com.cdf.service.IUserService;
 import org.springframework.beans.BeanUtils;
@@ -29,7 +31,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/back/dept")
-public class SysDeptController {
+public class SysDeptController extends BaseLogController{
 
     @Autowired
     private IDeptService deptService;
@@ -37,21 +39,28 @@ public class SysDeptController {
     private IUserService userService;
     @Autowired
     private IShopService shopService;
+    @Autowired
+    private ILogService logService;
 
     @PostMapping("/saveOrUpdate")
-    @SysLog(logType = "组织架构",value = "新增或修改")
     public ResultData saveOrUpdate(@RequestBody Dept dept){
         if(dept.getId()!=null && dept.getId().equals(dept.getParentId())){
             throw new BusinessException(ResultCode.ERROR);
         }
-        dept.setCreateTime(null);
-        dept.setUpdateTime(null);
+        String info = null;
+        if(dept.getId()== null){
+            info = String.format(LogInfoKey.baseInfo,"新增",dept.getDeptName(),"组织架构");
+        }else {
+            info = String.format(LogInfoKey.baseInfo,"编辑",dept.getDeptName(),"组织架构");
+            dept.setCreateTime(null);
+            dept.setUpdateTime(null);
+        }
+        logService.addLog("组织架构",info,getIp(),getToken());
         deptService.saveOrUpdate(dept);
         return ResultData.ok(dept);
     }
 
     @PostMapping("/delete")
-    @SysLog(logType = "组织架构",value = "删除")
     public ResultData delete(@RequestBody Dept param){
         Dept dept = deptService.getById(param.getId());
         if(dept == null ){
@@ -72,11 +81,17 @@ public class SysDeptController {
         if(shopCount > 0){
             throw new BusinessException(ResultCode.NOT_DELETE_DEPT_SHOP);
         }
-        deptService.removeById(dept.getId());
+        Dept byId = deptService.getById(dept.getId());
+        if(byId !=null){
+            deptService.removeById(dept.getId());
+            String info = String.format(LogInfoKey.baseInfo,"删除",byId.getDeptName(),"组织架构");
+            logService.addLog("组织架构",info,getIp(),getToken());
+        }
         return ResultData.ok();
     }
 
     @PostMapping("/allList")
+    @SysLog(logType = "组织架构",value = "查看组织架构")
     public ResultData list(){
         return ResultData.ok(deptService.getDeptList(null));
     }

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

@@ -1,19 +1,12 @@
 package com.cdf.controller.back;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cdf.aop.SysLog;
 import com.cdf.common.PageInfo;
 import com.cdf.common.ResultData;
-import com.cdf.entity.Log;
-import com.cdf.entity.User;
 import com.cdf.request.LogRequest;
-import com.cdf.request.UserRequest;
 import com.cdf.response.LogVo;
 import com.cdf.service.ILogService;
-import com.cdf.service.IUserService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
 
 
 @RestController
@@ -33,6 +24,7 @@ public class SysLogController {
     private ILogService logService;
 
     @PostMapping("/list")
+    @SysLog(logType = "操作日志",value = "查看日志列表")
     public ResultData list(@RequestBody LogRequest param){
         PageInfo<LogVo> pageInfo = logService.getPageByParam(param);
         return ResultData.ok(pageInfo);

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

@@ -3,14 +3,17 @@ package com.cdf.controller.back;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cdf.aop.SysLog;
+import com.cdf.common.LogInfoKey;
 import com.cdf.common.PageInfo;
 import com.cdf.common.ResultCode;
 import com.cdf.common.ResultData;
 import com.cdf.entity.User;
+import com.cdf.entity.Video;
 import com.cdf.exception.BusinessException;
 import com.cdf.request.UserRequest;
 import com.cdf.request.UserUpdateRequest;
 import com.cdf.response.UserVo;
+import com.cdf.service.ILogService;
 import com.cdf.service.IUserService;
 import com.cdf.util.Base64Converter;
 import com.cdf.util.JwtUtil;
@@ -25,15 +28,17 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/back/user")
-public class SysUserController {
+public class SysUserController extends BaseLogController {
 
     @Autowired
     private IUserService userService;
     @Value("${user.default-password}")
     private String defaultPassword;
+    @Autowired
+    private ILogService logService;
 
     @PostMapping("/saveOrUpdate")
-    @SysLog(logType = "系统用户",value = "新增或修改")
+    @SysLog(logType = "用户管理",value = "新增或修改")
     public ResultData saveOrUpdate(@RequestBody User user){
         if(StringUtils.isNotBlank(user.getPhone())){
             LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
@@ -43,7 +48,6 @@ public class SysUserController {
                 throw  new BusinessException(ResultCode.PHONE_EXIST);
             }
         }
-
        if(user.getId() == null){
            if(StringUtils.isBlank(user.getPhone())||StringUtils.isBlank(user.getPassword())){
                throw  new BusinessException(ResultCode.PARAM_MISS);
@@ -55,26 +59,41 @@ public class SysUserController {
            String passwordMd5 = SecurityUtil.MD52(password);
            user.setPassword(passwordMd5);
        }
-        user.setCreateTime(null);
-        user.setUpdateTime(null);
+        String info = null;
+        if(user.getId()== null){
+            info = String.format(LogInfoKey.baseInfo,"新增",user.getNickName(),"用户");
+        }else {
+            info = String.format(LogInfoKey.baseInfo,"编辑",user.getNickName(),"用户");
+            user.setCreateTime(null);
+            user.setUpdateTime(null);
+        }
+        logService.addLog("用户管理",info,getIp(),getToken());
         userService.saveOrUpdate(user);
         return ResultData.ok();
     }
 
     @PostMapping("/list")
+    @SysLog(logType = "用户管理",value = "查看用户列表")
     public ResultData list(@RequestBody UserRequest param){
         PageInfo<UserVo> page = userService.getPageByParam(param);
         return ResultData.ok(page);
     }
 
     @PostMapping("/delete")
-    @SysLog(logType = "系统用户",value = "删除")
     public ResultData delete(@RequestBody UserRequest param){
-        userService.removeById(param.getId());
+        if(param.getId() == null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        User byId = userService.getById(param.getId());
+        if(byId !=null){
+            userService.removeById(param.getId());
+            String info = String.format(LogInfoKey.baseInfo,"删除",byId.getNickName(),"用户");
+            logService.addLog("用户管理",info,getIp(),getToken());
+        }
         return ResultData.ok();
     }
     @PostMapping("/rePassword")
-    @SysLog(logType = "系统用户",value = "重置密码")
+    @SysLog(logType = "用户管理",value = "重置密码")
     public ResultData rePassword(@RequestBody UserRequest param){
         if(param.getId() == null){
             throw new BusinessException(ResultCode.PARAM_MISS);
@@ -87,7 +106,7 @@ public class SysUserController {
     }
 
     @PostMapping("/updatePassword")
-    @SysLog(logType = "系统用户",value = "修改密码")
+    @SysLog(logType = "用户管理",value = "修改密码")
     public ResultData updatePassword(@RequestBody UserUpdateRequest param, @RequestHeader String token){
         Integer userId = JwtUtil.getId(token);
         User user = userService.getById(userId);

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

@@ -4,10 +4,15 @@ package com.cdf.controller.back;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cdf.aop.SysLog;
+import com.cdf.common.LogInfoKey;
 import com.cdf.common.PageInfo;
+import com.cdf.common.ResultCode;
 import com.cdf.common.ResultData;
+import com.cdf.entity.Dept;
 import com.cdf.entity.Video;
+import com.cdf.exception.BusinessException;
 import com.cdf.request.BaseRequest;
+import com.cdf.service.ILogService;
 import com.cdf.service.IVideoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,34 +24,50 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/back/video")
-public class VideoBackController {
+public class VideoBackController extends BaseLogController{
 
     @Autowired
     private IVideoService videoService;
+    @Autowired
+    private ILogService logService;
 
     @PostMapping("/saveOrUpdate")
-    @SysLog(logType = "开场视频",value = "新增或修改")
     public ResultData saveOrUpdate(@RequestBody Video video){
         if(video.getShowStatus() == 1){
             LambdaUpdateWrapper<Video> wrapper = new LambdaUpdateWrapper<>();
             wrapper.set(Video::getShowStatus, 0);
             videoService.update(wrapper);
         }
-        video.setUpdateTime(null);
-        video.setCreateTime(null);
+        String info = null;
+        if(video.getId()== null){
+            info = String.format(LogInfoKey.baseInfo,"新增",video.getVideoName(),"开场视频");
+        }else {
+            info = String.format(LogInfoKey.baseInfo,"编辑",video.getVideoName(),"开场视频");
+            video.setCreateTime(null);
+            video.setUpdateTime(null);
+        }
+        logService.addLog("开场视频",info,getIp(),getToken());
         videoService.saveOrUpdate(video);
         return ResultData.ok();
     }
 
     @PostMapping("/list")
+    @SysLog(logType = "开场视频",value = "查看视频列表")
     public ResultData list (@RequestBody BaseRequest param){
         Page<Video> page = videoService.page(new Page<>(param.getPageNum(), param.getPageSize()));
         return ResultData.ok(PageInfo.PageInfo(page));
     }
     @PostMapping("/delete")
-    @SysLog(logType = "开场视频",value = "删除")
     public ResultData delete (@RequestBody BaseRequest param){
-        videoService.removeById(param.getId());
+        if(param.getId() == null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        Video byId = videoService.getById(param.getId());
+        if(byId !=null){
+            videoService.removeById(param.getId());
+            String info = String.format(LogInfoKey.baseInfo,"删除",byId.getVideoName(),"开场视频");
+            logService.addLog("开场视频",info,getIp(),getToken());
+        }
         return ResultData.ok();
     }
 

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

@@ -2,10 +2,14 @@ package com.cdf.controller.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.cdf.aop.SysLog;
+import com.cdf.common.LogInfoKey;
 import com.cdf.common.ResultData;
+import com.cdf.controller.back.BaseLogController;
+import com.cdf.httpClient.request.FdkkHotData;
 import com.cdf.httpClient.request.FdkkHotRequest;
 import com.cdf.httpClient.request.FdkkUploadRequest;
 import com.cdf.httpClient.response.FdkkResponse;
+import com.cdf.service.ILogService;
 import com.cdf.service.impl.FdkkSceneEditService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -15,27 +19,35 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 
 @RestController
 @RequestMapping("/service/scene/edit")
-public class FdkkSceneEditController {
+public class FdkkSceneEditController extends BaseLogController {
 
     @Autowired
     private FdkkSceneEditService fdkkSceneEditService;
 
+    @Autowired
+    private ILogService logService;
+
     @PostMapping("/getAuth")
     public JSONObject getAuth(@RequestParam (required = false) String num, @RequestHeader String token){
         return  fdkkSceneEditService.getAuth(num, token);
     }
     @PostMapping("/tag/save")
-    @SysLog(logType = "VR场景",value = "热点新增或编辑")
     public ResultData save(@RequestBody FdkkHotRequest fdkkHotRequest, @RequestHeader String token){
         FdkkResponse fdkkResponse = fdkkSceneEditService.saveTag(fdkkHotRequest, token);
+
+        String title = fdkkSceneEditService.getHotTitle(fdkkHotRequest.getHotDataList());
+        String info = String.format(LogInfoKey.baseInfo,"热点新增或编辑",title,"热点");
+        logService.addLog("场景管理",info,getIp(),getToken());
+
         return ResultData.ok(fdkkResponse.getMsg(),fdkkResponse.getData());
     }
 
     @PostMapping("/tag/delete")
-    @SysLog(logType = "VR场景",value = "热点删除")
+    @SysLog(logType = "场景管理",value = "热点删除")
     public ResultData delete(@RequestBody FdkkHotRequest fdkkHotRequest, @RequestHeader String token){
         fdkkSceneEditService.deleteTag(fdkkHotRequest,token);
         return ResultData.ok();
@@ -52,7 +64,7 @@ public class FdkkSceneEditController {
     }
 
     @PostMapping("publicScene")
-    @SysLog(logType = "VR场景",value = "发布场景")
+    @SysLog(logType = "场景管理",value = "发布场景")
     public ResultData scenePublicScene(@RequestBody FdkkHotRequest fdkkHotRequest ,@RequestHeader String token) throws Exception{
         fdkkSceneEditService.publicScene(fdkkHotRequest,token);
         return ResultData.ok();

src/main/java/com/cdf/service/ILogService.java

@@ -17,4 +17,6 @@ import com.cdf.response.LogVo;
 public interface ILogService extends IService<Log> {
 
     PageInfo<LogVo> getPageByParam(LogRequest param);
+
+    void addLog(String logType,String info ,String ip,String token);
 }

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

@@ -20,6 +20,7 @@ import com.cdf.util.*;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -301,4 +302,25 @@ public class FdkkSceneEditService {
             e.printStackTrace();
         }
     }
+
+    public String getHotTitle(List<FdkkHotData> hotDataList) {
+        try {
+            StringBuilder title = new StringBuilder();
+            for (FdkkHotData fdkkHotData : hotDataList) {
+                String hotData = fdkkHotData.getHotData();
+                String s1 = StringEscapeUtils.unescapeJava(hotData);
+                JSONObject jsonObject = JSONObject.parseObject(s1);
+                title.append(jsonObject.getString("title"));
+                title.append(",");
+            }
+            if(title.length()>0 && title.toString().contains(",")){
+                title.delete(title.lastIndexOf(",") ,title.length() );
+            }
+            return title.toString();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+      return "";
+    }
+
 }

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

@@ -8,6 +8,7 @@ import com.cdf.request.LogRequest;
 import com.cdf.response.LogVo;
 import com.cdf.service.ILogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cdf.util.JwtUtil;
 import org.springframework.stereotype.Service;
 
 /**
@@ -26,4 +27,21 @@ public class LogServiceImpl extends ServiceImpl<ILogMapper, Log> implements ILog
         Page<LogVo> page = getBaseMapper().getPageByParam(new Page<>(param.getPageNum(),param.getPageSize()),param);
         return PageInfo.PageInfo(page);
     }
+
+    @Override
+    public void addLog(String logType,String info,String ip,String token) {
+        try {
+            Log log = new Log();
+            log.setLogType(logType);
+            log.setInfo(info);
+            log.setIp(ip);
+            log.setUserId(JwtUtil.getId(token));
+            log.setPhone(JwtUtil.getPhone(token));
+            log.setResult("操作成功");
+            this.save(log);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
 }