From 2ff9e6fc2b231902ee32347a7229952a0a11e289 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Mon, 12 May 2025 19:26:21 +0800
Subject: [PATCH] fix

---
 .../com/cool/store/enums/FileTypeEnum.java    |  2 +
 .../java/com/cool/store/enums/ImportEnum.java | 66 -------------------
 .../webb/DataHandlerController.java           |  5 +-
 3 files changed, 4 insertions(+), 69 deletions(-)
 delete mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/ImportEnum.java

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
index e498f51f7..4aea3aa78 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
@@ -19,6 +19,8 @@ public enum FileTypeEnum {
     EXPORT_JOIN_SHOP("exportJoinShop","加盟开店申请"),
     EXPORT_PROGRESS("exportProgress","进度确认"),
     IMPORT_OA_OLD_SHOP_DATA_ERROR("OaOldShopDataError", "导入OA旧数据错误列表"),
+    IMPORT_OA_OLD_SHOP_DATA("importOaOldShopData", "导入OA旧数据"),
+
     ;
     private String fileType;
     private String desc;
diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ImportEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ImportEnum.java
deleted file mode 100644
index 09d6758bd..000000000
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ImportEnum.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.cool.store.enums;
-
-import java.util.Arrays;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public enum ImportEnum {
-    /**
-     *
-     */
-    IMPORT_OA_OLD_SHOP_DATA("导入OA旧数据.xlsx", "importOaOldShopData", "导入OA旧数据"),
-
-    ;
-    /**
-     * 返回码
-     */
-    private String name;
-
-    /**
-     * 编码
-     */
-    private String code;
-
-    /**
-     * 返回信息
-     */
-    private String dec;
-
-    private static final Map<String, String> MAP = Arrays.stream(values()).collect(
-            Collectors.toMap(ImportEnum::getCode, ImportEnum::getName));
-
-
-    ImportEnum(String name, String code, String dec) {
-        this.name = name;
-        this.code = code;
-        this.dec = dec;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getDec() {
-        return dec;
-    }
-
-    public void setDec(String dec) {
-        this.dec = dec;
-    }
-
-    public static String getByCode(String code) {
-        return MAP.get(code);
-    }
-}
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java
index 3457e3f03..c93fbaae9 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java
@@ -3,9 +3,8 @@ package com.cool.store.controller.webb;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import com.cool.store.context.CurrentUserHolder;
-import com.cool.store.context.LoginUserInfo;
 import com.cool.store.entity.ImportTaskDO;
-import com.cool.store.enums.ImportEnum;
+import com.cool.store.enums.FileTypeEnum;
 import com.cool.store.enums.ImportTaskStatusEnum;
 import com.cool.store.mapper.ImportTaskMapper;
 import com.cool.store.response.ResponseResult;
@@ -58,7 +57,7 @@ public class DataHandlerController {
         List<Map<String, Object>> dataMapList = reader.read(0, 1, Integer.MAX_VALUE);
         ImportTaskDO importTaskDO = new ImportTaskDO();
         importTaskDO.setFileName(file.getOriginalFilename());
-        importTaskDO.setFileType(ImportEnum.IMPORT_OA_OLD_SHOP_DATA.getCode());
+        importTaskDO.setFileType(FileTypeEnum.IMPORT_OA_OLD_SHOP_DATA.getFileType());
         importTaskDO.setIsImport(true);
         importTaskDO.setStatus(ImportTaskStatusEnum.PROGRESS.getCode());
         importTaskDO.setCreateUserId(CurrentUserHolder.getUserId());