|
@@ -18,11 +18,13 @@ import com.fdkankan.contro.service.IScenePlusService;
|
|
import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
import com.fdkankan.model.constants.ConstantFilePath;
|
|
import com.fdkankan.model.constants.ConstantFilePath;
|
|
import com.fdkankan.model.constants.UploadFilePath;
|
|
import com.fdkankan.model.constants.UploadFilePath;
|
|
|
|
+import com.fdkankan.model.enums.ModelTypeEnums;
|
|
import com.fdkankan.redis.constant.RedisKey;
|
|
import com.fdkankan.redis.constant.RedisKey;
|
|
import com.fdkankan.redis.util.RedisUtil;
|
|
import com.fdkankan.redis.util.RedisUtil;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
@@ -35,6 +37,8 @@ import java.util.stream.Collectors;
|
|
@Service
|
|
@Service
|
|
public class LinkPanServiceImpl implements ILinkPanService {
|
|
public class LinkPanServiceImpl implements ILinkPanService {
|
|
|
|
|
|
|
|
+ @Value("${model.type:#{null}}")
|
|
|
|
+ private String modelType;
|
|
@Autowired
|
|
@Autowired
|
|
private IScenePlusService scenePlusService;
|
|
private IScenePlusService scenePlusService;
|
|
@Autowired
|
|
@Autowired
|
|
@@ -355,7 +359,7 @@ public class LinkPanServiceImpl implements ILinkPanService {
|
|
if("4k".equals(sceneResolution)){
|
|
if("4k".equals(sceneResolution)){
|
|
skyboxType = "SKYBOX_V6";
|
|
skyboxType = "SKYBOX_V6";
|
|
}
|
|
}
|
|
- if(sceneScheme == 3){
|
|
|
|
|
|
+ if(ModelTypeEnums.TILE_CODE.equals(modelType)){
|
|
skyboxType = "SKYBOX_V13";
|
|
skyboxType = "SKYBOX_V13";
|
|
if("4k".equals(sceneResolution)){
|
|
if("4k".equals(sceneResolution)){
|
|
skyboxType = "SKYBOX_V14";
|
|
skyboxType = "SKYBOX_V14";
|