Commit 07c50e11 authored by Dimitrios Chalepakis's avatar Dimitrios Chalepakis
Browse files

SI-999 Message Import berücksichtigen


Signed-off-by: Dimitrios Chalepakis's avatarDimitrios Chalepakis <dimitrios.chalepakis@pta.de>
parent a896009b
...@@ -120,7 +120,9 @@ public class JobManagerService { ...@@ -120,7 +120,9 @@ public class JobManagerService {
failureInformationDto.setStreet(foreignFailureDataDto.getStreet()); failureInformationDto.setStreet(foreignFailureDataDto.getStreet());
failureInformationDto.setVoltageLevel(foreignFailureDataDto.getVoltageLevel()); failureInformationDto.setVoltageLevel(foreignFailureDataDto.getVoltageLevel());
failureInformationDto.setBranchId(branchService.findByName(foreignFailureDataDto.getBranch()).getUuid()); String branchName = foreignFailureDataDto.getBranch();
branchName = branchName == null || branchName.isEmpty() ? "OS" : branchName;
failureInformationDto.setBranchId(branchService.findByName(branchName).getUuid());
failureInformationDto.setBranch(foreignFailureDataDto.getBranch()); failureInformationDto.setBranch(foreignFailureDataDto.getBranch());
if(foreignFailureDataDto.getRadiusInMeters() != null) { if(foreignFailureDataDto.getRadiusInMeters() != null) {
......
...@@ -33,7 +33,7 @@ public class ForeignFailureDataDto implements Serializable { ...@@ -33,7 +33,7 @@ public class ForeignFailureDataDto implements Serializable {
private String internalRemark; private String internalRemark;
@NotNull @NotNull
@Pattern(regexp = "^$|(S|W|F|G|TK|ST)") @Pattern(regexp = "^$|(S|W|F|G|TK|ST|OS)")
private String branch; private String branch;
@Pattern(regexp="^$|(NS|MS|HS)") @Pattern(regexp="^$|(NS|MS|HS)")
......
...@@ -33,7 +33,7 @@ public class ForeignFailureDataDto implements Serializable { ...@@ -33,7 +33,7 @@ public class ForeignFailureDataDto implements Serializable {
private String internalRemark; private String internalRemark;
@NotNull @NotNull
@Pattern(regexp = "^$|(S|W|F|G|TK|ST)") @Pattern(regexp = "^$|(S|W|F|G|TK|ST|OS)")
private String branch; private String branch;
@Pattern(regexp="^$|(NS|MS|HS)") @Pattern(regexp="^$|(NS|MS|HS)")
......
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