diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java new file mode 100644 index 0000000..97ba585 --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java @@ -0,0 +1,220 @@ +package com.docus.server.collect.basic.http; + +import com.docus.core.util.DateUtil; +import com.docus.log.context.TrackContext; +import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.ws.convert.IConverter; +import org.springframework.stereotype.Component; + +/** + * 被动请求参数转化器 + * + * @see com.docus.server.ws.impl.BasicServerImpl#setTBasic(String) + * @see com.docus.server.visitor.VisitorProcessor#beforeProcess(TrackContext) + */ +@Component("httpTBasicConverter") +public class HttpTBasicConverter implements IConverter { + + @Override + public TBasicDTO convert(String message, String group) { +// XmlUtil xml = XmlUtil.of(message); +// //id-消息流水号 +// String serialId = null; +// Node serialIdNode = FlagEnum.INSERT.equals(methodName) ? +// xml.getNode("/PRPA_HIP0032/id/@extension") : xml.getNode("/PRPA_HIP0033/id/@extension"); +// if (Func.isNotEmpty(serialIdNode)) { +// serialId = serialIdNode.getNodeValue(); +// } +// //接受方 +// String receive = null; +// Node receiveNode = FlagEnum.INSERT.equals(methodName) ? +// xml.getNode("/PRPA_HIP0032/receiver/device/id/item/@extension") : xml.getNode("/PRPA_HIP0033/receiver/device/id/item/@extension"); +// if (Func.isNotEmpty(receiveNode)) { +// receive = receiveNode.getNodeValue(); +// } +// //发送方 +// String send = null; +// Node sendNode = xml.getNode("/PRPA_HIP0032/sender/device/id/item/@extension"); +// if (Func.isNotEmpty(sendNode)) { +// send = sendNode.getNodeValue(); +// } +// //住院流水号 +// String jzh = null; +// Node jzhNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/item/@extension"); +// if (Func.isNotEmpty(jzhNode)) { +// jzh = jzhNode.getNodeValue(); +// } +// //住院号标识 +// String inpatientNo = null; +// Node inpatientNoNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/id/item/@extension"); +// if (Func.isNotEmpty(inpatientNoNode)) { +// inpatientNo = inpatientNoNode.getNodeValue(); +// } +// //住院次数[] +// String admissTimes = null; +// Node admissTimesNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/lengthOfStayQuantity[@unit='次']/@value"); +// if (Func.isNotEmpty(admissTimesNode)) { +// admissTimes = admissTimesNode.getNodeValue(); +// } +// //姓名 +// String name = null; +// Node nameNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/name/item/part/@value"); +// if (Func.isNotEmpty(nameNode)) { +// name = nameNode.getNodeValue(); +// } +// //入院日期时间 +// String admissDate = null; +// Node admissDateNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/effectiveTime/low/@value"); +// if (Func.isNotEmpty(admissDateNode)) { +// admissDate = admissDateNode.getNodeValue(); +// } +// //出院日期时间 +// String disDate = null; +// Node disDateNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/effectiveTime/high/@value"); +// if (Func.isNotEmpty(disDateNode)) { +// disDate = disDateNode.getNodeValue(); +// } +// //入院诊断科室名称[] +// String admissDeptName = null; +// Node admissDeptNameNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/component[@displayName='入院诊断']/section/entry[@displayName='入院诊断-西医条目']/observation/performer/assignedEntity/representedOrganization/name"); +// if (Func.isNotEmpty(admissDeptNameNode)) { +// admissDeptNameNode.getTextContent(); +// } +// //出院诊断科室名称[] +// String disDeptName = null; +// Node disDeptNameNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/component[@displayName='出院诊断']/section/entry[@displayName='出院诊断-西医条目']/observation/performer/assignedEntity/representedOrganization/name"); +// if (Func.isNotEmpty(disDeptNameNode)) { +// disDeptName = disDeptNameNode.getTextContent(); +// } +// //主治医师[] +// String attendingName = null; +// Node attendingNameNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/authenticator[@displayName='主治医师']/assignedEntity/assignedPerson/name"); +// if (Func.isNotEmpty(attendingNameNode)) { +// attendingName = attendingNameNode.getTextContent(); +// } +// //年龄 +// String age = null; +// Node ageNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/age[@unit='岁']/@value"); +// if (Func.isNotEmpty(ageNode)) { +// age = ageNode.getNodeValue(); +// } +// //性别 +// String sex = null; +// Node sexNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/administrativeGenderCode/@code"); +// if (Func.isNotEmpty(sexNode)) { +// sex = sexNode.getNodeValue(); +// } +// //身份证号 +// String idCard = null; +// Node idCardNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/id/item/@extension"); +// if (Func.isNotEmpty(idCardNode)) { +// idCard = idCardNode.getNodeValue(); +// } +// //出院科室 +// String disDept = null; +// Node disDeptCardNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/componentOf/encompassingEncounter/location/healthCareFacility/serviceProviderOrganization/asOrganizationPartOf/wholeOrganization/asOrganizationPartOf/wholeOrganization/asOrganizationPartOf/wholeOrganization/id/@extension"); +// if (Func.isNotEmpty(disDeptCardNode)) { +// disDept = disDeptCardNode.getNodeValue(); +// } +// //性别名称 +// String sexName = null; +// Node sexNameNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/administrativeGenderCode/@displayName"); +// if (Func.isNotEmpty(sexNameNode)) { +// sexName = sexNameNode.getNodeValue(); +// } +// //床位号 +// String bedNum = null; +// Node bedNumNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/componentOf/encompassingEncounter/location/healthCareFacility/serviceProviderOrganization/asOrganizationPartOf/wholeOrganization/id/@extension"); +// if (Func.isNotEmpty(bedNumNode)) { +// bedNum = bedNumNode.getNodeValue(); +// } +// //住院天数数[] +// String admissDays = null; +// Node admissDaysNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/lengthOfStayQuantity[@unit='天']/@value"); +// if (Func.isNotEmpty(admissDaysNode)) { +// admissDays = admissDaysNode.getNodeValue(); +// } +// //是否死亡[] +// String isDead = null; +// Node isDeadNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/component[@displayName='出院诊断']/section/entry[@displayName='出院情况']/observation/value"); +// if (Func.isNotEmpty(isDeadNode)) { +// isDead = isDeadNode.getTextContent(); +// } +// //病区编号 +// String wardCode = null; +// Node wardCodeNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/componentOf/encompassingEncounter/location/healthCareFacility/serviceProviderOrganization/asOrganizationPartOf/wholeOrganization/asOrganizationPartOf/wholeOrganization/asOrganizationPartOf/wholeOrganization/asOrganizationPartOf/wholeOrganization/id/@extension"); +// if (Func.isNotEmpty(wardCodeNode)) { +// wardCode = wardCodeNode.getNodeValue(); +// } +// //病区名称 +// String wardName = null; +// Node wardNameNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/componentOf/encompassingEncounter/location/healthCareFacility/serviceProviderOrganization/asOrganizationPartOf/wholeOrganization/asOrganizationPartOf/wholeOrganization/asOrganizationPartOf/wholeOrganization/asOrganizationPartOf/wholeOrganization/name"); +// if (Func.isNotEmpty(wardNameNode)) { +// wardName = wardNameNode.getTextContent(); +// } +// //顺德人医第三方索引 +// String sdryIndex = null; +// Node sdryIndexNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/id/item/@extension"); +// if (Func.isNotEmpty(sdryIndexNode)) { +// sdryIndex = sdryIndexNode.getNodeValue(); +// } +// +// //设置dto +// TBasicDTO dto = new TBasicDTO(); +// dto.setSerialId(serialId); +// dto.setSend(send); +// dto.setReceive(receive); +// dto.setInpatientNo(inpatientNo); +// dto.setName(name); +// dto.setJzh(jzh); +// dto.setAdmissDeptName(admissDeptName); +// dto.setDisDeptName(disDeptName); +// dto.setAdmissDate(admissDate); +// dto.setDisDate(disDate); +// dto.setAdmissTimes(admissTimes); +// dto.setAttendingName(attendingName); +// dto.setAge(age); +// dto.setSex(sex); +// dto.setIdCard(idCard); +// dto.setDisDept(disDept); +// dto.setSexName(sexName); +// dto.setBedNum(bedNum); +// dto.setIsDead(isDead); +// dto.setAdmissDays(admissDays); +// dto.setWardCode(wardCode); +// dto.setWardName(wardName); +// dto.setSdryIndex(sdryIndex); +// +// dto.setParams(ParamsUtils.addParam("serialId", dto.getSerialId()) +// .addParam("receive", dto.getReceive()) +// .addParam("send", dto.getSend()) +// .param()); + + + TBasicDTO dto = new TBasicDTO(); + dto.setSerialId("1212"); + dto.setSend("1"); + dto.setReceive("1"); + dto.setInpatientNo("334"); + dto.setName("1"); + dto.setJzh("565"); + dto.setAdmissDeptName("1"); + dto.setDisDeptName("1"); + dto.setAdmissDate(DateUtil.formatDateTime(DateUtil.now())); + dto.setDisDate(DateUtil.formatDateTime(DateUtil.now())); + dto.setAdmissTimes("3"); + dto.setAttendingName("1"); + dto.setAge("1"); + dto.setSex("1"); + dto.setIdCard("1"); + dto.setDisDept("1"); + dto.setSexName("1"); + dto.setBedNum("1"); + dto.setIsDead("1"); + dto.setAdmissDays("1"); + dto.setWardCode("1"); + dto.setWardName("1"); + dto.setSdryIndex("1"); + return dto; + } +} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java index 98c2aa9..960148d 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java @@ -9,7 +9,7 @@ import java.util.Date; import java.util.List; /** - * 主动ws + * 主动ws采集数据 */ @Component("wsBasicCollectorImpl") public class WsBasicCollectorImpl implements IWsCollector { diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/TBasicConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java similarity index 98% rename from collect-sdry/src/main/java/com/docus/server/collect/basic/ws/TBasicConverter.java rename to collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java index 690e4ce..627692c 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/TBasicConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java @@ -12,11 +12,11 @@ import org.springframework.stereotype.Component; * @see com.docus.server.ws.impl.BasicServerImpl#setTBasic(String) * @see com.docus.server.visitor.VisitorProcessor#beforeProcess(TrackContext) */ -@Component("tBasicConverter") -public class TBasicConverter implements IConverter { +@Component("wsTBasicConverter") +public class WsTBasicConverter implements IConverter { @Override - public TBasicDTO convert(String message, String methodName) { + public TBasicDTO convert(String message, String group) { // XmlUtil xml = XmlUtil.of(message); // //id-消息流水号 // String serialId = null; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptConverter.java new file mode 100644 index 0000000..a8b999b --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptConverter.java @@ -0,0 +1,52 @@ +package com.docus.server.collect.dept.http; + +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.ws.convert.IConverter; +import org.springframework.stereotype.Component; + +import java.util.UUID; + +@Component("httpDeptConverter") +public class HttpDeptConverter implements IConverter { + + @Override + public DeptDTO convert(String message, String group) { + //TODO： 根据协议进行解析。 +// XmlUtil xmlParseUtil = XmlUtil.of(message); +// Node msgIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/id/@extension"); +// Node receiverNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/receiver/device/id/item/@extension"); +// Node operateTypeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/@operateType"); +// Node deptCodeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/DEPT_CODE/@value"); +// Node deptNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/DEPT_NAME/@value"); +// Node authorIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); +// Node authorNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); +// +// DeptDTO deptDto = new DeptDTO(); +// deptDto.setMessageId(msgIdNode.getNodeValue()); +// deptDto.setReceiver(receiverNode.getNodeValue()); +// deptDto.setOperateType(operateTypeNode.getNodeValue()); +// deptDto.setDeptCode(deptCodeNode.getNodeValue()); +// deptDto.setDeptName(deptNameNode.getNodeValue()); +// deptDto.setAuthorId(authorIdNode.getNodeValue()); +// deptDto.setAuthorName(authorNameNode.getNodeValue()); +// deptDto.setSource(message);//原始xml报文 +// +// deptDto.setParams(ParamsUtils.addParam("msg", "操作成功！") +// .addParam("msgId", deptDto.getMessageId()) +// .addParam("receiver", deptDto.getReceiver()) +// .param()); + + + DeptDTO deptDto = new DeptDTO(); + deptDto.setMessageId(UUID.randomUUID().toString()); + deptDto.setReceiver("1"); + deptDto.setOperateType("2"); + deptDto.setDeptCode("3"); + deptDto.setDeptName("4"); + deptDto.setAuthorId("5"); + deptDto.setAuthorName("6"); + deptDto.setSource(message);//原始xml报文 + + return deptDto; + } +} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmListener.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmListener.java new file mode 100644 index 0000000..c00c84f --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmListener.java @@ -0,0 +1,64 @@ +package com.docus.server.collect.dept.mq; + +import com.docus.server.collect.mq.IDeptMqCollectService; +import com.docus.server.collect.mq.IUserMqCollectService; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * @author jiashi + * 梅州中医医院 MQ 监听 + */ +@Component +public class JmsIbmListener { + @Resource + private IDeptMqCollectService deptMqCollectService; + @Resource + private IUserMqCollectService userMqCollectService; + + /** + * 订阅队列（注册科室） + * + * @param message 科室信息 + */ +// @JmsIbmListener(destination = "TJ_createDepartment") + public void addDept(String message) { + deptMqCollectService.addDept(message); + } + + + /** + * 订阅队列（变更科室） + * + * @param message 科室信息 + */ +// @JmsIbmListener(destination = "TJ_updateDepartment") + public void updateDept(String message) { + deptMqCollectService.updateDept(message); + } + + + /** + * 订阅队列（注册人员） + * + * @param message 人员信息 + */ +// @JmsIbmListener(destination = "TJ_createPractitioner") + public void addUser(String message) { + userMqCollectService.addUser(message); + } + + + /** + * 订阅队列（变更人员） + * + * @param message 人员信息 + */ +// @JmsIbmListener(destination = "TJ_updatePractitioner") + public void updateUser(String message) { + userMqCollectService.updateUser(message); + } + + +} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmMqDeptCollectServiceImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmMqDeptCollectServiceImpl.java deleted file mode 100644 index 753e354..0000000 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmMqDeptCollectServiceImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.docus.server.collect.dept.mq; - -import com.docus.core.util.XmlUtil; -import com.docus.server.collect.mq.dept.AbstractDeptMqCollectService; -import com.docus.server.sys.common.pojo.dto.DeptDTO; -import org.springframework.stereotype.Service; -import org.w3c.dom.Node; - -@Service -public class JmsIbmMqDeptCollectServiceImpl extends AbstractDeptMqCollectService { - - /** - * 监听注解订阅，自己编写 - * - * @param message 科室信息 - */ - //@JmsIbmListener(destination = "TJ_createDepartment") - @Override - public void addDept(String message) { - super.addDept(message); - } - - /** - * 监听注解订阅，自己编写 - * - * @param message 科室信息 - */ - //@JmsIbmListener(destination = "TJ_updateDepartment") - @Override - public void updateDept(String message) { - super.updateDept(message); - } - - /** - * 解析新增的消息, 下面是个例子 - * - * @param xml - * @return - */ - @Override - public DeptDTO parseAddDeptXml(String xml) { - XmlUtil xmlParseUtil = XmlUtil.of(xml); - Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/id/item/@extension"); - Node deptNameNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/assignedPrincipalOrganization/name/item[@use='OR']/part/@value"); - Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); - Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); - - DeptDTO deptDto = new DeptDTO(); - deptDto.setDeptCode(deptCodeNode.getNodeValue()); - deptDto.setDeptName(deptNameNode.getNodeValue()); - deptDto.setAuthorId(authorIdNode.getNodeValue()); - deptDto.setAuthorName(authorNameNode.getNodeValue()); - return deptDto; - } - - /** - * 解析更新的消息, 下面是个例子 - * - * @param xml - * @return - */ - @Override - public DeptDTO parseUpdateDeptXml(String xml) { - XmlUtil xmlParseUtil = XmlUtil.of(xml); - Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/id/item/@extension"); - Node deptNameNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/assignedPrincipalOrganization/name/item[@use='OR']/part/@value"); - Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); - Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); - - DeptDTO deptDto = new DeptDTO(); - deptDto.setDeptCode(deptCodeNode.getNodeValue()); - deptDto.setDeptName(deptNameNode.getNodeValue()); - deptDto.setAuthorId(authorIdNode.getNodeValue()); - deptDto.setAuthorName(authorNameNode.getNodeValue()); - return deptDto; - } - -} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/PowerDeptConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptConverter.java similarity index 94% rename from collect-sdry/src/main/java/com/docus/server/collect/dept/mq/PowerDeptConverter.java rename to collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptConverter.java index d9193a5..fae385b 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/PowerDeptConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptConverter.java @@ -6,11 +6,11 @@ import org.springframework.stereotype.Component; import java.util.UUID; -@Component("powerDeptConverter") -public class PowerDeptConverter implements IConverter { +@Component("mqDeptConverter") +public class MqDeptConverter implements IConverter { @Override - public DeptDTO convert(String message, String methodName) { + public DeptDTO convert(String message, String group) { //TODO： 根据协议进行解析。 // XmlUtil xmlParseUtil = XmlUtil.of(message); // Node msgIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/id/@extension"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptResultImpl.java new file mode 100644 index 0000000..8415376 --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptResultImpl.java @@ -0,0 +1,20 @@ +package com.docus.server.collect.dept.mq; + +import com.docus.server.ws.IMqResult; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component("mqDeptResultImpl") +public class MqDeptResultImpl implements IMqResult { + + @Override + public Void ok(Map params) { + return null; + } + + @Override + public Void fail(Map params) { + return null; + } +} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java index 55d0d38..8e1a0c2 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java @@ -9,7 +9,7 @@ import java.util.Date; import java.util.List; /** - * 主动ws + * 主动ws采集数据 */ @Component("wsDeptCollectorImpl") public class WsDeptCollectorImpl implements IWsCollector { diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/PowerDeptConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptConverter.java similarity index 94% rename from collect-sdry/src/main/java/com/docus/server/collect/dept/ws/PowerDeptConverter.java rename to collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptConverter.java index 329d767..6fd1e0b 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/PowerDeptConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptConverter.java @@ -6,11 +6,11 @@ import org.springframework.stereotype.Component; import java.util.UUID; -@Component("powerDeptConverter") -public class PowerDeptConverter implements IConverter { +@Component("wsDeptConverter") +public class WsDeptConverter implements IConverter { @Override - public DeptDTO convert(String message, String methodName) { + public DeptDTO convert(String message, String group) { //TODO： 根据协议进行解析。 // XmlUtil xmlParseUtil = XmlUtil.of(message); // Node msgIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/id/@extension"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java index c197a67..b2e8c1f 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java @@ -15,7 +15,7 @@ import org.w3c.dom.Node; public class ReportConverter implements IConverter { @Override - public ReportDTO convert(String message, String methodName) { + public ReportDTO convert(String message, String group) { //TODO： 根据协议进行解析。 XmlUtil xmlUtil = XmlUtil.of(message); Node msgNode = xmlUtil.getNode("/Request/Msg/ID"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserConverter.java new file mode 100644 index 0000000..4fb186f --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserConverter.java @@ -0,0 +1,66 @@ +package com.docus.server.collect.user.http; + +import com.docus.server.sys.common.pojo.dto.UserDTO; +import com.docus.server.ws.convert.IConverter; +import org.springframework.stereotype.Component; + +import java.util.UUID; + +/** + * 被动ws和http转化器 + */ +@Component("httpUserConverter") +public class HttpUserConverter implements IConverter { + + @Override + public UserDTO convert(String message, String group) { +// XmlUtil xmlParseUtil = XmlUtil.of(message); +// Node msgIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/id/@extension"); +// Node receiverNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/receiver/device/id/item/@extension"); +// Node operateTypeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/@operateType"); +// Node employeeCodeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/EMPL_CODE/@value"); +// Node employeeNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/EMPL_NAME/@value"); +// Node deptCodeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/DEPT_CODE/@value"); +// Node positionNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/POSI_NAME/@value"); +// Node authorIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); +// Node authorNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); +// UserDTO userDTO = new UserDTO(); +// userDTO.setDeptId(deptCodeNode.getNodeValue()); +// userDTO.setReceiver(receiverNode.getNodeValue()); +// userDTO.setOperateType(operateTypeNode.getNodeValue()); +// userDTO.setUserName(employeeCodeNode.getNodeValue()); +// userDTO.setName(employeeNameNode.getNodeValue()); +// userDTO.setPosition(positionNode.getNodeValue()); +// userDTO.setAuthorId(authorIdNode.getNodeValue()); +// userDTO.setMessageId(msgIdNode.getNodeValue()); +// userDTO.setAuthorName(authorNameNode.getNodeValue()); +// userDTO.setRoleId(0L); +// +// userDTO.setParams(ParamsUtils.addParam("msg", "操作成功！") +// .addParam("msgId", userDTO.getMessageId()) +// .addParam("receiver", userDTO.getReceiver()) +// .param()); + + + UserDTO userDTO = new UserDTO(); + userDTO.setDeptId("1"); + userDTO.setReceiver("2"); + userDTO.setOperateType("3"); + userDTO.setUserName("4"); + userDTO.setName("5"); + userDTO.setPosition("6"); + userDTO.setAuthorId("7"); + userDTO.setMessageId(UUID.randomUUID().toString()); + userDTO.setAuthorName("9"); + userDTO.setRoleId(0L); + +// userDTO.setParams(ParamsUtils.addParam("msg", "操作成功！") +// .addParam("msgId", userDTO.getMessageId()) +// .addParam("receiver", userDTO.getReceiver()) +// .param()); + + + return userDTO; + } + +} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/JmsIbmMqUserCollectServiceImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/JmsIbmMqUserCollectServiceImpl.java deleted file mode 100644 index c14cd8d..0000000 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/JmsIbmMqUserCollectServiceImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.docus.server.collect.user.mq; - -import com.docus.core.util.XmlUtil; -import com.docus.server.collect.mq.user.AbstractUserMqCollectService; -import com.docus.server.sys.common.pojo.dto.UserDTO; -import org.springframework.stereotype.Service; -import org.w3c.dom.Node; - -@Service -public class JmsIbmMqUserCollectServiceImpl extends AbstractUserMqCollectService { - /** - * 监听注解订阅，自己编写 - * - * @param message 科室信息 - */ - //@JmsIbmListener(destination = "TJ_createPractitioner") - @Override - public void addUser(String message) { - super.addUser(message); - } - - /** - * 监听注解订阅，自己编写 - * - * @param message 科室信息 - */ - //@JmsIbmListener(destination = "TJ_updatePractitioner") - @Override - public void updateUser(String message) { - super.updateUser(message); - } - - /** - * 解析新增的消息, 下面是个例子 - * - * @param xml - * @return - */ - @Override - public UserDTO parseAddUserXml(String xml) { - XmlUtil xmlParseUtil = XmlUtil.of(xml); - Node employeeCodeNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/id/item/@extension"); - Node employeeNameNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/name/item[@use='OR']/part/@value"); - Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/asAffiliate/affiliatedPrincipalOrganization/id/item/@extension"); - Node positionNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/relatedTo/assignedEntity/relatedTo/assignedEntity/code[@codeSystem='2.16.156.10011.0.9.2.3.2.122']/displayName/@value"); - Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); - Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); - - UserDTO userDto = new UserDTO(); - userDto.setDeptId(deptCodeNode.getNodeValue()); - userDto.setUserName(employeeCodeNode.getNodeValue()); - userDto.setName(employeeNameNode.getNodeValue()); - userDto.setPosition(positionNode.getNodeValue()); - userDto.setAuthorId(authorIdNode.getNodeValue()); - userDto.setAuthorName(authorNameNode.getNodeValue()); - userDto.setRoleId(0L); - return userDto; - } - - /** - * 解析更新的消息, 下面是个例子 - * - * @param xml - * @return - */ - @Override - public UserDTO parseUpdateUserXml(String xml) { - XmlUtil xmlParseUtil = XmlUtil.of(xml); - Node employeeCodeNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/id/item/@extension"); - Node employeeNameNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/name/item[@use='OR']/part/@value"); - Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/asAffiliate/affiliatedPrincipalOrganization/id/item/@extension"); - Node positionNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/relatedTo/assignedEntity/relatedTo/assignedEntity/code[@codeSystem='2.16.156.10011.0.9.2.3.2.122']/displayName/@value"); - Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); - Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); - - UserDTO userDto = new UserDTO(); - userDto.setDeptId(deptCodeNode.getNodeValue()); - userDto.setUserName(employeeCodeNode.getNodeValue()); - userDto.setName(employeeNameNode.getNodeValue()); - userDto.setPosition(positionNode.getNodeValue()); - userDto.setAuthorId(authorIdNode.getNodeValue()); - userDto.setAuthorName(authorNameNode.getNodeValue()); - userDto.setRoleId(0L); - return userDto; - } - - -} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/PowerUserConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserConverter.java similarity index 94% rename from collect-sdry/src/main/java/com/docus/server/collect/user/mq/PowerUserConverter.java rename to collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserConverter.java index 80ebbee..5c42658 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/PowerUserConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserConverter.java @@ -7,13 +7,13 @@ import org.springframework.stereotype.Component; import java.util.UUID; /** - * 被动ws和http转化器 + * 被动mq转化器 */ -@Component("powerUserConverter") -public class PowerUserConverter implements IConverter { +@Component("mqUserConverter") +public class MqUserConverter implements IConverter { @Override - public UserDTO convert(String message, String methodName) { + public UserDTO convert(String message, String group) { // XmlUtil xmlParseUtil = XmlUtil.of(message); // Node msgIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/id/@extension"); // Node receiverNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/receiver/device/id/item/@extension"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserResultImpl.java new file mode 100644 index 0000000..d26a1e1 --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserResultImpl.java @@ -0,0 +1,20 @@ +package com.docus.server.collect.user.mq; + +import com.docus.server.ws.IMqResult; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component("mqUserResultImpl") +public class MqUserResultImpl implements IMqResult { + + @Override + public Void ok(Map params) { + return null; + } + + @Override + public Void fail(Map params) { + return null; + } +} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java index 4f538a2..db14895 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java @@ -9,7 +9,7 @@ import java.util.Date; import java.util.List; /** - * 主动ws + * 主动ws采集数据 */ @Component("wsUserCollectorImpl") public class WsUserCollectorImpl implements IWsCollector { diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/PowerUserConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserConverter.java similarity index 94% rename from collect-sdry/src/main/java/com/docus/server/collect/user/ws/PowerUserConverter.java rename to collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserConverter.java index 6158fc3..4c91391 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/PowerUserConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserConverter.java @@ -7,13 +7,13 @@ import org.springframework.stereotype.Component; import java.util.UUID; /** - * 被动ws和http转化器 + * 被动ws转化器 */ -@Component("powerUserConverter") -public class PowerUserConverter implements IConverter { +@Component("wsUserConverter") +public class WsUserConverter implements IConverter { @Override - public UserDTO convert(String message, String methodName) { + public UserDTO convert(String message, String group) { // XmlUtil xmlParseUtil = XmlUtil.of(message); // Node msgIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/id/@extension"); // Node receiverNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/receiver/device/id/item/@extension"); diff --git a/common-collect/src/main/java/com/docus/server/collect/controller/BasicController.java b/common-collect/src/main/java/com/docus/server/collect/controller/BasicController.java index 6b9b50a..a11af23 100644 --- a/common-collect/src/main/java/com/docus/server/collect/controller/BasicController.java +++ b/common-collect/src/main/java/com/docus/server/collect/controller/BasicController.java @@ -45,7 +45,7 @@ public class BasicController { @PostMapping("/insert") @TrackGroup( group = "HTTP_PASSIVE_BASIC", - beanNames = {"tBasicConverter", "httpBasicResultImpl"}, + beanNames = {"httpTBasicConverter", "httpBasicResultImpl"}, processor = VisitorProcessor.class) public CommonResult insertHttpPassiveBasic(@RequestBody String message) { log.info("新增基础数据：{}", message); @@ -63,7 +63,7 @@ public class BasicController { @PostMapping("/update") @TrackGroup( group = "HTTP_PASSIVE_BASIC", - beanNames = {"tBasicConverter", "httpBasicResultImpl"}, + beanNames = {"httpTBasicConverter", "httpBasicResultImpl"}, processor = VisitorProcessor.class) public CommonResult updateHttpPassiveBasic(@RequestBody String message) { log.info("编辑基础数据：{}", message); diff --git a/common-collect/src/main/java/com/docus/server/collect/controller/DeptController.java b/common-collect/src/main/java/com/docus/server/collect/controller/DeptController.java index e953a27..4d6a292 100644 --- a/common-collect/src/main/java/com/docus/server/collect/controller/DeptController.java +++ b/common-collect/src/main/java/com/docus/server/collect/controller/DeptController.java @@ -45,7 +45,7 @@ public class DeptController { @PostMapping("/update") @TrackGroup( group = "HTTP_PASSIVE_DEPT", - beanNames = {"powerDeptConverter", "httpDeptResultImpl"}, + beanNames = {"httpDeptConverter", "httpDeptResultImpl"}, processor = VisitorProcessor.class) public CommonResult httpPassiveDept(@RequestBody String message) { log.info("新增/修改科室数据：{}", message); diff --git a/common-collect/src/main/java/com/docus/server/collect/controller/UserController.java b/common-collect/src/main/java/com/docus/server/collect/controller/UserController.java index fcdc13b..cc8073b 100644 --- a/common-collect/src/main/java/com/docus/server/collect/controller/UserController.java +++ b/common-collect/src/main/java/com/docus/server/collect/controller/UserController.java @@ -45,7 +45,7 @@ public class UserController { @PostMapping("/update") @TrackGroup( group = "HTTP_PASSIVE_USER", - beanNames = {"powerUserConverter", "httpUserResultImpl"}, + beanNames = {"httpUserConverter", "httpUserResultImpl"}, processor = VisitorProcessor.class) public CommonResult httpPassiveUser(@RequestBody String message) { log.info("新增/修改用户数据：{}", message); diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java b/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java index 3a0714f..a88d789 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java +++ b/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java @@ -6,7 +6,8 @@ public enum CollectTypeEnum implements IIntegerEnum { WEBSERVICE_XML_DEPT(0, "WEBSERVICE_XML_DEPT", "新增/修改-科室信息"), WEBSERVICE_XML_USER(1, "WEBSERVICE_XML_USER", "新增/修改-用户信息"), - WEBSERVICE_XML_BASIC(2, "WEBSERVICE_XML_BASIC", "新增/修改-基础数据"), + WEBSERVICE_XML_INSERT_BASIC(2, "WEBSERVICE_XML_BASIC", "新增/修改-基础数据"), + WEBSERVICE_XML_UPDATE_BASIC(2, "WEBSERVICE_XML_BASIC", "新增/修改-基础数据"), WEBSERVICE_XML_SA_REPORT(3, "WEBSERVICE_XML_SA_REPORT", "新增-手麻报告信息"), WEBSERVICE_XML_ICU_REPORT(4, "WEBSERVICE_XML_ICU_REPORT", "新增-重症报告信息"), WEBSERVICE_XML_EXAMINATION_REPORT(5, "WEBSERVICE_XML_EXAMINATION_REPORT", "新增-检验报告信息"), @@ -16,6 +17,13 @@ public enum CollectTypeEnum implements IIntegerEnum { HTTP_PASSIVE_USER(8, "HTTP_PASSIVE_USER", "新增/修改-用户信息"), HTTP_PASSIVE_DEPT(9, "HTTP_PASSIVE_DEPT", "新增/修改-科室信息"), HTTP_PASSIVE_BASIC(10, "HTTP_PASSIVE_BASIC", "新增/修改-基础数据"), + + MQ_PASSIVE_INSERT_USER(11, "MQ_PASSIVE_USER", "新增-用户信息"), + MQ_PASSIVE_UPDATE_USER(12, "MQ_PASSIVE_USER", "修改-用户信息"), + MQ_PASSIVE_INSERT_DEPT(13, "MQ_PASSIVE_DEPT", "新增-科室信息"), + MQ_PASSIVE_UPDATE_DEPT(14, "MQ_PASSIVE_DEPT", "修改-科室信息"), + MQ_PASSIVE_INSERT_BASIC(15, "MQ_PASSIVE_BASIC", "新增-基础数据"), + MQ_PASSIVE_UPDATE_BASIC(16, "MQ_PASSIVE_BASIC", "修改-基础数据"), ; private Integer value; diff --git a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicWsCollectJob.java index 1790edc..ef3af04 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicWsCollectJob.java @@ -40,7 +40,7 @@ public class TBasicWsCollectJob extends AbstractCollectJob { @Override public void batchInsertOrUpdate(List t) { - userService.batchSaveOrUpdatePowerUser(t); + userService.batchInsertOrUpdatePowerUser(t); } @SuppressWarnings("unchecked") diff --git a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java index fb9dd52..4e9c1b6 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java @@ -41,7 +41,7 @@ public class DeptHttpCollectJob extends AbstractCollectJob { @Override public void batchInsertOrUpdate(List t) { - deptService.batchSaveOrUpdatePowerDept(t); + deptService.batchInsertOrUpdatePowerDept(t); } @SuppressWarnings("unchecked") diff --git a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java index ad0ea24..a0fc459 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java @@ -40,7 +40,7 @@ public class DeptViewCollectJob extends AbstractCollectJob { @Override public void batchInsertOrUpdate(List t) { - deptService.batchSaveOrUpdatePowerDept(t); + deptService.batchInsertOrUpdatePowerDept(t); } @SuppressWarnings("unchecked") diff --git a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptWsCollectJob.java index 0115929..b5e6633 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptWsCollectJob.java @@ -40,7 +40,7 @@ public class DeptWsCollectJob extends AbstractCollectJob { @Override public void batchInsertOrUpdate(List t) { - userService.batchSaveOrUpdatePowerUser(t); + userService.batchInsertOrUpdatePowerUser(t); } @SuppressWarnings("unchecked") diff --git a/common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java index 71703af..ebc78e3 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java @@ -40,7 +40,7 @@ public class UserHttpCollectJob extends AbstractCollectJob { @Override public void batchInsertOrUpdate(List t) { - userService.batchSaveOrUpdatePowerUser(t); + userService.batchInsertOrUpdatePowerUser(t); } @SuppressWarnings("unchecked") diff --git a/common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java index 9c953a2..4dea710 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java @@ -41,7 +41,7 @@ public class UserViewCollectJob extends AbstractCollectJob { @Override public void batchInsertOrUpdate(List t) { - userService.batchSaveOrUpdatePowerUser(t); + userService.batchInsertOrUpdatePowerUser(t); } @Override diff --git a/common-collect/src/main/java/com/docus/server/collect/job/user/UserWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/user/UserWsCollectJob.java index 7a57c21..8e1b9cb 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/user/UserWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/user/UserWsCollectJob.java @@ -40,7 +40,7 @@ public class UserWsCollectJob extends AbstractCollectJob { @Override public void batchInsertOrUpdate(List t) { - userService.batchSaveOrUpdatePowerUser(t); + userService.batchInsertOrUpdatePowerUser(t); } @SuppressWarnings("unchecked") diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/dept/IMqDeptCollectService.java b/common-collect/src/main/java/com/docus/server/collect/mq/IDeptMqCollectService.java similarity index 62% rename from common-collect/src/main/java/com/docus/server/collect/mq/dept/IMqDeptCollectService.java rename to common-collect/src/main/java/com/docus/server/collect/mq/IDeptMqCollectService.java index 1109120..4e65807 100644 --- a/common-collect/src/main/java/com/docus/server/collect/mq/dept/IMqDeptCollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/mq/IDeptMqCollectService.java @@ -1,8 +1,6 @@ -package com.docus.server.collect.mq.dept; +package com.docus.server.collect.mq; -import com.docus.server.collect.mq.IMqCollectService; - -public interface IMqDeptCollectService extends IMqCollectService { +public interface IDeptMqCollectService { /** * 订阅队列（注册科室） diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/IMqCollectService.java b/common-collect/src/main/java/com/docus/server/collect/mq/IMqCollectService.java deleted file mode 100644 index def4c4a..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/mq/IMqCollectService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.docus.server.collect.mq; - -public interface IMqCollectService { - - -} diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/user/IMqUserCollectService.java b/common-collect/src/main/java/com/docus/server/collect/mq/IUserMqCollectService.java similarity index 62% rename from common-collect/src/main/java/com/docus/server/collect/mq/user/IMqUserCollectService.java rename to common-collect/src/main/java/com/docus/server/collect/mq/IUserMqCollectService.java index 59baebb..6a047e0 100644 --- a/common-collect/src/main/java/com/docus/server/collect/mq/user/IMqUserCollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/mq/IUserMqCollectService.java @@ -1,8 +1,6 @@ -package com.docus.server.collect.mq.user; +package com.docus.server.collect.mq; -import com.docus.server.collect.mq.IMqCollectService; - -public interface IMqUserCollectService extends IMqCollectService { +public interface IUserMqCollectService { /** diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/dept/AbstractDeptMqCollectService.java b/common-collect/src/main/java/com/docus/server/collect/mq/dept/AbstractDeptMqCollectService.java deleted file mode 100644 index 18f810c..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/mq/dept/AbstractDeptMqCollectService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.docus.server.collect.mq.dept; - -import com.docus.server.sys.common.pojo.dto.DeptDTO; -import com.docus.server.sys.service.IPowerDeptService; -import lombok.extern.slf4j.Slf4j; - -import javax.annotation.Resource; - -/** - * 每家mq 都不一样，这部分无法预先写好写入，需要根据每家独立编写。 - */ -@Slf4j -public abstract class AbstractDeptMqCollectService implements IMqDeptCollectService { - - @Resource - private IPowerDeptService deptService; - - /** - * 订阅队列（注册科室） - * - * @param message 科室信息 - */ - @Override - public void addDept(String message) { - log.info("注册科室 队列接收信息：{}", message); - DeptDTO dept = this.parseAddDeptXml(message); - deptService.saveOrUpdatePowerDept(dept); - } - - - /** - * 订阅队列（变更科室） - * - * @param message 科室信息 - */ - @Override - public void updateDept(String message) { - log.info("变更科室 队列接收信息：{}", message); - DeptDTO deptDto = this.parseUpdateDeptXml(message); - deptService.saveOrUpdatePowerDept(deptDto); - } - - protected abstract DeptDTO parseAddDeptXml(String message); - - protected abstract DeptDTO parseUpdateDeptXml(String message); - - -} diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/dept/DeptMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/mq/dept/DeptMqCollectServiceImpl.java new file mode 100644 index 0000000..6241fae --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/mq/dept/DeptMqCollectServiceImpl.java @@ -0,0 +1,58 @@ +package com.docus.server.collect.mq.dept; + +import com.docus.core.util.json.JSON; +import com.docus.log.annotation.TrackGroup; +import com.docus.log.context.TrackHelper; +import com.docus.server.collect.mq.IDeptMqCollectService; +import com.docus.server.collect.service.CollectService; +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.visitor.VisitorProcessor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 每家mq 都不一样，这部分无法预先写好写入，需要根据每家独立编写。 + */ +@Slf4j +@Service +public class DeptMqCollectServiceImpl implements IDeptMqCollectService { + @Resource + private CollectService collectService; + + /** + * 订阅队列（注册科室） + * + * @param message 科室信息 + */ + @Override + @TrackGroup( + group = "MQ_PASSIVE_INSERT_DEPT", + beanNames = {"mqDeptConverter", "mqDeptResultImpl"}, + processor = VisitorProcessor.class) + public void addDept(String message) { + log.info("注册科室 队列接收信息：{}", message); + collectService.insertOrUpdateDept(getValue()); + } + + + /** + * 订阅队列（变更科室） + * + * @param message 科室信息 + */ + @Override + @TrackGroup( + group = "MQ_PASSIVE_UPDATE_DEPT", + beanNames = {"mqDeptConverter", "mqDeptResultImpl"}, + processor = VisitorProcessor.class) + public void updateDept(String message) { + log.info("变更科室 队列接收信息：{}", message); + collectService.insertOrUpdateDept(getValue()); + } + + public DeptDTO getValue() { + return JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), DeptDTO.class); + } +} diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/user/AbstractUserMqCollectService.java b/common-collect/src/main/java/com/docus/server/collect/mq/user/AbstractUserMqCollectService.java deleted file mode 100644 index aca935a..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/mq/user/AbstractUserMqCollectService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.docus.server.collect.mq.user; - -import com.docus.server.sys.common.pojo.dto.UserDTO; -import com.docus.server.sys.service.IPowerUserService; -import lombok.extern.slf4j.Slf4j; - -import javax.annotation.Resource; - -/** - * 每家mq 都不一样，这部分无法预先写好写入，需要根据每家独立编写。 - */ -@Slf4j -public abstract class AbstractUserMqCollectService implements IMqUserCollectService { - - @Resource - private IPowerUserService userService; - - /** - * 订阅队列（注册人员） - * - * @param message 人员信息 - */ - @Override - public void addUser(String message) { - log.info("人员注册 队列接收信息：{}", message); - UserDTO userDto = this.parseAddUserXml(message); - userService.saveOrUpdatePowerUser(userDto); - } - - /** - * 订阅队列（变更人员） - * - * @param message 人员信息 - */ - @Override - public void updateUser(String message) { - log.info("人员变更 队列接收信息：{}", message); - UserDTO userDto = this.parseUpdateUserXml(message); - userService.saveOrUpdatePowerUser(userDto); - } - - protected abstract UserDTO parseAddUserXml(String message); - - protected abstract UserDTO parseUpdateUserXml(String message); - - -} diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/user/UserMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/mq/user/UserMqCollectServiceImpl.java new file mode 100644 index 0000000..4a15597 --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/mq/user/UserMqCollectServiceImpl.java @@ -0,0 +1,58 @@ +package com.docus.server.collect.mq.user; + +import com.docus.core.util.json.JSON; +import com.docus.log.annotation.TrackGroup; +import com.docus.log.context.TrackHelper; +import com.docus.server.collect.mq.IUserMqCollectService; +import com.docus.server.collect.service.CollectService; +import com.docus.server.sys.common.pojo.dto.UserDTO; +import com.docus.server.visitor.VisitorProcessor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 每家mq 都不一样，这部分无法预先写好写入，需要根据每家独立编写。 + */ +@Slf4j +@Service +public class UserMqCollectServiceImpl implements IUserMqCollectService { + + @Resource + private CollectService collectService; + + /** + * 订阅队列（注册人员） + * + * @param message 人员信息 + */ + @Override + @TrackGroup( + group = "MQ_PASSIVE_INSERT_DEPT", + beanNames = {"mqUserConverter", "mqUserResultImpl"}, + processor = VisitorProcessor.class) + public void addUser(String message) { + log.info("人员注册 队列接收信息：{}", message); + collectService.insertOrUpdateUser(getValue()); + } + + /** + * 订阅队列（变更人员） + * + * @param message 人员信息 + */ + @Override + @TrackGroup( + group = "MQ_PASSIVE_UPDATE_USER", + beanNames = {"mqUserConverter", "mqUserResultImpl"}, + processor = VisitorProcessor.class) + public void updateUser(String message) { + log.info("人员变更 队列接收信息：{}", message); + collectService.insertOrUpdateUser(getValue()); + } + + public UserDTO getValue() { + return JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), UserDTO.class); + } +} diff --git a/common-collect/src/main/java/com/docus/server/collect/service/CollectService.java b/common-collect/src/main/java/com/docus/server/collect/service/CollectService.java index ff2263c..45e4f8c 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/CollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/service/CollectService.java @@ -29,7 +29,7 @@ public class CollectService { if (checkType(deptDTO.getOperateType(), DEL_TYPE)) { deptService.delDeptByDeptCode(deptDTO.getDeptCode()); } else { - deptService.saveOrUpdatePowerDept(deptDTO); + deptService.insertOrUpdatePowerDept(deptDTO); } } @@ -39,7 +39,7 @@ public class CollectService { if (checkType(userDTO.getOperateType(), DEL_TYPE)) { userService.delUserByUserName(userDTO.getUserName()); } else { - userService.saveOrUpdatePowerUser(userDTO); + userService.insertOrUpdatePowerUser(userDTO); } } diff --git a/common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java b/common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java index 91549b4..225b35b 100644 --- a/common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java +++ b/common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java @@ -36,7 +36,7 @@ public class VisitorProcessor extends AbstractProcessor { if (Func.isEmpty(message)) { throw new RuntimeException("参数为空"); } - String jsonStr = JSON.toJSON(converter.convert(message, context.getMethodName())); + String jsonStr = JSON.toJSON(converter.convert(message, context.getGroup())); Long taskId = messageService.insertTaskOriginalMessage(jsonStr, message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup())); Map params = context.getParams(); params.put("taskId", taskId); diff --git a/common-collect/src/main/java/com/docus/server/ws/IMqResult.java b/common-collect/src/main/java/com/docus/server/ws/IMqResult.java new file mode 100644 index 0000000..6aee4a7 --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/ws/IMqResult.java @@ -0,0 +1,6 @@ +package com.docus.server.ws; + +public interface IMqResult extends IResult { + + +} diff --git a/common-collect/src/main/java/com/docus/server/ws/convert/IConverter.java b/common-collect/src/main/java/com/docus/server/ws/convert/IConverter.java index 30a661b..f3d9cff 100644 --- a/common-collect/src/main/java/com/docus/server/ws/convert/IConverter.java +++ b/common-collect/src/main/java/com/docus/server/ws/convert/IConverter.java @@ -3,10 +3,10 @@ package com.docus.server.ws.convert; public interface IConverter { /** - * @param message 原始报文 - * @param methodName 目标方法 + * @param message 原始报文 + * @param group 分组 * @return T */ - T convert(String message, String methodName); + T convert(String message, String group); } diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/BasicServerImpl.java b/common-collect/src/main/java/com/docus/server/ws/impl/BasicServerImpl.java index 32dc3ca..ab2c491 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/BasicServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/ws/impl/BasicServerImpl.java @@ -28,8 +28,8 @@ public class BasicServerImpl implements IBasicServer { @Override @TrackGroup( - group = "WEBSERVICE_XML_BASIC", - beanNames = {"tBasicConverter", "wsBasicResultImpl"}, + group = "WEBSERVICE_XML_INSERT_BASIC", + beanNames = {"wsTBasicConverter", "wsBasicResultImpl"}, processor = VisitorProcessor.class) public String setTBasic(String message) { log.info("新增基础数据：{}", message); @@ -39,8 +39,8 @@ public class BasicServerImpl implements IBasicServer { @Override @TrackGroup( - group = "WEBSERVICE_XML_BASIC", - beanNames = {"tBasicConverter", "wsBasicResultImpl"}, + group = "WEBSERVICE_XML_UPDATE_BASIC", + beanNames = {"wsTBasicConverter", "wsBasicResultImpl"}, processor = VisitorProcessor.class) public String updateTBasic(String message) { log.info("修改基础数据：{}", message); diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/DeptServerImpl.java b/common-collect/src/main/java/com/docus/server/ws/impl/DeptServerImpl.java index 0299f0a..8128a36 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/DeptServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/ws/impl/DeptServerImpl.java @@ -29,7 +29,7 @@ public class DeptServerImpl implements IDeptServer { @Override @TrackGroup( group = "WEBSERVICE_XML_DEPT", - beanNames = {"powerDeptConverter", "wsDeptResultImpl"}, + beanNames = {"wsDeptConverter", "wsDeptResultImpl"}, processor = VisitorProcessor.class) public String deptModify(String message) { log.info("新增/修改科室数据：{}", message); diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java b/common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java index 7791a17..400d27a 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java @@ -35,7 +35,7 @@ public class UserServerImpl implements IUserServer { @Override @TrackGroup( group = "WEBSERVICE_XML_USER", - beanNames = {"powerUserConverter", "wsUserResultImpl"}, + beanNames = {"wsUserConverter", "wsUserResultImpl"}, processor = VisitorProcessor.class) public String userModify(String message) { log.debug("新增/修改用户数据：{}", message); diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java index f22f9f1..9f4298e 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java @@ -12,7 +12,7 @@ public interface IPowerDeptService { * @param deptDto 用户注册参数 * @return 处理结果 */ - boolean saveOrUpdatePowerDept(DeptDTO deptDto); + boolean insertOrUpdatePowerDept(DeptDTO deptDto); /** * 根据科室编号删除科室 @@ -27,5 +27,5 @@ public interface IPowerDeptService { * * @param deptDTOList */ - void batchSaveOrUpdatePowerDept(List deptDTOList); + void batchInsertOrUpdatePowerDept(List deptDTOList); } diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java index bf6c5b9..bd5797e 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java @@ -14,7 +14,7 @@ public interface IPowerUserService { * @param userDTO 用户注册参数 * @return 处理结果 */ - boolean saveOrUpdatePowerUser(UserDTO userDTO); + boolean insertOrUpdatePowerUser(UserDTO userDTO); /** * 根据用户工号删除用户 @@ -29,5 +29,5 @@ public interface IPowerUserService { * * @param users */ - void batchSaveOrUpdatePowerUser(List users); + void batchInsertOrUpdatePowerUser(List users); } diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java index 9a2b060..9aff056 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java @@ -26,13 +26,13 @@ public class PowerDeptServiceImpl extends ServiceImpl deptDTOList) { - deptDTOList.forEach(this::saveOrUpdatePowerDept); + public void batchInsertOrUpdatePowerDept(List deptDTOList) { + deptDTOList.forEach(this::insertOrUpdatePowerDept); } @Transactional @Override - public boolean saveOrUpdatePowerDept(DeptDTO deptDTO) { + public boolean insertOrUpdatePowerDept(DeptDTO deptDTO) { PowerDept powerDept = baseMapper.getDeptByDeptCode(deptDTO.getDeptCode()); DeptModifyParam deptModifyParam = deptDTO.transDeptAddParam(); if (Func.isEmpty(powerDept)) { diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java index 114fff6..fdaf7e8 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java @@ -29,13 +29,13 @@ public class PowerUserServiceImpl extends ServiceImpl userDTOList) { - userDTOList.forEach(this::saveOrUpdatePowerUser); + public void batchInsertOrUpdatePowerUser(List userDTOList) { + userDTOList.forEach(this::insertOrUpdatePowerUser); } @Transactional @Override - public boolean saveOrUpdatePowerUser(UserDTO userDTO) { + public boolean insertOrUpdatePowerUser(UserDTO userDTO) { PowerUser powerUser = baseMapper.getUserByUserName(userDTO.getUserName()); UserModifyParam userModifyParam = userDTO.transUserAddParam(); if (Func.isEmpty(powerUser)) {