huangxingxing пре 2 месеци
родитељ
комит
76d55c13c0

+ 1 - 0
definitionsrc/returncode/returncode-business.properties

@@ -96,6 +96,7 @@ EB3100035 = pumphfid:{0}\u6C34\u6CF5\u6C34\u4F4D\u6D41\u91CF\u4E0D\u5B58\u5728\u
 EB3100036 = fanid:{0}\u98CE\u673A\u4E0D\u5B58\u5728\uFF01
 EB3100037 = doorid:{0}\u98CE\u95E8\u4E0D\u5B58\u5728\uFF01
 EB3100038 = aid:{0}\u4E8B\u6545\u4E0D\u5B58\u5728\uFF01
+EB3100039 = \u7F16\u7801{0}\u5DF2\u5B58\u5728\uFF01
 EMB00001 = \u8BA1\u7B97\u672A\u5B8C\u6210\uFF01
 EMB00002 = \u8BA1\u7B97\u5931\u8D25\uFF01
 EMB00003 = \u4EBA\u5458\u4F4D\u7F6E\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF01

+ 1 - 0
definitionsrc/returncode/returncode-business_zh_CN.properties

@@ -96,6 +96,7 @@ EB3100035 = pumphfid:{0}\u6C34\u6CF5\u6C34\u4F4D\u6D41\u91CF\u4E0D\u5B58\u5728\u
 EB3100036 = fanid:{0}\u98CE\u673A\u4E0D\u5B58\u5728\uFF01
 EB3100037 = doorid:{0}\u98CE\u95E8\u4E0D\u5B58\u5728\uFF01
 EB3100038 = aid:{0}\u4E8B\u6545\u4E0D\u5B58\u5728\uFF01
+EB3100039 = \u7F16\u7801{0}\u5DF2\u5B58\u5728\uFF01
 EMB00001 = \u8BA1\u7B97\u672A\u5B8C\u6210\uFF01
 EMB00002 = \u8BA1\u7B97\u5931\u8D25\uFF01
 EMB00003 = \u4EBA\u5458\u4F4D\u7F6E\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF01

+ 11 - 1
src/main/java/com/miniframe/bisiness/system/D10000Service.java

@@ -5,10 +5,10 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D10000BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
 import com.miniframe.model.system.DNode;
 import com.miniframe.model.system.DNodeSQLBuilder;
 import com.miniframe.model.system.dao.DNodeMapper;
-import com.miniframe.model.system.dao.DNodeValMapper;
 
 /**
  * 基础系统,“节点数据添加修改”逻辑处理(重新生成不覆盖)。
@@ -33,10 +33,20 @@ public class D10000Service extends D10000BaseModel implements ExecProcessFlow {
 
 		if(nid ==null || nid<=0){//添加
 			pdXYZ(dNodeDao, x, y, z);
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getNodecodeNum(code,-1);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{code});
+			}
 			saveNode(dNodeDao, x, y, z, name, ntype, desc,code);
 		}else{//修改
 			DNode node =findById(dNodeDao, nid);
 			pdXYZExId(dNodeDao,x,y,z,nid);
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getNodecodeNum(code,nid);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{code});
+			}
 			updateNode(dNodeDao, x, y, z, name, ntype, desc, node,code);
 		}
 	}

+ 11 - 3
src/main/java/com/miniframe/bisiness/system/D10002Service.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.D10002BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
 import com.miniframe.model.system.DNode;
 import com.miniframe.model.system.DPipe;
 import com.miniframe.model.system.DPipeSQLBuilder;
@@ -61,6 +62,11 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 
 		if(pid ==null || pid<=0){//添加
 			pdSnIdEnId(dPipeDao,snId,enId);
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getPipcodeNum(code,-1);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{code});
+			}
 			savePipe(dPipeDao, name, snId, enId, roughCoe,
 					sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4, sectionPara5,code,roughCoeName,gf,bf);
 		}else{//修改
@@ -69,13 +75,15 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 			if(pipe==null){
 				throw new BusinessException("EB3100002");
 			}
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getPipcodeNum(code,pid);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{code});
+			}
 			updatePipe(dPipeDao, name, snId, enId, roughCoe, sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4,
 					sectionPara5,roughCoeName, pipe,code,gf,bf);
 		}
 
-
-
-
 	}
 
 

+ 12 - 0
src/main/java/com/miniframe/bisiness/system/D10005Service.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.D10005BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
 import com.miniframe.model.system.DChecknode;
 import com.miniframe.model.system.DChecknodeSQLBuilder;
 import com.miniframe.model.system.DPipe;
@@ -35,7 +36,13 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 		}
 		String pname =pipe.getName();
 		String pcode = pipe.getCode();
+
 		if(cid ==null||cid<=0 ){//添加
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getChcodeNum(chcode,-1);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{chcode});
+			}
 			pdPidSite(checknodeDao, pid, (float) site);
 			DChecknode node =new DChecknode();
 			node.setPid(pid);
@@ -50,6 +57,11 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 			if(node ==null){
 				throw new BusinessException("EB3100004");
 			}
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getChcodeNum(chcode,cid);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{chcode});
+			}
 			pdPidSiteExCid(checknodeDao, pid, (float) site,cid);
 			node.setPid(pid);
 			node.setSite((float)site);

+ 11 - 0
src/main/java/com/miniframe/bisiness/system/D10031Service.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.D10031BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
 import com.miniframe.model.system.DWay;
 import com.miniframe.model.system.DWaySQLBuilder;
 import com.miniframe.model.system.dao.DWayMapper;
@@ -34,6 +35,11 @@ public class D10031Service extends D10031BaseModel implements ExecProcessFlow {
 			if(count>0){
 				throw  new BusinessException("EB3100030");
 			}
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getWayCodeNum(code,-1);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{code});
+			}
 			DWay way =new DWay();
 			way.setCode(code);
 			way.setName(name);
@@ -43,6 +49,11 @@ public class D10031Service extends D10031BaseModel implements ExecProcessFlow {
 			if(way==null){
 				throw  new BusinessException("EB3100029");
 			}
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getWayCodeNum(code,wid);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{code});
+			}
 			DWaySQLBuilder wsb  =new DWaySQLBuilder();
 			DWaySQLBuilder.Criteria wsc =wsb.createCriteria();
 			wsc.andCodeEqualTo(code);

+ 12 - 0
src/main/java/com/miniframe/bisiness/system/D20002Service.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.D20002BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
 import com.miniframe.model.system.DPipe;
 import com.miniframe.model.system.DPump;
 import com.miniframe.model.system.dao.DPipeMapper;
@@ -40,6 +41,12 @@ 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);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{pumpcode});
+			}
+
 			DPump p =new DPump();
 			p.setPid(pipe.getId());
 			p.setPname(pipe.getName());
@@ -58,6 +65,11 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 			if(p==null){
 				throw new BusinessException("EB3100034", new String[]{pumpid.toString()});
 			}
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getPumpcodeNum(pumpcode,pumpid);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{pumpcode});
+			}
 			p.setPid(pipe.getId());
 			p.setPname(pipe.getName());
 			p.setPcode(pipe.getCode());

+ 11 - 0
src/main/java/com/miniframe/bisiness/system/D20008Service.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.D20008BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
 import com.miniframe.model.system.DPipe;
 import com.miniframe.model.system.DVentfan;
 import com.miniframe.model.system.dao.DPipeMapper;
@@ -38,6 +39,11 @@ 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);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{fancode});
+			}
 			DVentfan fan =new DVentfan();
 			fan.setAid(aid);
 			fan.setName(fanname);
@@ -55,6 +61,11 @@ public class D20008Service extends D20008BaseModel implements ExecProcessFlow {
 			if(fan==null){
 				throw  new BusinessException("EB3100036",new String[]{fanid.toString()});
 			}
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getFancodeNum(fancode,fanid);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{fancode});
+			}
 			fan.setAid(aid);
 			fan.setName(fanname);
 			fan.setSite(site.floatValue());

+ 11 - 0
src/main/java/com/miniframe/bisiness/system/D20011Service.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.D20011BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
 import com.miniframe.model.system.DPipe;
 import com.miniframe.model.system.DVentdoor;
 import com.miniframe.model.system.dao.DPipeMapper;
@@ -37,6 +38,11 @@ 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);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{doorcode});
+			}
 			DVentdoor d =new DVentdoor();
 			d.setAid(aid);
 			d.setDragcoe(dragcoe.floatValue());
@@ -54,6 +60,11 @@ public class D20011Service extends D20011BaseModel implements ExecProcessFlow {
 			if(d==null){
 				throw new BusinessException("EB3100037",new String[]{doorid.toString()});
 			}
+			CodeOnlyOneMapper codedao =UtilTools.getBean(CodeOnlyOneMapper.class);
+			Integer codenum =codedao.getDoorcodeNum(doorcode,doorid);
+			if(codenum!=0){
+				throw new BusinessException("EB3100039",new String[]{doorcode});
+			}
 			d.setAid(aid);
 			d.setDragcoe(dragcoe.floatValue());
 			d.setName(doorname);

+ 62 - 0
src/main/java/com/miniframe/mappers/system/dao/CodeOnlyOneMapper.java

@@ -0,0 +1,62 @@
+package com.miniframe.mappers.system.dao;
+
+import com.miniframe.system.MiniserviceBaseDao;
+import org.apache.ibatis.annotations.Select;
+
+public interface CodeOnlyOneMapper extends MiniserviceBaseDao {
+
+    /**
+     * 监测编码唯一 判断
+     * @param chcode
+     * @return
+     */
+    @Select("select count(1) from d_checknode where chcode =#{chcode} and id!=#{id} ")
+    Integer getChcodeNum(String chcode,Integer id );
+
+    /**
+     * 预设路径编码唯一 判断
+     * @param code
+     * @return
+     */
+    @Select("select count(1) from d_way where code =#{code} and id!=#{id} ")
+    Integer getWayCodeNum(String code,Integer id );
+
+    /**
+     * 水泵编码唯一 判断
+     * @param pumpcode
+     * @return
+     */
+    @Select("select count(1) from d_pump where code =#{pumpcode} and id!=#{id} ")
+    Integer getPumpcodeNum(String pumpcode, Integer id);
+    /**
+     * 风机编码唯一 判断
+     * @param fancode
+     * @return
+     */
+    @Select("select count(1) from d_ventfan where code =#{fancode} and id!=#{id} ")
+    Integer getFancodeNum(String fancode, Integer id);
+
+
+    /**
+     * 风门编码唯一 判断
+     * @param code
+     * @return
+     */
+    @Select("select count(1) from d_ventdoor where code =#{code} and id!=#{id} ")
+    Integer getDoorcodeNum(String code, Integer id);
+    /**
+     * 节点编码唯一 判断
+     * @param code
+     * @return
+     */
+    @Select("select count(1) from d_node where code =#{code} and id!=#{id} ")
+    Integer getNodecodeNum(String code, Integer id);
+
+    /**
+     * 巷道编码唯一 判断
+     * @param code
+     * @return
+     */
+    @Select("select count(1) from d_pipe where code =#{code} and id!=#{id} ")
+    Integer getPipcodeNum(String code, Integer id);
+}

+ 1 - 1
系统设计/数据定义/返 回 码/business(业务系统).csv

@@ -113,7 +113,7 @@
 3100037,EB3100037,doorid:{0}风门不存在!,
 
 3100038,EB3100038,aid:{0}事故不存在!,
-
+3100039,EB3100039,编码{0}已存在!,
 
 
 4000001,EMB00001,计算未完成!,