Skip to content

T
traffic-signal-platform
Commit 4989b034 authored by duanruiming's avatar duanruiming
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 7ce9682e 5e0a766f
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 96 deletions
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/ControlCommandServiceImpl.java
View file @ 4989b034
......@@ -97,7 +97,7 @@ public class ControlCommandServiceImpl implements ControlCommandService {
String extendResult = extendPost.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_RESULT).getText();
if (HttpConstants.RESULT_1.equals(extendResult) || HttpConstants.RESULT_2.equals(extendResult)) {
return jsonViewObject.success("相位锁定/解锁 - 控制成功");
}else {
} else {
return jsonViewObject.fail("相位锁定/解锁 - 控制失败");
}
}
......@@ -211,7 +211,7 @@ public class ControlCommandServiceImpl implements ControlCommandService {
return jsonViewObject.fail("相位步进 - 控制失败");
}
}
return jsonViewObject.fail("相位步进 - 控制失败");
return jsonViewObject.success("相位步进 - 控制成功");
}
@Override
......
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/StaticInfoServiceImpl.java
View file @ 4989b034
......@@ -134,7 +134,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
//方案号
int schemeNo = (Integer.valueOf(crossSchemeRings.getPattern()) + 2) / 3;
crossSchemePO.setSchemeNo(schemeNo + "");
crossSchemePO.setName("海信方案:" + schemeNo);
crossSchemePO.setName("方案" + schemeNo);
crossSchemePO.setCrossId(crossId);
crossSchemePO.setCycle(cycle);
//协调相位id先默认给1
......@@ -170,65 +170,6 @@ public class StaticInfoServiceImpl implements StaticInfoService {
getStagesByRings(lightsMap, lightNum, cycle, ringCount, crossId, schemeNo, ringPhasesMap, crossLightsList, crossPhaseList, crossPhaseLightsPOList, channelDim);
}
}
//查询当前运行的方案
/* CoordinationStatus coordinationStatus = crossPlan(crossId);
if (Optional.ofNullable(coordinationStatus).isPresent()) {
CrossSchemeRingsDTO crossSchemeRingsDTO = new CrossSchemeRingsDTO();
crossSchemeRingsDTO.setCrossId(crossId);
crossSchemeRingsDTO.setPattern(coordinationStatus.getCoordPatternStatus());
//查询方案环图请求
CrossSchemeRings crossSchemeRings = crossSchemeRings(crossSchemeRingsDTO);
if (Optional.ofNullable(crossSchemeRings).isPresent()) {
//环数
int ringCount = Integer.parseInt(crossSchemeRings.getRingCount());
//周期长度
String cycleLen = crossSchemeRings.getCycleLen();
JSONObject cycleJSONObject = crossSchemeRings.getCycleList();
//相位差
String offset = crossSchemeRings.getOffset();
int cycle = Integer.valueOf(cycleLen);
CrossSchemePO crossSchemePO = new CrossSchemePO();
//方案号
int schemeNo = (Integer.valueOf(crossSchemeRings.getPattern()) + 2) / 3;
crossSchemePO.setSchemeNo(schemeNo + "");
crossSchemePO.setName("海信方案:" + schemeNo);
crossSchemePO.setCrossId(crossId);
crossSchemePO.setCycle(cycle);
//协调相位id先默认给1
crossSchemePO.setCoordPhase(1);
crossSchemePO.setOffset(Integer.valueOf(offset));
//来源默认信号机
crossSchemePO.setSource(1);
//默认给0
crossSchemePO.setIsDeleted(0);
//默认给0
crossSchemePO.setStatus(0);
crossSchemePO.setGmtCreate(null);
crossSchemePO.setGmtModified(null);
crossSchemeList.add(crossSchemePO);
List<CrossSchemeRings.Phase> phaseList = crossSchemeRings.getPhaseList();
CrossSchemeRings.Phase phase = phaseList.get(0);
//16 个相位的红灯时间（单位秒）,中间用空格隔开,不存在的相位置 0。
String[] redTime = phase.getRedTime().split(" ");
//16 个相位的绿灯时间（单位秒）,中间用空格隔开,不存在的相位置 0。
String[] greenTime = phase.getGreenTime().split(" ");
//16 个相位的黄灯时间（单位秒）,中间用空格隔开,不存在的相位置 0。
String[] yellowTime = phase.getYellowTime().split(" ");
//16 个相位的最小绿时间（单位秒）,中间用空格隔开,不存在的相位置 0。
String[] minGTime = phase.getMinGTime().split(" ");
//16 个相位的最大绿时间（单位秒）,中间用空格隔开,不存在的相位置 0。
String[] maxGTime = phase.getMaxGTime().split(" ");
//封装环和环上相位数据
Map<Integer, List<RingPhaseDTO>> ringPhasesMap = getRingPhasesMap(ringCount, cycleJSONObject, redTime, greenTime, yellowTime, minGTime, maxGTime);
//16 个相位的放行方向，每个相位由 8 字节整型值存储（最多支持 7 个放行方向），每个字节表示一个放行方向，
String[] channelDim = phase.getChannelDim().split(" ");
//数据处理
getStagesByRings(cycle, ringCount, crossId, schemeNo, ringPhasesMap, crossLightsList, crossPhaseList, crossPhaseLightsPOList, channelDim);
}
}*/
phaseLightsVO.setCrossPhaseLightsPOList(crossPhaseLightsPOList);
phaseLightsVO.setCrossLightsList(crossLightsList);
phaseLightsVO.setCrossSchemeList(crossSchemeList);
......@@ -422,7 +363,6 @@ public class StaticInfoServiceImpl implements StaticInfoService {
count++;
}
if (CollectionUtil.isNotEmpty(stagePhaseList)) {
//将结果组装到结果集
doView(lightsMap, lightNum, cycle, ringCount, crossId, schemeNo, stagePhaseList, crossLightsList, crossPhaseList, crossPhaseLightsPOList, channelDim);
}
......@@ -443,9 +383,12 @@ public class StaticInfoServiceImpl implements StaticInfoService {
List<RingPhaseDTO> ringPhaseList = stagePhaseDTO.getRingPhaseList();
//相位
CrossPhasePO crossPhasePO = new CrossPhasePO();
crossPhasePO.setPhaseNo(stageId + "");
//相位号变为方案号拼接阶段号
stageId = Integer.valueOf(String.valueOf(schemeNo).concat(String.valueOf(stageId)));
crossPhasePO.setPhaseNo(String.valueOf(stageId));
crossPhasePO.setName("相位" + stageId);
crossPhasePO.setSort(phaseNum.getAndIncrement());
phaseNum.getAndIncrement();
crossPhasePO.setSort(phaseNum.get());
crossPhasePO.setCrossId(crossId);
crossPhasePO.setPlanId(schemeNo);
crossPhasePO.setAccompanyPhaseNo("1");
......@@ -528,7 +471,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
crossLightsPO.setType(1);
}
//key
String lightMapKey = dir + turn + crossLightsPO.getType();
String lightMapKey = String.valueOf(wjLightsDir).concat(String.valueOf(wjLightsTurn)).concat(String.valueOf(crossLightsPO.getType()));
if (!lightsMap.containsKey(lightMapKey)) {
lightNum.getAndIncrement();
lightsMap.put(lightMapKey, lightNum.get());
......@@ -541,19 +484,16 @@ public class StaticInfoServiceImpl implements StaticInfoService {
crossLightsPO.setGmtCreate(null);
crossLightsPO.setGmtModified(null);
crossLightsList.add(crossLightsPO);
}
//灯组与相位关系
CrossPhaseLightsPO crossPhaseLightsPO = new CrossPhaseLightsPO();
crossPhaseLightsPO.setLightsId(lightsMap.get(lightMapKey));
crossPhaseLightsPO.setPhaseId(stageId);
crossPhaseLightsPO.setPhaseId(stageId); // 方向转向
crossPhaseLightsPO.setCrossId(crossId);
crossPhaseLightsPO.setGmtCreate(null);
crossPhaseLightsPO.setGmtModified(null);
crossPhaseLightsPOList.add(crossPhaseLightsPO);
}
}
}
}
}
......@@ -570,21 +510,6 @@ public class StaticInfoServiceImpl implements StaticInfoService {
return crossPhaseLightsPO;
}
public static void main(String[] args) {
int l = 6442253;
String binaryString = Integer.toBinaryString(l);
String dirTurn = String.format("%8s", Integer.toBinaryString(6442253)).replace(' ', '0');
if (StringUtils.isNotBlank(dirTurn)) {
String dir = dirTurn.substring(0, 3); // 高三位 方向
String turn = dirTurn.substring(3); // 低五位 转向
Integer wjLightsDir = HiseseDirEnum.getWjLightsDir(Integer.parseInt(dir, 2));
Integer wjLightsTurn = HisenseTurnEnum.getWjLightsTurn(Integer.parseInt(turn, 2));
System.out.println("wjLightsDir " + wjLightsDir);
System.out.println("wjLightsTurn " + wjLightsTurn);
}
}
private static CrossLightsPO getCrossLights(String crossId, Integer nChannelControlType, Integer nChannelNumber, Integer nChannelDim) {
CrossLightsPO crossLightsPO = new CrossLightsPO();
crossLightsPO.setLightsNo(String.valueOf(nChannelNumber));
......@@ -626,7 +551,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
crossPlan.setCrossId(crossId);
//计划号-取的是时段表号
crossPlan.setPlanNo(String.valueOf(i));
crossPlan.setName("海信信号机-时段表号:" + i);
crossPlan.setName("计划号:" + i);
crossPlanPOList.add(crossPlan);
PlanSectionVO planSectionVO = new PlanSectionVO();
......@@ -697,7 +622,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
CrossSchedulesPO crossSchedulesPO = new CrossSchedulesPO();
crossSchedulesPO.setCrossId(crossId);
crossSchedulesPO.setScheduleNo(vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
crossSchedulesPO.setName("海信调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
crossSchedulesPO.setName("调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
// 海信月份
Integer hisenseMonth = vNtcipTimeBaseScheduleView.getNTimeBaseScheduleMonth();
// 星期
......@@ -715,7 +640,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
CrossSchedulesPO crossSchedulesPOWeek = new CrossSchedulesPO();
crossSchedulesPOWeek.setCrossId(crossId);
crossSchedulesPOWeek.setScheduleNo(vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
crossSchedulesPOWeek.setName("海信调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
crossSchedulesPOWeek.setName("调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
crossSchedulesPOWeek.setWeek(Integer.valueOf(oneWeek));
crossSchedulesPOWeek.setMonths(monthsStr);
crossSchedulesPOWeek.setDays(daysStr);
......@@ -727,7 +652,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
CrossSchedulesPO crossSchedulesPOMonthDays = new CrossSchedulesPO();
crossSchedulesPOMonthDays.setCrossId(crossId);
crossSchedulesPOMonthDays.setScheduleNo(vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
crossSchedulesPOMonthDays.setName("海信调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
crossSchedulesPOMonthDays.setName("调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
crossSchedulesPOMonthDays.setWeek(null);
crossSchedulesPOMonthDays.setMonths(monthsStr);
crossSchedulesPOMonthDays.setDays(daysStr);
......
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