Commit 2d64acde authored by duanruiming's avatar duanruiming

[add] 优化神思绿波优化相位开始时间

parent e111becc
...@@ -42,7 +42,7 @@ import java.util.stream.Collectors; ...@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
*/ */
@Component @Component
@Slf4j @Slf4j
@Profile("test") @Profile("docker")
public class HisenseGreenChartTask { public class HisenseGreenChartTask {
@Resource @Resource
...@@ -57,7 +57,7 @@ public class HisenseGreenChartTask { ...@@ -57,7 +57,7 @@ public class HisenseGreenChartTask {
private GreenChartSchemeRingPhaseMapper greenChartSchemeRingPhaseMapper; private GreenChartSchemeRingPhaseMapper greenChartSchemeRingPhaseMapper;
@Scheduled(fixedRate = 1 * 60 * 1000, initialDelay = 1 * 60 * 1000) @Scheduled(fixedRate = 10 * 60 * 1000, initialDelay = 1 * 60 * 1000)
public void getGreenChart() { public void getGreenChart() {
try { try {
ObjectMapper mapper = JacksonUtils.getInstance(); ObjectMapper mapper = JacksonUtils.getInstance();
...@@ -482,6 +482,7 @@ public class HisenseGreenChartTask { ...@@ -482,6 +482,7 @@ public class HisenseGreenChartTask {
Integer endTime = start + greenTime + yellowTime; Integer endTime = start + greenTime + yellowTime;
schemeGreenDirGreenTimeDTO.setEnd(endTime); schemeGreenDirGreenTimeDTO.setEnd(endTime);
schemeGreenDirGreenTimeDTO.setDate(date); schemeGreenDirGreenTimeDTO.setDate(date);
schemeGreenDirGreenTimeDTO.setFromScheme(1);
schemeGreenDirGreenTimeDTOS.add(schemeGreenDirGreenTimeDTO); schemeGreenDirGreenTimeDTOS.add(schemeGreenDirGreenTimeDTO);
} else { // 如果是非协调方向, 相位时间作为开始时间 } else { // 如果是非协调方向, 相位时间作为开始时间
start += greenTime + yellowTime + redTime; start += greenTime + yellowTime + redTime;
...@@ -521,9 +522,9 @@ public class HisenseGreenChartTask { ...@@ -521,9 +522,9 @@ public class HisenseGreenChartTask {
dto.setRingNo(1); dto.setRingNo(1);
++index; ++index;
dto.setPhaseId(index); dto.setPhaseId(index);
Double greenStart = greenDetail.getGreenStartTime(); Double greenStart = greenDetail.getPhaseStartTime();
dto.setStart(greenStart.intValue()); dto.setStart(greenStart.intValue());
Double greenEnd = greenStart + greenWidthTime; Double greenEnd = greenDetail.getPhaseEndTime();
dto.setEnd(greenEnd.intValue()); dto.setEnd(greenEnd.intValue());
dto.setDir(inDir); dto.setDir(inDir);
dto.setDate(new Date()); dto.setDate(new Date());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment