Commit 41e4a388b234f475f459c66b3d9cc55210337013
1 parent
27368090
调度预案配置
Showing
4 changed files
with
33 additions
and
2 deletions
src/main/java/com/bsth/data/zndd/AutomaticSch.java
| @@ -2,6 +2,7 @@ package com.bsth.data.zndd; | @@ -2,6 +2,7 @@ package com.bsth.data.zndd; | ||
| 2 | 2 | ||
| 3 | import com.alibaba.fastjson.JSON; | 3 | import com.alibaba.fastjson.JSON; |
| 4 | import com.alibaba.fastjson.JSONObject; | 4 | import com.alibaba.fastjson.JSONObject; |
| 5 | +import com.alibaba.fastjson.TypeReference; | ||
| 5 | import com.bsth.data.BasicData; | 6 | import com.bsth.data.BasicData; |
| 6 | import com.bsth.data.adjg.domain.LargeGap; | 7 | import com.bsth.data.adjg.domain.LargeGap; |
| 7 | import com.bsth.data.directive.DayOfDirectives; | 8 | import com.bsth.data.directive.DayOfDirectives; |
| @@ -12,9 +13,11 @@ import com.bsth.data.schedule.ScheduleComparator; | @@ -12,9 +13,11 @@ import com.bsth.data.schedule.ScheduleComparator; | ||
| 12 | import com.bsth.data.schedule.late_adjust.LateAdjustHandle; | 13 | import com.bsth.data.schedule.late_adjust.LateAdjustHandle; |
| 13 | import com.bsth.entity.directive.D60; | 14 | import com.bsth.entity.directive.D60; |
| 14 | import com.bsth.entity.realcontrol.ScheduleRealInfo; | 15 | import com.bsth.entity.realcontrol.ScheduleRealInfo; |
| 16 | +import com.bsth.entity.zndd.ZnddYuAn; | ||
| 15 | import com.bsth.repository.StationRouteRepository; | 17 | import com.bsth.repository.StationRouteRepository; |
| 16 | import com.bsth.service.directive.DirectiveService; | 18 | import com.bsth.service.directive.DirectiveService; |
| 17 | import com.bsth.service.realcontrol.ScheduleRealInfoService; | 19 | import com.bsth.service.realcontrol.ScheduleRealInfoService; |
| 20 | +import com.bsth.service.zndd.ZnddYuAnService; | ||
| 18 | import com.bsth.util.HttpClientUtils; | 21 | import com.bsth.util.HttpClientUtils; |
| 19 | import com.google.gson.Gson; | 22 | import com.google.gson.Gson; |
| 20 | import org.apache.commons.lang3.StringUtils; | 23 | import org.apache.commons.lang3.StringUtils; |
| @@ -22,6 +25,7 @@ import org.slf4j.Logger; | @@ -22,6 +25,7 @@ import org.slf4j.Logger; | ||
| 22 | import org.slf4j.LoggerFactory; | 25 | import org.slf4j.LoggerFactory; |
| 23 | import org.springframework.beans.factory.annotation.Autowired; | 26 | import org.springframework.beans.factory.annotation.Autowired; |
| 24 | import org.springframework.stereotype.Component; | 27 | import org.springframework.stereotype.Component; |
| 28 | + | ||
| 25 | import java.text.ParseException; | 29 | import java.text.ParseException; |
| 26 | import java.text.SimpleDateFormat; | 30 | import java.text.SimpleDateFormat; |
| 27 | import java.util.*; | 31 | import java.util.*; |
| @@ -53,6 +57,8 @@ public class AutomaticSch { | @@ -53,6 +57,8 @@ public class AutomaticSch { | ||
| 53 | carMonitor carMonitor; | 57 | carMonitor carMonitor; |
| 54 | @Autowired | 58 | @Autowired |
| 55 | BasicData basicData; | 59 | BasicData basicData; |
| 60 | + @Autowired | ||
| 61 | + ZnddYuAnService znddYuAnService; | ||
| 56 | 62 | ||
| 57 | Queue<Map> queue = new LinkedList<>(); | 63 | Queue<Map> queue = new LinkedList<>(); |
| 58 | 64 | ||
| @@ -442,4 +448,18 @@ public class AutomaticSch { | @@ -442,4 +448,18 @@ public class AutomaticSch { | ||
| 442 | long rangeLong = (((long) (new Random().nextDouble() * (max - min)))) + min; | 448 | long rangeLong = (((long) (new Random().nextDouble() * (max - min)))) + min; |
| 443 | return rangeLong; | 449 | return rangeLong; |
| 444 | } | 450 | } |
| 451 | + | ||
| 452 | + //调度预案的配置情况 | ||
| 453 | + public String penum(String type, String types){ | ||
| 454 | + List<ZnddYuAn> znyanList = znddYuAnService.yuanList(type,types); | ||
| 455 | + for (ZnddYuAn zn : znyanList){ | ||
| 456 | + Map<String, Object> jsonMap = JSON.parseObject(zn.getJsonDate(), new TypeReference<HashMap<String, Object>>() {}); | ||
| 457 | + | ||
| 458 | + String typetext = jsonMap.get("type").toString(); | ||
| 459 | + if(type.equals("pz")){ | ||
| 460 | + return typetext; | ||
| 461 | + } | ||
| 462 | + } | ||
| 463 | + return null; | ||
| 464 | + } | ||
| 445 | } | 465 | } |
src/main/java/com/bsth/repository/zndd/ZnddYuAnRepository.java
| @@ -7,9 +7,14 @@ import org.springframework.data.jpa.repository.Modifying; | @@ -7,9 +7,14 @@ import org.springframework.data.jpa.repository.Modifying; | ||
| 7 | import org.springframework.data.jpa.repository.Query; | 7 | import org.springframework.data.jpa.repository.Query; |
| 8 | import org.springframework.stereotype.Repository; | 8 | import org.springframework.stereotype.Repository; |
| 9 | 9 | ||
| 10 | +import java.util.List; | ||
| 11 | + | ||
| 10 | @Repository | 12 | @Repository |
| 11 | public interface ZnddYuAnRepository extends BaseRepository<ZnddYuAn, Integer> { | 13 | public interface ZnddYuAnRepository extends BaseRepository<ZnddYuAn, Integer> { |
| 12 | @Modifying | 14 | @Modifying |
| 13 | @Query(value="delete from ZnddYuAn sr where sr.type = ?1") | 15 | @Query(value="delete from ZnddYuAn sr where sr.type = ?1") |
| 14 | void deleteType(String type); | 16 | void deleteType(String type); |
| 17 | + | ||
| 18 | + @Query(value="select sr from ZnddYuAn sr where sr.type = ?1 and sr.types = ?2") | ||
| 19 | + List<ZnddYuAn> yuanlist(String type,String types); | ||
| 15 | } | 20 | } |
src/main/java/com/bsth/service/zndd/ZnddYuAnService.java
| 1 | package com.bsth.service.zndd; | 1 | package com.bsth.service.zndd; |
| 2 | 2 | ||
| 3 | -import com.bsth.entity.GeoPremise; | ||
| 4 | import com.bsth.entity.zndd.ZnddYuAn; | 3 | import com.bsth.entity.zndd.ZnddYuAn; |
| 5 | import com.bsth.service.BaseService; | 4 | import com.bsth.service.BaseService; |
| 6 | 5 | ||
| 6 | +import java.util.List; | ||
| 7 | import java.util.Map; | 7 | import java.util.Map; |
| 8 | 8 | ||
| 9 | public interface ZnddYuAnService extends BaseService<ZnddYuAn, Integer> { | 9 | public interface ZnddYuAnService extends BaseService<ZnddYuAn, Integer> { |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | Map<String, Object> addMap(Map<String, Object> params); | 12 | Map<String, Object> addMap(Map<String, Object> params); |
| 13 | + | ||
| 14 | + | ||
| 15 | + List<ZnddYuAn> yuanList(String type, String types); | ||
| 13 | } | 16 | } |
src/main/java/com/bsth/service/zndd/impl/ZnddYuAnServiceImpl.java
| @@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; | @@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; | ||
| 13 | import org.springframework.stereotype.Service; | 13 | import org.springframework.stereotype.Service; |
| 14 | import org.springframework.transaction.annotation.Transactional; | 14 | import org.springframework.transaction.annotation.Transactional; |
| 15 | 15 | ||
| 16 | -import java.util.Arrays; | ||
| 17 | import java.util.HashMap; | 16 | import java.util.HashMap; |
| 18 | import java.util.List; | 17 | import java.util.List; |
| 19 | import java.util.Map; | 18 | import java.util.Map; |
| @@ -61,4 +60,8 @@ public class ZnddYuAnServiceImpl extends BaseServiceImpl<ZnddYuAn, Integer> impl | @@ -61,4 +60,8 @@ public class ZnddYuAnServiceImpl extends BaseServiceImpl<ZnddYuAn, Integer> impl | ||
| 61 | 60 | ||
| 62 | return rs; | 61 | return rs; |
| 63 | } | 62 | } |
| 63 | + | ||
| 64 | + public List<ZnddYuAn> yuanList(String type,String types){ | ||
| 65 | + return znddYuAnRepository.yuanlist(type, types); | ||
| 66 | + } | ||
| 64 | } | 67 | } |