Merge branch 'master' of http://192.168.0.130:13000/huangxingxing/es-server

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

@@ -13,9 +13,18 @@ public class EsProResultKey extends MiniserviceBaseModel implements Serializable
 
     private String pid;
 
+    /**
+     * 组件ID
+     */
     @Column(name = "com_id")
     private String comId;
 
+    /**
+     * 项目组件ID
+     */
+    @Column(name = "pc_id")
+    private String pcId;
+
     @Column(name = "job_id")
     private String jobId;
 
@@ -78,19 +87,41 @@ public class EsProResultKey extends MiniserviceBaseModel implements Serializable
     }
 
     /**
-     * @return com_id
+     * 获取组件ID
+     *
+     * @return com_id - 组件ID
      */
     public String getComId() {
         return comId;
     }
 
     /**
-     * @param comId
+     * 设置组件ID
+     *
+     * @param comId 组件ID
      */
     public void setComId(String comId) {
         this.comId = comId == null ? null : comId.trim();
     }
 
+    /**
+     * 获取项目组件ID
+     *
+     * @return pc_id - 项目组件ID
+     */
+    public String getPcId() {
+        return pcId;
+    }
+
+    /**
+     * 设置项目组件ID
+     *
+     * @param pcId 项目组件ID
+     */
+    public void setPcId(String pcId) {
+        this.pcId = pcId == null ? null : pcId.trim();
+    }
+
     /**
      * @return job_id
      */

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

@@ -315,6 +315,76 @@ public class EsProResultKeySQLBuilder {
             return (Criteria) this;
         }
 
+        public Criteria andPcIdIsNull() {
+            addCriterion("pc_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdIsNotNull() {
+            addCriterion("pc_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdEqualTo(String value) {
+            addCriterion("pc_id =", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotEqualTo(String value) {
+            addCriterion("pc_id <>", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdGreaterThan(String value) {
+            addCriterion("pc_id >", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdGreaterThanOrEqualTo(String value) {
+            addCriterion("pc_id >=", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdLessThan(String value) {
+            addCriterion("pc_id <", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdLessThanOrEqualTo(String value) {
+            addCriterion("pc_id <=", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdLike(String value) {
+            addCriterion("pc_id like", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotLike(String value) {
+            addCriterion("pc_id not like", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdIn(List<String> values) {
+            addCriterion("pc_id in", values, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotIn(List<String> values) {
+            addCriterion("pc_id not in", values, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdBetween(String value1, String value2) {
+            addCriterion("pc_id between", value1, value2, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotBetween(String value1, String value2) {
+            addCriterion("pc_id not between", value1, value2, "pcId");
+            return (Criteria) this;
+        }
+
         public Criteria andJobIdIsNull() {
             addCriterion("job_id is null");
             return (Criteria) this;

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

@@ -20,6 +20,12 @@ public class EsProResultValue extends MiniserviceBaseModel implements Serializab
     @Column(name = "com_id")
     private String comId;
 
+    /**
+     * 项目组件ID
+     */
+    @Column(name = "pc_id")
+    private String pcId;
+
     @Column(name = "job_id")
     private String jobId;
 
@@ -110,6 +116,24 @@ public class EsProResultValue extends MiniserviceBaseModel implements Serializab
         this.comId = comId == null ? null : comId.trim();
     }
 
+    /**
+     * 获取项目组件ID
+     *
+     * @return pc_id - 项目组件ID
+     */
+    public String getPcId() {
+        return pcId;
+    }
+
+    /**
+     * 设置项目组件ID
+     *
+     * @param pcId 项目组件ID
+     */
+    public void setPcId(String pcId) {
+        this.pcId = pcId == null ? null : pcId.trim();
+    }
+
     /**
      * @return job_id
      */

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

@@ -386,6 +386,76 @@ public class EsProResultValueSQLBuilder {
             return (Criteria) this;
         }
 
+        public Criteria andPcIdIsNull() {
+            addCriterion("pc_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdIsNotNull() {
+            addCriterion("pc_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdEqualTo(String value) {
+            addCriterion("pc_id =", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotEqualTo(String value) {
+            addCriterion("pc_id <>", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdGreaterThan(String value) {
+            addCriterion("pc_id >", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdGreaterThanOrEqualTo(String value) {
+            addCriterion("pc_id >=", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdLessThan(String value) {
+            addCriterion("pc_id <", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdLessThanOrEqualTo(String value) {
+            addCriterion("pc_id <=", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdLike(String value) {
+            addCriterion("pc_id like", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotLike(String value) {
+            addCriterion("pc_id not like", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdIn(List<String> values) {
+            addCriterion("pc_id in", values, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotIn(List<String> values) {
+            addCriterion("pc_id not in", values, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdBetween(String value1, String value2) {
+            addCriterion("pc_id between", value1, value2, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotBetween(String value1, String value2) {
+            addCriterion("pc_id not between", value1, value2, "pcId");
+            return (Criteria) this;
+        }
+
         public Criteria andJobIdIsNull() {
             addCriterion("job_id is null");
             return (Criteria) this;

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 Thu Jun 12 11:44:20 CST 2025.
+    This file was generated on Fri Jun 13 15:15:48 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 Thu Jun 12 11:44:22 CST 2025.
+    This file was generated on Fri Jun 13 15:15:48 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -122,6 +122,7 @@ public class ES0013Service extends ES0013BaseModel implements ExecProcessFlow {
 			if(fileName.isEmpty()) continue;
 			fileName = fileName + epcList.get(i).getSer().toString();
 			String comId = epcList.get(i).getComId();
+			String pcId = epcList.get(i).getPcId();
 			List<String> lines = Files.readAllLines(Paths.get(XIFileUtils.getRootPathStr()+"/es/"+pid+"/Calculate/"+fileName));
 			List<List<String>> data = lines.stream()
 					.filter(line -> !line.trim().isEmpty()) // 跳过空行
@@ -135,10 +136,10 @@ public class ES0013Service extends ES0013BaseModel implements ExecProcessFlow {
 			for(int j=0;j<data.size();j++){
 				for(int k=0;k<data.get(j).size();k++){
 					if(j==1){
-						String pcrId = insertIntoTbKey(data.get(j-1).get(k),data.get(j).get(k),jobId,comId);
+						String pcrId = insertIntoTbKey(data.get(j-1).get(k),data.get(j).get(k),jobId,comId,pcId);
 						keyList.add(pcrId);
 					}else if(j>1){
-						insertIntoTbValue(new BigDecimal(data.get(j).get(k)),jobId,Integer.valueOf(step),comId,keyList.get(k));
+						insertIntoTbValue(new BigDecimal(data.get(j).get(k)),jobId,Integer.valueOf(step),comId,keyList.get(k),pcId);
 						++step;
 					}
 				}
@@ -147,13 +148,14 @@ public class ES0013Service extends ES0013BaseModel implements ExecProcessFlow {
 	}
 
 
-	private void insertIntoTbValue(BigDecimal value,String job_id,Integer step,String comId,String pcrId) throws Exception{
+	private void insertIntoTbValue(BigDecimal value,String job_id,Integer step,String comId,String pcrId,String pcId) throws Exception{
 		EsProResultValueMapper eprvMapper = UtilTools.getBean(EsProResultValueMapper.class);
 		EsProResultValue eprv = new EsProResultValue();
 		eprv.setPcrvId(UtilTools.getUUid());
 		eprv.setPcrId(pcrId);
 		eprv.setPid(this.getA_es0013().getPid());
 		eprv.setComId(comId);
+		eprv.setPcId(pcId);
 		eprv.setJobId(job_id);
 		eprv.setValue(value);
 		eprv.setUid(this.getA_eshead().getUserId());
@@ -164,13 +166,14 @@ public class ES0013Service extends ES0013BaseModel implements ExecProcessFlow {
 		eprvMapper.insert(eprv);
 	}
 
-	private String insertIntoTbKey(String key_en,String key_zh,String jobId,String comId) throws Exception{
+	private String insertIntoTbKey(String key_en,String key_zh,String jobId,String comId,String pcId) throws Exception{
 		EsProResultKeyMapper eprkMapper = UtilTools.getBean(EsProResultKeyMapper.class);
 		EsProResultKey eprk = new EsProResultKey();
 		String pcrId = UtilTools.getUUid();
 		eprk.setPcrId(pcrId);
 		eprk.setPid(this.getA_es0013().getPid());
 		eprk.setComId(comId);
+		eprk.setPcId(pcId);
 		eprk.setJobId(jobId);
 		eprk.setKeyEn(key_en);
 		eprk.setKeyZh(key_zh);