From 7b7e2cb0a59221fd0e7f77a471bd22e42ece4911 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 25 五月 2023 10:44:30 +0800
Subject: [PATCH] 导出中英文切换日志
---
src/main/java/com/whyc/util/CommonUtil.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/whyc/util/CommonUtil.java b/src/main/java/com/whyc/util/CommonUtil.java
index d3133c8..c08e36b 100644
--- a/src/main/java/com/whyc/util/CommonUtil.java
+++ b/src/main/java/com/whyc/util/CommonUtil.java
@@ -7,7 +7,6 @@
import org.springframework.boot.system.ApplicationHome;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.text.ParseException;
@@ -62,42 +61,49 @@
ApplicationHome applicationHome = new ApplicationHome(CommonUtil.class);
File jarFile = applicationHome.getDir();
String baseDirPath;
- if(YamlProperties.runModel == 1) {
+ if (YamlProperties.runModel == 1) {
//寮�鍙戣矾寰�
baseDirPath = jarFile.getParentFile().toString();
- }else {
+ } else {
//鎵撳寘璺緞
baseDirPath = jarFile.toString();
}
return baseDirPath;
}
- /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
- public static void record(long uId, int operationType, String msg){
- userLogService.record(uId,operationType,msg);
- }
-
- /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
- public static void record(long uId, int operationType, String msg,String msgDetail){
- userLogService.record(uId,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 record(long uId, int operationType, String msg, String msgEnUs) {
+ userLogService.record(uId, operationType, msg, msgEnUs);
}
/**
- *
+ * 鎵嬪姩璁板綍鐗瑰畾鏃ュ織
+ */
+ public static void record(long uId, int operationType, String msg, String msgDetail, String msgEnUs, String msgDetailEnUs) {
+ userLogService.record(uId, operationType, msg, msgDetail, msgEnUs, msgDetailEnUs);
+ }
+
+ /**
+ * 鎵嬪姩璁板綍鐗瑰畾鏃ュ織
+ */
+ public static void record2(HttpServletRequest request, long uId, int operationType, String msg, String msgDetail, String msgEnUs, String msgDetailEnUs) {
+ userLogService.record2(request, uId, operationType, msg, msgDetail, msgEnUs, msgDetailEnUs);
+ }
+
+ /**
* 鍦ㄥ垎琛ㄧ殑鎯呭喌涓嬩娇鐢�,鎸夊勾鍒嗚〃,鏌ヨ闇�瑕佸垏鍓叉煡璇娇鐢�
- *
+ * <p>
* 鏍规嵁浼犲叆鐨勮捣姝㈡椂闂�,鎸夌収骞村垏鍓叉垚涓嶅悓鏃堕棿娈�
+ *
* @param startTimeStr 2021-01-01 10:00:00
- * @param endTimeStr 2023-05-01 10:10:10
- * @return 绀轰緥[2021,2022,2023]
+ * @param endTimeStr 2023-05-01 10:10:10
+ * @return 绀轰緥[2021, 2022, 2023]
* 浣跨敤鏂规硶:
- * 鏍规嵁杩斿洖鐨勭涓�涓暟鎹�,濡傛灉瀛樺湪琛�,鍒欐煡璇㈢瓫閫夋潯浠朵负>=杈撳叆鐨勮捣濮嬫椂闂�;涓嶅瓨鍦ㄥ垯寮冪敤杈撳叆鐨勮捣濮嬫椂闂�
- * 鏍规嵁杩斿洖鐨勬渶鍚庝釜鏁版嵁,濡傛灉琛ㄥ瓨鍦�,鍒欐煡璇㈢瓫閫夋潯浠朵负<=杈撳叆鐨勭粓姝㈡椂闂�;涓嶅瓨鍦ㄥ垯寮冪敤杈撳叆鐨勭粓姝㈡椂闂�
- * 杩斿洖鐨勯潪绗竴鏈�鍚庢暟鎹�,鏌ヨ鍏ㄨ〃
+ * 鏍规嵁杩斿洖鐨勭涓�涓暟鎹�,濡傛灉瀛樺湪琛�,鍒欐煡璇㈢瓫閫夋潯浠朵负>=杈撳叆鐨勮捣濮嬫椂闂�;涓嶅瓨鍦ㄥ垯寮冪敤杈撳叆鐨勮捣濮嬫椂闂�
+ * 鏍规嵁杩斿洖鐨勬渶鍚庝釜鏁版嵁,濡傛灉琛ㄥ瓨鍦�,鍒欐煡璇㈢瓫閫夋潯浠朵负<=杈撳叆鐨勭粓姝㈡椂闂�;涓嶅瓨鍦ㄥ垯寮冪敤杈撳叆鐨勭粓姝㈡椂闂�
+ * 杩斿洖鐨勯潪绗竴鏈�鍚庢暟鎹�,鏌ヨ鍏ㄨ〃
*/
public static List<Integer> getYearList(String startTimeStr,String endTimeStr) throws ParseException {
Integer startYear = Integer.valueOf(startTimeStr.split("-")[0]);
--
Gitblit v1.9.1