diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java index e7f3e542..59310437 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java @@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import lombok.Getter; +import lombok.Setter; import java.sql.Timestamp; import java.io.Serializable; @@ -20,7 +22,8 @@ import java.io.Serializable; * @date 2020-05-13 */ -@Data +@Getter +@Setter @TableName("local_storage") public class LocalStorage implements Serializable { @@ -69,6 +72,8 @@ public class LocalStorage implements Serializable { // @Column(name = "create_time") @TableField(fill= FieldFill.INSERT) private Timestamp createTime; + + public LocalStorage(String realName,String name, String suffix, String path, String type, String size, String operate) { this.realName = realName; this.name = name; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java index e1fe7383..1887e25a 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java @@ -66,8 +66,8 @@ public class LocalStorageController { @Log("修改文件") @ApiOperation("修改文件") @PreAuthorize("@el.check('admin','localStorage:edit')") - public ResponseEntity update(@Validated @RequestBody LocalStorage resources){ - localStorageService.saveOrUpdate(resources); + public ResponseEntity update(@Validated @RequestBody LocalStorageDto resources){ + localStorageService.updateLocalStorage(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java index e8a8aff6..95fe6bcb 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java @@ -66,4 +66,10 @@ public interface LocalStorageService extends BaseService{ * @throws IOException / */ void download(List localStorageDtos, HttpServletResponse response) throws IOException; + + /** + * 修改文件 + * @param resources + */ + void updateLocalStorage(LocalStorageDto resources); } diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java index 321e07da..7b7de15c 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java @@ -23,6 +23,8 @@ public class LocalStorageDto implements Serializable { private String suffix; + private String path; + private String type; private String size; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java index 93920bb7..0923493a 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java @@ -17,6 +17,7 @@ import co.yixiang.tools.service.LocalStorageService; import co.yixiang.tools.service.dto.LocalStorageDto; import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; import co.yixiang.tools.service.mapper.LocalStorageMapper; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -100,8 +101,8 @@ public class LocalStorageServiceImpl extends BaseServiceImpl