From 66db1d15cf5d4b51a346a42b66f0505bd7f31ce0 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 03 一月 2024 15:23:47 +0800
Subject: [PATCH] 解压
---
src/main/java/com/whyc/util/ActionUtil.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/whyc/util/ActionUtil.java b/src/main/java/com/whyc/util/ActionUtil.java
index 4fdadbd..2cc114a 100644
--- a/src/main/java/com/whyc/util/ActionUtil.java
+++ b/src/main/java/com/whyc/util/ActionUtil.java
@@ -3,7 +3,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonSyntaxException;
-import com.whyc.pojo.UserInf;
+import com.whyc.pojo.DocUser;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -27,14 +27,19 @@
public static String time_yyyyMMdd = "yyyy-MM-dd";
public static SimpleDateFormat sdfwithOutday = new SimpleDateFormat("yyyy_MM");
public static SimpleDateFormat sdfwithday = new SimpleDateFormat("yyyy-MM-dd");
-
+ public static SimpleDateFormat sdfwithFTP = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
+ public static SimpleDateFormat sdfwithALL = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/*
* 鑾峰彇HttpServletRequest
*/
public static HttpServletRequest getRequest(){
ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
- HttpServletRequest request = requestAttributes.getRequest();
- return request;
+ if(requestAttributes!=null) {
+ HttpServletRequest request = requestAttributes.getRequest();
+ return request;
+ }else{
+ return null;
+ }
}
/*
@@ -85,7 +90,7 @@
msg = sdf.format(time);
return msg;
}
-
+
/**
*
@@ -188,16 +193,16 @@
*
* @return 鑾峰彇褰撳墠session 涓殑鐢ㄦ埛瀵硅薄
*/
- public static UserInf getUser(){
+ public static DocUser getUser(){
HttpSession session =getSession();
Object obj=session.getAttribute("user");
- UserInf userInf = new UserInf();
+ DocUser userInf = new DocUser();
if(obj==null){
- userInf.setUName("鏈櫥褰曠殑鐢ㄦ埛璐﹀彿");
- userInf.setUId(0L);
- userInf.setURole(0);
+ userInf.setName("鏈櫥褰曠殑鐢ㄦ埛璐﹀彿");
+ userInf.setId(0L);
+ userInf.setRoleId("0");
}else{
- userInf=(UserInf) session.getAttribute("user");
+ userInf=(DocUser) session.getAttribute("user");
}
return userInf;
}
@@ -357,7 +362,6 @@
smdate=sdf.parse(sdf.format(smdate));
bdate=sdf.parse(sdf.format(bdate));
} catch (ParseException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
@@ -378,7 +382,6 @@
smdate=sdf.parse(sdf.format(smdate));
bdate=sdf.parse(sdf.format(bdate));
} catch (ParseException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
Calendar cal = Calendar.getInstance();
--
Gitblit v1.9.1