From 6c54f45bbfcfe820ea4b56c56cd039ec25fbb5af Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 25 Aug 2021 14:03:49 +0800 Subject: [PATCH] update --- .../operate/web/facade/BabyBookbuildingFacade.java | 2 +- .../operate/web/facade/BabyCheckFacade.java | 4 +-- .../operate/web/request/BabyManageRequest.java | 6 ++--- .../com/lyms/platform/conn/inf/BaseConnection.java | 16 ++++++------ .../lyms/platform/worker/BoneTransferWorker.java | 30 +++++++++++++++------- 5 files changed, 35 insertions(+), 23 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index e3e98dc..46e9541 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2788,7 +2788,7 @@ public class BabyBookbuildingFacade { } } - if (request.getIsShowPhone() == 1) {//隐藏姓名、地址 + if (request.getIsShowPhone() != null && request.getIsShowPhone() == 1) {//隐藏姓名、地址 for (BabyManageListResult result : list) { result.setMommnyPhone(StringUtils.encryPhone(result.getMommnyPhone())); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 091ced0..4434e79 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1102,8 +1102,8 @@ public class BabyCheckFacade extends BaseServiceImpl { boolean flag = false; // List hospital = groupsFacade.findGroupHospital(userId, false); String hospitalId = autoMatchFacade.getHospitalId(userId); - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); - Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); + Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); + Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) { pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index bf2be95..3cffdbe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -88,7 +88,7 @@ public class BabyManageRequest extends BaseQuery { //0 不需要隐藏 1 隐藏 - private int isShowPhone; + private Integer isShowPhone; private String vcCardNo; @@ -112,11 +112,11 @@ public class BabyManageRequest extends BaseQuery { private String lastCheckDoctor; private String riskCode; - public int getIsShowPhone() { + public Integer getIsShowPhone() { return isShowPhone; } - public void setIsShowPhone(int isShowPhone) { + public void setIsShowPhone(Integer isShowPhone) { this.isShowPhone = isShowPhone; } diff --git a/platform-transfer/src/main/java/com/lyms/platform/conn/inf/BaseConnection.java b/platform-transfer/src/main/java/com/lyms/platform/conn/inf/BaseConnection.java index 88be4da..181a3e3 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/conn/inf/BaseConnection.java +++ b/platform-transfer/src/main/java/com/lyms/platform/conn/inf/BaseConnection.java @@ -19,14 +19,14 @@ public abstract class BaseConnection implements IConnection{ public void close(Connection conn, Statement sta, ResultSet rst) { try { -// if (sta != null) -// { -// sta.close(); -// } -// if (rst != null) -// { -// rst.close(); -// } + if (rst != null) + { + rst.close(); + } + if (sta != null) + { + sta.close(); + } if (conn != null) { conn.close(); diff --git a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java index 1b8194f..e7038ed 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java +++ b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java @@ -1,6 +1,7 @@ package com.lyms.platform.worker; import com.lyms.platform.comm.ApplicationProperties; +import com.lyms.platform.comm.StringUtils; import com.lyms.platform.conn.BoneConnectionFactory; import com.lyms.platform.conn.inf.ConnectionFactoryMethod; import com.lyms.platform.conn.inf.IConnection; @@ -10,10 +11,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -27,6 +25,22 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ @Autowired private ApplicationProperties properties; + + + public Connection getConnection() + { + Connection conn = null; + try { + Class.forName("com.hxtt.sql.access.AccessDriver"); + String url = "jdbc:Access:///"+properties.getDataPath(); + conn = DriverManager.getConnection(url, "", ""); + } catch (Exception e) { + logger.error("getConnection error."+e.toString()); + } + return conn; + } + + @Override public void doTransfer() { while (true) @@ -35,11 +49,9 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ Connection conn = null; Statement sta = null; ResultSet rst = null; - ConnectionFactoryMethod factoryMethod = new BoneConnectionFactory(); IConnection iConnection = null; try { - iConnection = factoryMethod.createConnection(properties.getDataPath()); - conn = iConnection.getConnection(); + conn = getConnection(); sta = conn.createStatement(); String sql = "select PatientID,ZScore,TScore,dbSos,dbBqi,dbRrf,dbEoa,YoungAdult,ageMatched,dbAge,PartDisplayName,PatientName from PatientInfo where status is null and DayTimeOfSave > "+ DateUtil.formatDate(new Date(),"yyyy-MM-dd"); rst = sta.executeQuery(sql); @@ -80,7 +92,7 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ map.put("type",properties.getType()); // map.put("hospitalId",properties.getHospitalId()); // - if (map.size() > 0 && PatientID != null) + if (map.size() > 0 && StringUtils.isNotEmpty(PatientID)) { String response = send(map, properties.getUrl() + "/saveBone"); if (response.contains("0")) @@ -90,7 +102,7 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ } } } - Thread.sleep(10000); + Thread.sleep(30000); } catch (Exception e) { logger.error("getBoneRecords Exception. "+e.toString()); } -- 1.8.3.1