mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/develop' into develop

develop
zhaoxianglong 8 months ago
parent
1a7fae8e70 d4abcb481a
commit
fed938820f
1 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java

16
zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
View File

@ -491,7 +491,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
end.add(markArray[UniversalEnum.ONE.getNumber()]);
parameter.put("startStakeMark", start);
parameter.put("endStakeMark", end);
parameter.put("useState",UniversalEnum.ONE.getValue());
parameter.put("useState",UniversalEnum.ONE.getNumber());
dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter);
Collections.sort(dcDevices, new Comparator<DcDevice>() {
@Override
@ -515,7 +515,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
end.add(UniversalEnum.ONE_HUNDRED_AND_FIFTY_FOUR.getValue());
parameter.put("startStakeMark", start);
parameter.put("endStakeMark", end);
parameter.put("useState",UniversalEnum.ONE.getValue());
parameter.put("useState",UniversalEnum.ONE.getNumber());
dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter);
Collections.sort(dcDevices, new Comparator<DcDevice>() {
@Override
@ -542,7 +542,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
end.add(UniversalEnum.ONE_HUNDRED_AND_FIFTY_FOUR.getValue());
parameter.put("startStakeMark", start);
parameter.put("endStakeMark", end);
parameter.put("useState",UniversalEnum.ONE.getValue());
parameter.put("useState",UniversalEnum.ONE.getNumber());
dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter);
Collections.sort(dcDevices, new Comparator<DcDevice>() {
@Override
@ -566,7 +566,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
end.add(markArray[UniversalEnum.ONE.getNumber()]);
parameter.put("startStakeMark", start);
parameter.put("endStakeMark", end);
parameter.put("useState",UniversalEnum.ONE.getValue());
parameter.put("useState",UniversalEnum.ONE.getNumber());
dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter);
Collections.sort(dcDevices, new Comparator<DcDevice>() {
@Override
@ -595,7 +595,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
parameter.put("startStakeMark", start);
parameter.put("endStakeMark", end);
parameter.put("deviceType", dcExecuteAction.getDeviceType());
parameter.put("useState",UniversalEnum.ONE.getValue());
parameter.put("useState",UniversalEnum.ONE.getNumber());
// 根据桩号范围，查询附近设备
dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter);
}
@ -839,7 +839,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
if (dcDevices.size() == UniversalEnum.ZERO.getNumber()) {
JSONObject result = new JSONObject();
JSONObject errorResult = new JSONObject();
errorResult.put("code",UniversalEnum.FIVE_HUNDRED.getValue());
errorResult.put("code",UniversalEnum.FIVE_HUNDRED.getNumber());
errorResult.put("msg",UniversalEnum.OPERATION_FAILURE.getValue());
result.put("deviceName", deviceTypeName);
result.put("content", UniversalEnum.NO_DEVICE_FOUND.getValue());
@ -953,7 +953,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
// 说明没有匹配到设备
JSONObject errorResult = new JSONObject();
errorResult.put("device", device.getId());
errorResult.put("content", UniversalEnum.THE_CORRESPONDING_TEMPLATE_CONTENT_IS_NOT_MATCHED.getNumber());
errorResult.put("content", UniversalEnum.THE_CORRESPONDING_TEMPLATE_CONTENT_IS_NOT_MATCHED.getValue());
errorResult.put("deviceName", device.getDeviceName());
JSONObject result = new JSONObject();
result.put("result",errorResult);
@ -1068,7 +1068,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
propsList.add(proDevice);
// 语音广播恢复操作不存记录
if (!(device.getDeviceType().equals(DeviceTypeConstants.ROAD_SECTION_VOICE_BROADCASTING.toString())
&& operationType.equals(UniversalEnum.TWO.getValue()))) {
&& operationType.equals(UniversalEnum.TWO.getNumber()))) {
insertEquipmentControlRecordTable(device, propsList, resultArray, status, remark.toString(),eventId);
}

Write Preview
Loading…
Cancel
Save