增加重复校验功能

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -554,6 +555,9 @@ public class InputItemController extends AbstractBaseController {
 		if (param.getEquipmentType() == null && param.getCustomType() == null&&param.getFacilitiesType() == null&&param.getKeyPartsType() == null){
 			throw new BadRequest("适用类型至少需选择一项");
 		}
+		if (CollectionUtils.isNotEmpty(inputItemDao.findByItemName(param.getName()))) {
+			throw new BadRequest("该名称已存在,请重新输入");
+		}
 		//如果为1则为否，顺应机场逻辑
 		param.setCustomType("1".equals(param.getCustomType()) ? null : param.getCustomType());
 		param.setKeyPartsType("1".equals(param.getKeyPartsType()) ? null : param.getKeyPartsType());

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

@@ -7,10 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.dao.mapper.PointMapper;
-import com.yeejoin.amos.patrol.business.dao.repository.IPointClassifyDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointItemDao;
+import com.yeejoin.amos.patrol.business.dao.repository.*;
 import com.yeejoin.amos.patrol.business.feign.EquipFeign;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import com.yeejoin.amos.patrol.business.vo.*;
@@ -64,6 +61,7 @@ import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 @RestController
@@ -78,6 +76,8 @@ public class PointController extends AbstractBaseController {
 
 	@Autowired
 	private PointMapper pointMapper;
+	@Autowired
+	private IPointDao iPointDao;
 
 	@Autowired
 	private ICatalogTreeService catalogTreeService;
@@ -1502,6 +1502,20 @@ public class PointController extends AbstractBaseController {
 		if (ObjectUtils.isEmpty(pointNewVo.getChargePersonId())) {
 			return CommonResponseUtil.failure("责任人不能为空");
 		}
+		if (!ObjectUtils.isEmpty(pointNewVo.getName())) {
+			List<Point> list = iPointDao.findByName(pointNewVo.getName());
+			if (CollectionUtils.isNotEmpty(list)) {
+				throw new BadRequest("该名称巡检点已存在");
+			}
+		}
+		if (!ObjectUtils.isEmpty(pointNewVo.getName())) {
+			List<Point> list = iPointDao.findByNo(pointNewVo.getPointNo());
+			if (CollectionUtils.isNotEmpty(list)) {
+				throw new BadRequest("该编号已存在");
+			}
+		}
+
+
 		try {
 			Point point = new Point();
 			BeanUtils.copyProperties(pointNewVo,point);

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

@@ -9,10 +9,13 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.dao.mapper.RoutePointItemMapper;
 import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointDao;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
+import com.yeejoin.amos.patrol.business.service.impl.RouteServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +57,7 @@ import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.annotation.Resource;
@@ -80,6 +84,8 @@ public class RouteController extends AbstractBaseController {
 	private RoutePointItemMapper routePointItemMapper;
 	@Autowired
 	private IRoutePointDao iRoutePointDao;
+	@Autowired
+	private RouteServiceImpl routeServiceImpl;
 	/**
 	 *
 	 * 新增接口
@@ -167,6 +173,15 @@ public class RouteController extends AbstractBaseController {
 			String loginOrgCode = getOrgCode(reginParams);
 			route.setOrgCode(loginOrgCode);
 
+
+			if(!StringUtils.isEmpty(route.getName())){
+				LambdaQueryWrapper<Route> wrapper = new LambdaQueryWrapper<>();
+				wrapper.eq(Route::getName,route.getName());
+				List<Route> list = routeServiceImpl.list(wrapper);
+				if (!ObjectUtils.isEmpty(list) || list.size()>0){
+					throw new BadRequest("该名称路线已存在");
+				}
+			}
 			if(route.getDeptId()!=null){
 				//查询jcs
 				ResponseModel<Object> companyInfo = jcsFeignClient.getCompanyInfo(route.getDeptId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/RouteMapper.java

@@ -17,7 +17,7 @@ import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
 import com.yeejoin.amos.patrol.dao.entity.Route;
 import com.yeejoin.amos.patrol.dao.entity.RoutePointItem;
 
-public interface RouteMapper extends BaseMapper {
+public interface RouteMapper extends BaseMapper, com.baomidou.mybatisplus.core.mapper.BaseMapper<Route> {
 
 	/**
 	 * 根据路线id与点id，获取路线上点的项

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

@@ -33,4 +33,11 @@ public interface IInputItemDao extends BaseDao<InputItem, Long> {
 
     @Query(value = "delete * from p_input_item where is not null and is_delete =0", nativeQuery = true)
     void deleteAllByEquipmentNameIsNotNull();
+
+    @Query(value = "select * from p_input_item where item_no = ?1 and is_delete =0", nativeQuery = true)
+    List<InputItem> findByItemNo(String itemNo);
+
+    @Query(value = "select * from p_input_item where name = ?1 and is_delete =0", nativeQuery = true)
+    List<InputItem> findByItemName(String name);
+
 }

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

@@ -27,4 +27,10 @@ public interface IPointDao extends BaseDao<Point, Long> {
     
     Optional<Point> findById(Long id);
 
+    @Query(value = "select * from p_point where point_no = (?1) and is_delete =0", nativeQuery = true)
+    List<Point> findByNo(String pointNo);
+
+    @Query(value = "select * from p_point where name = (?1) and is_delete =0", nativeQuery = true)
+    List<Point> findByName(String name);
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -67,7 +68,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service("routeService")
-public class RouteServiceImpl implements IRouteService {
+public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implements IRouteService {
 
     @Autowired
     private IRouteDao iRouteDao;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IRouteService.java

@@ -5,6 +5,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.patrol.business.param.LoginUserParam;
 import com.yeejoin.amos.patrol.business.param.SynRouteParam;
 import com.yeejoin.amos.patrol.business.util.DaoCriteria;
@@ -22,7 +23,7 @@ import com.yeejoin.amos.patrol.dao.entity.Point;
 import com.yeejoin.amos.patrol.dao.entity.Route;
 import com.yeejoin.amos.patrol.dao.entity.RoutePoint;
 
-public interface IRouteService {
+public interface IRouteService extends IService<Route> {
 
 	/**
 	 * 添加巡检路线