commit

DataFusion/.classpath

@@ -34,5 +34,10 @@
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jaxb-core-2.3.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jaxb-impl-2.3.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-codec-1.9.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/annotations-13.0.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/kotlin-stdlib-1.3.50.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/kotlin-stdlib-common-1.3.50.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/okhttp-4.2.2.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/okio-2.2.2.jar"/>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>

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

@@ -13,6 +13,13 @@ import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.plugin.redis.RedisPlugin;
 import com.zskk.model.*;
+
+import okhttp3.FormBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
 import org.apache.commons.codec.digest.DigestUtils;
 
 import java.io.BufferedReader;
@@ -26,6 +33,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 public class ViewController extends Controller {
+	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
 
 //	static{
 //		DruidPlugin druidPluginZskk = createZskkDruidPlugin();
@@ -182,8 +190,9 @@ public class ViewController extends Controller {
                 params.put("data", JSON.toJSONString(data));
                 //System.out.println(params);
                 //调用接口
-                String string2 = sendPost("http://39.106.136.96/pacs/zskk/writePatientReport", params);
-                string = string + string2 + "*******";
+               String s = post(null, data);
+               string = string+s;
+
 			}
             System.out.println(string);
 			this.renderText(string);
@@ -314,7 +323,26 @@ public class ViewController extends Controller {
         return result;
     }
 
+	private static String post(String url, Map<String, String> map) throws IOException {
+		RequestBody formBody = new FormBody.Builder()
+		        .add("timestamp", String.valueOf(getSecondTimestamp(new Date())))
+		        .add("signature", Ksort(map))
+		        .add("data", JSON.toJSONString(map))
+		        .build();
+
+		    Request request = new Request.Builder()
+		        .url("http://39.106.136.96/pacs/zskk/writePatientReport")
+		        .post(formBody)
+		        .build();
+
+		    try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
+		      if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+
+		      System.out.println(response.body().string());
+			  return response.body().string();
 
+		    }
+	  }  
 	public static String Ksort(Map<String, String> map){
 		String sb = "";
 		String[] key = new String[map.size()];
@@ -335,7 +363,6 @@ public class ViewController extends Controller {
 		}// 使用常见的UTF-8编码
 		sb = sb.replace("%3D", "=").replace("%26", "&");
 
-//		System.out.println(sb);
 		String resultString = HashKit.md5(sb+"YgpxjVeIx0yoK6Atz413IAj7hU9dygH4");
 		return resultString;
 	}

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

@@ -1,5 +1,7 @@
 package com.zskk.service;
 
+import java.util.List;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -7,17 +9,22 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 
+import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
+import com.jfinal.plugin.druid.DruidPlugin;
+import com.zskk.model.Doctors;
+import com.zskk.model.Report;
+import com.zskk.model._MappingKit;
+
 
 public class WeixinService {
 	static {
-//		PropKit.use("config.txt");
-//		ServiceFactory.init();
-//		DruidPlugin plugin = new DruidPlugin(PropKit.get("jdbcUrl"), PropKit.get("user"), PropKit.get("password").trim());
-//		ActiveRecordPlugin arp = new ActiveRecordPlugin(plugin); 		
-//		_MappingKit.mapping(arp);
-//		plugin.start();
-//		arp.start();
-
+		PropKit.use("config.properties");
+		DruidPlugin plugin = new DruidPlugin(PropKit.get("jdbcUrl_zskk"), PropKit.get("user_zskk"), PropKit.get("password_zskk").trim());
+		ActiveRecordPlugin arp = new ActiveRecordPlugin(plugin); 		
+		_MappingKit.mapping(arp);
+		plugin.start();
+		arp.start();
 	}
 	private static final PoolingHttpClientConnectionManager POOL_CM = new PoolingHttpClientConnectionManager();
 
@@ -67,4 +74,37 @@ public class WeixinService {
 		return content;
 	}
 
+	public static void main(String[] args) {
+		List<Doctors> doctors = Doctors.dao.find("SELECT * FROM doctors where realname='王振宇' and username='none' and institution_id='15700002' and id <>'8cfe556ca64f49e3'");
+		for (Doctors doctors2 : doctors) {
+			List<Report> reports = Report.dao.find("SELECT * FROM report where report_doctor_id=? or review_doctor_id=? or confirm_doctor_id=?",doctors2.getId(),doctors2.getId(),doctors2.getId());
+			if (reports.size() == 0) {
+				System.out.println("删除医生"+doctors2.getId());
+				doctors2.delete();
+			}else {
+				for (Report report3 : reports) {
+					String docString = "8cfe556ca64f49e3";
+					if (report3.getReportDoctorId().equals(doctors2.getId())) {
+						System.out.println("更改报告医生"+doctors2.getId());
+						report3.setReportDoctorId(docString);	
+					}
+					if (report3.getReviewDoctorId().equals(doctors2.getId())) {
+						System.out.println("更改审核医生"+doctors2.getId());
+						report3.setReviewDoctorId(docString);	
+					}
+					if (report3.getConfirmDoctorId().equals(doctors2.getId())) {
+						System.out.println("更改确认医生"+doctors2.getId());
+						report3.setConfirmDoctorId(docString);	
+					}
+					report3.update();
+					doctors2.delete();
+				}
+			}
+		}
+
+//		System.out.println("d"+doctors);
+
+
+	}
+
 }

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

@@ -11,6 +11,13 @@ import com.zskk.model.PatientInfos;
 import com.zskk.model.Report;
 import com.zskk.service.ServiceFactory;
 import com.zskk.service.WeixinService;
+
+import okhttp3.FormBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
 import org.apache.commons.codec.digest.DigestUtils;
 
 import java.io.*;
@@ -22,6 +29,7 @@ import java.util.*;
 
 
 public class DataTask implements ITask {
+	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
 
 	@Override
 	public void run() {
@@ -116,7 +124,8 @@ public class DataTask implements ITask {
                 params.put("data", JSON.toJSONString(data));
                 //System.out.println(params);
                 //调用接口
-                sendPost("http://39.106.136.96/pacs/zskk/writePatientReport", params);
+//                sendPost("http://39.106.136.96/pacs/zskk/writePatientReport", params);
+                post(null, params);
 //				WeixinService wService = ServiceFactory.getService(WeixinService.class);
 //				wService.requestWeixinQrcode(report.getId());;
 			}
@@ -126,6 +135,26 @@ public class DataTask implements ITask {
 		
 	}
 
+	private static void post(String url, Map<String, String> map) throws IOException {
+		RequestBody formBody = new FormBody.Builder()
+		        .add("timestamp", String.valueOf(getSecondTimestamp(new Date())))
+		        .add("signature", Ksort(map))
+		        .add("data", JSON.toJSONString(map))
+		        .build();
+
+		    Request request = new Request.Builder()
+		        .url("http://39.106.136.96/pacs/zskk/writePatientReport")
+		        .post(formBody)
+		        .build();
+
+		    try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
+		      if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+
+		      System.out.println(response.body().string());
+//			  return response.body().string();
+
+		    }
+	  }  
     /**
      *
      * 功能描述: 获取当前时间戳(秒)