Merge branch 'develop_dl_plan6_temp' of…

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -143,45 +143,48 @@ public class PointController extends AbstractBaseController {
 			List<RoutePoint> routePointList =  iRoutePointDao.queryByPointId(pointClassify.getPointId());
 			AgencyUserModel user = getUserInfo();
 			PointClassify newPointClassify = new PointClassify();
-			if(pointClassify.getId()!=null){
-				newPointClassify.setId(pointClassify.getId());
-			}
-			newPointClassify.setEquipmentId(pointClassify.getEquipmentId());
-			newPointClassify.setName(pointClassify.getName());
-			newPointClassify.setInspectionSpecName(pointClassify.getInspectionName());
-			newPointClassify.setCreatorId(user.getUserId());
-			newPointClassify.setPointId(pointClassify.getPointId());
-			newPointClassify.setOrderNo(0);
-			newPointClassify.setDataSourceCode(pointClassify.getDataSourceCode());
-			newPointClassify.setDataSourceName(pointClassify.getDataSourceName());
-			newPointClassify.setAddress(pointClassify.getAddress());
-			newPointClassify.setBuildingId(pointClassify.getBuildingId());
-
-			if(pointClassify.getBuildingName()==null){
-				FeignClientResult responseModel  = equipFeign.getBuildingTreeOne(pointClassify.getBuildingId());
-
-				if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) {
-					throw new RuntimeException(responseModel.getDevMessage());
+			if(pointClassify.getId()==null){
+
+				newPointClassify.setEquipmentId(pointClassify.getEquipmentId());
+				newPointClassify.setName(pointClassify.getName());
+				newPointClassify.setInspectionSpecName(pointClassify.getInspectionName());
+				newPointClassify.setCreatorId(user.getUserId());
+				newPointClassify.setPointId(pointClassify.getPointId());
+				newPointClassify.setOrderNo(0);
+				newPointClassify.setDataSourceCode(pointClassify.getDataSourceCode());
+				newPointClassify.setDataSourceName(pointClassify.getDataSourceName());
+				newPointClassify.setAddress(pointClassify.getAddress());
+				newPointClassify.setBuildingId(pointClassify.getBuildingId());
+
+				if(pointClassify.getBuildingName()==null){
+					FeignClientResult responseModel  = equipFeign.getBuildingTreeOne(pointClassify.getBuildingId());
+
+					if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) {
+						throw new RuntimeException(responseModel.getDevMessage());
+					}else{
+						Map<String, Object> dat=(Map<String, Object>) responseModel.getResult();
+						newPointClassify.setBuildingName(dat.get("name").toString());
+					}
 				}else{
-					Map<String, Object> dat=(Map<String, Object>) responseModel.getResult();
-					newPointClassify.setBuildingName(dat.get("name").toString());
+					newPointClassify.setBuildingName(pointClassify.getBuildingName());
 				}
-			}else{
-				newPointClassify.setBuildingName(pointClassify.getBuildingName());
-			}
 
 
-			if(pointClassify.getOriginalId()!=null){
-				newPointClassify.setOriginalId(pointClassify.getOriginalId());
+				if(pointClassify.getOriginalId()!=null){
+					newPointClassify.setOriginalId(pointClassify.getOriginalId());
+				}else{
+					String uuid= UUID.randomUUID().toString().replace("-","");
+					newPointClassify.setOriginalId(uuid.substring(0,16));
+				}
+				newPointClassify.setCategoryCode(pointClassify.getCategoryCode());
+				newPointClassify.setCategoryName(pointClassify.getCategoryName());
+				newPointClassify.setCode(pointClassify.getCode());
+
+				iPointService.addPointClassifyByPointId(newPointClassify);
 			}else{
-               String uuid= UUID.randomUUID().toString().replace("-","");
-				newPointClassify.setOriginalId(uuid.substring(0,16));
+				 newPointClassify.setId(pointClassify.getId());
 			}
-			newPointClassify.setCategoryCode(pointClassify.getCategoryCode());
-			newPointClassify.setCategoryName(pointClassify.getCategoryName());
-			newPointClassify.setCode(pointClassify.getCode());
 
-			iPointService.addPointClassifyByPointId(newPointClassify);
 
 			List<PointInputItemVo> customInputList = pointClassify.getEquipIputDetailData();//巡检项