风机风门判断错误

src/main/java/com/miniframe/bisiness/system/D20002Service.java

@@ -42,7 +42,7 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 		DPumpMapper pumpDao = UtilTools.getBean(DPumpMapper.class);
 		if(pumpid==null||pumpid<=0){//添加
 			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
-			Integer codenum =codedao.getPumpcodeNum(pumpcode,-1);
+			Integer codenum =codedao.getPumpcodeNum(pumpcode,-1,aid);
 			if(codenum!=0){
 				throw new BusinessException("EB3100039",new String[]{pumpcode});
 			}
@@ -66,7 +66,7 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 				throw new BusinessException("EB3100034", new String[]{pumpid.toString()});
 			}
 			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
-			Integer codenum =codedao.getPumpcodeNum(pumpcode,pumpid);
+			Integer codenum =codedao.getPumpcodeNum(pumpcode,pumpid,aid);
 			if(codenum!=0){
 				throw new BusinessException("EB3100039",new String[]{pumpcode});
 			}

src/main/java/com/miniframe/bisiness/system/D20008Service.java

@@ -40,7 +40,7 @@ public class D20008Service extends D20008BaseModel implements ExecProcessFlow {
 		DVentfanMapper fanDao = UtilTools.getBean(DVentfanMapper.class);
 		if(fanid ==null ||fanid<=0){//添加
 			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
-			Integer codenum =codedao.getFancodeNum(fancode,-1);
+			Integer codenum =codedao.getFancodeNum(fancode,-1,aid);
 			if(codenum!=0){
 				throw new BusinessException("EB3100039",new String[]{fancode});
 			}
@@ -62,7 +62,7 @@ public class D20008Service extends D20008BaseModel implements ExecProcessFlow {
 				throw  new BusinessException("EB3100036",new String[]{fanid.toString()});
 			}
 			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
-			Integer codenum =codedao.getFancodeNum(fancode,fanid);
+			Integer codenum =codedao.getFancodeNum(fancode,fanid,aid);
 			if(codenum!=0){
 				throw new BusinessException("EB3100039",new String[]{fancode});
 			}

src/main/java/com/miniframe/bisiness/system/D20011Service.java

@@ -39,7 +39,7 @@ public class D20011Service extends D20011BaseModel implements ExecProcessFlow {
 		DVentdoorMapper doorDao = UtilTools.getBean(DVentdoorMapper.class);
 		if(doorid==null||doorid<=0){//添加
 			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
-			Integer codenum =codedao.getDoorcodeNum(doorcode,-1);
+			Integer codenum =codedao.getDoorcodeNum(doorcode,-1,aid);
 			if(codenum!=0){
 				throw new BusinessException("EB3100039",new String[]{doorcode});
 			}
@@ -61,7 +61,7 @@ public class D20011Service extends D20011BaseModel implements ExecProcessFlow {
 				throw new BusinessException("EB3100037",new String[]{doorid.toString()});
 			}
 			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
-			Integer codenum =codedao.getDoorcodeNum(doorcode,doorid);
+			Integer codenum =codedao.getDoorcodeNum(doorcode,doorid,aid);
 			if(codenum!=0){
 				throw new BusinessException("EB3100039",new String[]{doorcode});
 			}

src/main/java/com/miniframe/bisiness/system/D50002Service.java

@@ -5,6 +5,7 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D50002BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
 import com.miniframe.model.system.DPipe;
 import com.miniframe.model.system.DPump;
 import com.miniframe.model.system.DPumpBase;
@@ -39,6 +40,11 @@ public class D50002Service extends D50002BaseModel implements ExecProcessFlow {
 		}
 		DPumpBaseMapper pumpDao = UtilTools.getBean(DPumpBaseMapper.class);
 		if(pumpbaseid==null||pumpbaseid<=0){//添加
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getBasePumpcodeNum(pumpcode,-1);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{pumpcode});
+			}
 			DPumpBase p =new DPumpBase();
 			p.setPid(pipe.getId());
 			p.setPname(pipe.getName());
@@ -52,6 +58,11 @@ public class D50002Service extends D50002BaseModel implements ExecProcessFlow {
 			pumpDao.insertSelective(p);
 		}else{//修改
 			DPumpBase p =pumpDao.selectByPrimaryKey(pumpbaseid);
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getBasePumpcodeNum(pumpcode,pumpbaseid);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{pumpcode});
+			}
 			if(p!=null){
 				p.setPid(pipe.getId());
 				p.setPname(pipe.getName());

src/main/java/com/miniframe/bisiness/system/D50008Service.java

@@ -5,6 +5,7 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D50008BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
 import com.miniframe.model.system.DPipe;
 import com.miniframe.model.system.DVentfan;
 import com.miniframe.model.system.DVentfanBase;
@@ -37,6 +38,11 @@ public class D50008Service extends D50008BaseModel implements ExecProcessFlow {
 		}
 		DVentfanBaseMapper fanDao = UtilTools.getBean(DVentfanBaseMapper.class);
 		if(fanbaseid ==null ||fanbaseid<=0){//添加
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getBaseFancodeNum(fancode,-1);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{fancode});
+			}
 			DVentfanBase fan =new DVentfanBase();
 			fan.setName(fanname);
 			fan.setSite(site.floatValue());
@@ -49,6 +55,11 @@ public class D50008Service extends D50008BaseModel implements ExecProcessFlow {
 			fanDao.insertSelective(fan);
 		}else{//修改
 			DVentfanBase fan =fanDao.selectByPrimaryKey(fanbaseid);
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getBaseFancodeNum(fancode,fanbaseid);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{fancode});
+			}
 			if(fan!=null){
 				fan.setName(fanname);
 				fan.setSite(site.floatValue());

src/main/java/com/miniframe/bisiness/system/D50011Service.java

@@ -5,6 +5,7 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D50011BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
 import com.miniframe.model.system.DPipe;
 import com.miniframe.model.system.DVentdoor;
 import com.miniframe.model.system.DVentdoorBase;
@@ -37,6 +38,11 @@ public class D50011Service extends D50011BaseModel implements ExecProcessFlow {
 		}
 		DVentdoorBaseMapper doorDao = UtilTools.getBean(DVentdoorBaseMapper.class);
 		if(doorbaseid==null||doorbaseid<=0){//添加
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getBaseDoorcodeNum(doorcode,-1);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{doorcode});
+			}
 			DVentdoorBase d =new DVentdoorBase();
 			d.setDragcoe(dragcoe.floatValue());
 			d.setName(doorname);
@@ -50,6 +56,11 @@ public class D50011Service extends D50011BaseModel implements ExecProcessFlow {
 		}else{
 			DVentdoorBase d =doorDao.selectByPrimaryKey(doorbaseid);
 			if(d!=null){
+				CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+				Integer codenum =codedao.getBaseDoorcodeNum(doorcode,doorbaseid);
+				if(codenum!=0){
+					throw new BusinessException("EB3100039",new String[]{doorcode});
+				}
 				d.setDragcoe(dragcoe.floatValue());
 				d.setName(doorname);
 				d.setOnoff(onoff);

src/main/java/com/miniframe/mappers/system/dao/CodeOnlyOneMapper.java

@@ -26,15 +26,15 @@ public interface CodeOnlyOneMapper extends MiniserviceBaseDao {
      * @param pumpcode
      * @return
      */
-    @Select("select count(1) from d_pump where code =#{pumpcode} and id!=#{id} ")
-    Integer getPumpcodeNum(String pumpcode, Integer id);
+    @Select("select count(1) from d_pump where code =#{pumpcode} and id!=#{id} and aid =#{aid} ")
+    Integer getPumpcodeNum(String pumpcode, Integer id,Integer aid);
     /**
      * 风机编码唯一 判断
      * @param fancode
      * @return
      */
-    @Select("select count(1) from d_ventfan where code =#{fancode} and id!=#{id} ")
-    Integer getFancodeNum(String fancode, Integer id);
+    @Select("select count(1) from d_ventfan where code =#{fancode} and id!=#{id} and aid =#{aid}")
+    Integer getFancodeNum(String fancode, Integer id,Integer aid);
 
 
     /**
@@ -42,8 +42,32 @@ public interface CodeOnlyOneMapper extends MiniserviceBaseDao {
      * @param code
      * @return
      */
-    @Select("select count(1) from d_ventdoor where code =#{code} and id!=#{id} ")
-    Integer getDoorcodeNum(String code, Integer id);
+    @Select("select count(1) from d_ventdoor where code =#{code} and id!=#{id} and aid =#{aid} ")
+    Integer getDoorcodeNum(String code, Integer id,Integer aid);
+
+
+    /**
+     * 水泵base编码唯一 判断
+     * @param pumpcode
+     * @return
+     */
+    @Select("select count(1) from d_pump_base where code =#{pumpcode} and id!=#{id} ")
+    Integer getBasePumpcodeNum(String pumpcode, Integer id);
+    /**
+     * 风机base编码唯一 判断
+     * @param fancode
+     * @return
+     */
+    @Select("select count(1) from d_ventfan_base where code =#{fancode} and id!=#{id} ")
+    Integer getBaseFancodeNum(String fancode, Integer id);
+
+    /**
+     * 风门base编码唯一 判断
+     * @param code
+     * @return
+     */
+    @Select("select count(1) from d_ventdoor_base where code =#{code} and id!=#{id} ")
+    Integer getBaseDoorcodeNum(String code, Integer id);
     /**
      * 节点编码唯一 判断
      * @param code