Sfoglia il codice sorgente

项目添加修改删除

huangxingxing 3 mesi fa
parent
commit
db27705858
30 ha cambiato i file con 771 aggiunte e 175 eliminazioni
  1. 1 0
      dbscript/init/generate/03-functionInit.sql
  2. 112 0
      generated/com/miniframe/generate/business/es/model/ES0003BaseModel.java
  3. 13 52
      generated/com/miniframe/generate/comm/es/A_ES0002.java
  4. 25 0
      generated/com/miniframe/generate/comm/es/A_ES0003.java
  5. 33 7
      generated/com/miniframe/generate/comm/es/D_ES0001_ROWS_RECODE.java
  6. 12 0
      generated/com/miniframe/generate/comm/es/D_ES0003.java
  7. 99 0
      generated/com/miniframe/generate/comm/httpesapater/ES0003Client.java
  8. 12 0
      generated/validateform/a_es0003Form.xml
  9. 1 4
      generated/validator/resources_a_es0002Form_validator.properties
  10. 1 4
      generated/validator/resources_a_es0002Form_validator_zh_CN.properties
  11. 2 0
      generated/validator/resources_a_es0003Form_validator.properties
  12. 2 0
      generated/validator/resources_a_es0003Form_validator_zh_CN.properties
  13. 3 1
      generated/validator/resources_d_es0001_rows_recodeForm_validator.properties
  14. 3 1
      generated/validator/resources_d_es0001_rows_recodeForm_validator_zh_CN.properties
  15. 1 0
      generated/validator/resources_d_es0003Form_validator.properties
  16. 1 0
      generated/validator/resources_d_es0003Form_validator_zh_CN.properties
  17. 69 23
      modelsrc/com/miniframe/model/es/EsPro.java
  18. 210 70
      modelsrc/com/miniframe/model/es/EsProSQLBuilder.java
  19. 1 1
      modelsrc/com/miniframe/model/es/dbconfig/MapperConfig-es.xml
  20. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  21. 7 3
      src/main/java/com/miniframe/bisiness/es/ES0001Service.java
  22. 44 1
      src/main/java/com/miniframe/bisiness/es/ES0002Service.java
  23. 55 0
      src/main/java/com/miniframe/bisiness/es/ES0003Service.java
  24. 9 0
      src/main/java/com/miniframe/tools/XIFileUtils.java
  25. 44 0
      src/test/java/com/miniframe/comm/httpesapater/ES0003Test.java
  26. 1 0
      系统设计/系统模块/ES(无锡发动机).csv
  27. 4 2
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0001_D(项目列表查询).csv
  28. 2 5
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0002_A(项目新增修改).csv
  29. 2 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0003_A(项目删除).csv
  30. 1 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0003_D(项目删除).csv

+ 1 - 0
dbscript/init/generate/03-functionInit.sql

@@ -4,6 +4,7 @@ DELETE FROM SYS_FUNCTION;
 -- 无锡发动机
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0001', '无锡发动机','项目查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0002', '无锡发动机','项目新增修改',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0003', '无锡发动机','项目删除',true);
 -- 基础系统
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('A00000', '基础系统','获取图片验证码',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('A00001', '基础系统','获取短信验证码',true);

+ 112 - 0
generated/com/miniframe/generate/business/es/model/ES0003BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.es.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.es.A_ESHEAD;
+import com.miniframe.generate.comm.es.D_ESHEAD;
+import com.miniframe.generate.comm.es.A_ES0003;
+import com.miniframe.generate.comm.es.D_ES0003;
+
+/**
+ * 无锡发动机,“项目删除”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ES0003BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_ESHEAD a_eshead;//上行头
+	D_ESHEAD d_eshead;//下行头
+	A_ES0003 a_es0003;//上行体
+	D_ES0003 d_es0003;//下行体
+
+	public ES0003BaseModel(){
+		a_eshead=new A_ESHEAD();
+		d_eshead=new D_ESHEAD();
+		a_es0003=new A_ES0003();
+		d_es0003=new D_ES0003();
+	}
+
+	public void validater() throws Exception {
+		this.a_eshead.validater();
+		this.a_es0003.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_ESHEAD.class);
+		this.a_eshead = UtilTools.map2Obj(headMap, A_ESHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_ES0003.class);
+		this.a_es0003 = UtilTools.map2Obj(bodyMap, A_ES0003.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_eshead).getTransCode())){
+			(this.d_eshead).setTransCode((this.a_eshead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_eshead).getChannelNo())){
+			(this.d_eshead).setChannelNo((this.a_eshead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_eshead).getUserId())){
+			(this.d_eshead).setUserId((this.a_eshead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_eshead).getTransTime())){
+            (this.d_eshead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_eshead));
+		reMap.putAll(UtilTools.obj2Map(this.d_es0003));
+
+		return reMap;
+	}
+
+	public A_ESHEAD getA_eshead() {
+		return this.a_eshead;
+	}
+
+	public void setA_eshead(A_ESHEAD a_eshead) {
+		this.a_eshead=a_eshead;
+	}
+
+	public D_ESHEAD getD_eshead() {
+		return d_eshead;
+	}
+
+	public void setD_eshead(D_ESHEAD d_eshead) {
+		this.d_eshead=d_eshead;
+	}
+
+	public A_ES0003 getA_es0003() {
+		return a_es0003;
+	}
+
+	public void setA_es0003(A_ES0003 a_es0003) {
+		this.a_es0003=a_es0003;
+	}
+
+	public D_ES0003 getD_es0003() {
+		return this.d_es0003;
+	}
+
+	public void setD_es0003(D_ES0003 d_es0003) {
+		this.d_es0003=d_es0003;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 13 - 52
generated/com/miniframe/generate/comm/es/A_ES0002.java

@@ -22,19 +22,6 @@ public class A_ES0002 extends BaseMapModel implements Serializable {
 	public String getPid() {
 		return this.pid;
 	}
-	String uid;//用户id
-	/**
-	 *用户id
-	 */
-	public void setUid(String uid) {
-		this.uid=uid;
-	}
-	/**
-	 *用户id
-	 */
-	public String getUid() {
-		return this.uid;
-	}
 	String name;//项目名称
 	/**
 	 *项目名称
@@ -61,45 +48,6 @@ public class A_ES0002 extends BaseMapModel implements Serializable {
 	public String getRemark() {
 		return this.remark;
 	}
-	String image;//base64图片
-	/**
-	 *base64图片
-	 */
-	public void setImage(String image) {
-		this.image=image;
-	}
-	/**
-	 *base64图片
-	 */
-	public String getImage() {
-		return this.image;
-	}
-	String updateTime;//修改时间
-	/**
-	 *修改时间
-	 */
-	public void setUpdateTime(String updateTime) {
-		this.updateTime=updateTime;
-	}
-	/**
-	 *修改时间
-	 */
-	public String getUpdateTime() {
-		return this.updateTime;
-	}
-	String createTime;//创建时间
-	/**
-	 *创建时间
-	 */
-	public void setCreateTime(String createTime) {
-		this.createTime=createTime;
-	}
-	/**
-	 *创建时间
-	 */
-	public String getCreateTime() {
-		return this.createTime;
-	}
 	String flow;//流程
 	/**
 	 *流程
@@ -113,4 +61,17 @@ public class A_ES0002 extends BaseMapModel implements Serializable {
 	public String getFlow() {
 		return this.flow;
 	}
+	String keywords;//类型
+	/**
+	 *类型
+	 */
+	public void setKeywords(String keywords) {
+		this.keywords=keywords;
+	}
+	/**
+	 *类型
+	 */
+	public String getKeywords() {
+		return this.keywords;
+	}
 }

+ 25 - 0
generated/com/miniframe/generate/comm/es/A_ES0003.java

@@ -0,0 +1,25 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目删除
+ */
+public class A_ES0003 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pid;//项目Id
+	/**
+	 *项目Id
+	 */
+	public void setPid(String pid) {
+		this.pid=pid;
+	}
+	/**
+	 *项目Id
+	 */
+	public String getPid() {
+		return this.pid;
+	}
+}

+ 33 - 7
generated/com/miniframe/generate/comm/es/D_ES0001_ROWS_RECODE.java

@@ -61,18 +61,18 @@ public class D_ES0001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getRemark() {
 		return this.remark;
 	}
-	String image;//base64图片
+	String uname;//用户昵称
 	/**
-	 *base64图片
+	 *用户昵称
 	 */
-	public void setImage(String image) {
-		this.image=image;
+	public void setUname(String uname) {
+		this.uname=uname;
 	}
 	/**
-	 *base64图片
+	 *用户昵称
 	 */
-	public String getImage() {
-		return this.image;
+	public String getUname() {
+		return this.uname;
 	}
 	String updateTime;//修改时间
 	/**
@@ -113,4 +113,30 @@ public class D_ES0001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getFlow() {
 		return this.flow;
 	}
+	String dirsize;//文件大小
+	/**
+	 *文件大小
+	 */
+	public void setDirsize(String dirsize) {
+		this.dirsize=dirsize;
+	}
+	/**
+	 *文件大小
+	 */
+	public String getDirsize() {
+		return this.dirsize;
+	}
+	String keywords;//类型
+	/**
+	 *类型
+	 */
+	public void setKeywords(String keywords) {
+		this.keywords=keywords;
+	}
+	/**
+	 *类型
+	 */
+	public String getKeywords() {
+		return this.keywords;
+	}
 }

+ 12 - 0
generated/com/miniframe/generate/comm/es/D_ES0003.java

@@ -0,0 +1,12 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目删除
+ */
+public class D_ES0003 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpesapater/ES0003Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpesapater;
+
+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.es.D_ES0003;
+import com.miniframe.generate.comm.es.D_ESHEAD;
+
+import com.miniframe.generate.business.es.model.ES0003BaseModel;
+
+public class ES0003Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0003Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [无锡发动机->项目删除((ES0003)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0003BaseModel execute(ES0003BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0003BaseModel execute(ES0003BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(ES0003BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(ES0003BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_eshead().getTransCode())){
+			model.getA_eshead().setTransCode("ES0003");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_eshead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_es0003()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpesApater = (Transmitter) UtilTools.getBean("httpesApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpesApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpesApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_ESHEAD d_eshead =  UtilTools.map2Obj(outMap, D_ESHEAD.class);
+			D_ES0003 d_es0003 =  UtilTools.map2Obj(outMap, D_ES0003.class);
+			model.setD_eshead(d_eshead);
+			model.setD_es0003(d_es0003);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(ES0003BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0003BaseModel execute(ES0003BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 12 - 0
generated/validateform/a_es0003Form.xml

@@ -0,0 +1,12 @@
+<?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-validation>
+<formset>
+<form name="a_es0003Form">
+<field property="pid" depends="required">
+    <arg0 key="a_es0003.pid"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 1 - 4
generated/validator/resources_a_es0002Form_validator.properties

@@ -1,9 +1,6 @@
 a_es0002.pid = \u9879\u76EEId
-a_es0002.uid = \u7528\u6237id
 a_es0002.name = \u9879\u76EE\u540D\u79F0
 a_es0002.remark = \u9879\u76EE\u63CF\u8FF0
-a_es0002.image = base64\u56FE\u7247
-a_es0002.updateTime = \u4FEE\u6539\u65F6\u95F4
-a_es0002.createTime = \u521B\u5EFA\u65F6\u95F4
 a_es0002.flow = \u6D41\u7A0B
+a_es0002.keywords = \u7C7B\u578B
 a_es0002Form = true

+ 1 - 4
generated/validator/resources_a_es0002Form_validator_zh_CN.properties

@@ -1,9 +1,6 @@
 a_es0002.pid = \u9879\u76EEId
-a_es0002.uid = \u7528\u6237id
 a_es0002.name = \u9879\u76EE\u540D\u79F0
 a_es0002.remark = \u9879\u76EE\u63CF\u8FF0
-a_es0002.image = base64\u56FE\u7247
-a_es0002.updateTime = \u4FEE\u6539\u65F6\u95F4
-a_es0002.createTime = \u521B\u5EFA\u65F6\u95F4
 a_es0002.flow = \u6D41\u7A0B
+a_es0002.keywords = \u7C7B\u578B
 a_es0002Form = true

+ 2 - 0
generated/validator/resources_a_es0003Form_validator.properties

@@ -0,0 +1,2 @@
+a_es0003.pid = \u9879\u76EEId
+a_es0003Form = true

+ 2 - 0
generated/validator/resources_a_es0003Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_es0003.pid = \u9879\u76EEId
+a_es0003Form = true

+ 3 - 1
generated/validator/resources_d_es0001_rows_recodeForm_validator.properties

@@ -2,8 +2,10 @@ d_es0001_rows_recode.pid = \u9879\u76EEId
 d_es0001_rows_recode.uid = \u7528\u6237id
 d_es0001_rows_recode.name = \u9879\u76EE\u540D\u79F0
 d_es0001_rows_recode.remark = \u9879\u76EE\u63CF\u8FF0
-d_es0001_rows_recode.image = base64\u56FE\u7247
+d_es0001_rows_recode.uname = \u7528\u6237\u6635\u79F0
 d_es0001_rows_recode.updateTime = \u4FEE\u6539\u65F6\u95F4
 d_es0001_rows_recode.createTime = \u521B\u5EFA\u65F6\u95F4
 d_es0001_rows_recode.flow = \u6D41\u7A0B
+d_es0001_rows_recode.dirsize = \u6587\u4EF6\u5927\u5C0F
+d_es0001_rows_recode.keywords = \u7C7B\u578B
 d_es0001_rows_recodeForm = true

+ 3 - 1
generated/validator/resources_d_es0001_rows_recodeForm_validator_zh_CN.properties

@@ -2,8 +2,10 @@ d_es0001_rows_recode.pid = \u9879\u76EEId
 d_es0001_rows_recode.uid = \u7528\u6237id
 d_es0001_rows_recode.name = \u9879\u76EE\u540D\u79F0
 d_es0001_rows_recode.remark = \u9879\u76EE\u63CF\u8FF0
-d_es0001_rows_recode.image = base64\u56FE\u7247
+d_es0001_rows_recode.uname = \u7528\u6237\u6635\u79F0
 d_es0001_rows_recode.updateTime = \u4FEE\u6539\u65F6\u95F4
 d_es0001_rows_recode.createTime = \u521B\u5EFA\u65F6\u95F4
 d_es0001_rows_recode.flow = \u6D41\u7A0B
+d_es0001_rows_recode.dirsize = \u6587\u4EF6\u5927\u5C0F
+d_es0001_rows_recode.keywords = \u7C7B\u578B
 d_es0001_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_es0003Form_validator.properties

@@ -0,0 +1 @@
+d_es0003Form = false

+ 1 - 0
generated/validator/resources_d_es0003Form_validator_zh_CN.properties

@@ -0,0 +1 @@
+d_es0003Form = false

+ 69 - 23
modelsrc/com/miniframe/model/es/EsPro.java

@@ -28,11 +28,6 @@ public class EsPro extends MiniserviceBaseModel implements Serializable {
      */
     private String remark;
 
-    /**
-     * 图片base64
-     */
-    private String image;
-
     /**
      * 创建时间
 
@@ -52,6 +47,21 @@ public class EsPro extends MiniserviceBaseModel implements Serializable {
      */
     private String flow;
 
+    /**
+     * 用户昵称
+     */
+    private String uname;
+
+    /**
+     * 文件大小
+     */
+    private String size;
+
+    /**
+     * Model Power BEV
+     */
+    private String keywords;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -126,24 +136,6 @@ public class EsPro extends MiniserviceBaseModel implements Serializable {
         this.remark = remark == null ? null : remark.trim();
     }
 
-    /**
-     * 获取图片base64
-     *
-     * @return image - 图片base64
-     */
-    public String getImage() {
-        return image;
-    }
-
-    /**
-     * 设置图片base64
-     *
-     * @param image 图片base64
-     */
-    public void setImage(String image) {
-        this.image = image == null ? null : image.trim();
-    }
-
     /**
      * 获取创建时间
 
@@ -205,4 +197,58 @@ public class EsPro extends MiniserviceBaseModel implements Serializable {
     public void setFlow(String flow) {
         this.flow = flow == null ? null : flow.trim();
     }
+
+    /**
+     * 获取用户昵称
+     *
+     * @return uname - 用户昵称
+     */
+    public String getUname() {
+        return uname;
+    }
+
+    /**
+     * 设置用户昵称
+     *
+     * @param uname 用户昵称
+     */
+    public void setUname(String uname) {
+        this.uname = uname == null ? null : uname.trim();
+    }
+
+    /**
+     * 获取文件大小
+     *
+     * @return size - 文件大小
+     */
+    public String getSize() {
+        return size;
+    }
+
+    /**
+     * 设置文件大小
+     *
+     * @param size 文件大小
+     */
+    public void setSize(String size) {
+        this.size = size == null ? null : size.trim();
+    }
+
+    /**
+     * 获取Model Power BEV
+     *
+     * @return keywords - Model Power BEV
+     */
+    public String getKeywords() {
+        return keywords;
+    }
+
+    /**
+     * 设置Model Power BEV
+     *
+     * @param keywords Model Power BEV
+     */
+    public void setKeywords(String keywords) {
+        this.keywords = keywords == null ? null : keywords.trim();
+    }
 }

+ 210 - 70
modelsrc/com/miniframe/model/es/EsProSQLBuilder.java

@@ -385,76 +385,6 @@ public class EsProSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andImageIsNull() {
-            addCriterion("image is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageIsNotNull() {
-            addCriterion("image is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageEqualTo(String value) {
-            addCriterion("image =", value, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageNotEqualTo(String value) {
-            addCriterion("image <>", value, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageGreaterThan(String value) {
-            addCriterion("image >", value, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageGreaterThanOrEqualTo(String value) {
-            addCriterion("image >=", value, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageLessThan(String value) {
-            addCriterion("image <", value, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageLessThanOrEqualTo(String value) {
-            addCriterion("image <=", value, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageLike(String value) {
-            addCriterion("image like", value, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageNotLike(String value) {
-            addCriterion("image not like", value, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageIn(List<String> values) {
-            addCriterion("image in", values, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageNotIn(List<String> values) {
-            addCriterion("image not in", values, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageBetween(String value1, String value2) {
-            addCriterion("image between", value1, value2, "image");
-            return (Criteria) this;
-        }
-
-        public Criteria andImageNotBetween(String value1, String value2) {
-            addCriterion("image not between", value1, value2, "image");
-            return (Criteria) this;
-        }
-
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;
@@ -644,6 +574,216 @@ public class EsProSQLBuilder {
             addCriterion("flow not between", value1, value2, "flow");
             return (Criteria) this;
         }
+
+        public Criteria andUnameIsNull() {
+            addCriterion("uname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameIsNotNull() {
+            addCriterion("uname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameEqualTo(String value) {
+            addCriterion("uname =", value, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameNotEqualTo(String value) {
+            addCriterion("uname <>", value, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameGreaterThan(String value) {
+            addCriterion("uname >", value, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameGreaterThanOrEqualTo(String value) {
+            addCriterion("uname >=", value, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameLessThan(String value) {
+            addCriterion("uname <", value, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameLessThanOrEqualTo(String value) {
+            addCriterion("uname <=", value, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameLike(String value) {
+            addCriterion("uname like", value, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameNotLike(String value) {
+            addCriterion("uname not like", value, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameIn(List<String> values) {
+            addCriterion("uname in", values, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameNotIn(List<String> values) {
+            addCriterion("uname not in", values, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameBetween(String value1, String value2) {
+            addCriterion("uname between", value1, value2, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnameNotBetween(String value1, String value2) {
+            addCriterion("uname not between", value1, value2, "uname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeIsNull() {
+            addCriterion("size is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeIsNotNull() {
+            addCriterion("size is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeEqualTo(String value) {
+            addCriterion("size =", value, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeNotEqualTo(String value) {
+            addCriterion("size <>", value, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeGreaterThan(String value) {
+            addCriterion("size >", value, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeGreaterThanOrEqualTo(String value) {
+            addCriterion("size >=", value, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeLessThan(String value) {
+            addCriterion("size <", value, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeLessThanOrEqualTo(String value) {
+            addCriterion("size <=", value, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeLike(String value) {
+            addCriterion("size like", value, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeNotLike(String value) {
+            addCriterion("size not like", value, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeIn(List<String> values) {
+            addCriterion("size in", values, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeNotIn(List<String> values) {
+            addCriterion("size not in", values, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeBetween(String value1, String value2) {
+            addCriterion("size between", value1, value2, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andSizeNotBetween(String value1, String value2) {
+            addCriterion("size not between", value1, value2, "size");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsIsNull() {
+            addCriterion("keywords is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsIsNotNull() {
+            addCriterion("keywords is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsEqualTo(String value) {
+            addCriterion("keywords =", value, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsNotEqualTo(String value) {
+            addCriterion("keywords <>", value, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsGreaterThan(String value) {
+            addCriterion("keywords >", value, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsGreaterThanOrEqualTo(String value) {
+            addCriterion("keywords >=", value, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsLessThan(String value) {
+            addCriterion("keywords <", value, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsLessThanOrEqualTo(String value) {
+            addCriterion("keywords <=", value, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsLike(String value) {
+            addCriterion("keywords like", value, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsNotLike(String value) {
+            addCriterion("keywords not like", value, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsIn(List<String> values) {
+            addCriterion("keywords in", values, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsNotIn(List<String> values) {
+            addCriterion("keywords not in", values, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsBetween(String value1, String value2) {
+            addCriterion("keywords between", value1, value2, "keywords");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordsNotBetween(String value1, String value2) {
+            addCriterion("keywords not between", value1, value2, "keywords");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 1 - 1
modelsrc/com/miniframe/model/es/dbconfig/MapperConfig-es.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 Tue May 20 09:54:31 CST 2025.
+    This file was generated on Tue May 20 16:04:50 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/es/xml/EsProMapper.xml" />

+ 1 - 1
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 Tue May 20 09:54:31 CST 2025.
+    This file was generated on Tue May 20 16:05:14 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 7 - 3
src/main/java/com/miniframe/bisiness/es/ES0001Service.java

@@ -10,6 +10,7 @@ import com.miniframe.generate.comm.es.D_ES0001_ROWS_RECODE;
 import com.miniframe.model.es.EsPro;
 import com.miniframe.model.es.dao.EsProMapper;
 import com.miniframe.model.system.SysUser;
+import com.miniframe.model.system.dao.SysUserMapper;
 import com.miniframe.tools.XIDataUtils;
 import com.miniframe.tools.XIDateTimeUtils;
 import com.miniframe.tools.XIUtils;
@@ -31,9 +32,10 @@ public class ES0001Service extends ES0001BaseModel implements ExecProcessFlow {
 		Integer count =this.getA_es0001().getCount();
 		Integer page =this.getA_es0001().getPage();
 		String searchtag =this.getA_es0001().getSearchtag();
-
+//		String uid = this.getA_eshead().getUserId();
+//		SysUserMapper udao = UtilTools.getBean(SysUserMapper.class);
+//		SysUser user = udao.selectByPrimaryKey(uid);
 		EsProMapper proMapper = UtilTools.getBean(EsProMapper.class);
-
 		Weekend weekend = new Weekend<>(EsPro.class);
 		WeekendCriteria<EsPro, Object> keywordCriteria = weekend.weekendCriteria();
 		if (StringUtils.isNotEmpty(searchtag)) {
@@ -51,10 +53,12 @@ public class ES0001Service extends ES0001BaseModel implements ExecProcessFlow {
 			row.setPid(p.getId());
 			row.setCreateTime(XIDateTimeUtils.getStrFromDate(p.getCreateTime()));
 			row.setUpdateTime(XIDateTimeUtils.getStrFromDate(p.getUpdateTime()));
+			row.setUname(p.getUname());
 			row.setFlow(p.getFlow());
-			row.setImage(p.getImage());
 			row.setName(p.getName());
 			row.setRemark(p.getRemark());
+			row.setDirsize(p.getSize());
+			row.setKeywords(p.getKeywords());
 			rows.add(row);
 		}
 		this.getD_es0001().setRows(rows);

+ 44 - 1
src/main/java/com/miniframe/bisiness/es/ES0002Service.java

@@ -1,8 +1,15 @@
 package com.miniframe.bisiness.es;
 
+import java.util.Date;
 import java.util.Map;
 import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.es.model.ES0002BaseModel;
+import com.miniframe.model.es.EsPro;
+import com.miniframe.model.es.dao.EsProMapper;
+import com.miniframe.model.system.SysUser;
+import com.miniframe.model.system.dao.SysUserMapper;
+import io.netty.util.internal.StringUtil;
 
 /**
  * 无锡发动机,“项目新增修改”逻辑处理(重新生成不覆盖)。
@@ -15,7 +22,43 @@ public class ES0002Service extends ES0002BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“项目新增修改”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-	
+		String pid = this.getA_es0002().getPid();
+		String uid =this.getA_eshead().getUserId();
+		String name =this.getA_es0002().getName();
+		String remark =this.getA_es0002().getRemark();
+		String flow =this.getA_es0002().getFlow();
+		String keywords =this.getA_es0002().getKeywords();
+		SysUserMapper udao = UtilTools.getBean(SysUserMapper.class);
+		SysUser user = udao.selectByPrimaryKey(uid);
+
+		EsProMapper pdao = UtilTools.getBean(EsProMapper.class);
+
+		EsPro p;
+		if(StringUtil.isNullOrEmpty(pid)){//新增
+			p =new EsPro();
+			p.setId(UtilTools.getUUid());
+			p.setCreateTime(new Date());
+			p.setUpdateTime(new Date());
+			p.setUid(uid);
+			p.setUname(user.getNickname());
+			p.setFlow(flow);
+			p.setRemark(remark);
+			p.setName(name);
+			p.setKeywords(keywords);
+			pdao.insert(p);
+		}else{
+			p = pdao.selectByPrimaryKey(pid);
+			if(p!=null){
+				p.setUpdateTime(new Date());
+				p.setUid(uid);
+				p.setUname(user.getNickname());
+				p.setFlow(flow);
+				p.setRemark(remark);
+				p.setName(name);
+				p.setKeywords(keywords);
+				pdao.updateByPrimaryKey(p);
+			}
+		}
 	}
 	
 	/**

+ 55 - 0
src/main/java/com/miniframe/bisiness/es/ES0003Service.java

@@ -0,0 +1,55 @@
+package com.miniframe.bisiness.es;
+
+import java.nio.file.Paths;
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.es.model.ES0003BaseModel;
+import com.miniframe.model.es.dao.EsProMapper;
+import com.miniframe.tools.XIFileUtils;
+
+/**
+ * 无锡发动机,“项目删除”逻辑处理(重新生成不覆盖)。
+ */
+public class ES0003Service extends ES0003BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 无锡发动机,“项目删除”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String pid = this.getA_es0003().getPid();
+		EsProMapper pdao = UtilTools.getBean(EsProMapper.class);
+		XIFileUtils.deleteFolder(Paths.get(XIFileUtils.getRootPathStr()+"/"+pid));
+		pdao.deleteByPrimaryKey(pid);
+	}
+	
+	/**
+	 * 无锡发动机,“项目删除”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 9 - 0
src/main/java/com/miniframe/tools/XIFileUtils.java

@@ -23,6 +23,7 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,6 +43,14 @@ public class XIFileUtils {
 
 
 
+    }
+    public static void deleteFolder(Path folderPath) throws IOException {
+        if (Files.exists(folderPath)) {
+            Files.walk(folderPath)
+                    .sorted(Comparator.reverseOrder())
+                    .map(Path::toFile)
+                    .forEach(File::delete);
+        }
     }
     public static void  fileCopy(String sourcePath ,String destinationPath){
         File sourceFile = new File(sourcePath);

+ 44 - 0
src/test/java/com/miniframe/comm/httpesapater/ES0003Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpesapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpesapater.HttpesapaterUtil;
+import com.miniframe.generate.comm.es.A_ES0003;
+import com.miniframe.generate.comm.httpesapater.ES0003Client;
+import com.miniframe.generate.business.es.model.ES0003BaseModel;
+
+public class ES0003Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0003Test.class);
+
+	/**
+	 * 项目删除,获取报文体
+	 * @return
+	 */
+	public static A_ES0003 getA_es0003() {
+		A_ES0003 a_es0003 = new A_ES0003();
+
+		// ----------以下增加【项目删除】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_es0003;
+	}
+	
+	/**
+	 * 运行客户端测试,项目删除
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		ES0003BaseModel model = new ES0003BaseModel();
+		model.setA_eshead(HttpesapaterUtil.getA_eshead("ES0003"));
+		model.setA_es0003(ES0003Test.getA_es0003());
+		ES0003Client client = new ES0003Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 1 - 0
系统设计/系统模块/ES(无锡发动机).csv

@@ -1,4 +1,5 @@
 序号,交易编码,交易名称,属性,实现类,交易描述
 100001,ES0001,项目查询,service,
 100002,ES0002,项目新增修改,service,
+100003,ES0003,项目删除,service,
 

+ 4 - 2
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0001_D(项目列表查询).csv

@@ -5,7 +5,9 @@
 2.2,uid,用户id,string,,,,,,,,,,,
 2.3,name,项目名称,string,,,,,,,,,,,
 2.4,remark,项目描述,string,,,,,,,,,,,
-2.5,image,base64图片,string,,,,,,,,,,,
+2.5,uname,用户昵称,string,,,,,,,,,,,
 2.6,updateTime,修改时间,string,,,,,,,,,,,
 2.7,createTime,创建时间,string,,,,,,,,,,,
-2.8,flow,流程,string,,,,,,,,,,,
+2.8,flow,流程,string,,,,,,,,,,,
+2.9,dirsize,文件大小,string,,,,,,,,,,,
+2.10,keywords,类型,string,,,,,,,,,,,

+ 2 - 5
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0002_A(项目新增修改).csv

@@ -1,9 +1,6 @@
 "序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
 1,pid,项目Id,string,,,,,,,,,,,
-2,uid,用户id,string,,,,,,,,,,,
 3,name,项目名称,string,,,,,,,,,,,
 4,remark,项目描述,string,,,,,,,,,,,
-5,image,base64图片,string,,,,,,,,,,,
-6,updateTime,修改时间,string,,,,,,,,,,,
-7,createTime,创建时间,string,,,,,,,,,,,
-8,flow,流程,string,,,,,,,,,,,
+8,flow,流程,string,,,,,,,,,,,
+10,keywords,类型,string,,,,,,,,,,,

+ 2 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0003_A(项目删除).csv

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

+ 1 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0003_D(项目删除).csv

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