|
@@ -540,7 +540,14 @@ public class ImportDataController extends BaseController {
|
|
if (!new File(basePath).exists()) {
|
|
if (!new File(basePath).exists()) {
|
|
new File(basePath).mkdirs();
|
|
new File(basePath).mkdirs();
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ SceneEntity sceneEntity = sceneService.findBySceneNum(num);
|
|
|
|
+ if (ObjectUtil.isNull(sceneEntity)) {
|
|
|
|
+ sceneEntity = new SceneEntity();
|
|
|
|
+ sceneEntity.setSceneNum(num);
|
|
|
|
+ sceneEntity.setSceneName(sceneName);
|
|
|
|
+ sceneEntity.setUserId(userId);
|
|
|
|
+ sceneService.save(sceneEntity);
|
|
|
|
+ }
|
|
JSONObject entryJson = new JSONObject();
|
|
JSONObject entryJson = new JSONObject();
|
|
if (StrUtil.isEmpty(entry)) {
|
|
if (StrUtil.isEmpty(entry)) {
|
|
FileUtils.downLoadFromUrl("https://4dkk.4dage.com/images/images" + num + "/vision.modeldata?t=" + System.currentTimeMillis(),
|
|
FileUtils.downLoadFromUrl("https://4dkk.4dage.com/images/images" + num + "/vision.modeldata?t=" + System.currentTimeMillis(),
|
|
@@ -557,7 +564,6 @@ public class ImportDataController extends BaseController {
|
|
if (sweepArray != null && sweepArray.size() > 0) {
|
|
if (sweepArray != null && sweepArray.size() > 0) {
|
|
entryJson.put("noSetting", sweepArray.getJSONObject(0));
|
|
entryJson.put("noSetting", sweepArray.getJSONObject(0));
|
|
//处理漫游点供前端使用
|
|
//处理漫游点供前端使用
|
|
- SceneEntity sceneEntity = sceneService.findBySceneNum(num);
|
|
|
|
if (ObjectUtil.isNull(sceneEntity)) {
|
|
if (ObjectUtil.isNull(sceneEntity)) {
|
|
sceneEntity = new SceneEntity();
|
|
sceneEntity = new SceneEntity();
|
|
List<JSONObject> roamingPoint = new ArrayList();
|
|
List<JSONObject> roamingPoint = new ArrayList();
|