|
@@ -2005,27 +2005,32 @@ public class TimingTask {
|
|
|
List<UserWithBeisen> userWithBeisenList=new ArrayList<>();
|
|
|
LocalDate now=LocalDate.now();
|
|
|
DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
- String time=df.format(now.plusDays(1));
|
|
|
+ LocalDate start = now.minusDays(1);
|
|
|
+ LocalDate end = now.plusDays(1);
|
|
|
+ String startTime=df.format(start);
|
|
|
+ String endTime=df.format(end);
|
|
|
List<BeisenConfig> beisenConfigs = beisenConfigMapper.selectList(null);
|
|
|
for (BeisenConfig beisenConfig : beisenConfigs) {
|
|
|
if(beisenConfig!=null){
|
|
|
- List<JSONArray> byTimeWindow = BeiSenUtils.getByTimeWindow("",time,time,beisenConfig.getCompanyId(),beisenConfig.getAppKey(),beisenConfig.getAppSecret());
|
|
|
- for (JSONArray array : byTimeWindow) {
|
|
|
- for (int i = 0; i < array.size(); i++) {
|
|
|
- UserWithBeisen userWithBeisen=new UserWithBeisen();
|
|
|
- JSONObject targetItem = array.getJSONObject(i);
|
|
|
- JSONObject employeeInfo = targetItem.getJSONObject("employeeInfo");
|
|
|
- JSONObject recordInfo = targetItem.getJSONObject("recordInfo");
|
|
|
- userWithBeisen.setCompanyId(beisenConfig.getCompanyId());
|
|
|
- userWithBeisen.setJobNumber(recordInfo.getString("jobNumber"));
|
|
|
- userWithBeisen.setMobilePhone(employeeInfo.getString("mobilePhone"));
|
|
|
- userWithBeisen.setName(employeeInfo.getString("name"));
|
|
|
- userWithBeisen.setUserId(employeeInfo.getString("userID"));
|
|
|
- Optional<UserWithBeisen> first = allBeisenList.stream().filter(a -> a.getUserId().equals(employeeInfo.getString("userID"))).findFirst();
|
|
|
- if(first.isPresent()){
|
|
|
- userWithBeisen.setId(first.get().getId());
|
|
|
+ List<JSONArray> byTimeWindow = BeiSenUtils.getByTimeWindow("",startTime,endTime,beisenConfig.getCompanyId(),beisenConfig.getAppKey(),beisenConfig.getAppSecret());
|
|
|
+ if(byTimeWindow.size()>0){
|
|
|
+ for (JSONArray array : byTimeWindow) {
|
|
|
+ for (int i = 0; i < array.size(); i++) {
|
|
|
+ UserWithBeisen userWithBeisen=new UserWithBeisen();
|
|
|
+ JSONObject targetItem = array.getJSONObject(i);
|
|
|
+ JSONObject employeeInfo = targetItem.getJSONObject("employeeInfo");
|
|
|
+ JSONObject recordInfo = targetItem.getJSONObject("recordInfo");
|
|
|
+ userWithBeisen.setCompanyId(beisenConfig.getCompanyId());
|
|
|
+ userWithBeisen.setJobNumber(recordInfo.getString("jobNumber"));
|
|
|
+ userWithBeisen.setMobilePhone(employeeInfo.getString("mobilePhone"));
|
|
|
+ userWithBeisen.setName(employeeInfo.getString("name"));
|
|
|
+ userWithBeisen.setUserId(employeeInfo.getString("userID"));
|
|
|
+ Optional<UserWithBeisen> first = allBeisenList.stream().filter(a -> a.getUserId().equals(employeeInfo.getString("userID"))).findFirst();
|
|
|
+ if(first.isPresent()){
|
|
|
+ userWithBeisen.setId(first.get().getId());
|
|
|
+ }
|
|
|
+ userWithBeisenList.add(userWithBeisen);
|
|
|
}
|
|
|
- userWithBeisenList.add(userWithBeisen);
|
|
|
}
|
|
|
}
|
|
|
if(userWithBeisenList.size()>0){
|