事故修改删除

dbscript/init/generate/03-functionInit.sql

@@ -25,7 +25,7 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('B0
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('B00029', '基础系统','文件分片合并',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D00000', '基础系统','节点数据查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D00001', '基础系统','管道数据查询',true);
-INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D00002', '基础系统','事故数据添加',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D00002', '基础系统','事故数据添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D00003', '基础系统','事故数据查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D00004', '基础系统','灾情点源数据添加',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D00005', '基础系统','灾情点源数据查询',true);
@@ -39,6 +39,7 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D0
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D000013', '基础系统','灾情点源检测数据删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D000014', '基础系统','灾情几何文件获取',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D000015', '基础系统','日志文件获取',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D000016', '基础系统','事故数据删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10000', '基础系统','节点数据添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10001', '基础系统','节点数据删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10002', '基础系统','管道数据添加修改',true);

generated/com/miniframe/generate/business/system/model/D000016BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.system.model;
+
+import java.util.Map;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import com.miniframe.core.BaseMapModel;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.core.ext.HttpMapFormater;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import com.miniframe.generate.global.AppGlobalVariableSysconfig;
+
+import com.miniframe.generate.comm.system.A_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.A_D000016;
+import com.miniframe.generate.comm.system.D_D000016;
+
+/**
+ * 系统服务,“事故删除”模型类（不要维护，重新生成将覆盖）。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D000016BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D000016 a_d000016;//上行体
+	D_D000016 d_d000016;//下行体
+
+	public D000016BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d000016=new A_D000016();
+		d_d000016=new D_D000016();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d000016.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_SYSTEMHEAD.class);
+		this.a_systemhead = UtilTools.map2Obj(headMap, A_SYSTEMHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_D000016.class);
+		this.a_d000016 = UtilTools.map2Obj(bodyMap, A_D000016.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getTransCode())){
+			(this.d_systemhead).setTransCode((this.a_systemhead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getChannelNo())){
+			(this.d_systemhead).setChannelNo((this.a_systemhead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getUserId())){
+			(this.d_systemhead).setUserId((this.a_systemhead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_systemhead).getTransTime())){
+            (this.d_systemhead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_systemhead));
+		reMap.putAll(UtilTools.obj2Map(this.d_d000016));
+
+		return reMap;
+	}
+
+	public A_SYSTEMHEAD getA_systemhead() {
+		return this.a_systemhead;
+	}
+
+	public void setA_systemhead(A_SYSTEMHEAD a_systemhead) {
+		this.a_systemhead=a_systemhead;
+	}
+
+	public D_SYSTEMHEAD getD_systemhead() {
+		return d_systemhead;
+	}
+
+	public void setD_systemhead(D_SYSTEMHEAD d_systemhead) {
+		this.d_systemhead=d_systemhead;
+	}
+
+	public A_D000016 getA_d000016() {
+		return a_d000016;
+	}
+
+	public void setA_d000016(A_D000016 a_d000016) {
+		this.a_d000016=a_d000016;
+	}
+
+	public D_D000016 getD_d000016() {
+		return this.d_d000016;
+	}
+
+	public void setD_d000016(D_D000016 d_d000016) {
+		this.d_d000016=d_d000016;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

generated/com/miniframe/generate/business/system/model/D00002BaseModel.java

@@ -16,7 +16,7 @@ import com.miniframe.generate.comm.system.A_D00002;
 import com.miniframe.generate.comm.system.D_D00002;
 
 /**
- * 系统服务,“事故数据添加”模型类（不要维护，重新生成将覆盖）。
+ * 系统服务,“事故数据添加修改”模型类（不要维护，重新生成将覆盖）。
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class D00002BaseModel extends BaseMapModel {

generated/com/miniframe/generate/comm/httpclientapater/D000016Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpclientapater;
+
+import com.miniframe.spring.httpclient.MFHttpRespInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.miniframe.core.Transmitter;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.comm.system.D_D000016;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D000016BaseModel;
+
+public class D000016Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D000016Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->事故删除((D000016)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D000016BaseModel execute(D000016BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D000016BaseModel execute(D000016BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D000016BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D000016BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D000016");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d000016()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpclientApater = (Transmitter) UtilTools.getBean("httpclientApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_SYSTEMHEAD d_systemhead =  UtilTools.map2Obj(outMap, D_SYSTEMHEAD.class);
+			D_D000016 d_d000016 =  UtilTools.map2Obj(outMap, D_D000016.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d000016(d_d000016);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D000016BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D000016BaseModel execute(D000016BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

generated/com/miniframe/generate/comm/httpclientapater/D00002Client.java

@@ -24,7 +24,7 @@ public class D00002Client {
 	}
 
 	/**
-	 * 调用 [系统服务->事故数据添加((D00002)]的通讯接口
+	 * 调用 [系统服务->事故数据添加修改((D00002)]的通讯接口
 	 * @param model 接口模型
 	 * @param extMap 扩展输入
 	 * @param url 请求地址

generated/com/miniframe/generate/comm/system/A_D00002.java

@@ -5,7 +5,7 @@ package com.miniframe.generate.comm.system;
 import com.miniframe.core.BaseMapModel;
 import java.io.Serializable;
 /**
- * 事故数据添加
+ * 事故数据添加修改
  */
 public class A_D00002 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
@@ -74,4 +74,17 @@ public class A_D00002 extends BaseMapModel implements Serializable {
 	public String getStype() {
 		return this.stype;
 	}
+	int aid;//事故ID
+	/**
+	 *事故ID
+	 */
+	public void setAid(int aid) {
+		this.aid=aid;
+	}
+	/**
+	 *事故ID
+	 */
+	public int getAid() {
+		return this.aid;
+	}
 }

generated/com/miniframe/generate/comm/system/D_D00002.java

@@ -5,7 +5,7 @@ package com.miniframe.generate.comm.system;
 import com.miniframe.core.BaseMapModel;
 import java.io.Serializable;
 /**
- * 事故数据添加
+ * 事故数据添加修改
  */
 public class D_D00002 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;

generated/validateform/a_d00002Form.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd">
-<!-- 事故数据添加Form配置文件系统生成请勿修改,否则重新生成将覆盖 -->
+<!-- 事故数据添加修改Form配置文件系统生成请勿修改,否则重新生成将覆盖 -->
 <form-validation>
 <formset>
 <form name="a_d00002Form">

generated/validator/resources_a_d00002Form_validator.properties

@@ -3,4 +3,5 @@ a_d00002.type = \u4E8B\u6545\u7C7B\u578B
 a_d00002.name = \u4E8B\u6545\u540D\u79F0
 a_d00002.sid = \u4E8B\u6545\u6765\u6E90ID
 a_d00002.stype = \u707E\u60C5\u7C7B\u578B
+a_d00002.aid = \u4E8B\u6545ID
 a_d00002Form = true

generated/validator/resources_a_d00002Form_validator_zh_CN.properties

@@ -3,4 +3,5 @@ a_d00002.type = \u4E8B\u6545\u7C7B\u578B
 a_d00002.name = \u4E8B\u6545\u540D\u79F0
 a_d00002.sid = \u4E8B\u6545\u6765\u6E90ID
 a_d00002.stype = \u707E\u60C5\u7C7B\u578B
+a_d00002.aid = \u4E8B\u6545ID
 a_d00002Form = true

modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Thu Feb 29 15:53:30 CST 2024.
+    This file was generated on Thu Feb 29 16:09:15 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -0,0 +1,58 @@
+package com.miniframe.bisiness.system;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.exception.BusinessException;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D000016BaseModel;
+import com.miniframe.model.system.DAccident;
+import com.miniframe.model.system.dao.DAccidentMapper;
+
+/**
+ * 基础系统,“事故数据删除”逻辑处理（重新生成不覆盖）。
+ */
+public class D000016Service extends D000016BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“事故数据删除”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		DAccidentMapper accidentMapper = UtilTools.getBean(DAccidentMapper.class);
+		Integer aid =this.getA_d000016().getAid();
+		DAccident acc =accidentMapper.selectByPrimaryKey(aid);
+		if(acc==null){
+			throw new BusinessException("EB3000002");
+		}
+		accidentMapper.deleteByPrimaryKey(aid);
+	}
+	
+	/**
+	 * 基础系统,“事故数据删除”业务前处理
+ 	 */
+	public void preTransFlow() throws Exception {
+		this.validater();
+	}
+	
+	/**
+	 * 基础系统,“事故数据删除”业务后处理
+ 	 */
+	public void afterTransFlow() throws Exception {
+	
+	}
+	
+	/**
+	 * 基础系统,“事故数据删除”逻辑入口处理方法
+ 	 */
+ 	@SuppressWarnings("rawtypes")
+	@Override
+	public Map execute(Map vars) throws Exception {
+		this.setTransMap(vars);
+		preTransFlow();// 执行业务开始的规则检查和校验
+		transExecute();// 执行核心业务段
+		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
+		return this.getTransMap();
+	}
+
+}

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

@@ -26,29 +26,45 @@ public class D00002Service extends D00002BaseModel implements ExecProcessFlow {
 	 * 基础系统,“事故数据添加”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-		DAccidentMapper projectDao  = UtilTools.getBean(DAccidentMapper.class);
+		DAccidentMapper accDao  = UtilTools.getBean(DAccidentMapper.class);
 		String sid = this.getA_d00002().getSid();
 		String source =this.getA_d00002().getSource();
 
-		DAccidentSQLBuilder asb = new DAccidentSQLBuilder();
-		DAccidentSQLBuilder.Criteria asbc= asb.createCriteria();
-		asbc.andSourceEqualTo(source);
-		asbc.andSidEqualTo(sid);
+		Integer aid =this.getA_d00002().getAid();
+
+		if(aid==null&&aid<=0){//修改
+//			DAccidentSQLBuilder asb = new DAccidentSQLBuilder();
+//			DAccidentSQLBuilder.Criteria asbc= asb.createCriteria();
+//			asbc.andSourceEqualTo(source);
+//			asbc.andSidEqualTo(sid);
 //		DAccident accident= projectDao.selectOneByExample(asb);
 //		if(accident!=null){
 //			throw new BusinessException("EB3000005");
 //		}
 
-		DAccident da = new DAccident();
-		da.setName(this.getA_d00002().getName());
-		da.setSid(this.getA_d00002().getSid());
-		da.setSource(this.getA_d00002().getSource());
-		da.setType(this.getA_d00002().getType());
-		da.setStype(this.getA_d00002().getStype());
-		da.setTime(XIDateTimeUtils.getNowStr());
-		int aid=projectDao.insertSelective(da);
+			DAccident da = new DAccident();
+			da.setName(this.getA_d00002().getName());
+			da.setSid(this.getA_d00002().getSid());
+			da.setSource(this.getA_d00002().getSource());
+			da.setType(this.getA_d00002().getType());
+			da.setStype(this.getA_d00002().getStype());
+			da.setTime(XIDateTimeUtils.getNowStr());
+			accDao.insertSelective(da);
+		}else{//修改
+			DAccident da =accDao.selectByPrimaryKey(aid);
+			if(da==null){
+				throw new BusinessException("EB3000002");
+			}
+			da.setName(this.getA_d00002().getName());
+			da.setSid(this.getA_d00002().getSid());
+			da.setSource(this.getA_d00002().getSource());
+			da.setType(this.getA_d00002().getType());
+			da.setStype(this.getA_d00002().getStype());
+//			da.setTime(XIDateTimeUtils.getNowStr());
+			accDao.updateByPrimaryKey(da);
+		}
+
 
-//		accident= projectDao.selectOneByExample(asb);
 
 	}
 	

src/test/java/com/miniframe/comm/httpclientapater/D000016Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpclientapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpclientapater.HttpclientapaterUtil;
+import com.miniframe.generate.comm.system.A_D000016;
+import com.miniframe.generate.comm.httpclientapater.D000016Client;
+import com.miniframe.generate.business.system.model.D000016BaseModel;
+
+public class D000016Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D000016Test.class);
+
+	/**
+	 * 事故删除，获取报文体
+	 * @return
+	 */
+	public static A_D000016 getA_d000016() {
+		A_D000016 a_d000016 = new A_D000016();
+
+		// ----------以下增加【事故删除】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d000016;
+	}
+	
+	/**
+	 * 运行客户端测试，事故删除
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D000016BaseModel model = new D000016BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D000016"));
+		model.setA_d000016(D000016Test.getA_d000016());
+		D000016Client client = new D000016Client();
+		logger.error("客户端发送前总线：\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线：\r\n"+model);
+	}
+}

系统设计/系统模块/SYSTEM(基础系统).csv

@@ -23,8 +23,9 @@
 
 300000,D00000,节点数据查询,service,,
 300001,D00001,管道数据查询,service,,
-300002,D00002,事故数据添加,service,,
+300002,D00002,事故数据添加修改,service,,
 300003,D00003,事故数据查询,service,,
+
 300004,D00004,灾情点源数据添加,service,,
 
 300005,D00005,灾情点源数据查询,service,,、
@@ -43,6 +44,7 @@
 300014,D000014,灾情几何文件获取,service,,
 
 300015,D000015,日志文件获取,service,,
+300016,D000016,事故数据删除,service,,
 
 310000,D10000,节点数据添加修改,service,,
 310001,D10001,节点数据删除,service,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D000016_A(事故删除).csv

@@ -0,0 +1,2 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,aid,事故ID,int,,,是,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D000016_D(事故删除).csv

@@ -0,0 +1 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00002_A(事故数据添加).csv → 系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00002_A(事故数据添加修改).csv

@@ -3,4 +3,5 @@
 2,type,事故类型,string,,,是,1,128,,,,,,
 3,name,事故名称,string,,,是,1,128,,,,,,
 4,sid,事故来源ID,string,,,是,1,128,,,,,,
-5,stype,灾情类型,string,,,是,1,128,,,,,,
+5,stype,灾情类型,string,,,是,1,128,,,,,,
+6,aid,事故ID,int,,,,,,,,,,,