Compare commits

..

No commits in common. "3bfbebf460b3741da9d7f6034295ea17fd28c8c7" and "52e58019fc9af26522fb97ec26b2d77fb9978203" have entirely different histories.

5 changed files with 8 additions and 9 deletions

View File

@ -20,7 +20,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler {
this.strictInsertFill(metaObject, "createdAt", Date.class, new Date());
}
if (metaObject.hasGetter("createdTime")) {
this.setFieldValByName("createdTime", new Date(), metaObject);
this.strictInsertFill(metaObject, "createdTime", Date.class, new Date());
}
if (metaObject.hasGetter("gmtModified")) {
this.strictInsertFill(metaObject, "gmtModified", Date.class, new Date());
@ -29,7 +29,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler {
this.strictInsertFill(metaObject, "updatedAt", Date.class, new Date());
}
if (metaObject.hasGetter("createdBy")) {
this.setFieldValByName("createdBy", Optional.of(UserThreadLocal.getUserId()).orElse(""), metaObject);
this.strictUpdateFill(metaObject, "createdBy", String.class, Optional.of(UserThreadLocal.getUserId()).orElse(""));
}
}
@ -42,10 +42,10 @@ public class EdMetaObjectHandler implements MetaObjectHandler {
this.strictUpdateFill(metaObject, "updatedAt", Date.class, new Date());
}
if (metaObject.hasGetter("updatedTime")) {
this.setFieldValByName("updatedTime", new Date(), metaObject);
this.strictUpdateFill(metaObject, "updatedTime", Date.class, new Date());
}
if (metaObject.hasGetter("updatedBy")) {
this.setFieldValByName("updatedBy", Optional.of(UserThreadLocal.getUserId()).orElse(""), metaObject);
this.strictUpdateFill(metaObject, "updatedTime", String.class, Optional.of(UserThreadLocal.getUserId()).orElse(""));
}
}
}

View File

@ -16,7 +16,7 @@ public class FileFormatController {
@Resource
private FileFormatService fileFormatService;
@GetMapping("/add")
@PostMapping("/add")
@UserOperation(value = "新增文件格式", modelName = UserOperationModuleEnum.DATABASE)
public ElectromagneticResult<?> addFileFormat(@RequestParam String suffixName) {
return ElectromagneticResultUtil.success(fileFormatService.addFileFormat(suffixName));

View File

@ -26,7 +26,7 @@ public class FileRecycleController {
}
@RequestMapping("remove")
@UserOperation(value = "彻底清除文件", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "物理删除", modelName = UserOperationModuleEnum.DATABASE)
public ElectromagneticResult<?> remove(@RequestParam String fileId) {
return fileRecycleService.remove(fileId);
}

View File

@ -17,7 +17,7 @@ public class FileRecycleQueryVO {
private String fileVersion;
private Date updatedTime;
private Date updateTime;
private String fileNote;

View File

@ -13,7 +13,6 @@ import com.electromagnetic.industry.software.manage.pojo.models.FileFormat;
import com.electromagnetic.industry.software.manage.pojo.resp.FileFormatVO;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@ -74,7 +73,7 @@ public class FileFormatServiceImpl extends ServiceImpl<FileFormatMapper, FileFor
*/
@Override
public List<FileFormatVO> getList() {
List<FileFormat> fileFormats = this.baseMapper.selectList(Wrappers.<FileFormat>lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code).orderByDesc(FileFormat::getCreatedTime));
List<FileFormat> fileFormats = this.baseMapper.selectList(Wrappers.<FileFormat>lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code));
List<FileFormatVO> fileFormatVOS = BeanUtil.copyToList(fileFormats, FileFormatVO.class);
UserThreadLocal.setSuccessInfo("","", "查询了文件格式列表");
return fileFormatVOS;