潘钊 / bsth_control · Commits

Commit 55c2a7ae2b2e339ecb646cc5ecbfbfea0c9efe25

Authored by 徐烜
1 parent 05e20a9a

update

Inline Side-by-side
Showing 2 changed files with 10 additions and 0 deletions
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
  View file @55c2a7a
@@ -21,4 +21,6 @@ public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanI @@ -21,4 +21,6 @@ public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanI
21 @Query(value = "select s from SchedulePlanInfo s where scheduleDate=?1") 21 @Query(value = "select s from SchedulePlanInfo s where scheduleDate=?1")
22 List<SchedulePlanInfo> findByDate(Date date); 22 List<SchedulePlanInfo> findByDate(Date date);
23 23
  24 + Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
  25 +
24 } 26 }
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java
  View file @55c2a7a
@@ -3,6 +3,7 @@ package com.bsth.service.schedule; @@ -3,6 +3,7 @@ package com.bsth.service.schedule;
3 import com.bsth.entity.Line; 3 import com.bsth.entity.Line;
4 import com.bsth.entity.schedule.*; 4 import com.bsth.entity.schedule.*;
5 import com.bsth.entity.schedule.rule.ScheduleRule1Flat; 5 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
  6 +import com.bsth.repository.schedule.SchedulePlanInfoRepository;
6 import com.bsth.repository.schedule.SchedulePlanRepository; 7 import com.bsth.repository.schedule.SchedulePlanRepository;
7 import com.bsth.service.LineService; 8 import com.bsth.service.LineService;
8 import com.bsth.service.impl.BaseServiceImpl; 9 import com.bsth.service.impl.BaseServiceImpl;
@@ -37,6 +38,8 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt; @@ -37,6 +38,8 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
37 private IStrategy strategy; 38 private IStrategy strategy;
38 @Autowired 39 @Autowired
39 private SchedulePlanRepository schedulePlanRepository; 40 private SchedulePlanRepository schedulePlanRepository;
  41 + @Autowired
  42 + private SchedulePlanInfoRepository schedulePlanInfoRepository;
40 43
41 @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED) 44 @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
42 @Override 45 @Override
@@ -79,6 +82,11 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt; @@ -79,6 +82,11 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
79 82
80 System.out.println(scheduleResults_output.showGuideboardDesc1()); 83 System.out.println(scheduleResults_output.showGuideboardDesc1());
81 84
  85 + // 2-3、如果排班的数据之前已经有了，删除之前的数据
  86 + schedulePlanInfoRepository.deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(
  87 + xl.getId(), schedulePlan.getScheduleFromTime(), schedulePlan.getScheduleToTime()
  88 + );
  89 +
82 // 3、根据规则返回，组合最后的输出数据 90 // 3、根据规则返回，组合最后的输出数据
83 // 3-1、根据注入的策略服务，获取原始数据 91 // 3-1、根据注入的策略服务，获取原始数据
84 Multimap<Long, TTInfoDetail> gbdTTinfoMaps = strategy.getGuideboardXlTTInfoDetailMaps(xl.getId()); // 路牌对应时刻明细 92 Multimap<Long, TTInfoDetail> gbdTTinfoMaps = strategy.getGuideboardXlTTInfoDetailMaps(xl.getId()); // 路牌对应时刻明细