|
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.fdkankan.common.constant.ErrorCode;
|
|
|
+import com.fdkankan.common.constant.SceneKind;
|
|
|
import com.fdkankan.common.constant.SceneStatus;
|
|
|
import com.fdkankan.common.exception.BusinessException;
|
|
|
import com.fdkankan.common.util.FileUtils;
|
|
@@ -29,6 +30,7 @@ import com.fdkankan.scene.service.IUserService;
|
|
|
import com.fdkankan.web.response.ResultData;
|
|
|
import java.io.File;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
@@ -74,7 +76,7 @@ public class InnerApiServiceImpl implements IInnerApiService {
|
|
|
private RedisLockUtil redisLockUtil;
|
|
|
|
|
|
@Override
|
|
|
- public ResultData uploadMatterproData(String sceneName, String userName, String floor, MultipartFile file) throws Exception {
|
|
|
+ public ResultData uploadMatterproData(String sceneName, String userName, String floor, String sceneKind, MultipartFile file) throws Exception {
|
|
|
if(file == null || file.getSize() <=0){
|
|
|
throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
|
|
|
}
|
|
@@ -158,9 +160,10 @@ public class InnerApiServiceImpl implements IInnerApiService {
|
|
|
sceneProEntity.setUserId(userEntity.getId());
|
|
|
}
|
|
|
}
|
|
|
- sceneProEntity.setSceneScheme(10);
|
|
|
+ sceneProEntity.setSceneScheme(SceneKind.FACE.code().equals(sceneKind) ? 3 : 10);
|
|
|
sceneProEntity.setSceneSource(14);
|
|
|
sceneProEntity.setBuildType("V3");
|
|
|
+ sceneProEntity.setCreateTime(Calendar.getInstance().getTime());
|
|
|
sceneProService.save(sceneProEntity);
|
|
|
|
|
|
SceneProEdit sceneProEditEntity = new SceneProEdit();
|