弹窗最后一次清缓存

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxAlertLogController.java

@@ -69,7 +69,10 @@ public class WxAlertLogController  extends ApiBaseController {
         if (alertConfiguration1!=null){
             //有启动
             alertConfiguration1.setIsClearCache(false);
-            Date date = new Date();
+            Date datez = new Date();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String now = sdf.format(datez);
+            Date date = sdf.parse(now);
             int i = date.compareTo(alertConfiguration1.getAlertStartTime());
             int i1 = date.compareTo(alertConfiguration1.getAlertEndTime());
             if (i >= 0 && i1 < 0) {
@@ -89,8 +92,8 @@ public class WxAlertLogController  extends ApiBaseController {
                             Long count =alertLog.getAlertNum()+1;
                             // 创建两个日期对象
                             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                            Date date1 = dateFormat.parse(alertLog.getCreateTime().toString());
-                            Date date2 = dateFormat.parse(alertConfiguration1.getAlertEndTime().toString());
+                            Date date1 = dateFormat.parse(sdf.format(alertLog.getCreateTime()));
+                            Date date2 = dateFormat.parse(sdf.format(alertConfiguration1.getAlertEndTime()));
                             // 设置时间部分为零点
                             Calendar calendar = Calendar.getInstance();
                             calendar.setTime(date1);
@@ -125,8 +128,8 @@ public class WxAlertLogController  extends ApiBaseController {
                         alertLog1.setAlertNum(1L);
                         // 创建两个日期对象
                         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                        Date date1 = dateFormat.parse(date.toString());
-                        Date date2 = dateFormat.parse(alertConfiguration1.getAlertEndTime().toString());
+                        Date date1 = dateFormat.parse(now);
+                        Date date2 = dateFormat.parse(sdf.format(alertConfiguration1.getAlertEndTime()));
                         // 设置时间部分为零点
                         Calendar calendar = Calendar.getInstance();
                         calendar.setTime(date1);
@@ -161,8 +164,8 @@ public class WxAlertLogController  extends ApiBaseController {
                             Long count =alertLog.getAlertNum()+1;
                             // 创建两个日期对象
                             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                            Date date1 = dateFormat.parse(alertLog.getCreateTime().toString());
-                            Date date2 = dateFormat.parse(alertConfiguration1.getAlertEndTime().toString());
+                            Date date1 = dateFormat.parse(sdf.format(alertLog.getCreateTime()));
+                            Date date2 = dateFormat.parse(sdf.format(alertConfiguration1.getAlertEndTime()));
                             // 设置时间部分为零点
                             Calendar calendar = Calendar.getInstance();
                             calendar.setTime(date1);
@@ -198,8 +201,8 @@ public class WxAlertLogController  extends ApiBaseController {
                         alertLog1.setAlertNum(1L);
                         // 创建两个日期对象
                         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                        Date date1 = dateFormat.parse(date.toString());
-                        Date date2 = dateFormat.parse(alertConfiguration1.getAlertEndTime().toString());
+                        Date date1 = dateFormat.parse(now);
+                        Date date2 = dateFormat.parse(sdf.format(alertConfiguration1.getAlertEndTime()));
                         // 设置时间部分为零点
                         Calendar calendar = Calendar.getInstance();
                         calendar.setTime(date1);