Merge pull request '[1393]Simulation 발전량 오류' (#300) from dev into dev-deploy
Reviewed-on: #300
This commit is contained in:
commit
a1192d4656
@ -262,21 +262,13 @@ public class PwrGnrSimService {
|
|||||||
for (PwrGnrSimRoofResponse m : moduleGroupList) {
|
for (PwrGnrSimRoofResponse m : moduleGroupList) {
|
||||||
if (data.getRoofSurfaceId().equals(m.getRoofSurfaceId())) {
|
if (data.getRoofSurfaceId().equals(m.getRoofSurfaceId())) {
|
||||||
dSpecification += m.getTotSpecification();
|
dSpecification += m.getTotSpecification();
|
||||||
if (j == 0) {
|
if (m.getItemId().equals(pwrGnrSimReq.getModule1())) {
|
||||||
if(pwrGnrSimReq.getModule1().equals(m.getItemId())){
|
dModuleInput1[i] = Integer.parseInt(m.getAmount());
|
||||||
dModuleInput1[i] = Integer.parseInt(m.getAmount());
|
} else if (m.getItemId().equals(pwrGnrSimReq.getModule2())) {
|
||||||
}else if(pwrGnrSimReq.getModule2().equals(m.getItemId())){
|
dModuleInput2[i] = Integer.parseInt(m.getAmount());
|
||||||
dModuleInput2[i] = Integer.parseInt(m.getAmount());
|
} else if (m.getItemId().equals(pwrGnrSimReq.getModule3())) {
|
||||||
}else if(pwrGnrSimReq.getModule3().equals(m.getItemId())){
|
dModuleInput3[i] = Integer.parseInt(m.getAmount());
|
||||||
dModuleInput3[i] = Integer.parseInt(m.getAmount());
|
}
|
||||||
}
|
|
||||||
|
|
||||||
} else if (j == 1) {
|
|
||||||
dModuleInput2[i] = Integer.parseInt(m.getAmount());
|
|
||||||
} else {
|
|
||||||
dModuleInput3[i] = Integer.parseInt(m.getAmount());
|
|
||||||
}
|
|
||||||
j++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
i++;
|
i++;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user