From addc5a16ce7c02e37997c7e9c8d6586ace3ab4d8 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 16 六月 2022 11:41:47 +0800
Subject: [PATCH] A059的的时候stateFlag文本信息“时间+第几次放/充电”

---
 src/main/java/com/whyc/util/ActionUtil.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/whyc/util/ActionUtil.java b/src/main/java/com/whyc/util/ActionUtil.java
index 04678bd..4fdadbd 100644
--- a/src/main/java/com/whyc/util/ActionUtil.java
+++ b/src/main/java/com/whyc/util/ActionUtil.java
@@ -5,7 +5,6 @@
 import com.google.gson.JsonSyntaxException;
 import com.whyc.pojo.UserInf;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.web.context.ContextLoader;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
@@ -21,15 +20,13 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Optional;
-
-import static jdk.nashorn.internal.objects.NativeNumber.toFixed;
 
 public class ActionUtil{
 
 	public static String time_yyyyMMddHHmmss = "yyyy-MM-dd HH:mm:ss";
 	public static String time_yyyyMMdd = "yyyy-MM-dd";
-	public static SimpleDateFormat sdfwithOutday=new SimpleDateFormat("yyyy_MM");
+	public static SimpleDateFormat sdfwithOutday = new SimpleDateFormat("yyyy_MM");
+	public static SimpleDateFormat sdfwithday = new SimpleDateFormat("yyyy-MM-dd");
 
 	/*
 	 * 鑾峰彇HttpServletRequest
@@ -436,8 +433,9 @@
      * @return
     */
     public static boolean generateImage(String imgStr, String path) {
-    	if (imgStr == null)
-    		return false;
+    	if (imgStr == null) {
+			return false;
+		}
     	BASE64Decoder decoder = new BASE64Decoder();
     	try {
     		// 瑙e瘑

--
Gitblit v1.9.1