|
@@ -103,23 +103,23 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
|
|
|
}
|
|
|
objPathFile = new File(objPath );
|
|
|
if(!objPathFile.isDirectory()){
|
|
|
- redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
|
|
|
+ setCreateStatus(model,-1);
|
|
|
throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
|
|
|
}
|
|
|
List<File> fileList = new ArrayList<>();
|
|
|
FileWriterUtil.getCanRunList(fileList,objPathFile);
|
|
|
|
|
|
if(fileList.size() != 1){
|
|
|
- redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
|
|
|
+ setCreateStatus(model,-1);
|
|
|
throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
|
|
|
}
|
|
|
File file1 = fileList.get(0);
|
|
|
if(file1 == null){
|
|
|
- redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
|
|
|
+ setCreateStatus(model,-1);
|
|
|
throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
|
|
|
}
|
|
|
if(com.fdkankan.fusion.common.util.StringUtils.isChinese(file1.getName())){
|
|
|
- redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
|
|
|
+ setCreateStatus(model,-1);
|
|
|
throw new BusinessException(ResultCode.UPLOAD_FILE_CHINA_NAME);
|
|
|
}
|
|
|
redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"20");
|
|
@@ -127,6 +127,12 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
|
|
|
return model;
|
|
|
}
|
|
|
|
|
|
+ private void setCreateStatus(Model model,Integer status){
|
|
|
+ model.setCreateStatus(status);
|
|
|
+ this.saveOrUpdate(model);
|
|
|
+ redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),status.toString());
|
|
|
+ }
|
|
|
+
|
|
|
private void runThread(File file1,String objPath,Model model,File newObjFile,File objPathFile,IModelService modelService){
|
|
|
new Thread() {
|
|
|
@Override
|