|
|
@@ -275,6 +275,9 @@ public class RunHaoSfDeviceImpl extends DeviceAbstractImpl implements IRunHaoSfD
|
|
|
}else{
|
|
|
// 如果存在,则比较灌区内的电磁阀配置,如果不同,则删除原有的电磁阀配置,创建新的电磁阀配置
|
|
|
List<IotSfElementfactorAlreadyListResVo> valveEleList = groupEle.getChildrenList();
|
|
|
+ if(valveEleList == null){
|
|
|
+ valveEleList = new ArrayList<>();
|
|
|
+ }
|
|
|
Map<String, IotSfElementfactorAlreadyListResVo> valveEleMap = new HashMap<>();
|
|
|
for(IotSfElementfactorAlreadyListResVo valveEle: valveEleList){
|
|
|
valveEleMap.put(valveEle.getSfCode(), valveEle);
|
|
|
@@ -304,7 +307,9 @@ public class RunHaoSfDeviceImpl extends DeviceAbstractImpl implements IRunHaoSfD
|
|
|
|
|
|
// 剩余的元素为需要删除的元素
|
|
|
for(IotSfElementfactorAlreadyListResVo ele: eleMap.values()){
|
|
|
- deleteSfBidList.add(ele.getSfBid());
|
|
|
+ if(ele.getChildrenList() != null && !ele.getChildrenList().isEmpty()){
|
|
|
+ deleteSfBidList.add(ele.getSfBid());
|
|
|
+ }
|
|
|
}
|
|
|
if(!deleteSfBidList.isEmpty()){
|
|
|
iIotSfElementfactorService.batchDeleteIotSfElementfactorBySfBidList(deleteSfBidList);
|