瀏覽代碼

fix: OsEnvUtils

shc 9 月之前
父節點
當前提交
c97b0ebcaa

+ 1 - 1
hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/impl/NewCommonExcelReportServiceImpl.java

@@ -25,8 +25,8 @@ import com.qunzhixinxi.hnqz.report.service.WmDaDrugEntService;
 import com.qunzhixinxi.hnqz.report.service.WmScorePackageStatusService;
 import com.qunzhixinxi.hnqz.report.service.WmTaskService;
 import com.qunzhixinxi.hnqz.report.service.WmTaskTypeService;
-import com.qunzhixinxi.hnqz.report.util.OsEnvUtils;
 import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.report.util.OsEnvUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.springframework.mock.web.MockMultipartFile;

+ 58 - 33
hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/util/OsEnvUtils.java

@@ -1,5 +1,9 @@
 package com.qunzhixinxi.hnqz.report.util;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.UtilityClass;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -12,37 +16,58 @@ import java.util.Properties;
  * @date 2021-04-16
  * @since ver.1.0.0
  */
-public final class OsEnvUtils {
-
-	private OsEnvUtils(){}
-
-	/**
-	 * 获取系统名称
-	 * @return 系统名称
-	 */
-	public static String getOSName(){
-		Properties props = System.getProperties(); // 获得系统属性集
-		String osName = props.getProperty("os.name").toLowerCase(); // 操作系统名称
-		return osName;
-	}
-
-	/**
-	 * 根据环境获取不用的路径
-	 *
-	 * @return 路径map
-	 */
-	public static Map<String, Object> getEachEnvPaths() {
-		String osName = getOSName();
-		Map<String, Object> pathMap = new HashMap<String, Object>();
-		if (osName.contains("linux") || osName.contains("unix")) {
-			pathMap.put("EXCEL_FILE_PATH","/excel/");
-		}
-		if (osName.contains("mac")) {
-			pathMap.put("EXCEL_FILE_PATH","/Users/jimmy/Develops/tmp/excel/");
-		}
-		if (osName.contains("windows")) {
-			pathMap.put("EXCEL_FILE_PATH","D:\\");
-		}
-		return pathMap;
-	}
+@UtilityClass
+public class OsEnvUtils {
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum TargetFile {
+        FONT("font"),
+        TEMPLATE("tmpl"),
+        EXCEL("EXCEL_FILE_PATH"),
+        CONTRACT("pkg_cont");
+
+        private final String name;
+    }
+
+    /**
+     * 获取系统名称
+     *
+     * @return 系统名称
+     */
+    public static String getOSName() {
+        Properties props = System.getProperties(); // 获得系统属性集
+        return props.getProperty("os.name").toLowerCase();
+    }
+
+
+    /**
+     * 根据环境获取不用的路径
+     *
+     * @return 路径map
+     */
+    public static Map<String, String> getEachEnvPaths() {
+        String osName = getOSName();
+        Map<String, String> pathMap = new HashMap<>(2);
+        if (osName.contains("linux") || osName.contains("unix")) {
+            pathMap.put(TargetFile.EXCEL.getName(), "/serving/server/cso_prod/excel/");
+            pathMap.put(TargetFile.FONT.getName(), "/serving/server/cso_prod/font/");
+            pathMap.put(TargetFile.CONTRACT.getName(), "/serving/server/cso_prod/contract/");
+            pathMap.put(TargetFile.TEMPLATE.getName(), "/serving/server/cso_prod/template/");
+        }
+        if (osName.contains("mac")) {
+            pathMap.put(TargetFile.EXCEL.getName(), "~/");
+            pathMap.put(TargetFile.FONT.getName(), "~/");
+            pathMap.put(TargetFile.CONTRACT.getName(), "~/");
+            pathMap.put(TargetFile.TEMPLATE.getName(), "~/");
+        }
+        if (osName.contains("windows")) {
+            pathMap.put(TargetFile.EXCEL.getName(), "D:\\");
+            pathMap.put(TargetFile.FONT.getName(), "D:\\");
+            pathMap.put(TargetFile.CONTRACT.getName(), "D:\\");
+            pathMap.put(TargetFile.TEMPLATE.getName(), "D:\\");
+        }
+        return pathMap;
+    }
 }