添加接口

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

@@ -143,6 +143,9 @@ 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());
@@ -153,15 +156,21 @@ public class PointController extends AbstractBaseController {
 			newPointClassify.setDataSourceName(pointClassify.getDataSourceName());
 			newPointClassify.setAddress(pointClassify.getAddress());
 			newPointClassify.setBuildingId(pointClassify.getBuildingId());
-			FeignClientResult responseModel  = equipFeign.getBuildingTreeOne(pointClassify.getBuildingId());
 
-			if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) {
-				throw new RuntimeException(responseModel.getDevMessage());
+			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());
 			}
 
+
 			if(pointClassify.getOriginalId()!=null){
 				newPointClassify.setOriginalId(pointClassify.getOriginalId());
 			}else{
@@ -178,6 +187,7 @@ public class PointController extends AbstractBaseController {
 
 			for (PointInputItemVo pItemVo : customInputList) {
 				PointInputItem pointInputItem = new PointInputItem();
+				if(pItemVo.getPointItemId()==0l) {
 				pointInputItem.setPointId(pointClassify.getPointId());
 				pointInputItem.setInputItemId(pItemVo.getId());
 				pointInputItem.setClassifyIds(Long.valueOf(newPointClassify.getId()).toString());
@@ -195,6 +205,15 @@ public class PointController extends AbstractBaseController {
 						iRoutePointItemDao.save(routePointItem);
 					}
 				}
+			}else{
+				pointInputItem.setId(pItemVo.getPointItemId());
+				pointInputItem.setInputItemId(pItemVo.getId());
+				pointInputItem.setPointId(pointClassify.getPointId());
+				pointInputItem.setClassifyIds(Long.valueOf(newPointClassify.getId()).toString());
+				pointInputItem.setId(pItemVo.getPointItemId());
+				pointInputItem.setOrderNo(pItemVo.getpOrderNo());
+				iPointInputItemDao.save(pointInputItem);
+			}
 			}
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
@@ -238,7 +257,7 @@ public class PointController extends AbstractBaseController {
 
 				for (PointInputItemVo pItemVo : customInputList) {
 					    PointInputItem pointInputItem = new PointInputItem();
-					if(pItemVo.getPointItemId()==0l) {
+
 						pointInputItem.setPointId(pointClassify.getPointId());
 						pointInputItem.setInputItemId(pItemVo.getId());
 						pointInputItem.setClassifyIds(Long.valueOf(newPointClassify.getId()).toString());
@@ -258,21 +277,6 @@ public class PointController extends AbstractBaseController {
 								iRoutePointItemDao.save(routePointItem);
 							}
 						}
-					}else{
-						pointInputItem.setId(pItemVo.getPointItemId());
-						pointInputItem.setInputItemId(pItemVo.getId());
-						pointInputItem.setPointId(pointClassify.getPointId());
-						pointInputItem.setClassifyIds(Long.valueOf(newPointClassify.getId()).toString());
-						pointInputItem.setId(pItemVo.getPointItemId());
-						pointInputItem.setOrderNo(pItemVo.getpOrderNo());
-						iPointInputItemDao.save(pointInputItem);
-
-
-
-
-
-
-					}
 				}