项目组件属性值处理

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

@@ -22,4 +22,17 @@ public class A_ES0011 extends BaseMapModel implements Serializable {
 	public String getPcaId() {
 		return this.pcaId;
 	}
+	String pcadvals;//cdvId-pcadgId-pcadId-value-unit字段已逗号分隔数据已分号分隔
+	/**
+	 *cdvId-pcadgId-pcadId-value-unit字段已逗号分隔数据已分号分隔
+	 */
+	public void setPcadvals(String pcadvals) {
+		this.pcadvals=pcadvals;
+	}
+	/**
+	 *cdvId-pcadgId-pcadId-value-unit字段已逗号分隔数据已分号分隔
+	 */
+	public String getPcadvals() {
+		return this.pcadvals;
+	}
 }

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

@@ -9,17 +9,17 @@ import java.io.Serializable;
  */
 public class D_ES0010_DATAS_RECODE extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
-	String pcadgId;//项目组件属性数据分组ID
+	int pcadgId;//行号
 	/**
-	 *项目组件属性数据分组ID
+	 *行号
 	 */
-	public void setPcadgId(String pcadgId) {
+	public void setPcadgId(int pcadgId) {
 		this.pcadgId=pcadgId;
 	}
 	/**
-	 *项目组件属性数据分组ID
+	 *行号
 	 */
-	public String getPcadgId() {
+	public int getPcadgId() {
 		return this.pcadgId;
 	}
 	String pcadId;//项目组件属性数据ID

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

@@ -9,17 +9,4 @@ import java.io.Serializable;
  */
 public class D_ES0011 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;
-	}
 }

generated/validateform/a_es0011Form.xml

@@ -0,0 +1,15 @@
+<?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_es0011Form">
+<field property="pcaId" depends="required">
+    <arg0 key="a_es0011.pcaId"/>
+</field>
+<field property="pcadvals" depends="required">
+    <arg0 key="a_es0011.pcadvals"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validateform/d_es0011Form.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_es0011Form">
+<field property="pcadvals" depends="required">
+    <arg0 key="d_es0011.pcadvals"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validator/resources_a_es0011Form_validator.properties

@@ -1,2 +1,3 @@
 a_es0011.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+a_es0011.pcadvals = cdvId-pcadgId-pcadId-value-unit\u5B57\u6BB5\u5DF2\u9017\u53F7\u5206\u9694\u6570\u636E\u5DF2\u5206\u53F7\u5206\u9694
 a_es0011Form = true

generated/validator/resources_a_es0011Form_validator_zh_CN.properties

@@ -1,2 +1,3 @@
 a_es0011.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+a_es0011.pcadvals = cdvId-pcadgId-pcadId-value-unit\u5B57\u6BB5\u5DF2\u9017\u53F7\u5206\u9694\u6570\u636E\u5DF2\u5206\u53F7\u5206\u9694
 a_es0011Form = true

generated/validator/resources_d_es0010_datas_recodeForm_validator.properties

@@ -1,4 +1,4 @@
-d_es0010_datas_recode.pcadgId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u6570\u636E\u5206\u7EC4ID
+d_es0010_datas_recode.pcadgId = \u884C\u53F7
 d_es0010_datas_recode.pcadId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u6570\u636EID
 d_es0010_datas_recode.value = \u6570\u503C
 d_es0010_datas_recode.unit = \u5355\u4F4D

generated/validator/resources_d_es0010_datas_recodeForm_validator_zh_CN.properties

@@ -1,4 +1,4 @@
-d_es0010_datas_recode.pcadgId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u6570\u636E\u5206\u7EC4ID
+d_es0010_datas_recode.pcadgId = \u884C\u53F7
 d_es0010_datas_recode.pcadId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u6570\u636EID
 d_es0010_datas_recode.value = \u6570\u503C
 d_es0010_datas_recode.unit = \u5355\u4F4D

generated/validator/resources_d_es0011Form_validator.properties

@@ -1,2 +1 @@
-d_es0011.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
-d_es0011Form = true
+d_es0011Form = false

generated/validator/resources_d_es0011Form_validator_zh_CN.properties

@@ -1,2 +1 @@
-d_es0011.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
-d_es0011Form = true
+d_es0011Form = false

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

@@ -14,6 +14,12 @@ public class EsProComAttData extends MiniserviceBaseModel implements Serializabl
     @Column(name = "pcad_id")
     private String pcadId;
 
+    /**
+     * 行号
+     */
+    @Column(name = "pcadg_id")
+    private Integer pcadgId;
+
     /**
      * 工程ID
      */
@@ -66,10 +72,9 @@ public class EsProComAttData extends MiniserviceBaseModel implements Serializabl
     private String unit;
 
     /**
-     * 项目组件属性数据分组ID
+     * 序号
      */
-    @Column(name = "pcadg_id")
-    private String pcadgId;
+    private Integer ser;
 
     /**
      * 用户编码
@@ -95,11 +100,6 @@ public class EsProComAttData extends MiniserviceBaseModel implements Serializabl
     @Column(name = "update_time")
     private Date updateTime;
 
-    /**
-     * 序号
-     */
-    private Integer ser;
-
     private static final long serialVersionUID = 1L;
 
     /**
@@ -120,6 +120,24 @@ public class EsProComAttData extends MiniserviceBaseModel implements Serializabl
         this.pcadId = pcadId == null ? null : pcadId.trim();
     }
 
+    /**
+     * 获取行号
+     *
+     * @return pcadg_id - 行号
+     */
+    public Integer getPcadgId() {
+        return pcadgId;
+    }
+
+    /**
+     * 设置行号
+     *
+     * @param pcadgId 行号
+     */
+    public void setPcadgId(Integer pcadgId) {
+        this.pcadgId = pcadgId;
+    }
+
     /**
      * 获取工程ID
      *
@@ -283,21 +301,21 @@ public class EsProComAttData extends MiniserviceBaseModel implements Serializabl
     }
 
     /**
-     * 获取项目组件属性数据分组ID
+     * 获取序号
      *
-     * @return pcadg_id - 项目组件属性数据分组ID
+     * @return ser - 序号
      */
-    public String getPcadgId() {
-        return pcadgId;
+    public Integer getSer() {
+        return ser;
     }
 
     /**
-     * 设置项目组件属性数据分组ID
+     * 设置序号
      *
-     * @param pcadgId 项目组件属性数据分组ID
+     * @param ser 序号
      */
-    public void setPcadgId(String pcadgId) {
-        this.pcadgId = pcadgId == null ? null : pcadgId.trim();
+    public void setSer(Integer ser) {
+        this.ser = ser;
     }
 
     /**
@@ -379,22 +397,4 @@ public class EsProComAttData extends MiniserviceBaseModel implements Serializabl
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    /**
-     * 获取序号
-     *
-     * @return ser - 序号
-     */
-    public Integer getSer() {
-        return ser;
-    }
-
-    /**
-     * 设置序号
-     *
-     * @param ser 序号
-     */
-    public void setSer(Integer ser) {
-        this.ser = ser;
-    }
 }

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

@@ -175,6 +175,66 @@ public class EsProComAttDataSQLBuilder {
             return (Criteria) this;
         }
 
+        public Criteria andPcadgIdIsNull() {
+            addCriterion("pcadg_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdIsNotNull() {
+            addCriterion("pcadg_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdEqualTo(Integer value) {
+            addCriterion("pcadg_id =", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdNotEqualTo(Integer value) {
+            addCriterion("pcadg_id <>", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdGreaterThan(Integer value) {
+            addCriterion("pcadg_id >", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pcadg_id >=", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdLessThan(Integer value) {
+            addCriterion("pcadg_id <", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("pcadg_id <=", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdIn(List<Integer> values) {
+            addCriterion("pcadg_id in", values, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdNotIn(List<Integer> values) {
+            addCriterion("pcadg_id not in", values, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdBetween(Integer value1, Integer value2) {
+            addCriterion("pcadg_id between", value1, value2, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("pcadg_id not between", value1, value2, "pcadgId");
+            return (Criteria) this;
+        }
+
         public Criteria andPidIsNull() {
             addCriterion("pid is null");
             return (Criteria) this;
@@ -805,73 +865,63 @@ public class EsProComAttDataSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdIsNull() {
-            addCriterion("pcadg_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPcadgIdIsNotNull() {
-            addCriterion("pcadg_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPcadgIdEqualTo(String value) {
-            addCriterion("pcadg_id =", value, "pcadgId");
+        public Criteria andSerIsNull() {
+            addCriterion("ser is null");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdNotEqualTo(String value) {
-            addCriterion("pcadg_id <>", value, "pcadgId");
+        public Criteria andSerIsNotNull() {
+            addCriterion("ser is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdGreaterThan(String value) {
-            addCriterion("pcadg_id >", value, "pcadgId");
+        public Criteria andSerEqualTo(Integer value) {
+            addCriterion("ser =", value, "ser");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdGreaterThanOrEqualTo(String value) {
-            addCriterion("pcadg_id >=", value, "pcadgId");
+        public Criteria andSerNotEqualTo(Integer value) {
+            addCriterion("ser <>", value, "ser");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdLessThan(String value) {
-            addCriterion("pcadg_id <", value, "pcadgId");
+        public Criteria andSerGreaterThan(Integer value) {
+            addCriterion("ser >", value, "ser");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdLessThanOrEqualTo(String value) {
-            addCriterion("pcadg_id <=", value, "pcadgId");
+        public Criteria andSerGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ser >=", value, "ser");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdLike(String value) {
-            addCriterion("pcadg_id like", value, "pcadgId");
+        public Criteria andSerLessThan(Integer value) {
+            addCriterion("ser <", value, "ser");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdNotLike(String value) {
-            addCriterion("pcadg_id not like", value, "pcadgId");
+        public Criteria andSerLessThanOrEqualTo(Integer value) {
+            addCriterion("ser <=", value, "ser");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdIn(List<String> values) {
-            addCriterion("pcadg_id in", values, "pcadgId");
+        public Criteria andSerIn(List<Integer> values) {
+            addCriterion("ser in", values, "ser");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdNotIn(List<String> values) {
-            addCriterion("pcadg_id not in", values, "pcadgId");
+        public Criteria andSerNotIn(List<Integer> values) {
+            addCriterion("ser not in", values, "ser");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdBetween(String value1, String value2) {
-            addCriterion("pcadg_id between", value1, value2, "pcadgId");
+        public Criteria andSerBetween(Integer value1, Integer value2) {
+            addCriterion("ser between", value1, value2, "ser");
             return (Criteria) this;
         }
 
-        public Criteria andPcadgIdNotBetween(String value1, String value2) {
-            addCriterion("pcadg_id not between", value1, value2, "pcadgId");
+        public Criteria andSerNotBetween(Integer value1, Integer value2) {
+            addCriterion("ser not between", value1, value2, "ser");
             return (Criteria) this;
         }
 
@@ -1134,66 +1184,6 @@ public class EsProComAttDataSQLBuilder {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
-
-        public Criteria andSerIsNull() {
-            addCriterion("ser is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerIsNotNull() {
-            addCriterion("ser is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerEqualTo(Integer value) {
-            addCriterion("ser =", value, "ser");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerNotEqualTo(Integer value) {
-            addCriterion("ser <>", value, "ser");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerGreaterThan(Integer value) {
-            addCriterion("ser >", value, "ser");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerGreaterThanOrEqualTo(Integer value) {
-            addCriterion("ser >=", value, "ser");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerLessThan(Integer value) {
-            addCriterion("ser <", value, "ser");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerLessThanOrEqualTo(Integer value) {
-            addCriterion("ser <=", value, "ser");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerIn(List<Integer> values) {
-            addCriterion("ser in", values, "ser");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerNotIn(List<Integer> values) {
-            addCriterion("ser not in", values, "ser");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerBetween(Integer value1, Integer value2) {
-            addCriterion("ser between", value1, value2, "ser");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerNotBetween(Integer value1, Integer value2) {
-            addCriterion("ser not between", value1, value2, "ser");
-            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 30 09:49:04 CST 2025.
+    This file was generated on Fri May 30 10:06:19 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 30 09:49:05 CST 2025.
+    This file was generated on Fri May 30 10:06:20 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -44,6 +44,7 @@ public class ES0001Service extends ES0001BaseModel implements ExecProcessFlow {
 					.orLike(EsPro::getRemark, searchtag);
 		}
 		keywordCriteria.andEqualTo(EsPro::getUid,uid);
+		weekend.orderBy("createTime").desc();
 		int total = proMapper.selectCountByExample(weekend);
 		XIUtils.pageSet(page, count);
 		List<EsPro>  eList = proMapper.selectByExample(weekend);

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

@@ -1,8 +1,17 @@
 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.ES0011BaseModel;
+import com.miniframe.model.es.EsDataAtt;
+import com.miniframe.model.es.EsProComAtt;
+import com.miniframe.model.es.EsProComAttData;
+import com.miniframe.model.es.dao.EsDataAttMapper;
+import com.miniframe.model.es.dao.EsProComAttDataMapper;
+import com.miniframe.model.es.dao.EsProComAttMapper;
+import io.netty.util.internal.StringUtil;
 
 /**
  * 无锡发动机,“项目组件属性值数据添加修改”逻辑处理（重新生成不覆盖）。
@@ -15,7 +24,58 @@ public class ES0011Service extends ES0011BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“项目组件属性值数据添加修改”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-	
+		//cdvId-pcadgId-pcadId-value-unit 字段已逗号分隔数据已分号分隔
+		String pcaId = this.getA_es0011().getPcaId();
+		EsProComAttMapper pcadao = UtilTools.getBean(EsProComAttMapper.class);
+		EsProComAtt pca = pcadao.selectByPrimaryKey(pcaId);
+		String pcadvals = this.getA_es0011().getPcadvals();
+		String[] pcads= pcadvals.split(";");
+		for (String pcad: pcads){
+			String[] pcadts = pcad.split(",");
+			String cdvId= pcadts[0];
+			String pcadgId= pcadts[1];
+			String pcadId= pcadts[2];
+			String value= pcadts[3];
+			String unit= pcadts[4];
+			EsDataAttMapper dattdao =UtilTools.getBean(EsDataAttMapper.class);
+			EsDataAtt datt = dattdao.selectByPrimaryKey(cdvId);
+			EsProComAttDataMapper pcaddao = UtilTools.getBean(EsProComAttDataMapper.class);
+			EsProComAttData d;
+			if(StringUtil.isNullOrEmpty(pcadId)){//新增
+				d=new EsProComAttData();
+				d.setPcadId(UtilTools.getUUid());
+				d.setPcadgId(Integer.valueOf(pcadgId));
+				d.setPid(pca.getPid());
+				d.setPcId(pca.getPcId());
+				d.setComId(pca.getComId());
+				d.setAttId(pca.getAttId());
+				d.setPcaId(pca.getPcaId());
+				d.setCdId(datt.getCdId());
+				d.setCdvId(cdvId);
+				d.setValue(value);
+				d.setUnit(unit);
+				d.setUid(this.getA_eshead().getUserId());
+				d.setCreateTime(new Date());
+				d.setUpdateTime(new Date());
+				pcaddao.insert(d);
+			}else{//修改
+				d =pcaddao.selectByPrimaryKey(pcadId);
+				if(d!=null){
+					d.setPid(pca.getPid());
+					d.setPcId(pca.getPcId());
+					d.setComId(pca.getComId());
+					d.setAttId(pca.getAttId());
+					d.setPcaId(pca.getPcaId());
+					d.setCdId(datt.getCdId());
+					d.setCdvId(cdvId);
+					d.setValue(value);
+					d.setUnit(unit);
+					d.setUid(this.getA_eshead().getUserId());
+					d.setUpdateTime(new Date());
+					pcaddao.updateByPrimaryKey(d);
+				}
+			}
+		}
 	}
 	
 	/**

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

@@ -9,7 +9,7 @@
 2.6,valueType,值类型,int,,,,,,,,,,,
 2.7,valueDef,默认值,string,,,,,,,,,,,
 3,datas,数据,list,,,,0,,,,,,,
-3.1,pcadgId,项目组件属性数据分组ID,string,,,,,,,,,,,
+3.1,pcadgId,行号,int,,,,,,,,,,,
 3.2,pcadId,项目组件属性数据ID,string,,,,,,,,,,,
 3.3,value,数值,string,,,,,,,,,,,
 3.4,unit,单位,string,,,,,,,,,,,

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

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

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

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