浏览代码

场景编辑修改数据接口 鉴权问题修复

dsx 1 年之前
父节点
当前提交
f95bfae4c1

+ 3 - 2
src/main/java/com/fdkankan/scene/Interceptor/SaveEditLogAspect.java

@@ -14,6 +14,7 @@ import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.SysLog;
 import com.fdkankan.scene.service.*;
+import com.fdkankan.scene.util.JmgaSSOLoginHelper;
 import com.fdkankan.web.user.SSOLoginHelper;
 import com.fdkankan.web.user.SSOUser;
 import com.fdkankan.web.util.WebUtil;
@@ -44,7 +45,7 @@ import java.util.Objects;
 public class SaveEditLogAspect {
 
 	@Autowired
-	private SSOLoginHelper ssoLoginHelper;
+	private JmgaSSOLoginHelper ssoLoginHelper;
 	@Autowired
 	private RedisUtil redisUtil;
 	@Autowired
@@ -86,7 +87,7 @@ public class SaveEditLogAspect {
 		Object proceed = joinPoint.proceed();
 
 		//场景编辑接口写入日志
-		JyUser jyUser = jyUserService.getByUserId(user.getId().intValue());
+		JyUser jyUser = jyUserService.getBySysUserId(user.getId().intValue());
 		SysLog sysLog = new SysLog();
 		sysLog.setUserId(jyUser.getSysUserId());
 		sysLog.setUserName(jyUser.getRyNo());

+ 75 - 0
src/main/java/com/fdkankan/scene/init/InitDataHandler.java

@@ -0,0 +1,75 @@
+//package com.fdkankan.scene.init;
+//
+//import cn.hutool.core.collection.CollUtil;
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONObject;
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.fdkankan.download.bean.DownLoadTaskBean;
+//import com.fdkankan.redis.constant.RedisKey;
+//import com.fdkankan.redis.constant.RedisLockKey;
+//import com.fdkankan.redis.util.RedisLockUtil;
+//import com.fdkankan.redis.util.RedisUtil;
+//import com.fdkankan.scene.entity.ScenePlus;
+//import com.fdkankan.scene.entity.ScenePlusExt;
+//import com.fdkankan.scene.service.IScenePlusExtService;
+//import com.fdkankan.scene.service.IScenePlusService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.CommandLineRunner;
+//import org.springframework.data.redis.core.RedisTemplate;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+///**
+// * <p>
+// * 应用启动校验是否有下载任务正在进行,如有过就重新入队头,从新下载
+// * </p>
+// *
+// * @author dengsixing
+// * @since 2022/2/22
+// **/
+//@Component
+//public class InitDataHandler implements CommandLineRunner {
+//
+//    @Autowired
+//    RedisUtil redisUtil;
+//    @Autowired
+//    RedisTemplate redisTemplate;
+//    @Autowired
+//    RedisLockUtil redisLockUtil;
+//    @Autowired
+//    private IScenePlusService scenePlusService;
+//    @Autowired
+//    private IScenePlusExtService scenePlusExtService;
+//
+//    @Override
+//    public void run(String... args) throws Exception {
+//
+//        List<ScenePlusExt> scenePlusExtList = scenePlusExtService.list(new LambdaQueryWrapper<ScenePlusExt>().like(ScenePlusExt::getVideos, "/oss/"));
+//        if(CollUtil.isNotEmpty(scenePlusExtList)){
+//            scenePlusExtList.stream().forEach(ext -> {
+//                ScenePlus scenePlus = scenePlusService.getById(ext.getPlusId());
+//
+//                JSONObject jsonObject = JSON.parseObject(ext.getVideos());
+//                String upPath = jsonObject.getString("upPath");
+//                jsonObject.put("upPath", upPath.replace("/oss/", ""));
+//
+//                String key = String.format(RedisKey.SCENE_JSON, scenePlus.getNum());
+//                String sceneJsonStr = redisUtil.get(key);
+//                JSONObject sceneJsonObj = JSON.parseObject(sceneJsonStr);
+//                sceneJsonObj.getJSONObject()
+//
+//
+//            });
+//
+//
+//
+//        }
+//
+//
+//    }
+//
+//
+//
+//}