|
@@ -87,6 +87,7 @@ import java.util.Set;
|
|
|
import java.util.UUID;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
import java.util.stream.Collectors;
|
|
|
+import javax.annotation.Resource;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -160,7 +161,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
IScenePlusService scenePlusService;
|
|
|
@Autowired
|
|
|
IScenePlusExtService scenePlusExtService;
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private FdkankanMiniClient fdkankanMiniClient;
|
|
|
@Autowired
|
|
|
private ISceneUploadService sceneUploadService;
|
|
@@ -662,7 +663,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
if(StrUtil.isNotEmpty(floorJsonData)){
|
|
|
// TODO: 2022/7/26 生成hostType
|
|
|
JSONObject houseTypeJson = CreateHouseJsonUtil
|
|
|
- .createHouseTypeJson(localDataPath + "floorplan_user.json");
|
|
|
+ .createHouseTypeJsonByUser(localDataPath + "floorplan_user.json");
|
|
|
uploadToOssUtil.upload(houseTypeJson.toJSONString().getBytes(), editUserPath + "houseType.json");
|
|
|
|
|
|
floorPlanUser = CommonStatus.YES.code();
|