commit

DataFusion/src/com/zskk/control/ViewController.java

@@ -71,7 +71,7 @@ public class ViewController extends Controller {
 	public void saveReport() {
 		try {
 			DataService dService = ServiceFactory.getService(DataService.class);
-	        String aesEncryptStr = dService.getExamList(this.getPara("data"));
+	        String aesEncryptStr = dService.saveReport(this.getPara("data"));
 			this.renderText(aesEncryptStr);
 		} catch (Exception e) {
 			// TODO: handle exception
@@ -86,7 +86,7 @@ public class ViewController extends Controller {
 	public void updateExam() {
 		try {
 			DataService dService = ServiceFactory.getService(DataService.class);
-	        String aesEncryptStr = dService.getExamList(this.getPara("data"));
+	        String aesEncryptStr = dService.updateExam(this.getPara("data"));
 			this.renderText(aesEncryptStr);
 		} catch (Exception e) {
 			// TODO: handle exception

DataFusion/src/com/zskk/service/DataService.java

@@ -102,9 +102,9 @@ public class DataService {
     	map.put("institution_id", "06300009");
     	map.put("params", cloudjmStr);
 		String content = postWithParameters(SAVE_REPORT_URL, map);
-		String examlistStr = cloudjm2localjm(content);
-		return examlistStr;
-		
+        JSONObject jsonObject = JSON.parseObject(content);
+        String result = jsonObject.getString("msg");
+		return result;	
 	}
     
     /**
@@ -117,9 +117,9 @@ public class DataService {
     	map.put("institution_id", "06300009");
     	map.put("params", cloudjmStr);
 		String content = postWithParameters(UPDATE_PATIENT_URL, map);
-		String examlistStr = cloudjm2localjm(content);
-		return examlistStr;
-		
+		JSONObject jsonObject = JSON.parseObject(content);
+		String result = jsonObject.getString("msg");
+		return result;
 	}
     
     /**

DataFusion/src/com/zskk/tools/AESUtils.java

@@ -166,12 +166,12 @@ public class AESUtils {
         //默认向量常量
         String IV = "0000000000000000";
         //密匙
-        String pkey = "2c1db8e7eee65eeeebacb0afbec37096";
+        String pkey = "7d1fd5324d25b3bc83d64653b14df796";
         System.out.println("待加密报文:" + content);
         System.out.println("密匙:" + pkey);
         String aesEncryptStr = AESUtils.aesEncryptStr(content, pkey,IV);
         System.out.println("加密报文:" + aesEncryptStr);
-        String aesDecodeStr = AESUtils.aesDecodeStr("MEMyZ7e2Ik6s7Harg0Riiwzcmr2eprWIrLX9B75A9Znem3aeLsp0Q91m8/x0LjxTp2qdrVR5ka63rIH5qpdNQeTba1CABN4uzKVjZMNx0x6Xdw8+zTGsvIxTCjvawNnGNRO0Xtlhi+DOkSs4LZtgeiaR2XEX1a2qlwxjJZj9/368dS+C2EuaG8HxvYCqA+0yDE1eJeXbenUg7JRMUdA7LKFl1uFbhWalCV4zal4A6kefmGQKdpSdQDu5MDkjaWOto8jdo9cmEtnHN1s2KvFjk6hTkFnwnPs+BnHSCIyFZ4wmH8IU4pQPQvEx6iMNr+fBVP5rV+Wb82K2cnl2ofxMseuBcpgQ5wefiaJwiUEzuaSbg70/ZR9HHtx050n3eAYoU/DQzOZKt/b2YNV+Ya/r4zTq19V7CsSRRumjgSY4XWzEr+LoUTEIxCC243cEzdCSl1OW+Gz26QDVZmLM6TA8ecX0CHeq6uXk7xJOAmlsgnNqi3Rreec9XB4zfz0Gl4E0b0CyshduKxpAcPRHQmfUfb4IVXsDiJSLIWTwN/dF/h5Ys8BRJeiV5+54Fa5Il1G1pEkiFIcEuRjfoEDhTaiQVis1VrePrZIB7eibv2zB/Z26Q+EoEP++l1dItqV5Oq79sCDhP8bNu0c9eo7aguVs/RDThYqerQfZ6h3UZV93Zv4=", pkey,IV);
+        String aesDecodeStr = AESUtils.aesDecodeStr("xBSFty7xhXHecMEBAn\\/wm5lYRPJg\\/J8bEO6pOndzYto=", pkey,IV);
         System.out.println("解密报文:" + aesDecodeStr);
         System.out.println("加解密前后内容是否相等:" + aesDecodeStr.equals(content));
     }