天气获取

blade-service/blade-business/src/main/java/org/springblade/business/mapper/WeatherInfoMapper.xml

@@ -49,4 +49,4 @@
     </select>
 
 
-</mapper>
+</mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/WeatherInfoServiceImpl.java

@@ -143,6 +143,7 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
                 e.printStackTrace();
             }
         }
+        System.out.println("同步当天天气完成");
     }
 
     /**
@@ -253,6 +254,7 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
                 }
             }
         }
+        System.out.println("完成");
 
     }
 
@@ -335,21 +337,20 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
                     Map<String, String> day = weatherMap.get(date.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")));
                     if (day == null || day.size() == 0){
                         log.info("从整月天气中获取当天失败：" + area.getCity()+"-"+area.getCounty() + "，syncTime：" + date);
+                    }else {
+                        //计算平均气温
+                        BigDecimal aver = (new BigDecimal(day.get("high")).add(new BigDecimal(day.get("low")))).divide(new BigDecimal("2"), 1, BigDecimal.ROUND_HALF_UP);
+                        WeatherInfo newWeather = new WeatherInfo(String.valueOf(area.getId()), day.get("weather"), aver.toString(), day.get("high"), day.get("low"), day.get("windLevel"));
+                        newWeather.setRecordTime(Date.from(date.atStartOfDay().atZone(zone).toInstant()));
+                        list.add(newWeather);
                     }
-                    //计算平均气温
-                    BigDecimal aver = (new BigDecimal(day.get("high")).add(new BigDecimal(day.get("low")))).divide(new BigDecimal("2"), 1, BigDecimal.ROUND_HALF_UP);
-                    WeatherInfo newWeather = new WeatherInfo(String.valueOf(area.getId()), day.get("weather"), aver.toString(), day.get("high"), day.get("low"), day.get("windLevel"));
-                    newWeather.setRecordTime(Date.from(date.atStartOfDay().atZone(zone).toInstant()));
-                    list.add(newWeather);
                 }
 
             }
             //保存进天气表
             this.saveBatch(list);
         }
-
         System.out.println("同步天气完成");
-
     }
     //测试循环
     public void test7(){

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -1691,24 +1691,26 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                     e.printStackTrace();
                 }
             });
-            //过滤审批人状态
-            if (vo.getWaitingUserStatus() != null) {
-                voResult = voResult.stream()
-                    .filter(vo1 -> {
-                        List<InformationQueryVO.WaitingUser> waitingUsers = vo1.getWaitingUserList();
-                        if(waitingUsers!=null){
-                            //签字正常状态
-                            if (vo.getWaitingUserStatus() == 2) {
-                                // 当 waitingUserStatus == 2 时，所有元素的 status 都必须等于 waitingUserStatus
-                                return waitingUsers.stream().allMatch(waitingUser ->waitingUser!=null&&waitingUser.getStatus()!=null&& waitingUser.getStatus().equals(vo.getWaitingUserStatus()));
-                            } else {
-                                // 当 waitingUserStatus != 2 时，只要有一个元素的 status 等于 waitingUserStatus 就满足
-                                return waitingUsers.stream().anyMatch(waitingUser ->waitingUser!=null&&waitingUser.getStatus()!=null&& waitingUser.getStatus().equals(vo.getWaitingUserStatus()));
+            if(!ObjectUtil.isEmpty(voResult)){
+                //过滤审批人状态
+                if (vo.getWaitingUserStatus() != null) {
+                    voResult = voResult.stream()
+                        .filter(vo1 -> {
+                            List<InformationQueryVO.WaitingUser> waitingUsers = vo1.getWaitingUserList();
+                            if(waitingUsers!=null){
+                                //签字正常状态
+                                if (vo.getWaitingUserStatus() == 2) {
+                                    // 当 waitingUserStatus == 2 时，所有元素的 status 都必须等于 waitingUserStatus
+                                    return waitingUsers.stream().allMatch(waitingUser ->waitingUser!=null&&waitingUser.getStatus()!=null&& waitingUser.getStatus().equals(vo.getWaitingUserStatus()));
+                                } else {
+                                    // 当 waitingUserStatus != 2 时，只要有一个元素的 status 等于 waitingUserStatus 就满足
+                                    return waitingUsers.stream().anyMatch(waitingUser ->waitingUser!=null&&waitingUser.getStatus()!=null&& waitingUser.getStatus().equals(vo.getWaitingUserStatus()));
+                                }
                             }
-                        }
-                        return false;
-                    })
-                    .collect(Collectors.toList());
+                            return false;
+                        })
+                        .collect(Collectors.toList());
+                }
             }
             if (ObjectUtil.isEmpty(voResult)) {
                 return page.setRecords(null);