Bladeren bron

工程项目保存返回PID

huangxingxing 11 maanden geleden
bovenliggende
commit
9f55ebb2d0

+ 13 - 0
generated/com/miniframe/generate/comm/mdo/D_MDO0002.java

@@ -9,4 +9,17 @@ import java.io.Serializable;
  */
 public class D_MDO0002 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
+	String pid;//UUID
+	/**
+	 *UUID
+	 */
+	public void setPid(String pid) {
+		this.pid=pid;
+	}
+	/**
+	 *UUID
+	 */
+	public String getPid() {
+		return this.pid;
+	}
 }

+ 2 - 1
generated/validator/resources_d_mdo0002Form_validator.properties

@@ -1 +1,2 @@
-d_mdo0002Form = false
+d_mdo0002.pid = UUID
+d_mdo0002Form = true

+ 2 - 1
generated/validator/resources_d_mdo0002Form_validator_zh_CN.properties

@@ -1 +1,2 @@
-d_mdo0002Form = false
+d_mdo0002.pid = UUID
+d_mdo0002Form = true

+ 2 - 0
src/main/java/com/miniframe/bisiness/mdo/MDO0002Service.java

@@ -61,6 +61,8 @@ public class MDO0002Service extends MDO0002BaseModel implements ExecProcessFlow
 			proDao.updateByPrimaryKey(pro);
 		}
 
+		this.getD_mdo0002().setPid(pid);
+
 
 	}
 	

+ 47 - 0
src/main/java/com/miniframe/bisiness/mdo/MDO0020Service.java

@@ -8,6 +8,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.exception.BusinessException;
@@ -91,6 +93,7 @@ public class MDO0020Service extends MDO0020BaseModel implements ExecProcessFlow
 				//获取变量信息
 				Optimizer_GA_Input ga_input = readInputXml(pid);
 				String x_name = ga_input.getOptimodel_data().getX_name();
+				x_name=x_name+","+ga_input.getOptimodel_data().getF_name();
 				MdoProComvalMapper comvalDao =UtilTools.getBean(MdoProComvalMapper.class);
 				MdoProComvalSQLBuilder sb =new MdoProComvalSQLBuilder();
 				MdoProComvalSQLBuilder.Criteria sc = sb.createCriteria();
@@ -116,6 +119,12 @@ public class MDO0020Service extends MDO0020BaseModel implements ExecProcessFlow
 						String step =line.substring(0,line.indexOf(":"));
 						line =line.substring(line.indexOf(":")+1).trim();
 						String vals =line.substring(line.indexOf("[")+1,line.indexOf("]"));
+						String[] fits =line.split("Fitness-");
+						String fitness=fits[1].substring(1,fits[1].indexOf("]")).trim();
+						vals =vals+" "+fitness;
+//						System.out.println(vals);
+						vals =extractDoubles(vals);
+
 						MdoProComval comval =new MdoProComval();
 						comval.setId(UtilTools.getUUid());
 						comval.setPid(pid);
@@ -137,6 +146,44 @@ public class MDO0020Service extends MDO0020BaseModel implements ExecProcessFlow
 		});
 	}
 
+	public static void main(String[] args) {
+		//Gen20: BestX-[0.60371031 0.38946135 0.26024623 0.02400547 0.10866815], Fitness-[4.63029182], Index-[27]
+		String line ="Gen1: BestX-[0.92628971 0.66077288 1.1946117  1.38324986 1.74320906], Fitness-[64.73871441], Index-[0]\n";
+		if(line.startsWith("Gen")) {
+			line = line.replace("Gen", "");
+			String step = line.substring(0, line.indexOf(":"));
+			line = line.substring(line.indexOf(":") + 1).trim();
+			String vals = line.substring(line.indexOf("[") + 1, line.indexOf("]"));
+			String[] fits =line.split("Fitness-");
+			String fitness=fits[1].substring(1,fits[1].indexOf("]")).trim();
+			vals =vals+" "+fitness;
+
+			String ds =extractDoubles(vals);
+			System.out.println(ds);
+		}
+	}
+
+	public static String extractDoubles(String input) {
+		List<Double> doubles = new ArrayList<>();
+		Pattern pattern = Pattern.compile("-?\\d+(\\.\\d+)?");
+		Matcher matcher = pattern.matcher(input);
+
+		while (matcher.find()) {
+			String matchedString = matcher.group();
+			try {
+				doubles.add(Double.parseDouble(matchedString));
+			} catch (NumberFormatException e) {
+				// Skip the string if it's not a valid double
+			}
+		}
+		String ds ="";
+		for (Double d:doubles) {
+			ds+=d.toString()+" ";
+		}
+
+		return ds.trim();
+	}
+
 	private Optimizer_GA_Input readInputXml(String pid) throws JAXBException {
 		String inputxml =LogService.BPATH+"/"+ pid +"/in/Optimizer_GA_Input.xml";
 		JAXBContext jaxbContext = JAXBContext.newInstance(Optimizer_GA_Input.class);

+ 1 - 1
系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0002_D(工程添加修改).csv

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