dengsixing 10 meses atrás
pai
commit
a6e0b02b36

+ 3 - 2
src/main/java/com/fdkankan/common/util/FdfsUtil.java

@@ -95,15 +95,16 @@ public class FdfsUtil {
     }
 
     public static void main(String[] args) {
+        String timestamp = String.valueOf(new Date().getTime());
         Map<String, String> headers = new HashMap<>();
-        headers.put("timestamp", "1719389524320");
+        headers.put("timestamp", timestamp);
         headers.put("nonce", "123123");
         headers.put("sysCode", "CT00017");
         headers.put("signature", "3044022062501c9896a919d81d00216379a84c7d89b2d7315a22f89aee2ce7c1185f656c02206d4694fb685247a289e1c0d11e7492311ef66354c64cd2234fa593e02a635074");
 
         Map<String, Object> test = new HashMap<>();
         test.put("visibilityLevel", "1003");
-        test.put("file", new File("D:\\四维时代\\中国铁塔\\数据推送示例\\KK-R4YYV4yIZlT\\images\\4k\\ff54999789b970e64e2845a2337954f9.jpg"));
+        test.put("file", new File("C:\\Users\\dsx\\Downloads\\vision.txt"));
         test.put("userId", "111111");
         HttpRequest httpRequest = HttpRequest.post("http://10.180.22.41:8761/ChinatowerFileService/uploadFile/").form(test).addHeaders(headers).timeout(60000);
         HttpResponse res = httpRequest.execute();

+ 97 - 97
src/main/java/com/fdkankan/scene/Interceptor/CheckTokenAspect.java

@@ -1,97 +1,97 @@
-//package com.fdkankan.scene.Interceptor;
-//
-//import cn.hutool.http.HttpUtil;
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.fdkankan.common.exception.BusinessException;
-//import com.fdkankan.common.util.ThreeDESUtil;
-//import com.fdkankan.common.util.UserAgentUtils;
-//import com.fdkankan.common.util.WebUtil;
-//import com.fdkankan.feign.TietaFeignClient;
-//import com.fdkankan.feign.WS4AServiceClient;
-//import com.fdkankan.scene.entity.SceneViewLog;
-//import com.fdkankan.scene.service.SceneViewLogService;
-//import lombok.extern.log4j.Log4j2;
-//import org.aspectj.lang.JoinPoint;
-//import org.aspectj.lang.annotation.Aspect;
-//import org.aspectj.lang.annotation.Before;
-//import org.aspectj.lang.annotation.Pointcut;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.core.annotation.Order;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.context.request.RequestContextHolder;
-//import org.springframework.web.context.request.ServletRequestAttributes;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletRequest;
-//import java.io.IOException;
-//import java.util.Date;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//@Log4j2
-//@Aspect
-//@Component
-//@Order(101)
-//public class CheckTokenAspect {
-//
-//	@Value("${spring.cloud.nacos.discovery.access-key}")
-//	private String accessKey;
-//
-//	@Value("${tieta.checkToken.syscode}")
-//	private String syscode;
-//	@Value("${gateway.key:6#dPz>3F}")
-//	private String gatewayKey;
-//	@Value("${gateway.url}")
-//	private String gatewayUrl;
-//	@Resource
-//	private TietaFeignClient tietaFeignClient;
-//	@Autowired
-//	private WS4AServiceClient ws4AServiceClient;
-//	@Autowired
-//	private SceneViewLogService sceneViewLogService;
-//
-//	@Pointcut("@annotation(com.fdkankan.scene.annotation.CheckToken)")
-//	public void CheckToken() {
-//	}
-//
-//	/**
-//	 * 前置通知 用于判断用户协作场景是否有协作权限
-//	 *
-//	 * @param joinPoint
-//	 *            切点
-//	 * @throws IOException
-//	 */
-//	@Before("CheckToken()")
-//	public void doBefore(JoinPoint joinPoint) throws Exception {
-//		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-//
-//		//请求4a接口获取用户信息
-//		Map<String, Object> parameter = WebUtil.getParameter(joinPoint, request);
-//		String acctId = (String) parameter.get("acctId");
-//		String token = (String) parameter.get("token");
-//		String num = (String) parameter.get("num");
-//
-//		//token校验
-//		JSONObject checkProwadaTokenParam = new JSONObject();
-//		JSONObject params = new JSONObject();
-//		params.put("SYSCODE", syscode);
-//		params.put("ACCTID", acctId);
-//		params.put("TOKEN", token);
-//		String encode = ThreeDESUtil.encode(JSON.toJSONString(params), gatewayKey);
-//		checkProwadaTokenParam.put("args", encode);
-//		JSONObject result = ws4AServiceClient.checkProwadaToken(checkProwadaTokenParam);
-//		log.info("场景:{},4A校验token结果:{}", num, result);
-//		if(!"SUCCESS".equals(result.getString("resultStat"))){
-//			throw new BusinessException(4000, "4A鉴权失败");
-//		}
-//		String data = result.getString("data");
-//		JSONObject dataObj = JSONObject.parseObject(data);
-//		if(!"0".equals(dataObj.getString("RSP"))){
-//			throw new BusinessException(4000, "4A鉴权失败:" + dataObj.getString("ERRDESC"));
-//		}
-//	}
-//
-//}
+package com.fdkankan.scene.Interceptor;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.util.ThreeDESUtil;
+import com.fdkankan.common.util.UserAgentUtils;
+import com.fdkankan.common.util.WebUtil;
+import com.fdkankan.feign.TietaFeignClient;
+import com.fdkankan.feign.WS4AServiceClient;
+import com.fdkankan.scene.entity.SceneViewLog;
+import com.fdkankan.scene.service.SceneViewLogService;
+import lombok.extern.log4j.Log4j2;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Log4j2
+@Aspect
+@Component
+@Order(101)
+public class CheckTokenAspect {
+
+	@Value("${spring.cloud.nacos.discovery.access-key}")
+	private String accessKey;
+
+	@Value("${tieta.checkToken.syscode}")
+	private String syscode;
+	@Value("${gateway.key:6#dPz>3F}")
+	private String gatewayKey;
+	@Value("${gateway.url}")
+	private String gatewayUrl;
+	@Resource
+	private TietaFeignClient tietaFeignClient;
+	@Autowired
+	private WS4AServiceClient ws4AServiceClient;
+	@Autowired
+	private SceneViewLogService sceneViewLogService;
+
+	@Pointcut("@annotation(com.fdkankan.scene.annotation.CheckToken)")
+	public void CheckToken() {
+	}
+
+	/**
+	 * 前置通知 用于判断用户协作场景是否有协作权限
+	 *
+	 * @param joinPoint
+	 *            切点
+	 * @throws IOException
+	 */
+	@Before("CheckToken()")
+	public void doBefore(JoinPoint joinPoint) throws Exception {
+		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+
+		//请求4a接口获取用户信息
+		Map<String, Object> parameter = WebUtil.getParameter(joinPoint, request);
+		String acctId = (String) parameter.get("acctId");
+		String token = (String) parameter.get("token");
+		String num = (String) parameter.get("num");
+
+		//token校验
+		JSONObject checkProwadaTokenParam = new JSONObject();
+		JSONObject params = new JSONObject();
+		params.put("SYSCODE", syscode);
+		params.put("ACCTID", acctId);
+		params.put("TOKEN", token);
+		String encode = ThreeDESUtil.encode(JSON.toJSONString(params), gatewayKey);
+		checkProwadaTokenParam.put("args", encode);
+		JSONObject result = ws4AServiceClient.checkProwadaToken(checkProwadaTokenParam);
+		log.info("场景:{},4A校验token结果:{}", num, result);
+		if(!"SUCCESS".equals(result.getString("resultStat"))){
+			throw new BusinessException(4000, "4A鉴权失败");
+		}
+		String data = result.getString("data");
+		JSONObject dataObj = JSONObject.parseObject(data);
+		if(!"0".equals(dataObj.getString("RSP"))){
+			throw new BusinessException(4000, "4A鉴权失败:" + dataObj.getString("ERRDESC"));
+		}
+	}
+
+}

+ 162 - 162
src/main/java/com/fdkankan/scene/Interceptor/ViewLogAspect.java

@@ -1,162 +1,162 @@
-//package com.fdkankan.scene.Interceptor;
-//
-//import cn.hutool.http.HttpUtil;
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.fdkankan.common.util.ThreeDESUtil;
-//import com.fdkankan.common.util.UserAgentUtils;
-//import com.fdkankan.common.util.WebUtil;
-//import com.fdkankan.common.exception.BusinessException;
-//import com.fdkankan.feign.TietaFeignClient;
-//import com.fdkankan.feign.WS4AServiceClient;
-//import com.fdkankan.scene.entity.SceneViewLog;
-//import com.fdkankan.scene.service.SceneViewLogService;
-//import lombok.extern.log4j.Log4j2;
-//import org.aspectj.lang.JoinPoint;
-//import org.aspectj.lang.annotation.Aspect;
-//import org.aspectj.lang.annotation.Before;
-//import org.aspectj.lang.annotation.Pointcut;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.core.annotation.Order;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.context.request.RequestContextHolder;
-//import org.springframework.web.context.request.ServletRequestAttributes;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletRequest;
-//import java.io.IOException;
-//import java.util.Date;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//@Log4j2
-//@Aspect
-//@Component
-//@Order(101)
-//public class ViewLogAspect {
-//
-//	@Value("${spring.cloud.nacos.discovery.access-key}")
-//	private String accessKey;
-//
-//	@Value("${tieta.checkToken.syscode}")
-//	private String syscode;
-//	@Value("${gateway.key:6#dPz>3F}")
-//	private String gatewayKey;
-//	@Value("${gateway.url}")
-//	private String gatewayUrl;
-//	@Resource
-//	private TietaFeignClient tietaFeignClient;
-//	@Autowired
-//	private WS4AServiceClient ws4AServiceClient;
-//	@Autowired
-//	private SceneViewLogService sceneViewLogService;
-//
-//	@Pointcut("@annotation(com.fdkankan.scene.annotation.VrLog)")
-//	public void checkCooperationPermit() {
-//	}
-//
-//	/**
-//	 * 前置通知 用于判断用户协作场景是否有协作权限
-//	 *
-//	 * @param joinPoint
-//	 *            切点
-//	 * @throws IOException
-//	 */
-//	@Before("checkCooperationPermit()")
-//	public void doBefore(JoinPoint joinPoint) throws Exception {
-//		log.info("记录日志开始");
-//		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-//		boolean mobileDevice = UserAgentUtils.isMobileDevice(request);
-//		String userAgent = "pc";
-//		if(mobileDevice){
-//			userAgent = "mobile";
-//		}
-//
-//		//请求4a接口获取用户信息
-//		Map<String, Object> parameter = WebUtil.getParameter(joinPoint, request);
-//		String acctId = (String) parameter.get("acctId");
-//		String token = (String) parameter.get("token");
-//		String num = (String) parameter.get("num");
-//
-//		//token校验
-//		JSONObject checkProwadaTokenParam = new JSONObject();
-//		JSONObject params = new JSONObject();
-//		params.put("SYSCODE", syscode);
-//		params.put("ACCTID", acctId);
-//		params.put("TOKEN", token);
-//		String encode = ThreeDESUtil.encode(JSON.toJSONString(params), gatewayKey);
-//		checkProwadaTokenParam.put("args", encode);
-//		JSONObject result = ws4AServiceClient.checkProwadaToken(checkProwadaTokenParam);
-//		log.info("场景:{},4A校验token结果:{}", num, result);
-//		if(!"SUCCESS".equals(result.getString("resultStat"))){
-//			throw new BusinessException(4000, "4A鉴权失败");
-//		}
-//		String data = result.getString("data");
-//		JSONObject dataObj = JSONObject.parseObject(data);
-//		if(!"0".equals(dataObj.getString("RSP"))){
-//			throw new BusinessException(4000, "4A鉴权失败:" + dataObj.getString("ERRDESC"));
-//		}
-//		String USERCODE = dataObj.getString("USERCODE");
-//		String SERVICEID = dataObj.getString("SERVICEID");
-//		String ORGCODE = dataObj.getString("ORGCODE");
-//
-//		//查询用户信息
-//		JSONObject param2 = new JSONObject();
-//		param2.put("SERVICEID", SERVICEID);
-//		param2.put("LOGINACCOUNT", USERCODE);
-//		param2.put("TOKEN", token);
-//		encode = ThreeDESUtil.encode(JSON.toJSONString(param2), gatewayKey);
-//		Map<String, Object> param = new HashMap<>();
-//		param.put("args", encode);
-//		String queryLoginUserInfoResp = HttpUtil.get(gatewayUrl + "/QUERY4A/user/queryLoginUserInfo?args=" + encode);
-//		result = JSON.parseObject(queryLoginUserInfoResp);
-////		result = ws4AServiceClient.queryLoginUserInfo(encode);
-//		log.info("场景:{},4A查询用户信息结果:{}", num, result);
-//		if(!"SUCCESS".equals(result.getString("resultStat"))){
-//			throw new BusinessException(4000, "4A查询用户信息失败");
-//		}
-//		data = result.getString("data");
-//		dataObj = JSONObject.parseObject(data);
-//		if(!"0".equals(dataObj.getString("RSP"))){
-//			throw new BusinessException(4000, "4A查询用户信息失败:" + dataObj.getString("ERRDESC"));
-//		}
-//		String nickName = dataObj.getString("LOGINNAME");
-//
-//		JSONObject param3 = new JSONObject();
-//		param3.put("SERVICEID", SERVICEID);
-//		param3.put("QUERYMODE", "3");
-//		param3.put("ORGCODE", ORGCODE);
-//		param3.put("TOKEN", token);
-//		encode = ThreeDESUtil.encode(JSON.toJSONString(param3), gatewayKey);
-////		result = ws4AServiceClient.queryOrgs(encode);
-//		String queryOrgsResp = HttpUtil.get(gatewayUrl + "/QUERY4A/query/queryOrgs?args=" + encode);
-//		result = JSON.parseObject(queryOrgsResp);
-//		log.info("场景:{},4A查询用户组织结果:{}", num, result);
-//		if(!"SUCCESS".equals(result.getString("resultStat"))){
-//			throw new BusinessException(4000, "查询用户组织失败");
-//		}
-//		data = result.getString("data");
-//		dataObj = JSONObject.parseObject(data);
-//		if(!"0".equals(dataObj.getString("RSP"))){
-//			throw new BusinessException(4000, "4A查询用户组织失败:" + dataObj.getString("ERRDESC"));
-//		}
-//		JSONObject ORGS = dataObj.getJSONObject("ORGS");
-//		JSONArray ORG = ORGS.getJSONArray("ORG");
-//		JSONObject ORG1 = ORG.getJSONObject(0);
-//		String ORGNAMEPATH = ORG1.getString("ORGNAMEPATH");
-//
-//		//写入表
-//		SceneViewLog sceneViewLog = new SceneViewLog();
-//		sceneViewLog.setOrgNamePath(ORGNAMEPATH);
-//		sceneViewLog.setFuncName("VR全景");
-//		sceneViewLog.setFuncDesc("VR全景试图");
-//		sceneViewLog.setUserName(USERCODE);
-//		sceneViewLog.setNickName(nickName);
-//		sceneViewLog.setCreateTime(new Date());
-//		sceneViewLog.setTerminalType(userAgent);
-//		sceneViewLogService.save(sceneViewLog);
-//	}
-//
-//}
+package com.fdkankan.scene.Interceptor;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.util.ThreeDESUtil;
+import com.fdkankan.common.util.UserAgentUtils;
+import com.fdkankan.common.util.WebUtil;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.feign.TietaFeignClient;
+import com.fdkankan.feign.WS4AServiceClient;
+import com.fdkankan.scene.entity.SceneViewLog;
+import com.fdkankan.scene.service.SceneViewLogService;
+import lombok.extern.log4j.Log4j2;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Log4j2
+@Aspect
+@Component
+@Order(101)
+public class ViewLogAspect {
+
+	@Value("${spring.cloud.nacos.discovery.access-key}")
+	private String accessKey;
+
+	@Value("${tieta.checkToken.syscode}")
+	private String syscode;
+	@Value("${gateway.key:6#dPz>3F}")
+	private String gatewayKey;
+	@Value("${gateway.url}")
+	private String gatewayUrl;
+	@Resource
+	private TietaFeignClient tietaFeignClient;
+	@Autowired
+	private WS4AServiceClient ws4AServiceClient;
+	@Autowired
+	private SceneViewLogService sceneViewLogService;
+
+	@Pointcut("@annotation(com.fdkankan.scene.annotation.VrLog)")
+	public void checkCooperationPermit() {
+	}
+
+	/**
+	 * 前置通知 用于判断用户协作场景是否有协作权限
+	 *
+	 * @param joinPoint
+	 *            切点
+	 * @throws IOException
+	 */
+	@Before("checkCooperationPermit()")
+	public void doBefore(JoinPoint joinPoint) throws Exception {
+		log.info("记录日志开始");
+		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+		boolean mobileDevice = UserAgentUtils.isMobileDevice(request);
+		String userAgent = "pc";
+		if(mobileDevice){
+			userAgent = "mobile";
+		}
+
+		//请求4a接口获取用户信息
+		Map<String, Object> parameter = WebUtil.getParameter(joinPoint, request);
+		String acctId = (String) parameter.get("acctId");
+		String token = (String) parameter.get("token");
+		String num = (String) parameter.get("num");
+
+		//token校验
+		JSONObject checkProwadaTokenParam = new JSONObject();
+		JSONObject params = new JSONObject();
+		params.put("SYSCODE", syscode);
+		params.put("ACCTID", acctId);
+		params.put("TOKEN", token);
+		String encode = ThreeDESUtil.encode(JSON.toJSONString(params), gatewayKey);
+		checkProwadaTokenParam.put("args", encode);
+		JSONObject result = ws4AServiceClient.checkProwadaToken(checkProwadaTokenParam);
+		log.info("场景:{},4A校验token结果:{}", num, result);
+		if(!"SUCCESS".equals(result.getString("resultStat"))){
+			throw new BusinessException(4000, "4A鉴权失败");
+		}
+		String data = result.getString("data");
+		JSONObject dataObj = JSONObject.parseObject(data);
+		if(!"0".equals(dataObj.getString("RSP"))){
+			throw new BusinessException(4000, "4A鉴权失败:" + dataObj.getString("ERRDESC"));
+		}
+		String USERCODE = dataObj.getString("USERCODE");
+		String SERVICEID = dataObj.getString("SERVICEID");
+		String ORGCODE = dataObj.getString("ORGCODE");
+
+		//查询用户信息
+		JSONObject param2 = new JSONObject();
+		param2.put("SERVICEID", SERVICEID);
+		param2.put("LOGINACCOUNT", USERCODE);
+		param2.put("TOKEN", token);
+		encode = ThreeDESUtil.encode(JSON.toJSONString(param2), gatewayKey);
+		Map<String, Object> param = new HashMap<>();
+		param.put("args", encode);
+		String queryLoginUserInfoResp = HttpUtil.get(gatewayUrl + "/QUERY4A/user/queryLoginUserInfo?args=" + encode);
+		result = JSON.parseObject(queryLoginUserInfoResp);
+//		result = ws4AServiceClient.queryLoginUserInfo(encode);
+		log.info("场景:{},4A查询用户信息结果:{}", num, result);
+		if(!"SUCCESS".equals(result.getString("resultStat"))){
+			throw new BusinessException(4000, "4A查询用户信息失败");
+		}
+		data = result.getString("data");
+		dataObj = JSONObject.parseObject(data);
+		if(!"0".equals(dataObj.getString("RSP"))){
+			throw new BusinessException(4000, "4A查询用户信息失败:" + dataObj.getString("ERRDESC"));
+		}
+		String nickName = dataObj.getString("LOGINNAME");
+
+		JSONObject param3 = new JSONObject();
+		param3.put("SERVICEID", SERVICEID);
+		param3.put("QUERYMODE", "3");
+		param3.put("ORGCODE", ORGCODE);
+		param3.put("TOKEN", token);
+		encode = ThreeDESUtil.encode(JSON.toJSONString(param3), gatewayKey);
+//		result = ws4AServiceClient.queryOrgs(encode);
+		String queryOrgsResp = HttpUtil.get(gatewayUrl + "/QUERY4A/query/queryOrgs?args=" + encode);
+		result = JSON.parseObject(queryOrgsResp);
+		log.info("场景:{},4A查询用户组织结果:{}", num, result);
+		if(!"SUCCESS".equals(result.getString("resultStat"))){
+			throw new BusinessException(4000, "查询用户组织失败");
+		}
+		data = result.getString("data");
+		dataObj = JSONObject.parseObject(data);
+		if(!"0".equals(dataObj.getString("RSP"))){
+			throw new BusinessException(4000, "4A查询用户组织失败:" + dataObj.getString("ERRDESC"));
+		}
+		JSONObject ORGS = dataObj.getJSONObject("ORGS");
+		JSONArray ORG = ORGS.getJSONArray("ORG");
+		JSONObject ORG1 = ORG.getJSONObject(0);
+		String ORGNAMEPATH = ORG1.getString("ORGNAMEPATH");
+
+		//写入表
+		SceneViewLog sceneViewLog = new SceneViewLog();
+		sceneViewLog.setOrgNamePath(ORGNAMEPATH);
+		sceneViewLog.setFuncName("VR全景");
+		sceneViewLog.setFuncDesc("VR全景试图");
+		sceneViewLog.setUserName(USERCODE);
+		sceneViewLog.setNickName(nickName);
+		sceneViewLog.setCreateTime(new Date());
+		sceneViewLog.setTerminalType(userAgent);
+		sceneViewLogService.save(sceneViewLog);
+	}
+
+}

+ 1 - 0
src/main/java/com/fdkankan/scene/controller/OssFileMappingController.java

@@ -46,4 +46,5 @@ public class OssFileMappingController {
     }
 
 
+
 }

+ 10 - 0
src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -4,6 +4,7 @@ package com.fdkankan.scene.controller;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import com.fdkankan.common.constant.SceneInfoReqType;
+import com.fdkankan.common.util.FdfsUtil;
 import com.fdkankan.scene.annotation.InitEditInfo;
 import com.fdkankan.scene.annotation.VrLog;
 import com.fdkankan.scene.bean.ResultData;
@@ -24,6 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.websocket.server.PathParam;
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * <p>
@@ -41,6 +43,8 @@ public class SceneController extends BaseController{
     private SceneService sceneService;
     @Autowired
     private SceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private FdfsUtil fdfsUtil;
     /**
      * <p>
      获取场景详情
@@ -82,5 +86,11 @@ public class SceneController extends BaseController{
     }
 
 
+    @PostMapping("testUploadFile")
+    public ResultData testUploadFile(String path){
+        Map<String, String> stringStringMap = fdfsUtil.uploadFile(path);
+        return ResultData.ok(stringStringMap);
+    }
+
 }
 

+ 2 - 0
src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.scene.controller;
 
 import com.fdkankan.common.constant.SceneInfoReqType;
+import com.fdkankan.scene.annotation.CheckToken;
 import com.fdkankan.scene.annotation.InitEditInfo;
 import com.fdkankan.scene.bean.ResultData;
 import com.fdkankan.scene.service.*;
@@ -376,6 +377,7 @@ public class SceneEditController extends BaseController{
      * @param param
      * @return com.fdkankan.scene.vo.SceneInfoVO
      **/
+    @CheckToken
     @InitEditInfo
     @GetMapping(value = "/getInfo")
     public SceneInfoVO getInfo(@Validated SceneInfoParamVO param) throws Exception{