Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java =================================================================== diff -u -r40945 -r41506 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java (.../MQHelper.java) (revision 40945) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java (.../MQHelper.java) (revision 41506) @@ -10,6 +10,7 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; +import java.util.UUID; import javax.jms.BytesMessage; import javax.jms.JMSException; @@ -38,9 +39,11 @@ import org.springframework.web.client.RestTemplate; import com.forgon.disinfectsystem.common.CssdUtils; +import com.forgon.disinfectsystem.datasynchronization.dao.gzs12rmyy.DatasyncConstant; import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo; import com.forgon.disinfectsystem.datasynchronization.model.PatientInfoVO; import com.forgon.disinfectsystem.datasynchronization.model.UserVo; +import com.forgon.tools.date.DateTools; import com.ibm.jms.JMSBytesMessage; import com.ibm.mq.MQException; import com.ibm.mq.MQGetMessageOptions; @@ -117,12 +120,12 @@ /** * ACK地址 */ - public static final String ackUrl = "http://192.168.7.183:7800/ack"; + public static final String ackUrl = "http://172.20.5.98:7800/ack"; /** * DOMAIN */ - public static final String domain = "DX_XDGY"; + //public static final String domain = "DX_XDGY"; /** * GTM8_SEC取值为8小时(平台规定的时间) @@ -145,12 +148,19 @@ try { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); + String currentDateTime = DateTools.getCurrentDayByFormat(DateTools.COMMON_DATE_HMS); + headers.add("rootId", UUID.randomUUID().toString()); + //headers.add("token", UUID.randomUUID().toString()); + headers.add("domain", DatasyncConstant.DOMAIN); + headers.add("businessTime", currentDateTime); + headers.add("oprationTime", currentDateTime); + headers.add("key", DatasyncConstant.KEY); Map map= new HashMap(); map.put("queue", destination); map.put("localTransId", message.getJMSCorrelationID()==null? "":message.getJMSCorrelationID() ); map.put("operTime", timestampToDateTime(message.getJMSTimestamp())); - map.put("domain", domain); + map.put("domain", DatasyncConstant.DOMAIN); HttpEntity> request = new HttpEntity<>(map, headers); Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/HttpClientHelper.java =================================================================== diff -u -r36039 -r41506 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/HttpClientHelper.java (.../HttpClientHelper.java) (revision 36039) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/HttpClientHelper.java (.../HttpClientHelper.java) (revision 41506) @@ -5,31 +5,40 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.util.UUID; import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import com.forgon.tools.date.DateTools; + /** * 广州市第十二人民医院门诊病人信息接口GZS12RMYY-50 */ public class HttpClientHelper { public static Logger logger = Logger.getLogger(HttpClientHelper.class); - public static String sendPost(String url, String content, String domain, String uKey) throws Exception { + public static String sendPost(String url, String content, String domain, String uKey, String treatmentNum) throws Exception { BufferedReader in = null; String result = ""; URL realUrl = new URL(url); HttpURLConnection conn = (HttpURLConnection) realUrl.openConnection(); conn.setRequestProperty("Content-Type", "application/json"); - if(StringUtils.isNotBlank(domain)){ + /*if(StringUtils.isNotBlank(domain)){ conn.setRequestProperty("DOMAIN", domain); } if(StringUtils.isNotBlank(uKey)){ conn.setRequestProperty("KEY", uKey); - } + }*/ + String currentDateTime = DateTools.getCurrentDayByFormat(DateTools.COMMON_DATE_HMS); + conn.setRequestProperty("rootId", UUID.randomUUID().toString()); + conn.setRequestProperty("token", treatmentNum); + conn.setRequestProperty("domain", domain); + conn.setRequestProperty("businessTime", currentDateTime); + conn.setRequestProperty("oprationTime", currentDateTime); + conn.setRequestProperty("key", uKey); conn.setDoOutput(true); conn.setDoInput(true); conn.setInstanceFollowRedirects(true); Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/primaryJmsIbmListener.xml =================================================================== diff -u -r35684 -r41506 --- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/primaryJmsIbmListener.xml (.../primaryJmsIbmListener.xml) (revision 35684) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/primaryJmsIbmListener.xml (.../primaryJmsIbmListener.xml) (revision 41506) @@ -15,15 +15,15 @@ - + - + Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/replicaJmsIbmListener.xml =================================================================== diff -u -r35684 -r41506 --- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/replicaJmsIbmListener.xml (.../replicaJmsIbmListener.xml) (revision 35684) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/replicaJmsIbmListener.xml (.../replicaJmsIbmListener.xml) (revision 41506) @@ -15,15 +15,15 @@ - + - + Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/FindPatientInfoByTreatmentNumDaoImpl.java =================================================================== diff -u -r36039 -r41506 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/FindPatientInfoByTreatmentNumDaoImpl.java (.../FindPatientInfoByTreatmentNumDaoImpl.java) (revision 36039) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/FindPatientInfoByTreatmentNumDaoImpl.java (.../FindPatientInfoByTreatmentNumDaoImpl.java) (revision 41506) @@ -34,7 +34,7 @@ try { String request = HttpClientHelper.buildRequest(treatmentNum); logger.info("门诊病人信息同步接口请求信息：" + request); - String responce = HttpClientHelper.sendPost(DatasyncConstant.queryURL, request, DatasyncConstant.DOMAIN, DatasyncConstant.KEY); + String responce = HttpClientHelper.sendPost(DatasyncConstant.queryURL, request, DatasyncConstant.DOMAIN, DatasyncConstant.KEY, treatmentNum); logger.info("门诊病人信息同步接口返回信息：" + responce); List patientInfoVOList = buildPatientInfoVOList(responce); if(CollectionUtils.isNotEmpty(patientInfoVOList)){ Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/DatasyncConstant.java =================================================================== diff -u -r36039 -r41506 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/DatasyncConstant.java (.../DatasyncConstant.java) (revision 36039) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/DatasyncConstant.java (.../DatasyncConstant.java) (revision 41506) @@ -8,16 +8,16 @@ /** * 门诊病人信息接口地址 */ - public final static String queryURL = "http://192.168.7.183:7800/roc/patient-service/api/v1/register/patient/getFinOprRegList"; + public final static String queryURL = "http://172.20.5.86:7801/roc/patient-service/api/v1/register/patient/getFinOprRegList"; /** * DOMAIN */ - public final static String DOMAIN = "DX_XDGY"; + public final static String DOMAIN = "XDGY"; /** * KEY */ - public final static String KEY = "fbae4eb2-361c-49b9-a9a0-bd513726b071"; + public final static String KEY = "1bd128f0-cfff-48ad-b9e3-04c8f7bc2eff"; }