Merge branch 'develop_dl_plan6_temp' of…

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -991,7 +991,7 @@ public class OrgUsrController extends BaseController {
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST", value = "查询单位基本信息", notes = "查询单位基本信息")
-	@GetMapping(value = "/selectByIdDeptList")
+	@PostMapping(value = "/selectByIdDeptList")
 	public ResponseModel<Object> selectByIdDeptList(@RequestBody String ids) throws Exception {
 
 		String[] slid  =  ids.split(",");
@@ -1003,7 +1003,7 @@ public class OrgUsrController extends BaseController {
 	}
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST", value = "查询单位基本信息", notes = "查询单位基本信息")
-	@GetMapping(value = "/selectByAmosOrgIdDeptList")
+	@PostMapping(value = "/selectByAmosOrgIdDeptList")
 	public ResponseModel<Object> selectByAmosOrgIdDeptList(@RequestBody String ids) throws Exception {
 
 		String[] slid  =  ids.split(",");

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

@@ -259,6 +259,21 @@ public class PointController extends AbstractBaseController {
 		}
 	}
 
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "新增巡查对象", notes = "新增巡查对象")
+	@GetMapping(value = "/xcdxIsExits", produces = "application/json;charset=UTF-8")
+	public CommonResponse xcdxIsExits(Long pointId,String equipMentId){
+
+		List<PointClassify> pointClassifies = iPointClassifyDao.queryByPointIdAndEquipmentId(pointId,equipMentId);
+
+		if (pointClassifies.size() > 0){
+			throw new RuntimeException(pointClassifies.get(0).getName() + "已存在，不可添加");
+		}
+		return CommonResponseUtil.success(true);
+	}
+
+
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "新增巡查对象", notes = "新增巡查对象")
 	@PostMapping(value = "/addPointXcdxList", produces = "application/json;charset=UTF-8")
@@ -269,11 +284,6 @@ public class PointController extends AbstractBaseController {
 			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

@@ -18,7 +18,7 @@ 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)
+	@Query(value = "SELECT * FROM `p_point_classify` where point_id = ?1 and equipment_id = ?2", nativeQuery = true)
 	List<PointClassify> queryByPointIdAndEquipmentId(Long pointId, String equipmentId);
 
 	@Modifying