修改bug

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

@@ -204,6 +204,15 @@ public class PointController extends AbstractBaseController {
 	public CommonResponse addPointXcdx(@ApiParam(value = "新增巡查对象", required = true) @RequestBody PointInputItemNewVo pointClassify){
 
 		try {
+			//增加判断
+
+			PointClassify PointClassifyk= iPointClassifyDao.getPointClassifyByPointIdandcode(pointClassify.getPointId(),pointClassify.getCode());
+			if(PointClassifyk!=null){
+				if(PointClassifyk.getId()!=pointClassify.getId()){
+					return CommonResponseUtil.failure("巡查对象code，不能重复！");
+				}
+			}
+
 			List<RoutePoint> routePointList =  iRoutePointDao.queryByPointId(pointClassify.getPointId());
 			AgencyUserModel user = getUserInfo();
 			PointClassify newPointClassify = new PointClassify();
@@ -334,6 +343,14 @@ public class PointController extends AbstractBaseController {
 			List<RoutePoint> routePointList =  iRoutePointDao.queryByPointId(pointClassifys.get(0).getPointId());
 			for (PointInputItemNewVo pointClassify : pointClassifys) {
 
+
+				PointClassify PointClassifyk= iPointClassifyDao.getPointClassifyByPointIdandcode(pointClassify.getPointId(),pointClassify.getCode());
+				if(PointClassifyk!=null){
+					if(PointClassifyk.getId()!=pointClassify.getId()){
+						return CommonResponseUtil.failure("巡查对象code，不能重复！");
+					}
+				}
+
 				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/mapper/RoutePointItemMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
 
-import com.yeejoin.amos.patrol.dao.entity.RoutePointItem;
+        import com.yeejoin.amos.patrol.dao.entity.RoutePointItem;
 
 public interface RoutePointItemMapper extends BaseMapper {
 

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

@@ -50,4 +50,9 @@ public interface IPointClassifyDao extends BaseDao<PointClassify, Long> {
 	List<PointClassify> selectByOriginalId(String id);
 
 	PointClassify findByOriginalId(String originalId);
+
+
+
+	@Query(value = "select * from p_point_classify where point_id = ?1 and code = ?2 and is_delete = 0   ", nativeQuery = true)
+	PointClassify getPointClassifyByPointIdandcode(long id,String code);
 }

amos-boot-system-patrol/src/main/resources/db/mapper/routePointItemMapper.xml

@@ -64,13 +64,13 @@
         (`id`, `route_point_id`, `order_no`, `point_input_item_id`, `creator_id`, `create_date`, `point_classify_id`, `basis_json`)
         VALUES(
                   #{id},
-                  #{route_point_id},
-                  #{order_no},
-                  #{point_input_item_id},
-                  #{creator_id},
-                  #{create_date},
-                  #{point_classify_id},
-                  #{basis_json})
+                  #{routePointId},
+                  #{orderNo},
+                  #{pointInputItemId},
+                  #{creatorId},
+                  #{createDate},
+                  #{pointClassifyId},
+                  #{basisJson})
 
     </insert>