From 93a16e3707b870856594e89b950174b64bb7d6cd Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 01 三月 2023 10:55:34 +0800
Subject: [PATCH] ecr提交前一步执行原文件存储

---
 src/main/java/com/whyc/util/CommonUtil.java |   82 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/whyc/util/CommonUtil.java b/src/main/java/com/whyc/util/CommonUtil.java
index 84942d4..0eba30a 100644
--- a/src/main/java/com/whyc/util/CommonUtil.java
+++ b/src/main/java/com/whyc/util/CommonUtil.java
@@ -1,7 +1,8 @@
 package com.whyc.util;
 
-import com.whyc.pojo.UserInf;
-import com.whyc.service.UserLogService;
+import com.whyc.constant.YamlProperties;
+import com.whyc.pojo.DocUser;
+import com.whyc.service.DocLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.system.ApplicationHome;
 import org.springframework.stereotype.Component;
@@ -15,16 +16,16 @@
 @Component
 public class CommonUtil {
 
-    private static UserLogService userLogService;
+    private static DocLogService docLogService;
 
     @Autowired
-    public void setUserLogService(UserLogService userLogService) {
-        CommonUtil.userLogService = userLogService;
+    public void setUserLogService(DocLogService docLogService) {
+        CommonUtil.docLogService = docLogService;
     }
 
     /**鑾峰彇褰撳墠Session涓殑灞炴�ser*/
-    public static UserInf getUser(HttpServletRequest request) {
-        return (UserInf) request.getSession().getAttribute("user");
+    public static DocUser getUser(HttpServletRequest request) {
+        return (DocUser) request.getSession().getAttribute("user");
     }
 
     public static String classesPath(){
@@ -33,17 +34,70 @@
         return jarFile.toString();
     }
 
-    /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
-    public static void record(long uId, int operationType, String msg){
-        userLogService.record(uId,operationType,msg);
+    /**
+     * 鑾峰彇瀛樻斁鏂囦欢鐨勬牴璺緞
+     * @return 杩斿洖瀛樻斁鏂囦欢鐨勬牴璺緞
+     */
+    public static String getRootFile(){
+        ApplicationHome applicationHome = new ApplicationHome(CommonUtil.class);
+        File jarFile = applicationHome.getDir();
+        String baseDirPath;
+        if(YamlProperties.runModel == 1) {
+            //寮�鍙戣矾寰�
+            baseDirPath = jarFile.getParentFile().toString()+File.separator+"doc_file"+File.separator;
+        }else {
+            //鎵撳寘璺緞
+            baseDirPath = jarFile.toString()+File.separator+"doc_file"+File.separator;
+        }
+        return baseDirPath;
+    }
+
+    /**
+     * 鑾峰彇椤圭洰鎵�鍦ㄦ枃浠跺す璺緞
+     * @return 鑾峰彇椤圭洰鎵�鍦ㄦ枃浠跺す璺緞
+     */
+    public static String getProjectDir(){
+        ApplicationHome applicationHome = new ApplicationHome(CommonUtil.class);
+        File jarFile = applicationHome.getDir();
+        String baseDirPath;
+        if(YamlProperties.runModel == 1) {
+            //寮�鍙戣矾寰�
+            baseDirPath = jarFile.getParentFile().toString();
+        }else {
+            //鎵撳寘璺緞
+            baseDirPath = jarFile.toString();
+        }
+        return baseDirPath;
     }
 
     /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
-    public static void record(long uId, int operationType, String msg,String msgDetail){
-        userLogService.record(uId,operationType,msg,msgDetail);
+    public static void record(long uId,String name, int operationType, String msg){
+        docLogService.record(uId,name,operationType,msg);
+    }
+
+    /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
+    public static void record(long uId,String name, int operationType, String msg,String msgDetail){
+        docLogService.record(uId,name,operationType,msg,msgDetail);
     }
     /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
-    public static void record2(HttpServletRequest request,long uId, int operationType, String msg,String msgDetail){
-        userLogService.record2(request,uId,operationType,msg,msgDetail);
+    public static void record2(HttpServletRequest request,long uId,String name, int operationType, String msg,String msgDetail){
+        docLogService.record2(request,uId,name,operationType,msg,msgDetail);
+    }
+
+    public static String codeAutoFill(String code){
+        int length = code.length();
+        if (length == 9) {
+            code = "0" + code;
+        } else if (length < 9) {
+            int centerZeroNum = 10 - length - 1;
+            StringBuilder centerZeroStr = new StringBuilder();
+            for (int j = 0; j < centerZeroNum; j++) {
+                centerZeroStr.append("0");
+            }
+            String strFront = code.substring(0, 3);
+            String strBehind = code.substring(3);
+            code = "0" + strFront + centerZeroStr + strBehind;
+        }
+        return code;
     }
 }

--
Gitblit v1.9.1