|
|
@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.StringUtils;
|
|
|
import org.apache.poi.ss.usermodel.DateUtil;
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
+import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
|
|
|
/**
|
|
|
@@ -169,7 +170,7 @@ public class EscapeUtil
|
|
|
System.out.println("escape: " + escape);
|
|
|
System.out.println("unescape: " + EscapeUtil.unescape(escape));
|
|
|
|
|
|
- String reqid = "81b2c95d-2126-4326-bd2e-4936916863c6newReqid1683799523958";
|
|
|
+ String reqid = "801623ce-fab5-4827-a9a5-3aabdde9980fnewReqid1683799523958";
|
|
|
if(reqid.indexOf("newReqid")>0){
|
|
|
String[] reqidlist = reqid.split("newReqid");
|
|
|
if(reqidlist.length>1){
|
|
|
@@ -179,8 +180,10 @@ public class EscapeUtil
|
|
|
long nm = 1000 * 60;
|
|
|
String time = reqidlist[1];
|
|
|
Date date = new Date(Long.valueOf(time));
|
|
|
+ Calendar ca = Calendar.getInstance();
|
|
|
+ ca.add(Calendar.SECOND, -59);
|
|
|
// 获得两个时间的毫秒时间差异
|
|
|
- long diff = new Date().getTime() - date.getTime();
|
|
|
+ long diff = new Date().getTime() - ca.getTime().getTime();
|
|
|
long min = diff % nd % nh / nm;
|
|
|
if(min>1){
|
|
|
|
