diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java index d9d3726757..291479ea96 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java @@ -91,9 +91,10 @@ public class IcPointNucleicMonitoringController { @NoRepeatSubmit @PutMapping - public Result update(@RequestBody IcPointNucleicMonitoringDTO dto){ + public Result update(@RequestBody IcPointNucleicMonitoringDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); icPointNucleicMonitoringService.update(dto); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java index bfeaa9c34a..5dcc3fad6f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -7,6 +7,7 @@ import com.epmet.dto.form.PointHSYMFormDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.entity.IcPointNucleicMonitoringEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -25,6 +26,7 @@ public interface IcPointNucleicMonitoringDao extends BaseDao getAllAddressName(); + List getAllAddressNameNoCurrent(@Param("id") String id); /** * 条件查询 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index 4987d470f2..98cc32d68f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -147,6 +147,20 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressNameNoCurrent(dto.getId()); + // 校验数据库是否存在该地点名称 + if (addressList.contains(dto.getName())){ + throw new RenException("该监测点名称已存在,请重新输入"); + } + if(StringUtils.isNotBlank(dto.getOrgName())){ + // 赋值pid pids + OrgInfoPointFormDTO formDTO = ConvertUtils.sourceToTarget(dto, OrgInfoPointFormDTO.class); + Result resultDTOResult = govOrgFeignClient.getCommunityInfo(formDTO); + CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData(); + dto.setPid(communityInfoResultDTO.getPid()); + dto.setPids(communityInfoResultDTO.getPids()); + } IcPointNucleicMonitoringEntity entity = ConvertUtils.sourceToTarget(dto, IcPointNucleicMonitoringEntity.class); updateById(entity); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml index 23ea0af5d8..d55f4fddce 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml @@ -31,6 +31,14 @@ where DEL_FLAG = 0 + +