huangxingxing 2 éve
szülő
commit
854f13f655

+ 10 - 0
src/main/java/com/miniframe/aftercure/ActionMsg.java

@@ -62,6 +62,16 @@ public class ActionMsg {
     private String b;
     private String g;
 
+    private  String fileNames;
+
+    public String getFileNames() {
+        return fileNames;
+    }
+
+    public void setFileNames(String fileNames) {
+        this.fileNames = fileNames;
+    }
+
     public String getR() {
         return r;
     }

+ 8 - 6
src/main/java/com/miniframe/bisiness/system/AFT001Service.java

@@ -313,9 +313,9 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 			obj.put("hideZones",hideZones);
 			animationTypePara(scalarName, level, range0, range1, obj);
 			if(solver.getSolverModel().equals("HCFDLab")) {
-				animationHcfdFile(proId, obj);
+				animationHcfdFile(proId, obj,msg);
 			}else if(solver.getSolverModel().equals("FEMLab(结构力学)")){
-				animationFemFile(proId, obj);
+				animationFemFile(proId, obj,msg);
 			}
 			msg.setParamJson(obj.toString());
 		}
@@ -328,7 +328,7 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 	 * @param obj
 	 * @throws BusinessException
 	 */
-	private void animationFemFile(String proId, JSONObject obj) throws BusinessException, JsonProcessingException {
+	private void animationFemFile(String proId, JSONObject obj,ActionMsg msg ) throws BusinessException, JsonProcessingException {
 		String jobPath = XIFileUtils.getRootPathStr()+ MFConstant.separator+ proId;
 		String exePath = jobPath+ MFConstant.separator+"fem";
 		String exeOutPath = exePath+ MFConstant.separator+"data_out";
@@ -354,7 +354,8 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 		}
 		obj.put("filePath", exeOutPath);
 		obj.put("fileType", "ascii");
-		obj.put("fileNames", XiJsonUtil.objectToJson(animationFiles));
+//		obj.put("fileNames", XiJsonUtil.objectToJson(animationFiles));
+		msg.setFileNames(XiJsonUtil.objectToJson(animationFiles));
 	}
 
 	/**
@@ -428,7 +429,7 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 	 * @param obj
 	 * @throws BusinessException
 	 */
-	private void animationHcfdFile(String proId, JSONObject obj) throws BusinessException, JsonProcessingException {
+	private void animationHcfdFile(String proId, JSONObject obj,ActionMsg msg ) throws BusinessException, JsonProcessingException {
 		String jobPath = XIFileUtils.getRootPathStr()+ MFConstant.separator+ proId;
 		String exePath = jobPath+ MFConstant.separator+"hcfd";
 		String testPath = exePath+ MFConstant.separator+"test";
@@ -453,7 +454,8 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 		}
 		obj.put("filePath", exeOutPath);
 		obj.put("fileType", "ascii");
-		obj.put("fileNames", XiJsonUtil.objectToJson(animationFiles));
+//		obj.put("fileNames", XiJsonUtil.objectToJson(animationFiles));
+		msg.setFileNames(XiJsonUtil.objectToJson(animationFiles));
 	}
 
 	/**