项目属性查询

generated/com/miniframe/generate/comm/es/A_ES0006.java

@@ -9,4 +9,56 @@ import java.io.Serializable;
  */
 public class A_ES0006 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
+	String npcId;//N节点项目组件Id
+	/**
+	 *N节点项目组件Id
+	 */
+	public void setNpcId(String npcId) {
+		this.npcId=npcId;
+	}
+	/**
+	 *N节点项目组件Id
+	 */
+	public String getNpcId() {
+		return this.npcId;
+	}
+	String pcId1;//项目组件Id
+	/**
+	 *项目组件Id
+	 */
+	public void setPcId1(String pcId1) {
+		this.pcId1=pcId1;
+	}
+	/**
+	 *项目组件Id
+	 */
+	public String getPcId1() {
+		return this.pcId1;
+	}
+	String pcId2;//项目组件Id
+	/**
+	 *项目组件Id
+	 */
+	public void setPcId2(String pcId2) {
+		this.pcId2=pcId2;
+	}
+	/**
+	 *项目组件Id
+	 */
+	public String getPcId2() {
+		return this.pcId2;
+	}
+	int type;//连线类型
+	/**
+	 *连线类型
+	 */
+	public void setType(int type) {
+		this.type=type;
+	}
+	/**
+	 *连线类型
+	 */
+	public int getType() {
+		return this.type;
+	}
 }

generated/com/miniframe/generate/comm/es/A_ES0007.java

@@ -9,4 +9,43 @@ import java.io.Serializable;
  */
 public class A_ES0007 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
+	String npcId;//N节点项目组件Id
+	/**
+	 *N节点项目组件Id
+	 */
+	public void setNpcId(String npcId) {
+		this.npcId=npcId;
+	}
+	/**
+	 *N节点项目组件Id
+	 */
+	public String getNpcId() {
+		return this.npcId;
+	}
+	String pcId;//项目组件Id
+	/**
+	 *项目组件Id
+	 */
+	public void setPcId(String pcId) {
+		this.pcId=pcId;
+	}
+	/**
+	 *项目组件Id
+	 */
+	public String getPcId() {
+		return this.pcId;
+	}
+	int type;//连线类型
+	/**
+	 *连线类型
+	 */
+	public void setType(int type) {
+		this.type=type;
+	}
+	/**
+	 *连线类型
+	 */
+	public int getType() {
+		return this.type;
+	}
 }

generated/com/miniframe/generate/comm/es/A_ES0008.java

@@ -9,4 +9,17 @@ import java.io.Serializable;
  */
 public class A_ES0008 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
+	String pcavals;//pcaId-value-unit字段已逗号分隔数据已分号分隔
+	/**
+	 *pcaId-value-unit字段已逗号分隔数据已分号分隔
+	 */
+	public void setPcavals(String pcavals) {
+		this.pcavals=pcavals;
+	}
+	/**
+	 *pcaId-value-unit字段已逗号分隔数据已分号分隔
+	 */
+	public String getPcavals() {
+		return this.pcavals;
+	}
 }

generated/com/miniframe/generate/comm/es/A_ES0009.java

@@ -9,4 +9,17 @@ import java.io.Serializable;
  */
 public class A_ES0009 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
+	String pcId;//项目组件Id
+	/**
+	 *项目组件Id
+	 */
+	public void setPcId(String pcId) {
+		this.pcId=pcId;
+	}
+	/**
+	 *项目组件Id
+	 */
+	public String getPcId() {
+		return this.pcId;
+	}
 }

generated/com/miniframe/generate/comm/es/D_ES0006.java

@@ -9,4 +9,30 @@ import java.io.Serializable;
  */
 public class D_ES0006 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
+	String pccId1;//组件1连线Id
+	/**
+	 *组件1连线Id
+	 */
+	public void setPccId1(String pccId1) {
+		this.pccId1=pccId1;
+	}
+	/**
+	 *组件1连线Id
+	 */
+	public String getPccId1() {
+		return this.pccId1;
+	}
+	String pccId2;//组件2连线Id
+	/**
+	 *组件2连线Id
+	 */
+	public void setPccId2(String pccId2) {
+		this.pccId2=pccId2;
+	}
+	/**
+	 *组件2连线Id
+	 */
+	public String getPccId2() {
+		return this.pccId2;
+	}
 }

generated/com/miniframe/generate/comm/es/D_ES0009.java

@@ -4,9 +4,23 @@
 package com.miniframe.generate.comm.es;
 import com.miniframe.core.BaseMapModel;
 import java.io.Serializable;
+import java.util.*;
 /**
  * 项目组件属性查询
  */
 public class D_ES0009 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
+	List <D_ES0009_ROWS_RECODE> rows;//数据
+	/**
+	 *数据
+	 */
+	public void setRows(List <D_ES0009_ROWS_RECODE> rows) {
+		this.rows=rows;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_ES0009_ROWS_RECODE> getRows() {
+		return this.rows;
+	}
 }

generated/com/miniframe/generate/comm/es/D_ES0009_ROWS_RECODE.java

@@ -0,0 +1,116 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目组件属性查询->数据
+ */
+public class D_ES0009_ROWS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pcaId;//项目组件属性ID
+	/**
+	 *项目组件属性ID
+	 */
+	public void setPcaId(String pcaId) {
+		this.pcaId=pcaId;
+	}
+	/**
+	 *项目组件属性ID
+	 */
+	public String getPcaId() {
+		return this.pcaId;
+	}
+	String value;//数值
+	/**
+	 *数值
+	 */
+	public void setValue(String value) {
+		this.value=value;
+	}
+	/**
+	 *数值
+	 */
+	public String getValue() {
+		return this.value;
+	}
+	String unit;//单位
+	/**
+	 *单位
+	 */
+	public void setUnit(String unit) {
+		this.unit=unit;
+	}
+	/**
+	 *单位
+	 */
+	public String getUnit() {
+		return this.unit;
+	}
+	String unitType;//单位类型
+	/**
+	 *单位类型
+	 */
+	public void setUnitType(String unitType) {
+		this.unitType=unitType;
+	}
+	/**
+	 *单位类型
+	 */
+	public String getUnitType() {
+		return this.unitType;
+	}
+	String name;//属性名称
+	/**
+	 *属性名称
+	 */
+	public void setName(String name) {
+		this.name=name;
+	}
+	/**
+	 *属性名称
+	 */
+	public String getName() {
+		return this.name;
+	}
+	String code;//属性编码
+	/**
+	 *属性编码
+	 */
+	public void setCode(String code) {
+		this.code=code;
+	}
+	/**
+	 *属性编码
+	 */
+	public String getCode() {
+		return this.code;
+	}
+	int valueType;//值类型
+	/**
+	 *值类型
+	 */
+	public void setValueType(int valueType) {
+		this.valueType=valueType;
+	}
+	/**
+	 *值类型
+	 */
+	public int getValueType() {
+		return this.valueType;
+	}
+	String valueDef;//默认值
+	/**
+	 *默认值
+	 */
+	public void setValueDef(String valueDef) {
+		this.valueDef=valueDef;
+	}
+	/**
+	 *默认值
+	 */
+	public String getValueDef() {
+		return this.valueDef;
+	}
+}

generated/validateform/a_es0006Form.xml

@@ -0,0 +1,18 @@
+<?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_es0006Form">
+<field property="npcId" depends="required">
+    <arg0 key="a_es0006.npcId"/>
+</field>
+<field property="pcId1" depends="required">
+    <arg0 key="a_es0006.pcId1"/>
+</field>
+<field property="type" depends="required">
+    <arg0 key="a_es0006.type"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validateform/a_es0007Form.xml

@@ -0,0 +1,18 @@
+<?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_es0007Form">
+<field property="npcId" depends="required">
+    <arg0 key="a_es0007.npcId"/>
+</field>
+<field property="pcId" depends="required">
+    <arg0 key="a_es0007.pcId"/>
+</field>
+<field property="type" depends="required">
+    <arg0 key="a_es0007.type"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validateform/a_es0008Form.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_es0008Form">
+<field property="pcavals" depends="required">
+    <arg0 key="a_es0008.pcavals"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validateform/a_es0009Form.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_es0009Form">
+<field property="pcId" depends="required">
+    <arg0 key="a_es0009.pcId"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validateform/d_es0006Form.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="d_es0006Form">
+<field property="pccId1" depends="required">
+    <arg0 key="d_es0006.pccId1"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validator/resources_a_es0006Form_validator.properties

@@ -1 +1,5 @@
-a_es0006Form = false
+a_es0006.npcId = N\u8282\u70B9\u9879\u76EE\u7EC4\u4EF6Id
+a_es0006.pcId1 = \u9879\u76EE\u7EC4\u4EF6Id
+a_es0006.pcId2 = \u9879\u76EE\u7EC4\u4EF6Id
+a_es0006.type = \u8FDE\u7EBF\u7C7B\u578B
+a_es0006Form = true

generated/validator/resources_a_es0006Form_validator_zh_CN.properties

@@ -1 +1,5 @@
-a_es0006Form = false
+a_es0006.npcId = N\u8282\u70B9\u9879\u76EE\u7EC4\u4EF6Id
+a_es0006.pcId1 = \u9879\u76EE\u7EC4\u4EF6Id
+a_es0006.pcId2 = \u9879\u76EE\u7EC4\u4EF6Id
+a_es0006.type = \u8FDE\u7EBF\u7C7B\u578B
+a_es0006Form = true

generated/validator/resources_a_es0007Form_validator.properties

@@ -1 +1,4 @@
-a_es0007Form = false
+a_es0007.npcId = N\u8282\u70B9\u9879\u76EE\u7EC4\u4EF6Id
+a_es0007.pcId = \u9879\u76EE\u7EC4\u4EF6Id
+a_es0007.type = \u8FDE\u7EBF\u7C7B\u578B
+a_es0007Form = true

generated/validator/resources_a_es0007Form_validator_zh_CN.properties

@@ -1 +1,4 @@
-a_es0007Form = false
+a_es0007.npcId = N\u8282\u70B9\u9879\u76EE\u7EC4\u4EF6Id
+a_es0007.pcId = \u9879\u76EE\u7EC4\u4EF6Id
+a_es0007.type = \u8FDE\u7EBF\u7C7B\u578B
+a_es0007Form = true

generated/validator/resources_a_es0008Form_validator.properties

@@ -1 +1,2 @@
-a_es0008Form = false
+a_es0008.pcavals = pcaId-value-unit\u5B57\u6BB5\u5DF2\u9017\u53F7\u5206\u9694\u6570\u636E\u5DF2\u5206\u53F7\u5206\u9694
+a_es0008Form = true

generated/validator/resources_a_es0008Form_validator_zh_CN.properties

@@ -1 +1,2 @@
-a_es0008Form = false
+a_es0008.pcavals = pcaId-value-unit\u5B57\u6BB5\u5DF2\u9017\u53F7\u5206\u9694\u6570\u636E\u5DF2\u5206\u53F7\u5206\u9694
+a_es0008Form = true

generated/validator/resources_a_es0009Form_validator.properties

@@ -1 +1,2 @@
-a_es0009Form = false
+a_es0009.pcId = \u9879\u76EE\u7EC4\u4EF6Id
+a_es0009Form = true

generated/validator/resources_a_es0009Form_validator_zh_CN.properties

@@ -1 +1,2 @@
-a_es0009Form = false
+a_es0009.pcId = \u9879\u76EE\u7EC4\u4EF6Id
+a_es0009Form = true

generated/validator/resources_d_es0006Form_validator.properties

@@ -1 +1,3 @@
-d_es0006Form = false
+d_es0006.pccId1 = \u7EC4\u4EF61\u8FDE\u7EBFId
+d_es0006.pccId2 = \u7EC4\u4EF62\u8FDE\u7EBFId
+d_es0006Form = true

generated/validator/resources_d_es0006Form_validator_zh_CN.properties

@@ -1 +1,3 @@
-d_es0006Form = false
+d_es0006.pccId1 = \u7EC4\u4EF61\u8FDE\u7EBFId
+d_es0006.pccId2 = \u7EC4\u4EF62\u8FDE\u7EBFId
+d_es0006Form = true

generated/validator/resources_d_es0009_rows_recodeForm_validator.properties

@@ -0,0 +1,9 @@
+d_es0009_rows_recode.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+d_es0009_rows_recode.value = \u6570\u503C
+d_es0009_rows_recode.unit = \u5355\u4F4D
+d_es0009_rows_recode.unitType = \u5355\u4F4D\u7C7B\u578B
+d_es0009_rows_recode.name = \u5C5E\u6027\u540D\u79F0
+d_es0009_rows_recode.code = \u5C5E\u6027\u7F16\u7801
+d_es0009_rows_recode.valueType = \u503C\u7C7B\u578B
+d_es0009_rows_recode.valueDef = \u9ED8\u8BA4\u503C
+d_es0009_rows_recodeForm = true

generated/validator/resources_d_es0009_rows_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,9 @@
+d_es0009_rows_recode.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+d_es0009_rows_recode.value = \u6570\u503C
+d_es0009_rows_recode.unit = \u5355\u4F4D
+d_es0009_rows_recode.unitType = \u5355\u4F4D\u7C7B\u578B
+d_es0009_rows_recode.name = \u5C5E\u6027\u540D\u79F0
+d_es0009_rows_recode.code = \u5C5E\u6027\u7F16\u7801
+d_es0009_rows_recode.valueType = \u503C\u7C7B\u578B
+d_es0009_rows_recode.valueDef = \u9ED8\u8BA4\u503C
+d_es0009_rows_recodeForm = true

modelsrc/com/miniframe/model/es/EsProComCon.java

@@ -50,6 +50,11 @@ public class EsProComCon extends MiniserviceBaseModel implements Serializable {
     @Column(name = "update_time")
     private Date updateTime;
 
+    /**
+     * 连线类型
+     */
+    private Short type;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -185,4 +190,22 @@ public class EsProComCon extends MiniserviceBaseModel implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    /**
+     * 获取连线类型
+     *
+     * @return type - 连线类型
+     */
+    public Short getType() {
+        return type;
+    }
+
+    /**
+     * 设置连线类型
+     *
+     * @param type 连线类型
+     */
+    public void setType(Short type) {
+        this.type = type;
+    }
 }

modelsrc/com/miniframe/model/es/EsProComConSQLBuilder.java

@@ -574,6 +574,66 @@ public class EsProComConSQLBuilder {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Short value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Short value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Short value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Short value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Short value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Short value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Short> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Short> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Short value1, Short value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Short value1, Short value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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 Fri May 23 15:57:28 CST 2025.
+    This file was generated on Tue May 27 10:26:14 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/es/xml/EsProMapper.xml" />

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 Fri May 23 15:57:29 CST 2025.
+    This file was generated on Tue May 27 10:26:15 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

src/main/java/com/miniframe/bisiness/es/ES0001Service.java

@@ -32,7 +32,7 @@ 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();
+		String uid = this.getA_eshead().getUserId();
 //		SysUserMapper udao = UtilTools.getBean(SysUserMapper.class);
 //		SysUser user = udao.selectByPrimaryKey(uid);
 		EsProMapper proMapper = UtilTools.getBean(EsProMapper.class);
@@ -43,6 +43,8 @@ public class ES0001Service extends ES0001BaseModel implements ExecProcessFlow {
 			keywordCriteria.orLike(EsPro::getName, searchtag)
 					.orLike(EsPro::getRemark, searchtag);
 		}
+		keywordCriteria.andEqualTo(EsPro::getUid,uid);
+		weekend.orderBy("create_time desc");
 		int total = proMapper.selectCountByExample(weekend);
 		XIUtils.pageSet(page, count);
 		List<EsPro>  eList = proMapper.selectByExample(weekend);

src/main/java/com/miniframe/bisiness/es/ES0006Service.java

@@ -1,8 +1,19 @@
 package com.miniframe.bisiness.es;
 
+import java.util.Date;
+import java.util.List;
 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.es.model.ES0006BaseModel;
+import com.miniframe.model.es.EsProCom;
+import com.miniframe.model.es.EsProComCon;
+import com.miniframe.model.es.EsProComConSQLBuilder;
+import com.miniframe.model.es.EsProComSQLBuilder;
+import com.miniframe.model.es.dao.EsProComConMapper;
+import com.miniframe.model.es.dao.EsProComMapper;
+import io.netty.util.internal.StringUtil;
 
 /**
  * 无锡发动机,“项目组件连线”逻辑处理（重新生成不覆盖）。
@@ -15,7 +26,61 @@ public class ES0006Service extends ES0006BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“项目组件连线”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-	
+		String npcId = this.getA_es0006().getNpcId();
+		String pcId1 = this.getA_es0006().getPcId1();
+		String pcId2 = this.getA_es0006().getPcId2();
+		Integer type =this.getA_es0006().getType();
+		String uid = this.getA_eshead().getUserId();
+		EsProCom  nProcom = findEsProCom(npcId);
+		EsProCom  proCom1 = findEsProCom(pcId1);
+		EsProCom  proCom2 = findEsProCom(pcId2);
+		if(nProcom==null){
+			throw  new BusinessException("");
+		}
+		if(nProcom.getComId()!="3"){
+			throw  new BusinessException("");
+		}
+		if(proCom1==null){
+			throw  new BusinessException("");
+		}
+		String pccId1 = savePcc(npcId, uid, pcId1,type);
+		this.getD_es0006().setPccId1(pccId1);
+		if(proCom2!=null){
+			String pccId2 = savePcc(npcId, uid, pcId1,type);
+			this.getD_es0006().setPccId2(pccId2);
+		}
+	}
+
+	private String  savePcc(String npcId, String uid, String pcId,Integer type) {
+		EsProComConMapper condao = UtilTools.getBean(EsProComConMapper.class);
+		EsProComConSQLBuilder consb = new EsProComConSQLBuilder();
+		EsProComConSQLBuilder.Criteria consc = consb.createCriteria();
+		consc.andPcIdEqualTo(pcId);
+		consc.andNpcIdEqualTo(npcId);
+		consc.andTypeEqualTo(Short.valueOf(type.toString()));
+		List<EsProComCon> comCons = condao.selectByExample(consb);
+		if(comCons==null||comCons.isEmpty()){
+			EsProComCon comCon = new EsProComCon();
+			comCon.setPccId(UtilTools.getUUid());
+			comCon.setNpcId(npcId);
+			comCon.setPcId(pcId);
+			comCon.setUid(uid);
+			comCon.setCreateTime(new Date());
+			comCon.setUpdateTime(new Date());
+			comCon.setType(Short.valueOf(type.toString()));
+			condao.insert(comCon);
+			return comCon.getPccId();
+		}else{
+			return  comCons.get(0).getPccId();
+		}
+	}
+
+	public EsProCom findEsProCom(String pcid){
+		if(StringUtil.isNullOrEmpty(pcid)){
+			return  null;
+		}
+		EsProComMapper cdao = UtilTools.getBean(EsProComMapper.class);
+		return cdao.selectByPrimaryKey(pcid);
 	}
 	
 	/**

src/main/java/com/miniframe/bisiness/es/ES0007Service.java

@@ -2,7 +2,15 @@ package com.miniframe.bisiness.es;
 
 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.es.model.ES0007BaseModel;
+import com.miniframe.model.es.EsProCom;
+import com.miniframe.model.es.EsProComCon;
+import com.miniframe.model.es.EsProComConSQLBuilder;
+import com.miniframe.model.es.EsProComSQLBuilder;
+import com.miniframe.model.es.dao.EsProComConMapper;
+import com.miniframe.model.es.dao.EsProComMapper;
 
 /**
  * 无锡发动机,“项目组件删除连线”逻辑处理（重新生成不覆盖）。
@@ -15,7 +23,29 @@ public class ES0007Service extends ES0007BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“项目组件删除连线”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-	
+		String npcId = this.getA_es0007().getNpcId();
+		String pcId = this.getA_es0007().getPcId();
+		Integer type = this.getA_es0007().getType();
+
+		EsProComMapper cdao = UtilTools.getBean(EsProComMapper.class);
+		EsProCom proCom= cdao.selectByPrimaryKey(pcId);
+		EsProCom nProCom =cdao.selectByPrimaryKey(npcId);
+		if(nProCom==null){
+			throw new BusinessException("");
+		}
+		if(nProCom.getComId()!="3"){
+			throw new BusinessException("");
+		}
+		if(proCom==null){
+			throw new BusinessException("");
+		}
+		EsProComConMapper pccdao =UtilTools.getBean(EsProComConMapper.class);
+		EsProComConSQLBuilder pccsb = new EsProComConSQLBuilder();
+		EsProComConSQLBuilder.Criteria pccsc = pccsb.createCriteria();
+		pccsc.andNpcIdEqualTo(npcId);
+		pccsc.andPcIdEqualTo(pcId);
+		pccsc.andTypeEqualTo(Short.valueOf(type.toString()));
+		pccdao.deleteByExample(pccsb);
 	}
 	
 	/**

src/main/java/com/miniframe/bisiness/es/ES0008Service.java

@@ -1,8 +1,12 @@
 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.ES0008BaseModel;
+import com.miniframe.model.es.EsProComAtt;
+import com.miniframe.model.es.dao.EsProComAttMapper;
 
 /**
  * 无锡发动机,“项目组件属性修改”逻辑处理（重新生成不覆盖）。
@@ -15,7 +19,22 @@ public class ES0008Service extends ES0008BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“项目组件属性修改”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-	
+		String pcavals= this.getA_es0008().getPcavals();
+		EsProComAttMapper cadao = UtilTools.getBean(EsProComAttMapper.class);
+		String[] pcavalobjs = pcavals.split(";");
+		for (String pcavalobj:pcavalobjs) {
+			String[] obj = pcavalobj.split(",");
+			String pcaId=obj[0];
+			String value=obj[1];
+			String unit=obj[2];
+			EsProComAtt ca = cadao.selectByPrimaryKey(pcaId);
+			if(ca!=null){
+				ca.setValue(value);
+				ca.setUnit(unit);
+				ca.setUpdateTime(new Date());
+				cadao.updateByPrimaryKey(ca);
+			}
+		}
 	}
 	
 	/**

src/main/java/com/miniframe/bisiness/es/ES0009Service.java

@@ -1,8 +1,20 @@
 package com.miniframe.bisiness.es;
 
+import java.util.ArrayList;
+import java.util.List;
 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.es.model.ES0009BaseModel;
+import com.miniframe.generate.comm.es.D_ES0009_ROWS_RECODE;
+import com.miniframe.mappers.es.dao.EsMapper;
+import com.miniframe.mappers.es.model.ProComAttDto;
+import com.miniframe.model.es.EsProCom;
+import com.miniframe.model.es.EsProComAtt;
+import com.miniframe.model.es.EsProComAttSQLBuilder;
+import com.miniframe.model.es.dao.EsProComAttMapper;
+import com.miniframe.model.es.dao.EsProComMapper;
 
 /**
  * 无锡发动机,“项目组件属性查询”逻辑处理（重新生成不覆盖）。
@@ -15,7 +27,23 @@ public class ES0009Service extends ES0009BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“项目组件属性查询”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-	
+		String pcId = this.getA_es0009().getPcId();
+		EsMapper esdao = UtilTools.getBean(EsMapper.class);
+		List<ProComAttDto> dtos = esdao.selectPrComAttList(pcId);
+		List<D_ES0009_ROWS_RECODE> rows = new ArrayList<>();
+		for (ProComAttDto dto:dtos) {
+			D_ES0009_ROWS_RECODE row = new D_ES0009_ROWS_RECODE();
+			row.setPcaId(dto.getPcaId());
+			row.setValue(dto.getValue());
+			row.setUnit(dto.getUnit());
+			row.setUnitType(dto.getUnitType());
+			row.setName(dto.getName());
+			row.setCode(dto.getCode());
+			row.setValueType(dto.getValueType());
+			row.setValueDef(dto.getValueDef());
+			rows.add(row);
+		}
+		this.getD_es0009().setRows(rows);
 	}
 	
 	/**

src/main/java/com/miniframe/mappers/es/dao/EsMapper.java

@@ -1,5 +1,6 @@
 package com.miniframe.mappers.es.dao;
 
+import com.miniframe.mappers.es.model.ProComAttDto;
 import com.miniframe.model.system.SysUser;
 import com.miniframe.system.MiniserviceBaseDao;
 import org.apache.ibatis.annotations.Select;
@@ -15,4 +16,15 @@ public interface EsMapper extends MiniserviceBaseDao {
      */
     @Select("select max(ser) from es_pro_com where pid =#{pid} and id_code=#{idCode}")
     Integer getProComSer(String pid,String idCode);
+
+    @Select("select a.pca_id as pcaId," +
+            "a.value as value," +
+            "a.unit as unit," +
+            "b.unit_type as unitType," +
+            "b.name as name," +
+            "b.code as code," +
+            "b.value_def as valueDef," +
+            "b.value_type as valueType " +
+            "from es_pro_com_att a,es_att b where a.att_id=b.att_id and pc_id=#{pcId} ORDER BY ser asc;")
+    List<ProComAttDto> selectPrComAttList(String pcId);
 }

src/main/java/com/miniframe/mappers/es/model/ProComAttDto.java

@@ -0,0 +1,32 @@
+package com.miniframe.mappers.es.model;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ProComAttDto {
+
+    private String pcaId;
+    private String value;
+    private String unit;
+    private String unitType;
+    private String name;
+    private String code;
+    private Integer valueType;
+    private String valueDef;
+
+    @Override
+    public String toString() {
+        return "ProComAttDto{" +
+                "pcaId='" + pcaId + '\'' +
+                ", value='" + value + '\'' +
+                ", unit='" + unit + '\'' +
+                ", unitType=" + unitType +
+                ", name='" + name + '\'' +
+                ", code='" + code + '\'' +
+                ", valueType=" + valueType +
+                ", valueDef='" + valueDef + '\'' +
+                '}';
+    }
+}

src/main/resources/templates/mail_script.html

@@ -0,0 +1,76 @@
+
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    
+    
+    <title>您的民用飞机多学科联合设计优化软件注册验证码</title>
+    <style>
+        body {
+            font-family: "Arial", "Helvetica Neue", "Helvetica", sans-serif;
+            line-height: 1.6;
+            color: #333333;
+            background-color: #f4f4f4;
+            margin: 0;
+            padding: 0;
+        }
+        .container {
+            max-width: 600px;
+            margin: 20px auto;
+            background-color: #ffffff;
+            padding: 20px 30px;
+            border-radius: 8px;
+            box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+        }
+        h1 {
+            color: #333333;
+            font-size: 24px;
+            margin-bottom: 20px;
+            text-align: center;
+        }
+        p {
+            margin-bottom: 15px;
+        }
+        .verification-code {
+            display: block;
+            width: fit-content;
+            margin: 25px auto;
+            padding: 15px 25px;
+            font-size: 28px;
+            font-weight: bold;
+            color: #007bff; /* 可以根据您的品牌色调整 */
+            background-color: #e9ecef; /* 可以根据您的品牌色调整 */
+            border-radius: 4px;
+            text-align: center;
+            letter-spacing: 2px; /* 增加字母间距方便阅读 */
+        }
+        .note {
+            font-size: 14px;
+            color: #666666;
+        }
+        .footer {
+            margin-top: 30px;
+            padding-top: 20px;
+            border-top: 1px solid #eeeeee;
+            font-size: 12px;
+            color: #999999;
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>您的民用飞机多学科联合设计优化软件注册验证码</h1>
+        <p>尊敬的{{username}}：</p>
+        <p>感谢您注册民用飞机多学科联合设计优化软件！您正在进行账号注册的邮箱验证操作。为了保障您的账户安全，请使用以下验证码完成验证。</p>
+        <p style="text-align: center;">您的验证码是：</p>
+        <div class="verification-code">{{verification_code}}</div>
+        <p>请在5分钟内输入此验证码进行验证。请妥善保管此验证码，切勿透露给任何人，包括气动与多学科优化设计研究所的客服人员。</p>
+        <p class="note">如果您没有进行注册操作，请忽略此邮件。这可能是他人误输入了您的邮箱地址。</p>
+        <div class="footer">
+            这是系统自动发送的邮件，请勿直接回复。<br>
+            气动与多学科优化设计研究所团队
+        </div>
+    </div>
+</body>
+</html>

src/test/java/com/miniframe/EsMapperTest.java

@@ -0,0 +1,23 @@
+package com.miniframe;
+
+import com.miniframe.mappers.es.dao.EsMapper;
+import com.miniframe.mappers.es.model.ProComAttDto;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+@SpringBootTest
+public class EsMapperTest {
+    @Autowired
+    EsMapper esdao;
+    @Test
+    public void selectPrComAttList(){
+        List<ProComAttDto> attDtoList = esdao.selectPrComAttList("ca80f1de4dda4459ab6448ee08bd22bf");
+        for (ProComAttDto vd:attDtoList
+             ) {
+            System.out.println(vd);
+        }
+    }
+}

系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0006_A(项目组件连线).csv

@@ -1 +1,5 @@
-"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
+"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
+1,npcId,N节点项目组件Id,string,,,是,,,,,,,,
+2,pcId1,项目组件Id,string,,,是,,,,,,,,
+3,pcId2,项目组件Id,string,,,,,,,,,,,
+4,type,连线类型,int,,,是,,,,,,,,

系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0006_D(项目组件连线).csv

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

系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0007_A(项目组件连线删除).csv

@@ -1 +1,4 @@
-"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
+"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
+1,npcId,N节点项目组件Id,string,,,是,,,,,,,,
+2,pcId,项目组件Id,string,,,是,,,,,,,,
+3,type,连线类型,int,,,是,,,,,,,,

系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0008_A(项目组件属性修改).csv

@@ -1 +1,2 @@
-"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
+"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
+1,pcavals,pcaId-value-unit字段已逗号分隔数据已分号分隔,string,,,是,,,,,,,,

系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0009_A(项目组件属性查询).csv

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

系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0009_D(项目组件属性查询).csv

@@ -1 +1,10 @@
-"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
+"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
+1,rows,数据,list,,,,0,,,,,,,
+1.1,pcaId,项目组件属性ID,string,,,,,,,,,,,
+1.2,value,数值,string,,,,,,,,,,,
+1.3,unit,单位,string,,,,,,,,,,,
+1.4,unitType,单位类型,string,,,,,,,,,,,
+1.5,name,属性名称,string,,,,,,,,,,,
+1.6,code,属性编码,string,,,,,,,,,,,
+1.7,valueType,值类型,int,,,,,,,,,,,
+1.8,valueDef,默认值,string,,,,,,,,,,,