diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java index 5ff1292..b97dc7d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java @@ -25,7 +25,7 @@ public class FileFormatController { @GetMapping("/delete/{id}") @UserOperation(value = "删除文件格式", modelName = UserOperationModuleEnum.DATABASE) - public ElectromagneticResult deleteFileFormat(@PathVariable Long id) { + public ElectromagneticResult deleteFileFormat(@PathVariable String id) { return ElectromagneticResultUtil.success(fileFormatService.deleteFileFormat(id)); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileFormat.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileFormat.java index 9ad958a..ba74edd 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileFormat.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileFormat.java @@ -9,8 +9,8 @@ import java.util.Date; @TableName("ed_file_format") public class FileFormat { - @TableId(type = IdType.AUTO) - private Long id; + @TableId(type = IdType.ASSIGN_UUID) + private String id; private String fileSuffix; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileFormatVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileFormatVO.java index bb7cd52..81720b8 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileFormatVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileFormatVO.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class FileFormatVO { - private Long id; + private String id; private String fileSuffix; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatService.java index dd69543..6edcfea 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatService.java @@ -20,7 +20,7 @@ public interface FileFormatService extends IService { * @param id * @return */ - boolean deleteFileFormat(Long id); + boolean deleteFileFormat(String id); /** * 查询文件格式列表 diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java index e7490d0..89e203d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java @@ -2,7 +2,6 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.StrFormatter; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.electromagnetic.industry.software.common.util.UserThreadLocal; import com.electromagnetic.industry.software.manage.mapper.FileFormatMapper; @@ -11,7 +10,6 @@ import com.electromagnetic.industry.software.manage.pojo.resp.FileFormatVO; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.io.File; import java.util.ArrayList; import java.util.List; @@ -40,7 +38,7 @@ public class FileFormatServiceImpl extends ServiceImpl