|
@@ -373,21 +373,24 @@ public class TbVmsDsplSchService {
|
|
|
public List<TbVmsDsplSchDto> mergeInfoList(Long id, List<TbVmsDsplSchDto.TbVmsDsplSchUpdReq> reqList) {
|
|
|
List<TbVmsDsplSchDto> result = new ArrayList<>();
|
|
|
|
|
|
- HashSet<String> trfcSituTypeCdSet = new HashSet<>();
|
|
|
+ HashSet<String> vmsSchTypeList = new HashSet<>();
|
|
|
+ HashSet<Integer> vmsSchFormTypeList = new HashSet<>();
|
|
|
reqList.forEach(obj -> {
|
|
|
// 제어기 ID를 모두 동일하게 설정
|
|
|
if (!Objects.equals(id, obj.getVmsCtlrNmbr())) {
|
|
|
//log.error("VmsCtlrNmbr different: {}, {}", id, obj.getVmsCtlrNmbr());
|
|
|
obj.setVmsCtlrNmbr(id);
|
|
|
}
|
|
|
- //TODO trfcSituTypeCdSet.add(obj.getTrfcSituTypeCd());
|
|
|
+ vmsSchTypeList.add(obj.getVmsSchType());
|
|
|
+ vmsSchFormTypeList.add(obj.getVmsSchFormType());
|
|
|
});
|
|
|
|
|
|
/**
|
|
|
* 기존 데이터를 모두 삭제
|
|
|
*/
|
|
|
- List<String> trfcSituTypeCd = new ArrayList<>(trfcSituTypeCdSet);
|
|
|
- // TODO this.repo.deleteDataByVmsCtrlTrfcSituTypeCd(id, trfcSituTypeCd);
|
|
|
+ List<String> vmsSchTypeCd = new ArrayList<>(vmsSchTypeList);
|
|
|
+ List<Integer> vmsSchFormTypeCd = new ArrayList<>(vmsSchFormTypeList);
|
|
|
+ this.repo.deleteDataByVmsCtrlTrfcSituTypeCd(id, vmsSchTypeCd, vmsSchFormTypeCd);
|
|
|
|
|
|
/**
|
|
|
* 요청 데이터 저장
|