Skip to content

A
amos-boot-biz
Commit 32973e9a authored by chenzhao's avatar chenzhao
Browse files
Options

Merge branch 'develop_dl_plan6_temp' of…

Merge branch 'develop_dl_plan6_temp' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6_temp
parents f0edbff5 3851ef01
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 32 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java
View file @ 32973e9a
...@@ -143,45 +143,48 @@ public class PointController extends AbstractBaseController { ...@@ -143,45 +143,48 @@ public class PointController extends AbstractBaseController {
List<RoutePoint> routePointList = iRoutePointDao.queryByPointId(pointClassify.getPointId()); List<RoutePoint> routePointList = iRoutePointDao.queryByPointId(pointClassify.getPointId());
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
PointClassify newPointClassify = new PointClassify(); PointClassify newPointClassify = new PointClassify();
if(pointClassify.getId()!=null){ if(pointClassify.getId()==null){
newPointClassify.setId(pointClassify.getId());
} newPointClassify.setEquipmentId(pointClassify.getEquipmentId());
newPointClassify.setEquipmentId(pointClassify.getEquipmentId()); newPointClassify.setName(pointClassify.getName());
newPointClassify.setName(pointClassify.getName()); newPointClassify.setInspectionSpecName(pointClassify.getInspectionName());
newPointClassify.setInspectionSpecName(pointClassify.getInspectionName()); newPointClassify.setCreatorId(user.getUserId());
newPointClassify.setCreatorId(user.getUserId()); newPointClassify.setPointId(pointClassify.getPointId());
newPointClassify.setPointId(pointClassify.getPointId()); newPointClassify.setOrderNo(0);
newPointClassify.setOrderNo(0); newPointClassify.setDataSourceCode(pointClassify.getDataSourceCode());
newPointClassify.setDataSourceCode(pointClassify.getDataSourceCode()); newPointClassify.setDataSourceName(pointClassify.getDataSourceName());
newPointClassify.setDataSourceName(pointClassify.getDataSourceName()); newPointClassify.setAddress(pointClassify.getAddress());
newPointClassify.setAddress(pointClassify.getAddress()); newPointClassify.setBuildingId(pointClassify.getBuildingId());
newPointClassify.setBuildingId(pointClassify.getBuildingId());
if(pointClassify.getBuildingName()==null){
if(pointClassify.getBuildingName()==null){ FeignClientResult responseModel = equipFeign.getBuildingTreeOne(pointClassify.getBuildingId());
FeignClientResult responseModel = equipFeign.getBuildingTreeOne(pointClassify.getBuildingId());
if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) {
if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) { throw new RuntimeException(responseModel.getDevMessage());
throw new RuntimeException(responseModel.getDevMessage()); }else{
Map<String, Object> dat=(Map<String, Object>) responseModel.getResult();
newPointClassify.setBuildingName(dat.get("name").toString());
}
}else{ }else{
Map<String, Object> dat=(Map<String, Object>) responseModel.getResult(); newPointClassify.setBuildingName(pointClassify.getBuildingName());
newPointClassify.setBuildingName(dat.get("name").toString());
} }
}else{
newPointClassify.setBuildingName(pointClassify.getBuildingName());
}
if(pointClassify.getOriginalId()!=null){ if(pointClassify.getOriginalId()!=null){
newPointClassify.setOriginalId(pointClassify.getOriginalId()); 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{ }else{
String uuid= UUID.randomUUID().toString().replace("-",""); newPointClassify.setId(pointClassify.getId());
newPointClassify.setOriginalId(uuid.substring(0,16));
} }
newPointClassify.setCategoryCode(pointClassify.getCategoryCode());
newPointClassify.setCategoryName(pointClassify.getCategoryName());
newPointClassify.setCode(pointClassify.getCode());
iPointService.addPointClassifyByPointId(newPointClassify);
List<PointInputItemVo> customInputList = pointClassify.getEquipIputDetailData();//巡检项 List<PointInputItemVo> customInputList = pointClassify.getEquipIputDetailData();//巡检项
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment