修复了导入bug

taais-admin/src/main/java/com/taais/web/controller/common/CommonController.java

@@ -22,6 +22,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import net.lingala.zip4j.model.FileHeader;
+import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -147,9 +148,8 @@ public class CommonController {
             List<File> extractedFileList = new ArrayList<File>();
             if(suffix.equals(".zip")){
                 List<FileHeader> fileheaders = UnPackedUtil.unPackZip(ZipOrRar_temp,dest);
-                //解压后的目录
-                String dir_name = fileheaders.get(0).getFileName();
-                dest = dest + '/' + dir_name.substring(0,dir_name.length()-1);
+                //添加解压目录
+//                dest = dest + "\\" + FilenameUtils.getBaseName(file.getOriginalFilename());
                 for(FileHeader fileHeader : fileheaders) {
 
                     if (!fileHeader.isDirectory()) {
@@ -174,9 +174,9 @@ public class CommonController {
             }else if(suffix.equals(".rar")){
                 List<com.github.junrar.rarfile.FileHeader> fileheaders = UnPackedUtil.unPackRar(ZipOrRar_temp,dest);
 
-                //解压后的目录
-                String dir_name = fileheaders.get(0).getFileName();
-                dest = dest + '/' + dir_name.substring(0,dir_name.length()-1);
+
+                //添加解压目录
+//                dest = dest + "\\" + FilenameUtils.getBaseName(file.getOriginalFilename());
                 for(com.github.junrar.rarfile.FileHeader fileHeader : fileheaders) {
 
                     if (!fileHeader.isDirectory()) {

taais-common/taais-common-core/src/main/java/com/taais/common/core/utils/file/FileUploadUtils.java

@@ -7,7 +7,7 @@ import com.taais.common.core.exception.file.FileSizeLimitExceededException;
 import com.taais.common.core.exception.file.InvalidExtensionException;
 import com.taais.common.core.utils.DateUtils;
 import com.taais.common.core.utils.StringUtils;
-import com.taais.common.core.utils.uuid.Seq;
+
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -110,8 +110,8 @@ public class FileUploadUtils {
      * 编码文件名
      */
     public static final String extractFilename(MultipartFile file) {
-        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
-            FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
+        return StringUtils.format("{}/{}.{}", DateUtils.datePath(),
+            FilenameUtils.getBaseName(file.getOriginalFilename()), getExtension(file));
     }
 
     public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException {

taais-mydemo/src/main/java/com/taais/demo/domain/Data.java

@@ -2,10 +2,11 @@ package com.taais.demo.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-import com.taais.common.orm.core.domain.BaseEntity;
+import com.taais.common.core.utils.uuid.Seq;
 
 import lombok.EqualsAndHashCode;
 
@@ -44,6 +45,7 @@ public class Data {
     private String objectSubtype;
 
     /** 批次号 */
+
     private Long batchNum;
 
     /** 场景 */
@@ -66,6 +68,7 @@ public class Data {
     private String increment;
 
     /** 是否标注 */
+    @Column(onInsertValue = "false")
     private Boolean labeled;
 
 

taais-mydemo/src/main/java/com/taais/demo/domain/bo/DataBo.java

@@ -61,7 +61,7 @@ public class DataBo {
     /**
      * 批次号
      */
-    @NotNull(message = "批次号不能为空")
+//    @NotNull(message = "批次号不能为空")
     private Long batchNum;
 
     /**

taais-mydemo/src/main/java/com/taais/demo/domain/vo/DataVo.java

@@ -2,6 +2,7 @@ package com.taais.demo.domain.vo;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.taais.common.core.utils.uuid.Seq;
 import com.taais.common.orm.core.domain.BaseEntity;
 import com.taais.demo.domain.Data;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@@ -55,7 +56,8 @@ public class DataVo  implements Serializable {
     private String objectSubtype;
 
     /** 批次号 */
-    @ExcelProperty(value = "批次号")
+//    @ExcelProperty(value = "批次号")
+
     private Long batchNum;
 
     /** 场景 */
@@ -83,8 +85,8 @@ public class DataVo  implements Serializable {
     @ExcelProperty(value = "扩增方式")
     private String increment;
 
-    /** 是否标注 */
-    @ExcelProperty(value = "是否标注")
+    /** 是否标注 默认是false*/
+//    @ExcelProperty(value = "是否标注")
     private Boolean labeled;
 
 

taais-mydemo/src/main/java/com/taais/demo/service/impl/DataServiceImpl.java

@@ -9,6 +9,7 @@ import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.StringUtils;
+import com.taais.common.core.utils.uuid.Seq;
 import com.taais.common.orm.core.page.PageQuery;
 import com.taais.common.orm.core.page.TableDataInfo;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;