Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -59,16 +60,30 @@ public class ThrInvWarehouseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");
-        boolean b = thrInvWarehouseService.insertThrInvWarehouse(invSubWarehouseEntity);
-        ThrDeptEntity thrDeptEntity = thrDeptService.selectByCode(invSubWarehouseEntity.getParentId(), invSubWarehouseEntity.getThirdSysFk());
-        thrDeptEntity.setUpdateTime(new Date());
-        thrDeptService.updateInvWarehouse(thrDeptEntity);
-
-        if (!b) {
-            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        //先判断是否存在
+        List<ThrInvWarehouseEntity> ThrInvWarehouseEntityList = new ArrayList<>();
+        List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.selectByPid(invSubWarehouseEntity.getParentId());
+        for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
+            if((invSubWarehouseEntity.getCode().equals(thrInvWarehouseEntity.getCode()) && invSubWarehouseEntity.getName().equals(thrInvWarehouseEntity.getName()))){
+                //添加集合中
+                ThrInvWarehouseEntityList.add(thrInvWarehouseEntity);
+            }
         }
-        return ResultVOUtils.success("添加成功！");
+        if(ThrInvWarehouseEntityList.size()==0){
+            invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");
+            boolean b = thrInvWarehouseService.insertThrInvWarehouse(invSubWarehouseEntity);
+            ThrDeptEntity thrDeptEntity = thrDeptService.selectByCode(invSubWarehouseEntity.getParentId(), invSubWarehouseEntity.getThirdSysFk());
+            thrDeptEntity.setUpdateTime(new Date());
+            thrDeptService.updateInvWarehouse(thrDeptEntity);
+
+            if (!b) {
+                return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+            }
+            return ResultVOUtils.success("添加成功！");
+        }else{
+            return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
+        }
+
     }
 
     @AuthRuleAnnotation("")

src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java

@@ -14,6 +14,8 @@ public interface ThrInvWarehouseDao {
 
     List<ThrInvWarehouseEntity> filterThrInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest);
 
+    List<ThrInvWarehouseEntity> selectByPid(String pid);
+
     boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity);
 
     boolean insertThrInvWarehouses(@Param("thrInvWarehouseEntitys") List<ThrInvWarehouseEntity> thrInvWarehouseEntitys);

src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java

@@ -14,6 +14,7 @@ public interface ThrInvWarehouseService {
     ThrInvWarehouseEntity selectByThrCode(String thirdSys, String thirdId);
 
     List<ThrInvWarehouseEntity> filterThrInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest);
+    List<ThrInvWarehouseEntity> selectByPid(String pid);
 
     boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity);
 

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java

@@ -58,6 +58,11 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
         return thrInvWarehouseDao.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
     }
 
+    @Override
+    public List<ThrInvWarehouseEntity> selectByPid(String pid) {
+        return thrInvWarehouseDao.selectByPid(pid);
+    }
+
     @Override
     public boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) {
         return thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity);

src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml

@@ -32,6 +32,13 @@
         WHERE id = #{id}
     </select>
 
+    <select id="selectByPid" parameterType="Map"
+            resultType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity">
+        SELECT *
+        FROM thr_inv_warehouse
+        WHERE parentId = #{pid}
+    </select>
+
     <select id="countSubInvByParentInvId" resultType="java.lang.Integer">
         select count(*) from thr_inv_warehouse where
             parentId = (select code from thr_dept where id = #{parentInvId})