111

src/main/java/com/fdkankan/common/exception/GlobalExceptionHandler.java

@@ -1,5 +1,6 @@
 package com.fdkankan.common.exception;
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 import com.fdkankan.scene.bean.ResultData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -7,6 +8,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 全局异常处理器
@@ -15,6 +17,18 @@ import javax.servlet.http.HttpServletRequest;
 @Slf4j
 public class GlobalExceptionHandler {
 
+    /**
+     * 处理未知异常
+     */
+    @ResponseBody
+    @ExceptionHandler(value = Exception.class)
+    public ResultData exceptionHandler(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Exception e) throws Exception {
+        log.error("服务错误:", e);
+        //增加sentinel异常次数
+//            Tracer.trace(e);
+        return ResultData.error(-1, ExceptionUtil.stacktraceToString(e, 3000));
+    }
+
 
 
     /**

src/main/java/com/fdkankan/redis/util/RedisClient.java

@@ -96,7 +96,7 @@ public class RedisClient {
         String url = host + url_set_add;
         Map<String, Object> params = new HashMap<>();
         params.put("key", this.genKey(key));
-        params.put("values", JSON.toJSONString(values));
+        params.put("values", values);
         JSONObject jsonObject = customHttpClient.postJson(url, params);
 //        if(Objects.isNull(jsonObject) || !"0".equals(jsonObject.getString("status"))){
 //            throw new RuntimeException("redis add set error");

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"));
+//		}
+//	}
+//
+//}

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);
+//	}
+//
+//}

src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -592,8 +592,8 @@ public class SceneEditController extends BaseController{
      **/
     @PostMapping(value = "/getAuth")
     public SceneAuthVO getAuth(@RequestParam("num") String num) throws Exception{
-        Integer subgroup = this.getSubgroup();
-        return sceneEditService.getAuth(num, subgroup);
+//        Integer subgroup = this.getSubgroup();
+        return sceneEditService.getAuth(num);
     }
 //
 //    /**

src/main/java/com/fdkankan/scene/service/ISceneEditService.java

@@ -17,7 +17,7 @@ import java.io.IOException;
  **/
 public interface ISceneEditService {
 
-    SceneAuthVO getAuth(String num, Integer subgroup);
+    SceneAuthVO getAuth(String num);
 
 //    ResultData locales(LocalesParamVO param) throws Exception;
 

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -417,6 +417,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<SceneEditInfoMapper, S
             case VIEW:
                 SceneInfoVO sceneInfo = this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
                 sceneInfo.setScenePassword(null);
+                sceneInfo.getControls().setShowDollhouse(CommonStatus.NO.code());
+                sceneInfo.getControls().setShowFloorplan(CommonStatus.NO.code());
                 return sceneInfo;
         }
         return null;

src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -82,11 +82,11 @@ public class SceneEditServiceImpl implements ISceneEditService {
     private SceneFileMappingService sceneFileMappingService;
 
     @Override
-    public SceneAuthVO getAuth(String num, Integer subgroup){
-        Scene scenePlus = scenePlusService.getByNum(num, subgroup);
-        if(Objects.isNull(scenePlus)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-        }
+    public SceneAuthVO getAuth(String num){
+//        Scene scenePlus = scenePlusService.getByNum(num, subgroup);
+//        if(Objects.isNull(scenePlus)){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+//        }
         SceneAuthVO sceneAuthVO = new SceneAuthVO();
         sceneAuthVO.setExclude(new ArrayList<>());
         sceneAuthVO.setInclude(new ArrayList<>());

src/main/resources/application-preprod.yml

@@ -8,10 +8,10 @@ spring:
         server-addr: 10.34.6.52:8848
         access-key: 9b006c7f8ee0ef3766c1ac36678819ca
   datasource:
-    url: jdbc:oracle:thin:@//10.38.52.243:1521/res
+    url: jdbc:postgresql://10.161.32.224:5432/chinatower_vr
     username: RES_VR
-    password: qawsed@123.
-    driver-class-name: oracle.jdbc.OracleDriver
+    password: Changeme#123
+    driver-class-name: org.postgresql.Driver
     hikari:
       maximum-pool-size: 20 #连接池最大连接数
       minimum-idle: 5 #连接池最小连接数

src/main/resources/application-prod.yml

@@ -8,10 +8,10 @@ spring:
         server-addr: 192.168.53.243:8848
         access-key: 6f8976ed25f072371e21f12fe19cc32e
   datasource:
-    url: jdbc:oracle:thin:@//192.168.29.122:1521/resdb
+    url: jdbc:postgresql://10.159.32.145:5432/chinatower_vr
     username: RES_VR
-    password: qawsed@123.
-    driver-class-name: oracle.jdbc.OracleDriver
+    password: Changeme#123
+    driver-class-name: org.postgresql.Driver
     hikari:
       maximum-pool-size: 20 #连接池最大连接数
       minimum-idle: 5 #连接池最小连接数

src/main/resources/application-test.yml

@@ -8,10 +8,10 @@ spring:
         server-addr: 10.190.26.194:8848
         access-key: 84f0bbec3a6e3ebf0c694462febce169
   datasource:
-    url: jdbc:oracle:thin:@//10.180.41.39:1521/resdb
-    username: RES_VR
-    password: IDCqawsed@123.
-    driver-class-name: oracle.jdbc.OracleDriver
+    url: jdbc:postgresql://10.180.145.98:5432/chinatower_vr
+    username: res_vr
+    password: qawsed@123.
+    driver-class-name: org.postgresql.Driver
     hikari:
       maximum-pool-size: 20 #连接池最大连接数
       minimum-idle: 5 #连接池最小连接数

src/main/resources/application.yml

@@ -1,5 +1,13 @@
 server:
   port: 10082
+  tomcat:
+    max-http-form-post-size: -1
 spring:
   main:
     allow-circular-references: true
+  servlet:
+    multipart:
+      # 设置单个文件大小
+      max-file-size: 10240MB
+      # 设置单次请求文件的总大小
+      max-request-size: 10240MB