commit

DataFusion/res/config.properties

@@ -7,6 +7,7 @@ password_connected = yunyingxiang
 institution_id     = 06300009
 nw_key             = 2c1db8e7eee65eeeebacb0afbec37096
 #DB-local partners
-jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+#jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/lisdb?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
 user_local	   = root
-password_local = Gryy@1234
+password_local = lis2022@

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

@@ -70,8 +70,8 @@ public class ZskkConfig extends JFinalConfig {
 	@Override
 	public void configPlugin(Plugins me) {
 		// 配置数据库连接池插件
-		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
-		me.add(druidPluginConnected);
+//		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
+//		me.add(druidPluginConnected);
 		
 		DruidPlugin druidPluginLocal = createLocalDruidPlugin();
 		me.add(druidPluginLocal);
@@ -88,12 +88,12 @@ public class ZskkConfig extends JFinalConfig {
 
 		//获取待匹配列表
 		Cron4jPlugin upData = new Cron4jPlugin();
-		upData.addTask("*/2 * * * *", new UpdateTask());
+		upData.addTask("*/1 * * * *", new UpdateTask());
 		me.add(upData);
 		
 		//获取报告
 		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/5 * * * *", new DataTask());
+		cpData.addTask("*/1 * * * *", new DataTask());
 		me.add(cpData);
 		
 //		Cron4jPlugin cpData = new Cron4jPlugin();

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

@@ -19,11 +19,11 @@ import okhttp3.Response;
 
 public class DataService {
 	
-    private static String GET_EXAM_URL = "https://risserver3.pacsonline.cn/butt/getExam";
+    private static String GET_EXAM_URL = "http://127.0.0.1:8082/df/view/getExam";
     
-    private static String SAVE_REPORT_URL = "https://risserver3.pacsonline.cn/butt/saveReport";
+    private static String SAVE_REPORT_URL = "http://10.200.100.155:8080/df/view/saveReport";
     
-    private static String UPDATE_PATIENT_URL = "https://risserver3.pacsonline.cn/butt/saveExam";
+    private static String UPDATE_PATIENT_URL = "http://10.200.100.155:8080/df/view/saveExam";
     
     private static String FEE_URL = "https://risserver3.pacsonline.cn/film/callback";
 	
@@ -41,7 +41,7 @@ public class DataService {
         String IV = "0000000000000000";
     	Map <String,String> map = new HashMap<String,String>();
     	map.put("exam_status","3");
-    	map.put("createAt", "2023-06-01 00:00:00,2023-06-14 12:00:00");
+    	map.put("createAt", "2023-06-01 00:00:00,2023-06-15 12:00:00");
     	map.put("num", number.toString());
     	String aesEncryptStr = AESUtils.aesEncryptStr(JSON.toJSONString(map), PropKit.get("nw_key"),IV);
     	Map <String,String> mapaes = new HashMap<String,String>();
@@ -59,7 +59,6 @@ public class DataService {
 			e.printStackTrace();
 			return null;
 		}
-
 		JSONArray jsonArray = JSON.parseArray(aesDecodeStr);		
 		return jsonArray;