Merge remote-tracking branch 'origin/dev_bugfix' into dev

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -10,7 +10,6 @@ package com.epmet.controller;
 
 import com.epmet.cloud.CloudStorageConfig;
 import com.epmet.cloud.OssFactory;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -42,7 +41,6 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -132,7 +130,7 @@ public class OssController {
 	@DeleteMapping
 	@ApiOperation(value = "删除")
 //	@LogOperation("删除")
-	public Result delete(@RequestBody Long[] ids){
+	public Result delete(@RequestBody String[] ids){
 		ossService.deleteBatchIds(Arrays.asList(ids));
 
 		return new Result();

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java

@@ -36,7 +36,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 	@Override
 	public PageData<OssEntity> page(Map<String, Object> params) {
 		IPage<OssEntity> page = baseDao.selectPage(
-			getPage(params, Constant.CREATE_DATE, false),
+			getPage(params, Constant.CREATED_TIME, false),
 			new QueryWrapper<>()
 		);
 		return getPageData(page, OssEntity.class);