commit

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,16 +9,23 @@ 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");
+		PropKit.use("config.properties");
 //		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();
+		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();
@@ -66,5 +75,45 @@ 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='47300001'");
+//		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 = "3e5523d101c0728a";
+//					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();
+//				}
+//			}
+//		}
+		
+		String dString  = null;
+		if (dString == null || dString.isBlank()) {
+			System.out.println("cs");
+
+		}
+
+
+//		System.out.println("d"+doctors);
+
+
+	}
 
 }

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

@@ -75,9 +75,10 @@ public class DataTask implements ITask {
 	}
 	
 	private String getDoctorIdByName(String name) {
-		if (name == null) {
+		if (name == null || name.isBlank()) {
 			return null;
 		}
+		name = name.replace(" ", "");
 		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where instr(?,realname) and institution_id=47300001 and realname is not null",name);
 		if (doctors == null) {
 			Doctors newDoctors = new Doctors().use("zskk");