Commit 7f0fa1c5 authored by liqin's avatar liqin 💬

bug fixed

parent 62e702ba
...@@ -88,7 +88,6 @@ public class FastDFSUtils { ...@@ -88,7 +88,6 @@ public class FastDFSUtils {
final Set<MetaData> metaDataSet = new HashSet<>(); final Set<MetaData> metaDataSet = new HashSet<>();
metaDataSet.add(new MetaData("fileName", fileName)); metaDataSet.add(new MetaData("fileName", fileName));
metaDataSet.add(new MetaData("fileSize", size + "")); metaDataSet.add(new MetaData("fileSize", size + ""));
metaDataSet.add(new MetaData("fileExtName", FilenameUtils.getExtension(fileName)));
metaDataSet.add(new MetaData("updateTime", TimeUtils.format(LocalDateTime.now(), TimeUtils.FORMAT_ONE))); metaDataSet.add(new MetaData("updateTime", TimeUtils.format(LocalDateTime.now(), TimeUtils.FORMAT_ONE)));
metaDataSet.add(new MetaData("MD5", md5)); metaDataSet.add(new MetaData("MD5", md5));
final StorePath storePath = storageClient.uploadFile(is, size, FilenameUtils.getExtension(fileName), metaDataSet); final StorePath storePath = storageClient.uploadFile(is, size, FilenameUtils.getExtension(fileName), metaDataSet);
......
...@@ -17,13 +17,13 @@ public class MetaObjectHandlerConfig implements MetaObjectHandler { ...@@ -17,13 +17,13 @@ public class MetaObjectHandlerConfig implements MetaObjectHandler {
@Override @Override
public void insertFill(MetaObject metaObject) { public void insertFill(MetaObject metaObject) {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
Object createTime = getFieldValByName("create_time", metaObject); Object createTime = getFieldValByName("createTime", metaObject);
Object updateTime = getFieldValByName("update_time", metaObject); Object updateTime = getFieldValByName("updateTime", metaObject);
if (createTime == null) { if (createTime == null) {
this.setFieldValByName("create_time", now, metaObject); this.setFieldValByName("createTime", now, metaObject);
} }
if (updateTime == null) { if (updateTime == null) {
this.setFieldValByName("update_time", now, metaObject); this.setFieldValByName("updateTime", now, metaObject);
} }
this.setFieldValByName("version", 1, metaObject); this.setFieldValByName("version", 1, metaObject);
// 创建人 // 创建人
...@@ -35,9 +35,9 @@ public class MetaObjectHandlerConfig implements MetaObjectHandler { ...@@ -35,9 +35,9 @@ public class MetaObjectHandlerConfig implements MetaObjectHandler {
@Override @Override
public void updateFill(MetaObject metaObject) { public void updateFill(MetaObject metaObject) {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
Object updateTime = getFieldValByName("update_time", metaObject); Object updateTime = getFieldValByName("updateTime", metaObject);
if (updateTime == null) { if (updateTime == null) {
this.setFieldValByName("update_time", now, metaObject); this.setFieldValByName("updateTime", now, metaObject);
} }
//操作人 //操作人
// this.setFieldValByName("createId", 111L, metaObject); // this.setFieldValByName("createId", 111L, metaObject);
......
...@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParam; ...@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -71,7 +72,7 @@ public class AssetController extends BaseController { ...@@ -71,7 +72,7 @@ public class AssetController extends BaseController {
final Set<MetaData> metaData = FastDFSUtils.getFileMetaData(videoUrl); final Set<MetaData> metaData = FastDFSUtils.getFileMetaData(videoUrl);
String fileName = metaData.stream().filter(x -> "fileName".equals(x.getName())).map(MetaData::getValue).findFirst().get(); String fileName = metaData.stream().filter(x -> "fileName".equals(x.getName())).map(MetaData::getValue).findFirst().get();
Long fileSize = metaData.stream().filter(x -> "fileSize".equals(x.getName())).map(MetaData::getValue).map(Long::parseLong).findFirst().get(); Long fileSize = metaData.stream().filter(x -> "fileSize".equals(x.getName())).map(MetaData::getValue).map(Long::parseLong).findFirst().get();
String fileExtName = metaData.stream().filter(x -> "fileExtName".equals(x.getName())).map(MetaData::getValue).findFirst().get(); String fileExtName = FilenameUtils.getExtension(fileName);
String updateTime = metaData.stream().filter(x -> "updateTime".equals(x.getName())).map(MetaData::getValue).findFirst().get(); String updateTime = metaData.stream().filter(x -> "updateTime".equals(x.getName())).map(MetaData::getValue).findFirst().get();
String md5 = metaData.stream().filter(x -> "MD5".equals(x.getName())).map(MetaData::getValue).findFirst().get(); String md5 = metaData.stream().filter(x -> "MD5".equals(x.getName())).map(MetaData::getValue).findFirst().get();
filesMetadata.add(VideoVo.builder() filesMetadata.add(VideoVo.builder()
...@@ -90,7 +91,6 @@ public class AssetController extends BaseController { ...@@ -90,7 +91,6 @@ public class AssetController extends BaseController {
boolean result = assetService.save(asset); boolean result = assetService.save(asset);
// 返回操作结果 // 返回操作结果
if (result) { if (result) {
return getSuccessResult(); return getSuccessResult();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment