Commit c9398b005273292b9c45048e019caf5329b28dcf
1 parent
3b225890
1.bug修复
Showing
2 changed files
with
13 additions
and
5 deletions
src/main/java/com/bsth/entity/WhiteIp.java
| ... | ... | @@ -25,6 +25,9 @@ public class WhiteIp { |
| 25 | 25 | private Date validDate; |
| 26 | 26 | |
| 27 | 27 | @JsonIgnore |
| 28 | + private String hash; | |
| 29 | + | |
| 30 | + @JsonIgnore | |
| 28 | 31 | private Date createDate; |
| 29 | 32 | |
| 30 | 33 | @JsonIgnore |
| ... | ... | @@ -78,6 +81,14 @@ public class WhiteIp { |
| 78 | 81 | this.validDate = validDate; |
| 79 | 82 | } |
| 80 | 83 | |
| 84 | + public String getHash() { | |
| 85 | + return hash; | |
| 86 | + } | |
| 87 | + | |
| 88 | + public void setHash(String hash) { | |
| 89 | + this.hash = hash; | |
| 90 | + } | |
| 91 | + | |
| 81 | 92 | public Date getCreateDate() { |
| 82 | 93 | return createDate; |
| 83 | 94 | } | ... | ... |
src/main/java/com/bsth/redis/ScheduleRedisService.java
| ... | ... | @@ -189,14 +189,11 @@ public class ScheduleRedisService implements CommandLineRunner { |
| 189 | 189 | */ |
| 190 | 190 | public ArrayListMultimap<String, ScheduleRealInfo> findByDate(String rq) { |
| 191 | 191 | |
| 192 | - List<Line> lines = LineBufferData.findAll(); | |
| 193 | 192 | ArrayListMultimap<String, ScheduleRealInfo> rs = ArrayListMultimap.create(); |
| 194 | 193 | |
| 195 | 194 | List<ScheduleRealInfo> list = scheduleRealInfoRepository.findAll(rq); |
| 196 | - for (Line line : lines) { | |
| 197 | - for (ScheduleRealInfo sch : list) { | |
| 198 | - rs.put(sch.getClZbh(), sch); | |
| 199 | - } | |
| 195 | + for (ScheduleRealInfo sch : list) { | |
| 196 | + rs.put(sch.getClZbh(), sch); | |
| 200 | 197 | } |
| 201 | 198 | return rs; |
| 202 | 199 | } | ... | ... |