Browse Source

阿米巴开发

anderx 3 years ago
parent
commit
dfa04ba99b

+ 6 - 1
src/main/java/com/goafanti/ambSystem/controller/AmbApiController.java

@@ -28,6 +28,11 @@ public class AmbApiController extends CertifyApiController {
 					ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
 			return res;
 		}
+		int i=ambService.checkAmb(in,0);
+		if (i==-1){
+			res.getError().add(buildError(String.format("[%s]已存在,请确认后再新增",in.getName())));
+			return res;
+		}
 		res.data(ambService.addAmb(in));
 		return res;
 	}
@@ -50,7 +55,7 @@ public class AmbApiController extends CertifyApiController {
 			res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_EMPTY_ERROR,"巴编号"));
 			return res;
 		}
-		int i=ambService.checkAmb(in);
+		int i=ambService.checkAmb(in,2);
 		if (i==-1){
 			res.getError().add(buildError("巴存在子项目,请先删除所有子项"));
 			return res;

+ 7 - 1
src/main/java/com/goafanti/ambSystem/service/AmbService.java

@@ -16,5 +16,11 @@ public interface AmbService {
 
     int deleteAmb(InputAmb in);
 
-    int checkAmb(InputAmb in);
+    /**
+     *
+     * @param in
+     * @param type 0新增 1修改 2删除
+     * @return
+     */
+    int checkAmb(InputAmb in,Integer type);
 }

+ 11 - 4
src/main/java/com/goafanti/ambSystem/service/Impl/AmbServiceImpl.java

@@ -76,13 +76,20 @@ public class AmbServiceImpl extends BaseMybatisDao<AmbSystemMapper> implements A
 
     @Override
     public int deleteAmb(InputAmb in) {
-        return 0;
+        return ambSystemMapper.deleteByPrimaryKey(in.getId());
     }
 
     @Override
-    public int checkAmb(InputAmb in) {
-        List<AmbSystem> ambSystems = ambSystemMapper.selectByParentId(in.getId());
-        if (!ambSystems.isEmpty())return -1;
+    public int checkAmb(InputAmb in,Integer type) {
+
+        if (type==0){
+            int i = ambSystemMapper.selectByName(in.getName());
+            if (i>0)return -1;
+        }else if (type==2){
+            List<AmbSystem> ambSystems = ambSystemMapper.selectByParentId(in.getId());
+            if (!ambSystems.isEmpty())return -1;
+        }
+
         return 0;
     }
 

+ 2 - 0
src/main/java/com/goafanti/common/dao/AmbSystemMapper.java

@@ -22,4 +22,6 @@ public interface AmbSystemMapper {
     List<AmbAll> getAncestorsList(List<String> list);
 
     List<AmbSystem> selectByParentId(Long id);
+
+    int selectByName(String name);
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/AmbSystemMapper.xml

@@ -264,4 +264,10 @@
         from amb_system
         where parent_id = #{id,jdbcType=BIGINT}
     </select>
+    <select id="selectByName" resultType="java.lang.Integer">
+      select
+       count(*)
+      from amb_system
+      where name= #{name}
+    </select>
 </mapper>