Sfoglia il codice sorgente

灾源删除,节点删除

huangxingxing 2 mesi fa
parent
commit
d3df79a703

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

@@ -97,6 +97,7 @@ 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
+EB3100040 = {0}\u5DF2\u88AB\u5E94\u7528\uFF0C\u4E0D\u80FD\u5220\u9664\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

@@ -97,6 +97,7 @@ 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
+EB3100040 = {0}\u5DF2\u88AB\u5E94\u7528\uFF0C\u4E0D\u80FD\u5220\u9664\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

+ 6 - 0
src/main/java/com/miniframe/bisiness/system/D000011Service.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.D000011BaseModel;
+import com.miniframe.mappers.system.dao.FkMapper;
 import com.miniframe.model.system.DSource;
 import com.miniframe.model.system.dao.DSourceMapper;
 
@@ -26,6 +27,11 @@ public class D000011Service extends D000011BaseModel implements ExecProcessFlow
 		if(ds==null){
 			throw new BusinessException("EB3000004");//点源数据不存在
 		}
+		FkMapper fkdao =UtilTools.getBean(FkMapper.class);
+		Integer nodeNum =fkdao.getSourceNum(sid);
+		if(nodeNum!=0){
+			throw new BusinessException("EB3100040",new String[]{sid.toString()});
+		}
 		dsm.delete(ds);
 	}
 	

+ 9 - 1
src/main/java/com/miniframe/bisiness/system/D10001Service.java

@@ -5,6 +5,8 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D10001BaseModel;
+import com.miniframe.mappers.system.dao.CodeOnlyOneMapper;
+import com.miniframe.mappers.system.dao.FkMapper;
 import com.miniframe.model.system.DNode;
 import com.miniframe.model.system.dao.DNodeMapper;
 
@@ -21,7 +23,13 @@ public class D10001Service extends D10001BaseModel implements ExecProcessFlow {
 	public void transExecute() throws Exception {
 		DNodeMapper dNodeDao = UtilTools.getBean(DNodeMapper.class);
 		Integer nid = this.getA_d10001().getNid();
-		findById(dNodeDao,nid);
+		DNode node=findById(dNodeDao,nid);
+		FkMapper fkdao =UtilTools.getBean(FkMapper.class);
+		Integer nodeNum =fkdao.getNodeNum(nid);
+		if(nodeNum!=0){
+			throw new BusinessException("EB3100040",new String[]{node.getCode()});
+		}
+
 		dNodeDao.deleteByPrimaryKey(nid);
 	}
 

+ 24 - 0
src/main/java/com/miniframe/mappers/system/dao/FkMapper.java

@@ -0,0 +1,24 @@
+package com.miniframe.mappers.system.dao;
+
+import com.miniframe.model.system.SysUser;
+import com.miniframe.system.MiniserviceBaseDao;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 自定义数据库语句
+ */
+public interface FkMapper extends MiniserviceBaseDao {
+
+    /**
+     *  判断节点是否被引用
+     * @param nid
+     * @return
+     */
+    @Select("select count(1) from d_pipe where snid=#{nid} or enid =#{nid} ")
+    Integer getNodeNum(Integer nid);
+
+    @Select("select count(1) from d_source_val where sid=#{sid} ")
+    Integer getSourceNum(Integer sid);
+}

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

@@ -114,6 +114,7 @@
 
 3100038,EB3100038,aid:{0}事故不存在!,
 3100039,EB3100039,编码{0}已存在!,
+3100040,EB3100040,{0}已被应用,不能删除!,
 
 
 4000001,EMB00001,计算未完成!,