commit

DataFusion/res/config.properties

@@ -4,4 +4,5 @@ jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
 user_connected 	   = jk
 password_connected = jk
 #DATA-Parms
-institution_id     = 47600001
+institution_id     = 06300009
+nw_key             = 2c1db8e7eee65eeeebacb0afbec37096

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -68,9 +68,9 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(druidPluginConnected);
 
 		// 配置ActiveRecord插件
-		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-		arpConnected.setDialect(new OracleDialect());
-		me.add(arpConnected);
+//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+//		arpConnected.setDialect(new OracleDialect());
+//		me.add(arpConnected);
 
 //		Cron4jPlugin cpData = new Cron4jPlugin();
 //		cpData.addTask("*/5 * * * *", new DataTask());

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

@@ -14,6 +14,10 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
+import com.zskk.service.DataService;
+import com.zskk.service.ServiceFactory;
+import com.zskk.tools.AESUtils;
+
 import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -40,6 +44,29 @@ public class ViewController extends Controller {
 		}
 		
 	}
+	
+	/**
+	 * 在被连接数据库执行sql语句
+	 */
+	public void getExam() {
+		try {
+	        String IV = "0000000000000000";
+			DataService dService = ServiceFactory.getService(DataService.class);
+			String aesEncryptStr = this.getPara("data");
+	        String aesDecodeStr = AESUtils.aesDecodeStr(aesEncryptStr, PropKit.get("nw_key") ,IV);
+	        String aesEncryptStr2 = AESUtils.aesEncryptStr(aesDecodeStr, "1735b0f1799eb3d40ad6fda6692e23e1",IV);
+	        String aesEncryptStr3 = dService.getExamList(aesEncryptStr2);
+	        String aesDecodeSt4 = AESUtils.aesDecodeStr(aesEncryptStr3, "1735b0f1799eb3d40ad6fda6692e23e1" ,IV);
+	        String aesDecodeSt5 = AESUtils.aesEncryptStr(aesDecodeSt4, PropKit.get("nw_key"),IV);
+
+			this.renderText(aesDecodeSt5);
+
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+		}
+		
+	}
 
 	public void testConn() {
 		try {

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

@@ -39,17 +39,13 @@ public class DataService {
      * @param instutionId
      * @param number
      */
-    public JSONArray getExamList(Integer number) {
+    public String getExamList(String str) {
     	Map <String,String> map = new HashMap<String,String>();
     	map.put("institution_id", PropKit.get("institution_id"));
-    	map.put("num", number.toString());
+    	map.put("params", str);
 		String content = postWithParameters(GET_EXAM_URL, map);
-	    JSONObject jsonObject = JSON.parseObject(content);
-	    if (!jsonObject.getString("msg").equals("success")) {
-			return null;
-		}
-		JSONArray jsonArray = JSON.parseArray(jsonObject.getString("data"));		
-		return jsonArray;
+	    	
+		return content;
 		
 	}
     
@@ -129,12 +125,13 @@ public class DataService {
     public static void main(String[] args) {
     	Map <String,String> map = new HashMap<String,String>();
     	map.put("institution_id", "06300009");
-    	map.put("params", "JEFH7RsOVjqjyMH33cWxuBRUYqLnupUcn/As3sMG46IZSSOnGs1mhpJepTnOz3f/D9KdR3PI5ikvVQpqCkQa5KQbfqNKGvgmMAt5OxCQGMND0wICypOLM3xs9h4gUxgo9NqzeTYcD6SSaUDe+3BKKQvXPhiSm/BxByTZNPkTYK91EXF86zQvCFY1IVg0wQjiqqIxheF/tUUKI3nPb5hUCNNo3WpVGNvYCvaTCng+KIu3MZu9Pv7KE/mQ7DFf+i/SgSlJT1ONDxv+Ni+AqaJfS9HD7y5fy5Us60xHPrqXNcjSAyRIazQNV6KQE+1zbaM4y1sr3vVs3hACxJVKApK4yMQeS3VLDvOyuvqEszWudV//nToH/lzmV0vtgOs4UEYxTBI+OfL1PXq+U4eNL8sTH6MY/NiCkN6OpjuYKQlP3wzqHHdJzuTAEFe1Vw1eFerpatfUTLIMj3T51+9L7NMsgW4CE6aJpvH4l88gUi9adCSrkoHkcKBgNkmx9X6XCvfzQvdung/+YZOKlQ+kqktpeA4tyjT724VyDaMhgdodsm6q5yIXgk7mw+x8Gq/WDzg/Q8+JiHE4zbKBg1pKyEazS8lXCU1TJzPd85ythBal46VCwcTEB2+g9SM5p4yqOk0c6ZK2VLay+bgPDpBak9IZJaV5ZVbSr0XdhGZzo+jDckaMhLSrDFe/5+8wXGJZ7U80Lw0tYlc4ydeVCcAA1GSzRc1YeqvkXsDG+JNXOPltQkfHdsX8YF5TgITlyJEvaoxjkvQsrQG+ruJ3mFoFV+ijSj/F3P1Z5wNyp6H9xMvchEr3VMIJv4Z7ieLDkRafDBkfs8oNGDUZyI/jQ+XA2g8+ErE7LbbxE/ZTCA6J4UUXkpF+f8yuMd8s6DXWJgogCGrSnt+FBcQevrU+utT+/YlngmM9vIQZOrO1seCZKhJ1tvu/0jhUBepmkIlSryGy6zT7KV1JbdCdHBNJ/JyhVb3KCZE6sFo2OSoa6aojRdpKF893zVGZJdVNBYvbLse4sskX6dvMs0mNzAn44xo3IVSXFvgEtxshoJJmSaAYA2vgsYJyOPKW/U8/uRLPrSdyxxmpa1IK/W4j9JnieDzoTfoa8rIAz3a6bPOjEnzgfyHtcSg3tZc+5pCixbui3Yol0zvNaey324+inHY9GnUAgSFR6ACmzjaWAoEKW5h/6qUKgfMBIk+AkI0BSz04RynPxDg5he/BM5GMsjFDmmurRl026Iaqnw3gaNCoV0KM9NSAVaodOVT3A8O8uj0S414JHvqS44MUrRqwNxgEa28Jsg9yRT1mTY/BydkMYQinsTG8+ff2gwMFqDK97XyLlaEDzw0415+HCjjWcGBGO1bQHixjSESGGDRH8GHqTe0Ygbzc7zejABGDPk2gcW+2y0jp316uwTC7Ib82SnFA8grr9gtLsiggIwkh0+0npQapNcDwHF+lchGHfMmU584fz7Okybm0yG545mfcYyHyeD/nUjrOSTrUolNGeETj7QFfM1+CJ8qt4UNTH4kfZbfrspsNcRrmdqsYtI8PWDbmi1XBNuIQf976qKV4sYzXrgiGQTv2VSOWAigmw7QEzP6IEAPNGG4kKv/uUxXpHmdrUBbssyxmazXhHWEiVAK0+CdZJIC9h4donpG7aab9xoUZEQTPW9TCblHssgJtqLUSwM1gzrCwU0hu1uDD2r+jrwDb0wCGXNajDPKyy1W45Jbw7G9UtQ1xkBNDBWgy+SCRtgk+PLf9V8pcncF7YmV3AVzIaz4QBtB8SKxTb3adRIQD+XhjVW/qAFTTclSrMqym8xTaLuJRnwMS0oqUQfHF9mjiyPrU6higOfSzNjHuwTqAA0qr23upeqQTGXgDV5FwG7WRGM+MTNQuUKe6A+pizdA13VzJzy7E23ZgEDJbl1T02vax9Q54DwMA1v+JqjAlJ8TxekSLExxUD0SfutGi01gw8nc2DWQ=");
+//    	map.put("params", "JEFH7RsOVjqjyMH33cWxuBRUYqLnupUcn/As3sMG46IZSSOnGs1mhpJepTnOz3f/D9KdR3PI5ikvVQpqCkQa5KQbfqNKGvgmMAt5OxCQGMND0wICypOLM3xs9h4gUxgo9NqzeTYcD6SSaUDe+3BKKQvXPhiSm/BxByTZNPkTYK91EXF86zQvCFY1IVg0wQjiqqIxheF/tUUKI3nPb5hUCNNo3WpVGNvYCvaTCng+KIu3MZu9Pv7KE/mQ7DFf+i/SgSlJT1ONDxv+Ni+AqaJfS9HD7y5fy5Us60xHPrqXNcjSAyRIazQNV6KQE+1zbaM4y1sr3vVs3hACxJVKApK4yMQeS3VLDvOyuvqEszWudV//nToH/lzmV0vtgOs4UEYxTBI+OfL1PXq+U4eNL8sTH6MY/NiCkN6OpjuYKQlP3wzqHHdJzuTAEFe1Vw1eFerpatfUTLIMj3T51+9L7NMsgW4CE6aJpvH4l88gUi9adCSrkoHkcKBgNkmx9X6XCvfzQvdung/+YZOKlQ+kqktpeA4tyjT724VyDaMhgdodsm6q5yIXgk7mw+x8Gq/WDzg/Q8+JiHE4zbKBg1pKyEazS8lXCU1TJzPd85ythBal46VCwcTEB2+g9SM5p4yqOk0c6ZK2VLay+bgPDpBak9IZJaV5ZVbSr0XdhGZzo+jDckaMhLSrDFe/5+8wXGJZ7U80Lw0tYlc4ydeVCcAA1GSzRc1YeqvkXsDG+JNXOPltQkfHdsX8YF5TgITlyJEvaoxjkvQsrQG+ruJ3mFoFV+ijSj/F3P1Z5wNyp6H9xMvchEr3VMIJv4Z7ieLDkRafDBkfs8oNGDUZyI/jQ+XA2g8+ErE7LbbxE/ZTCA6J4UUXkpF+f8yuMd8s6DXWJgogCGrSnt+FBcQevrU+utT+/YlngmM9vIQZOrO1seCZKhJ1tvu/0jhUBepmkIlSryGy6zT7KV1JbdCdHBNJ/JyhVb3KCZE6sFo2OSoa6aojRdpKF893zVGZJdVNBYvbLse4sskX6dvMs0mNzAn44xo3IVSXFvgEtxshoJJmSaAYA2vgsYJyOPKW/U8/uRLPrSdyxxmpa1IK/W4j9JnieDzoTfoa8rIAz3a6bPOjEnzgfyHtcSg3tZc+5pCixbui3Yol0zvNaey324+inHY9GnUAgSFR6ACmzjaWAoEKW5h/6qUKgfMBIk+AkI0BSz04RynPxDg5he/BM5GMsjFDmmurRl026Iaqnw3gaNCoV0KM9NSAVaodOVT3A8O8uj0S414JHvqS44MUrRqwNxgEa28Jsg9yRT1mTY/BydkMYQinsTG8+ff2gwMFqDK97XyLlaEDzw0415+HCjjWcGBGO1bQHixjSESGGDRH8GHqTe0Ygbzc7zejABGDPk2gcW+2y0jp316uwTC7Ib82SnFA8grr9gtLsiggIwkh0+0npQapNcDwHF+lchGHfMmU584fz7Okybm0yG545mfcYyHyeD/nUjrOSTrUolNGeETj7QFfM1+CJ8qt4UNTH4kfZbfrspsNcRrmdqsYtI8PWDbmi1XBNuIQf976qKV4sYzXrgiGQTv2VSOWAigmw7QEzP6IEAPNGG4kKv/uUxXpHmdrUBbssyxmazXhHWEiVAK0+CdZJIC9h4donpG7aab9xoUZEQTPW9TCblHssgJtqLUSwM1gzrCwU0hu1uDD2r+jrwDb0wCGXNajDPKyy1W45Jbw7G9UtQ1xkBNDBWgy+SCRtgk+PLf9V8pcncF7YmV3AVzIaz4QBtB8SKxTb3adRIQD+XhjVW/qAFTTclSrMqym8xTaLuJRnwMS0oqUQfHF9mjiyPrU6higOfSzNjHuwTqAA0qr23upeqQTGXgDV5FwG7WRGM+MTNQuUKe6A+pizdA13VzJzy7E23ZgEDJbl1T02vax9Q54DwMA1v+JqjAlJ8TxekSLExxUD0SfutGi01gw8nc2DWQ=");
 //    	map.put("createdAt", "2023-03-14 17:22:06,2023-03-14 17:22:06");
 //    	map.put("exam_status", "3,7,8,9");
 		System.out.println(JSON.toJSONString(map));
 //    	map.put("num", "10");
-		postWithParameters(SAVE_REPORT_URL, map);
+//		postWithParameters(SAVE_REPORT_URL, map);
+		postWithParameters(GET_KEY_URL, map);
 	}
 
 }

DataFusion/src/com/zskk/task/DataTask.java

@@ -21,77 +21,77 @@ public class DataTask implements ITask {
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
-		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(50);	
-        for (Object object : jsonArray) {
-        	try {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where STUDYUID=?", jsonObject.getString("studyuid"));
-			if (record == null) {
-				continue;
-			}
-			if (record.getStr("IMPRESSION").isBlank() && record.getStr("DESCRIPTION").isBlank()) {
-				continue;
-			}
-			Map<String, String> params = new HashMap<>();
-			//1:exam_id 2:patient_num 3:accession_num 4:study_uid
-			params.put("type", "1");
-			
-			params.put("institution_id", PropKit.get("institution_id"));
-
-			params.put("code", jsonObject.getString("id"));
-			//报告医生姓名
-			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
-			//报告时间
-			params.put("report_datetime", record.getStr("REPORTDATE"));
-			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
-			//审核时间
-			params.put("review_datetime", record.getStr("REPORTDATE"));
-			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
-			//确认时间
-			params.put("confirm_datetime", record.getStr("REPORTDATE"));
-			//意见建议
-			params.put("impression", record.getStr("IMPRESSION"));
-			//影像所见
-			params.put("description", record.getStr("DESCRIPTION"));
-			//exams表
-			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
-			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
-			//临床诊断
-			params.put("clin_diag", record.getStr("clin_diag")==null?"":record.getStr("clin_diag"));
-			//症状
-			params.put("clin_symp", record.getStr("clin_symp")==null?"":record.getStr("clin_symp"));
-			//patient_infos表
-			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
-			//患者手机号
-			params.put("phone", record.getStr("phone")==null?"":record.getStr("phone"));
-			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD"));
-			//检查结果1阴2阳
-			params.put("report_result", record.getStr("result").contains("阳")?"2":"1");
-			//住院号
-//			params.put("hopitalized_no", record.getStr("patientNumber"));
-			//门诊号
-//			params.put("out_patient", record.getStr("patientNumber"));
-			//病人ID
-//			params.put("his_patient_id", record.getStr("patientNumber"));
-			//检查方法
-			params.put("exam_project", record.getStr("patientNumber"));
-
-			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-			tService.execute(() -> {
-				dService.saveReport(params);
-			});	
-        	} catch (Exception e) {
-				// TODO: handle exception
-        		continue;
-			}
-        }
+//		DataService dService = ServiceFactory.getService(DataService.class);
+//        JSONArray jsonArray = dService.getExamList(50);	
+//        for (Object object : jsonArray) {
+//        	try {
+//			JSONObject jsonObject = JSON.parseObject(object.toString());
+//			Record record = Db.use("connected").findFirst("select * from reportinfo where STUDYUID=?", jsonObject.getString("studyuid"));
+//			if (record == null) {
+//				continue;
+//			}
+//			if (record.getStr("IMPRESSION").isBlank() && record.getStr("DESCRIPTION").isBlank()) {
+//				continue;
+//			}
+//			Map<String, String> params = new HashMap<>();
+//			//1:exam_id 2:patient_num 3:accession_num 4:study_uid
+//			params.put("type", "1");
+//			
+//			params.put("institution_id", PropKit.get("institution_id"));
+//
+//			params.put("code", jsonObject.getString("id"));
+//			//报告医生姓名
+//			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+//			//报告时间
+//			params.put("report_datetime", record.getStr("REPORTDATE"));
+//			//审核医生姓名
+//			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+//			//审核时间
+//			params.put("review_datetime", record.getStr("REPORTDATE"));
+//			//确认医生姓名
+//			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+//			//确认时间
+//			params.put("confirm_datetime", record.getStr("REPORTDATE"));
+//			//意见建议
+//			params.put("impression", record.getStr("IMPRESSION"));
+//			//影像所见
+//			params.put("description", record.getStr("DESCRIPTION"));
+//			//exams表
+//			//申请科室
+//			params.put("application_department", record.getStr("DEPARTMENT"));
+//			//申请医生
+//			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+//			//临床诊断
+//			params.put("clin_diag", record.getStr("clin_diag")==null?"":record.getStr("clin_diag"));
+//			//症状
+//			params.put("clin_symp", record.getStr("clin_symp")==null?"":record.getStr("clin_symp"));
+//			//patient_infos表
+//			//患者姓名
+//			params.put("name", record.getStr("PATIENTNAME"));
+//			//患者手机号
+//			params.put("phone", record.getStr("phone")==null?"":record.getStr("phone"));
+//			//患者身份证号
+//			params.put("card_num", record.getStr("IDCARD"));
+//			//检查结果1阴2阳
+//			params.put("report_result", record.getStr("result").contains("阳")?"2":"1");
+//			//住院号
+////			params.put("hopitalized_no", record.getStr("patientNumber"));
+//			//门诊号
+////			params.put("out_patient", record.getStr("patientNumber"));
+//			//病人ID
+////			params.put("his_patient_id", record.getStr("patientNumber"));
+//			//检查方法
+//			params.put("exam_project", record.getStr("patientNumber"));
+//
+//			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+//			tService.execute(() -> {
+//				dService.saveReport(params);
+//			});	
+//        	} catch (Exception e) {
+//				// TODO: handle exception
+//        		continue;
+//			}
+//        }
 	}
 
 	@Override

DataFusion/src/com/zskk/task/UpdateTask.java

@@ -19,44 +19,44 @@ public class UpdateTask implements ITask {
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
-		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(30);
-        for (Object object : jsonArray) {
-        	try {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from examinfo where studyuid=?", jsonObject.getString("studyuid"));
-			if (record == null) {
-				continue;
-			}
-			Map<String, String> params = new HashMap<>();
-			params.put("exam_id", jsonObject.getString("id"));
-			//exams表
-			//申请科室
-			params.put("application_department", record.getStr("department") == null ? "" : record.getStr("department"));
-			//申请医生
-			params.put("application_doctor", record.getStr("clinicaldoctor") == null ? "" : record.getStr("clinicaldoctor"));
-			//临床诊断
-			params.put("clin_diag", record.getStr("diagnosis") == null ? "" : record.getStr("diagnosis"));
-			//症状
-			params.put("clin_symp", record.getStr("symptom") == null ? "" : record.getStr("symptom"));
-			//patient_infos表
-			//患者姓名
-			params.put("name", record.getStr("patientname"));
-			//患者手机号
-			params.put("phone", record.getStr("phone") == null ? "" : record.getStr("phone"));
-			//患者身份证号
-			params.put("card_num", record.getStr("idcard") == null ? "" : record.getStr("idcard"));
-			//门诊号住院号
-			params.put("hopitalized_no", "");
-			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-			tService.execute(() -> {
-				dService.updatePatientInfo(params);
-			});	
-        	} catch (Exception e) {
-				// TODO: handle exception
-        		continue;
-			}
-        }
+//		DataService dService = ServiceFactory.getService(DataService.class);
+//        JSONArray jsonArray = dService.getExamList(30);
+//        for (Object object : jsonArray) {
+//        	try {
+//			JSONObject jsonObject = JSON.parseObject(object.toString());
+//			Record record = Db.use("connected").findFirst("select * from examinfo where studyuid=?", jsonObject.getString("studyuid"));
+//			if (record == null) {
+//				continue;
+//			}
+//			Map<String, String> params = new HashMap<>();
+//			params.put("exam_id", jsonObject.getString("id"));
+//			//exams表
+//			//申请科室
+//			params.put("application_department", record.getStr("department") == null ? "" : record.getStr("department"));
+//			//申请医生
+//			params.put("application_doctor", record.getStr("clinicaldoctor") == null ? "" : record.getStr("clinicaldoctor"));
+//			//临床诊断
+//			params.put("clin_diag", record.getStr("diagnosis") == null ? "" : record.getStr("diagnosis"));
+//			//症状
+//			params.put("clin_symp", record.getStr("symptom") == null ? "" : record.getStr("symptom"));
+//			//patient_infos表
+//			//患者姓名
+//			params.put("name", record.getStr("patientname"));
+//			//患者手机号
+//			params.put("phone", record.getStr("phone") == null ? "" : record.getStr("phone"));
+//			//患者身份证号
+//			params.put("card_num", record.getStr("idcard") == null ? "" : record.getStr("idcard"));
+//			//门诊号住院号
+//			params.put("hopitalized_no", "");
+//			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+//			tService.execute(() -> {
+//				dService.updatePatientInfo(params);
+//			});	
+//        	} catch (Exception e) {
+//				// TODO: handle exception
+//        		continue;
+//			}
+//        }
 	}
 
 	@Override