Commit 893de131 authored by duanruiming's avatar duanruiming

[add] 海信方案环相位,添加相位差周期

parent 15c8a938
......@@ -6,6 +6,7 @@ import net.wanji.databus.po.BaseCrossInfoPO;
import net.wanji.databus.vo.CrossInfoVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
......@@ -20,6 +21,7 @@ import java.util.stream.Collectors;
* @date 2023/03/14 10:42
*/
@Component
@Order(1)
@Slf4j
public class BaseCrossInfoCache implements CommandLineRunner {
......
package net.wanji.opt.common;
/**
* @author duanruiming
* @date 2025/04/02 15:44
*/
public class CommonUtils {
/**
* 分隔符:下划线
**/
public static final String SEPARATOR_UNDER_LINE = "_";
public static String getStrJoin(String ... str) {
String join = String.join(SEPARATOR_UNDER_LINE, str);
return join;
}
}
package net.wanji.opt.dto;
import lombok.Data;
/**
* @author duanruiming
* @date 2023/10/14 19:06
*/
@Data
public class CrossDirFreeFlowSpeedDTO {
private String crossId;
private Integer dir;
private Double freeFlowSpeed;
}
......@@ -31,6 +31,7 @@ import net.wanji.opt.synthesis.pojo.StrategyControlDetailList;
import net.wanji.opt.synthesis.pojo.StrategyDailyPlanInfoEntity;
import net.wanji.opt.synthesis.pojo.StrategyPlanInfoEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
......@@ -56,6 +57,7 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
@Component
@Slf4j
@Profile("docker")
public class InducesMonitorTask {
@Autowired
......
......@@ -11,4 +11,9 @@ public class GreenCrossDirDTO {
private Integer greenId;
private String crossId;
private String greenDir;
private Integer inDir;
private Integer outDir;
private Integer sort;
private Integer distance;
private Integer totalDistance;
}
......@@ -68,7 +68,10 @@
</select>
<select id="selectAllGreenCrossDir" resultType="net.wanji.databus.dao.entity.GreenCrossDirDTO">
select t2.green_id, t2.cross_id, t1.green_dir from t_greenwave_info t1
select
t2.green_id, t2.cross_id, t1.green_dir, t2.in_dir, t2.out_dir, t2.sort,
t2.next_cross_len distance, t1.length total_distance
from t_greenwave_info t1
left join t_greenwave_cross t2 on t1.id = t2.green_id
</select>
......
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