健康公示上面数字与曲线匹配。

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

@@ -341,6 +341,7 @@
             and a.record_time>=#{startDate}
             and a.record_time<#{endDate}
             and a.del_flag=0
+            and b.del_flag=0
         ]]>
     </select>
 </mapper>

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

@@ -35,10 +35,7 @@ import java.net.URLEncoder;
 import java.security.Key;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Base64;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 @Component
 @Slf4j
@@ -79,6 +76,9 @@ public class UnmeasureTemperatureAlarmTask {
     @Value("${mobile.unMeasureUrl}")
     private String unMeasureUrl;
 
+    @Autowired
+    private HolidayInfoService holidayInfoService;
+
     public int batchUpdate(String companyId,Date startDate,Date endDate) throws Exception {
         DateTime dt1 = new DateTime(startDate);
         DateTime dt2 = new DateTime(endDate);
@@ -149,6 +149,14 @@ public class UnmeasureTemperatureAlarmTask {
         DateTime now = DateTime.now();
 
         String date = now.toString("yyyy-MM-dd");
+
+        //最近一年的节假日
+        Set<String> holidaySet = holidayInfoService.getHolidaySetByDate(now.minusDays(364).toDate(),now.plusDays(1).toDate());
+
+        if (holidaySet.contains(date)){
+            return;
+        }
+
         int weekday = now.getDayOfWeek();
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");