加密SM4

DataFusion/.classpath

@@ -32,5 +32,6 @@
 	<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="lib" path="WebRoot/WEB-INF/lib/sqljdbc42.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/bcprov-jdk15on-1.59.jar"/>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>

DataFusion/res/config.properties

@@ -12,6 +12,7 @@ password_print = zskk
 
 #DATA-Parms
 institution_id     = 121403004061412685
+institution_key    = 837ffb03803b72cd99a941770fb6b2be
 #OSS
 oss_endpoint       = https://oss-cn-beijing.aliyuncs.com
 oss_accessKey      = LTAI5tLyAFqdCs9qxxhHRFwG

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

@@ -81,7 +81,7 @@ public class ZskkConfig extends JFinalConfig {
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
 		arpConnected.setDialect(new OracleDialect());
 		me.add(arpConnected);
-//		
+		
 //		// 配置数据库连接池插件
 //		DruidPlugin druidPluginPrint = createPrintDruidPlugin();
 //		me.add(druidPluginPrint);

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

@@ -164,67 +164,10 @@ public class ViewController extends Controller {
 	public void sdtb() {
 		try {
 		
-		DataService dService = ServiceFactory.getService(DataService.class);
-
-		Record record = Db.use("connected").findFirst("select * from reportcheck where studyuid=?",this.getPara("code"));
-
-		Map<String, String> params = new HashMap<>();
-		// 1:exam_id 2:patient_num 3:accession_num 4:study_uid
-		params.put("type", "4");
-
-		params.put("institution_id", PropKit.get("institution_id"));
-
-		params.put("code", record.getStr("studyuid"));
-		// 报告医生姓名
-		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("checktime"));
-		// 确认医生姓名
-		params.put("confirm_doctor_name",
-				record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
-		// 确认时间
-		params.put("confirm_datetime", record.getStr("checktime"));
-		// 意见建议
-		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("diagnosis") == null ? "" : record.getStr("diagnosis"));
-		// 症状
-		params.put("clin_symp", record.getStr("symptom"));
-		// patient_infos表
-		// 患者姓名
-		params.put("name", record.getStr("patientname"));
-		// 患者手机号
-		params.put("phone", record.getStr("phone"));
-		// 患者身份证号
-		params.put("card_num", record.getStr("idcard"));
-		// 检查结果1阴2阳
-		params.put("report_result", "0");
-		// 门诊号住院号
-		params.put("hopitalized_no", "");
-		
-		String x =dService.saveReport(params);
+		List<Record> records = Db.use("connected").find("select * from V_EXAM_INFO where 最后更新时间 > ?",parseStringToDate1());
 
-		Map<String, String> annex_params = new HashMap<>();
-		annex_params.put("institution_id", PropKit.get("institution_id"));
-		annex_params.put("type", "4");
-		annex_params.put("code", record.getStr("studyuid"));
-		//附件类型1.mp4 2.pdf 3.jpeg
-		annex_params.put("annex_class_code", "3");
-  		dService.saveAnnex(annex_params, record.getStr("reportpath"));
 
-		renderText(x);
+		renderJson(records);
 
 		
 		} catch (Exception e) {
@@ -443,7 +386,7 @@ public class ViewController extends Controller {
 		Date date = new Date();
 		String timeString = null;
 		Long i = date.getTime();
-		Long j = i - 43200;
+		Long j = i - 3600000;
 		Date newdate = new Date(j);
 		timeString = sdf.format(newdate);
 		return timeString;

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

@@ -9,9 +9,13 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Base64;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
+import org.bouncycastle.crypto.CryptoException;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -19,11 +23,14 @@ import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.PutObjectResult;
 import com.jfinal.kit.PropKit;
+import com.zskk.tools.SM4Utils;
+
 import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
+import com.zskk.tools.SM4Utils;
 
 public class DataService {
 
@@ -41,9 +48,98 @@ public class DataService {
 	
 	private static String SAVE_PRINT_URL = "https://risserver3.pacsonline.cn/butt/savePrint";
 
+//	private static String SAVE_EXAMINFO_URL = "http://10.200.199.136:9605/api/postExamInfo";
+	private static String SAVE_EXAMINFO_URL = "http://111.53.165.106:9605/api/postExamInfo";
+
 
 	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
 	
+	
+	
+	/**
+	 * 互认-检查信息
+	 * 
+	 * @param instutionId
+	 * @param number
+	 */
+	public static String postExamInfo(com.jfinal.plugin.activerecord.Record record) {
+		Map<String, String> params = new HashMap<>();
+		params.put("request_time", "1");
+		params.put("request_no", "12");
+		
+		JSONObject jsonObject = new JSONObject();
+		JSONObject jsonObjectA = new JSONObject();
+		jsonObjectA.put("AA", "张治勤");
+		jsonObjectA.put("AB", "01");
+		jsonObjectA.put("AC", "140302194905040815");
+		jsonObjectA.put("AD", "1");
+		jsonObjectA.put("AE", "1949-05-04");
+		jsonObjectA.put("AF", "15333038893");
+		jsonObjectA.put("AG", "");
+		
+
+		JSONObject jsonObjectB = new JSONObject();
+		jsonObjectB.put("BA", "1");
+		jsonObjectB.put("BB", "1810151251");
+		jsonObjectB.put("BC", "382346");
+		jsonObjectB.put("BD", "CT-926658");
+		jsonObjectB.put("BE", "2025-05-27 17:57:00");
+		jsonObjectB.put("BF", "急诊科");
+		jsonObjectB.put("BG", "郭占杰");
+		jsonObjectB.put("BH", "636");
+		jsonObjectB.put("BI", "");
+		jsonObjectB.put("BJ", "");
+		jsonObjectB.put("BK", "121403004061412685");
+		jsonObjectB.put("BL", "阳泉市第一人民医院");
+		jsonObjectB.put("BM", "");
+		jsonObjectB.put("BN", "");
+
+
+		JSONObject jsonObjectC = new JSONObject();
+		jsonObjectC.put("CA", "84090050");
+		jsonObjectC.put("CB", "25004415784");
+		jsonObjectC.put("CC", "CT");
+		jsonObjectC.put("CD", "CT检查（首部位）");
+		jsonObjectC.put("CE", "228929");
+		jsonObjectC.put("CF", "");
+		jsonObjectC.put("CG", "-");
+		jsonObjectC.put("CH", "-");
+		jsonObjectC.put("CI", "2025-05-27 18:04:00");
+		jsonObjectC.put("CJ", "1");
+		jsonObjectC.put("CK", "");
+		jsonObjectC.put("CL", "");
+		jsonObjectC.put("CM", "84090050");
+		jsonObjectC.put("CN", "CT-926658");
+		jsonObjectC.put("CO", "3");
+
+		jsonObject.put("A", jsonObjectA);
+		jsonObject.put("B", jsonObjectB);
+		jsonObject.put("C", jsonObjectC);
+		try {
+			String bbString= jsonObject.toJSONString();
+
+			String aaString= SM4Utils.sm4Encrypt("zLxapoeqWYpoeqWY",jsonObject.toJSONString());
+			System.out.println(bbString);
+            System.out.println(aaString);
+			
+
+		} catch (CryptoException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		try {
+	        String encodedString = Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes());
+
+			params.put("data", SM4Utils.sm4Encrypt("zLxapoeqWYpoeqWY",encodedString));
+		} catch (CryptoException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		String content = postWithParameters(SAVE_EXAMINFO_URL, params);
+		return content;
+
+	}
 
 	/**
 	 * 获取未出报告的检查列表
@@ -181,7 +277,7 @@ public class DataService {
 		}
 		RequestBody requestBody = formbody.build();
 
-		Request request = new Request.Builder().url(url).post(requestBody).build();
+		Request request = new Request.Builder().url(url).post(requestBody).addHeader("Authorization", "Bearer ZTFiZGFhNjlkMGU2YzE4NzJmYWE5ZDZkNzhiOGU0YWU=").build();
 
 		try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
 			if (!response.isSuccessful())
@@ -253,8 +349,9 @@ public class DataService {
 //		map.put("institution_id", "06300006");
 //		map.put("start", "2022-02-01");
 //		map.put("finish", "2022-03-01");
-//		String content = getWithUrl(RETURN_BIND_URL, map);
-//		System.out.println(content);
+		String content = postExamInfo(null);
+		System.out.println(content);
+		
 
 		
 	}

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

@@ -0,0 +1,127 @@
+package com.zskk.task;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.cron4j.ITask;
+import com.zskk.service.DataService;
+import com.zskk.service.ServiceFactory;
+import com.zskk.service.ThreadPoolService;
+
+public class JCBGTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+        JSONArray jsonArray = dService.getExamList(200);	
+        for (Object object : jsonArray) {
+        	try {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			Record record1 = Db.use("connected").findFirst("select * from V_EXAM_INFO where 检查号=? and 检查状态=4", jsonObject.getString("patient_num"));
+			if (record1 == null) {
+				continue;
+			}
+			Record record2 = Db.use("connected").findFirst("select * from V_EXAM_REPORT where 检查号=?", jsonObject.getString("patient_num"));
+
+//			if (parseStringToDate(record.getStr("checktime"))==Boolean.FALSE) {
+//				continue;
+//			}
+			if (record2.getStr("检查所见").isBlank() || record2.getStr("影像诊断").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", record2.getStr("报告医生姓名"));
+			//报告时间
+			params.put("report_datetime", record2.getStr("报告时间"));
+			//审核医生姓名
+			params.put("review_doctor_name", record2.getStr("审核医生姓名")==null?"":record2.getStr("审核医生姓名"));
+			//审核时间
+			params.put("review_datetime", record2.getStr("审核时间"));
+			//确认医生姓名
+			params.put("confirm_doctor_name", record2.getStr("审核医生姓名")==null?"":record2.getStr("审核医生姓名"));
+			//确认时间
+			params.put("confirm_datetime", record2.getStr("审核时间"));
+			//意见建议
+			params.put("impression", record2.getStr("影像诊断"));
+			//影像所见
+			params.put("description", record2.getStr("检查所见"));
+			//exams表
+			//申请科室
+			params.put("application_department", record1.getStr("就诊科室名称")==null?"":record1.getStr("就诊科室名称"));
+			//申请医生
+			params.put("application_doctor", record1.getStr("申请医师名称")==null?"":record1.getStr("申请医师名称"));
+			//临床诊断
+			params.put("clin_diag", "");
+			//症状
+			params.put("clin_symp", record1.getStr("主诉")==null?"":record1.getStr("主诉"));
+			//patient_infos表
+			//患者姓名
+			params.put("name", record1.getStr("姓名"));
+			//患者手机号
+			params.put("phone", record1.getStr("联系电话")==null?"":record1.getStr("联系电话"));
+			//患者身份证号
+			params.put("card_num", record1.getStr("证件号码")==null?"":record1.getStr("证件号码"));
+			//检查结果1阴2阳
+			params.put("report_result", "0");
+			//门诊号住院号
+			params.put("hopitalized_no", "");
+			params.put("exam_project", record1.getStr("标本部位") == null ? "" : record1.getStr("标本部位"));
+//			params.put("exam_method", record.getStr("JianchaFangfa") == null ? "" : record.getStr("JianchaFangfa"));
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});	
+        	} catch (Exception e) {
+				// TODO: handle exception
+        		continue;
+			}
+        }
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+	
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate(String dateStr) {
+		if (dateStr == null) {
+			return "";
+		}
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	    Date date = null;
+	    String timeString = null;
+		try {
+			date = sdf.parse(dateStr);
+			SimpleDateFormat sdf2= new SimpleDateFormat("yyyyMMdd");
+
+			timeString = sdf2.format(date);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return timeString;
+	}
+
+}

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

@@ -0,0 +1,127 @@
+package com.zskk.task;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.cron4j.ITask;
+import com.zskk.service.DataService;
+import com.zskk.service.ServiceFactory;
+import com.zskk.service.ThreadPoolService;
+
+public class JCTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+
+		List<Record> records = Db.use("connected").find("select * from V_EXAM_INFO where 最后更新时间 > ?",parseStringToDate1());
+		for (Record record : records) {
+			dService.postExamInfo(record);
+		}
+		
+		
+        JSONArray jsonArray = dService.getExamList(200);	
+        for (Object object : jsonArray) {
+        	try {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			Record record1 = Db.use("connected").findFirst("select * from V_EXAM_INFO where 检查号=? and 检查状态=4", jsonObject.getString("patient_num"));
+			if (record1 == null) {
+				continue;
+			}
+			Record record2 = Db.use("connected").findFirst("select * from V_EXAM_REPORT where 检查号=?", jsonObject.getString("patient_num"));
+
+//			if (parseStringToDate(record.getStr("checktime"))==Boolean.FALSE) {
+//				continue;
+//			}
+			if (record2.getStr("检查所见").isBlank() || record2.getStr("影像诊断").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", record2.getStr("报告医生姓名"));
+			//报告时间
+			params.put("report_datetime", record2.getStr("报告时间"));
+			//审核医生姓名
+			params.put("review_doctor_name", record2.getStr("审核医生姓名")==null?"":record2.getStr("审核医生姓名"));
+			//审核时间
+			params.put("review_datetime", record2.getStr("审核时间"));
+			//确认医生姓名
+			params.put("confirm_doctor_name", record2.getStr("审核医生姓名")==null?"":record2.getStr("审核医生姓名"));
+			//确认时间
+			params.put("confirm_datetime", record2.getStr("审核时间"));
+			//意见建议
+			params.put("impression", record2.getStr("影像诊断"));
+			//影像所见
+			params.put("description", record2.getStr("检查所见"));
+			//exams表
+			//申请科室
+			params.put("application_department", record1.getStr("就诊科室名称")==null?"":record1.getStr("就诊科室名称"));
+			//申请医生
+			params.put("application_doctor", record1.getStr("申请医师名称")==null?"":record1.getStr("申请医师名称"));
+			//临床诊断
+			params.put("clin_diag", "");
+			//症状
+			params.put("clin_symp", record1.getStr("主诉")==null?"":record1.getStr("主诉"));
+			//patient_infos表
+			//患者姓名
+			params.put("name", record1.getStr("姓名"));
+			//患者手机号
+			params.put("phone", record1.getStr("联系电话")==null?"":record1.getStr("联系电话"));
+			//患者身份证号
+			params.put("card_num", record1.getStr("证件号码")==null?"":record1.getStr("证件号码"));
+			//检查结果1阴2阳
+			params.put("report_result", "0");
+			//门诊号住院号
+			params.put("hopitalized_no", "");
+			params.put("exam_project", record1.getStr("标本部位") == null ? "" : record1.getStr("标本部位"));
+//			params.put("exam_method", record.getStr("JianchaFangfa") == null ? "" : record.getStr("JianchaFangfa"));
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});	
+        	} catch (Exception e) {
+				// TODO: handle exception
+        		continue;
+			}
+        }
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+	
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate1() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date date = new Date();
+		String timeString = null;
+		Long i = date.getTime();
+		Long j = i - 3600000;
+		Date newdate = new Date(j);
+		timeString = sdf.format(newdate);
+		return timeString;
+	}
+
+}

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

@@ -0,0 +1,127 @@
+package com.zskk.task;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.cron4j.ITask;
+import com.zskk.service.DataService;
+import com.zskk.service.ServiceFactory;
+import com.zskk.service.ThreadPoolService;
+
+public class JYTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+        JSONArray jsonArray = dService.getExamList(200);	
+        for (Object object : jsonArray) {
+        	try {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			Record record1 = Db.use("connected").findFirst("select * from V_EXAM_INFO where 检查号=? and 检查状态=4", jsonObject.getString("patient_num"));
+			if (record1 == null) {
+				continue;
+			}
+			Record record2 = Db.use("connected").findFirst("select * from V_EXAM_REPORT where 检查号=?", jsonObject.getString("patient_num"));
+
+//			if (parseStringToDate(record.getStr("checktime"))==Boolean.FALSE) {
+//				continue;
+//			}
+			if (record2.getStr("检查所见").isBlank() || record2.getStr("影像诊断").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", record2.getStr("报告医生姓名"));
+			//报告时间
+			params.put("report_datetime", record2.getStr("报告时间"));
+			//审核医生姓名
+			params.put("review_doctor_name", record2.getStr("审核医生姓名")==null?"":record2.getStr("审核医生姓名"));
+			//审核时间
+			params.put("review_datetime", record2.getStr("审核时间"));
+			//确认医生姓名
+			params.put("confirm_doctor_name", record2.getStr("审核医生姓名")==null?"":record2.getStr("审核医生姓名"));
+			//确认时间
+			params.put("confirm_datetime", record2.getStr("审核时间"));
+			//意见建议
+			params.put("impression", record2.getStr("影像诊断"));
+			//影像所见
+			params.put("description", record2.getStr("检查所见"));
+			//exams表
+			//申请科室
+			params.put("application_department", record1.getStr("就诊科室名称")==null?"":record1.getStr("就诊科室名称"));
+			//申请医生
+			params.put("application_doctor", record1.getStr("申请医师名称")==null?"":record1.getStr("申请医师名称"));
+			//临床诊断
+			params.put("clin_diag", "");
+			//症状
+			params.put("clin_symp", record1.getStr("主诉")==null?"":record1.getStr("主诉"));
+			//patient_infos表
+			//患者姓名
+			params.put("name", record1.getStr("姓名"));
+			//患者手机号
+			params.put("phone", record1.getStr("联系电话")==null?"":record1.getStr("联系电话"));
+			//患者身份证号
+			params.put("card_num", record1.getStr("证件号码")==null?"":record1.getStr("证件号码"));
+			//检查结果1阴2阳
+			params.put("report_result", "0");
+			//门诊号住院号
+			params.put("hopitalized_no", "");
+			params.put("exam_project", record1.getStr("标本部位") == null ? "" : record1.getStr("标本部位"));
+//			params.put("exam_method", record.getStr("JianchaFangfa") == null ? "" : record.getStr("JianchaFangfa"));
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});	
+        	} catch (Exception e) {
+				// TODO: handle exception
+        		continue;
+			}
+        }
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+	
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate(String dateStr) {
+		if (dateStr == null) {
+			return "";
+		}
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	    Date date = null;
+	    String timeString = null;
+		try {
+			date = sdf.parse(dateStr);
+			SimpleDateFormat sdf2= new SimpleDateFormat("yyyyMMdd");
+
+			timeString = sdf2.format(date);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return timeString;
+	}
+
+}

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

@@ -83,15 +83,15 @@ public class PrintTask implements ITask {
 	 * @param dateStr
 	 * @return
 	 */
-	private String parseStringToDate1() {
+	private Date parseStringToDate1() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Date date = new Date();
 		String timeString = null;
 		Long i = date.getTime();
 		Long j = i - 43200000;
 		Date newdate = new Date(j);
-		timeString = sdf.format(newdate);
-		return timeString;
+//		timeString = sdf.format(newdate);
+		return newdate;
 	}
 
 }

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

@@ -0,0 +1,39 @@
+package com.zskk.tools;
+
+import org.bouncycastle.crypto.CryptoException;
+import org.bouncycastle.crypto.engines.SM4Engine;
+import org.bouncycastle.crypto.modes.CBCBlockCipher;
+import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.Security;
+import java.util.Arrays;
+import java.util.Base64;
+public class SM4Utils {
+static {
+Security.addProvider(new BouncyCastleProvider());
+}
+public static String sm4Encrypt(String key, String data) throws CryptoException {
+byte[] keyBytes = key.getBytes(); // 确保密钥为16字节
+byte[] dataBytes = data.getBytes();
+PaddedBufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new SM4Engine()));
+cipher.init(true, new ParametersWithIV(new KeyParameter(keyBytes), new byte[16])); // IV为16个0字节
+byte[] output = new byte[cipher.getOutputSize(dataBytes.length)];
+int outputLength = cipher.processBytes(dataBytes, 0, dataBytes.length, output, 0);
+outputLength += cipher.doFinal(output, outputLength);
+// 返回Base64编码的字符串
+return Base64.getEncoder().encodeToString(Arrays.copyOf(output, outputLength));
+}
+public static String sm4Decrypt(String key, String encryptedData) throws CryptoException {
+byte[] keyBytes = key.getBytes();
+byte[] encryptedDataBytes = Base64.getDecoder().decode(encryptedData);
+PaddedBufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new SM4Engine()));
+cipher.init(false, new ParametersWithIV(new KeyParameter(keyBytes), new byte[16])); // IV为16个0字节
+byte[] output = new byte[cipher.getOutputSize(encryptedDataBytes.length)];
+int outputLength = cipher.processBytes(encryptedDataBytes, 0, encryptedDataBytes.length, output, 0);
+outputLength += cipher.doFinal(output, outputLength);
+// 返回解密后的字符串
+return new String(Arrays.copyOf(output, outputLength));
+}
+}