修改代码

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

@@ -268,6 +268,12 @@ public class PointController extends AbstractBaseController {
 			AgencyUserModel user = getUserInfo();
 			List<RoutePoint> routePointList =  iRoutePointDao.queryByPointId(pointClassifys.get(0).getPointId());
 			for (PointInputItemNewVo pointClassify : pointClassifys) {
+
+				List<PointClassify> pointClassifies = iPointClassifyDao.queryByPointIdAndEquipmentId(pointClassify.getPointId(), pointClassify.getEquipmentId());
+				if (pointClassifies.size() > 0){
+					throw new RuntimeException(pointClassify.getName()+"已存在，不可添加");
+				}
+
 				PointClassify newPointClassify = new PointClassify();
 				newPointClassify.setEquipmentId(pointClassify.getEquipmentId());
 				newPointClassify.setName(pointClassify.getName());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IPointClassifyDao.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.patrol.business.dao.repository;
 
 import java.util.List;
 
+import com.yeejoin.amos.patrol.dao.entity.RoutePoint;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -17,6 +18,9 @@ public interface IPointClassifyDao extends BaseDao<PointClassify, Long> {
 	@Query(value = "select * from p_point_classify where point_id = ?1 and is_delete = 0", nativeQuery = true)
 	List<PointClassify> getPointClassifyByPointId(long id);
 
+	@Query(value = "SELECT * FROM `p_route_point` where point_id = ?1 and equipment_id = ?2", nativeQuery = true)
+	List<PointClassify> queryByPointIdAndEquipmentId(Long pointId, String equipmentId);
+
 	@Modifying
 	@Transactional
 	@Query(value = "select * from p_point_classify where name = ?1", nativeQuery = true)