修改提醒为截止时间前10分钟提醒。

common/src/main/resources/mapper/base/PersonDeviceFilterLog.xml

@@ -268,7 +268,6 @@
             select * from base_person_info
             where company_id=#{companyId}
             and del_flag=0
-            and face_bound=1
             and id_ not in (
                 select person_id from base_person_device_filter_log
                 where record_time>=#{startTime}
@@ -283,7 +282,6 @@
             and a.company_id = b.id_
             and b.del_flag=0
             and a.del_flag=0
-            and a.face_bound=1
             and a.id_ not in (
                 select person_id from base_person_device_filter_log
                 where record_time>=#{startTime}

web/src/main/java/com/jpsoft/smart/schduled/UnmeasureTemperatureAlarmTask.java

@@ -44,12 +44,12 @@ public class UnmeasureTemperatureAlarmTask {
 
         List<AlarmConfig> configList = alarmConfigService.list();
 
-        try {
-            //停100毫秒，以便后续时间比endTime大
-            Thread.sleep(100);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+//        try {
+//            //停100毫秒，以便后续时间比endTime大
+//            Thread.sleep(100);
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        }
 
         DateTime now = DateTime.now();
 
@@ -64,6 +64,9 @@ public class UnmeasureTemperatureAlarmTask {
                 DateTime startTime = new DateTime(sdf.parse(date + " " + alarmConfig.getStartTime()));
                 DateTime endTime = new DateTime(sdf.parse(date + " " + alarmConfig.getEndTime()));
 
+                //截止时间前10分钟发提醒
+                endTime = endTime.plusMinutes(-10);
+
                 if (weekdays.indexOf(String.valueOf(weekday)) != -1) {
                     if (now.compareTo(endTime)>0 && now.compareTo(endTime.plusMinutes(intervalMinute))<0) {
                             //todo 进行通知
@@ -93,16 +96,16 @@ public class UnmeasureTemperatureAlarmTask {
 
         //todo 给未测量人推送微信通知
         for (PersonInfo personInfo : unmeasuredList) {
+            if (sb.length() != 0) {
+                sb.append(",");
+            }
+
+            sb.append(personInfo.getName());
+
             if (StringUtils.isNotEmpty(personInfo.getOpenId())) {
                 String message = "尊敬的用户：" + personInfo.getName()
                         + ",您未在" + startTime.toString("HH:mm") + "至" + endTime.toString("HH:mm") + "测量体温，请及时补测!";
 
-                if (sb.length() != 0) {
-                    sb.append(",");
-                }
-
-                sb.append(personInfo.getName());
-
                 WechatMessageUtil.sendUnmeasureAlarmInfo(personInfo.getOpenId(), companyInfo.getName(), message, wxConfig.getAppId(), wxConfig.getAppSecret());
             }