diff --git a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/schedule/VenueQuerySchedule.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/schedule/VenueQuerySchedule.java index 17ce6eb..9db1947 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/schedule/VenueQuerySchedule.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/schedule/VenueQuerySchedule.java @@ -9,8 +9,10 @@ import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -20,6 +22,7 @@ import java.util.Map; */ @Component @RequiredArgsConstructor +@RestController public class VenueQuerySchedule { private final static String STATIC_TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3NjU3ODQ1NjMsInVzZXJuYW1lIjoid3hfb3Blbl9pZF9vMjFNWDR5N3doWENHanZVVEdQNkNUejJIYkQ4In0.QBzNQNvJZQPZZnzmbU8K5Liz0piHwercrDIq3kirUJk"; @@ -27,6 +30,7 @@ public class VenueQuerySchedule { private final DingTalkScriptVenueService dingTalkScriptVenueService; @Scheduled(cron = "0 0/5 9-15 * * ?") + @PostMapping("/venueQueryTask") public void venueQueryTask4Free() { venueQuery(); } @@ -46,9 +50,9 @@ public class VenueQuerySchedule { return; } // 6-8场地 - Map> map1 = Maps.newHashMap(); + Map> map1 = Maps.newLinkedHashMap(); // 8-10场地 - Map> map2 = Maps.newHashMap(); + Map> map2 = Maps.newLinkedHashMap(); sitePositionLists.stream() .filter(item -> StringUtils.equals(item.getSjName(), "18:00-19:00") || StringUtils.equals(item.getSjName(), "19:00-20:00") || StringUtils.equals(item.getSjName(), "20:00-21:00") || StringUtils.equals(item.getSjName(), "21:00-22:00")) @@ -79,20 +83,23 @@ public class VenueQuerySchedule { SitePositionList sitePositionList1 = v.get(0); SitePositionList sitePositionList2 = v.get(1); String contacts = sitePositionList1.getContacts(); - if (StringUtils.equals(sitePositionList1.getContacts(), sitePositionList2.getContacts())) { + if (!StringUtils.equals(sitePositionList1.getContacts(), sitePositionList2.getContacts())) { contacts = sitePositionList1.getContacts() + "," + sitePositionList2.getContacts(); } - sb1.append(k).append("场地,订购人:").append(contacts); + sb1.append(k).append("场地,订购人:").append(contacts).append("\n"); }); } private static void putIntoMap(SitePositionList item, Map> map1) { - if (map1.containsKey(item.getPlaceName())) { - List positionLists = map1.get(item.getPlaceName()); - positionLists.add(item); - map1.put(item.getPlaceName(), positionLists); - } else { - map1.put(item.getPlaceName(), Collections.singletonList(item)); - } +// if (map1.containsKey(item.getPlaceName())) { +// List positionLists = map1.get(item.getPlaceName()); +// positionLists.add(item); +// map1.put(item.getPlaceName(), positionLists); +// } else { +// map1.put(item.getPlaceName(), Collections.singletonList(item)); +// } + map1.computeIfAbsent(item.getPlaceName(), + k -> new ArrayList<>() + ).add(item); } }