|
|
|
@ -93,7 +93,7 @@ public class BasedataMontPatrolPointHandleComponent { |
|
|
|
|
|
|
|
JSONObject jsonObject1 = XmlToJsonUtil.xmlToJsonObject(pointModel); |
|
|
|
assert jsonObject1 != null; |
|
|
|
this.log.info("===========模型xml转jison===========:: {}", jsonObject1.toJSONString()); |
|
|
|
this.log.info("===========模型xml转json===========:: {}", jsonObject1.toJSONString()); |
|
|
|
this.handleJsonObject(jsonObject1, SendCode); |
|
|
|
} |
|
|
|
|
|
|
|
@ -691,9 +691,11 @@ public class BasedataMontPatrolPointHandleComponent { |
|
|
|
bayData.setOldParentId(sendCode + "_" + oldPid); |
|
|
|
this.baseDataAreaService.insertArea(bayData); |
|
|
|
} else { |
|
|
|
bayData = baseDataAreaList.get(0); |
|
|
|
bayData.setAreaName(bayName); |
|
|
|
this.baseDataAreaService.updateArea(bayData); |
|
|
|
if(baseDataAreaList.size() > 0) { |
|
|
|
bayData = baseDataAreaList.get(0); |
|
|
|
bayData.setAreaName(bayName); |
|
|
|
this.baseDataAreaService.updateArea(bayData); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Long areaId = bayData.getAreaId(); |
|
|
|
|