|
|
@@ -14,10 +14,7 @@ import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
-import com.fdkankan.common.constant.ErrorCode;
|
|
|
-import com.fdkankan.common.constant.PayStatus;
|
|
|
-import com.fdkankan.common.constant.RecStatus;
|
|
|
-import com.fdkankan.common.constant.SceneStatus;
|
|
|
+import com.fdkankan.common.constant.*;
|
|
|
import com.fdkankan.common.exception.BusinessException;
|
|
|
import com.fdkankan.common.util.DateExtUtil;
|
|
|
import com.fdkankan.common.util.DateUtil;
|
|
|
@@ -59,6 +56,10 @@ public class JmgaServiceImpl implements IJmgaService {
|
|
|
private boolean eventNotice;
|
|
|
@Value("${scene.pro.new.url}")
|
|
|
private String sceneProNewUrl;
|
|
|
+ @Value("${model.modelKind:3dtiles}")
|
|
|
+ private String modelKind;
|
|
|
+ @Value("#{'${model.3dtiles.sceneSource:}'.split(',')}")
|
|
|
+ private List<Integer> sdTilesSceneSourceList;
|
|
|
|
|
|
@Autowired
|
|
|
private IOrigFileUploadBatchService origFileUploadBatchService;
|
|
|
@@ -309,6 +310,11 @@ public class JmgaServiceImpl implements IJmgaService {
|
|
|
scenePlusExt.setWebSite("/" + sceneProNewUrl + scenePlus.getNum());
|
|
|
String fileId = sceneFileBuildService.getFileId(snCode, uniCode);
|
|
|
scenePlusExt.setDataSource(ConstantFilePath.BUILD_MODEL_PATH + snCode + File.separator + fileId + File.separator + uniCode);
|
|
|
+ if(ModelKind.THREE_D_TILE.code().equals(modelKind)
|
|
|
+ && CollUtil.isNotEmpty(sdTilesSceneSourceList)
|
|
|
+ && sdTilesSceneSourceList.contains(scenePlus.getSceneSource())){
|
|
|
+ scenePlusExt.setModelKind(modelKind);
|
|
|
+ }
|
|
|
scenePlusExtService.save(scenePlusExt);
|
|
|
}
|
|
|
|
dengsixing