feat:家庭医生初始化

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/ImChatTemplate.java

@@ -29,5 +29,5 @@ public interface ImChatTemplate {
 
     void doctorPrompted(String admId);
 
-    Boolean sendMsg(List<Components> componentsList, String admId, Integer contentType);
+    Boolean sendMsg(List<Components> componentsList, String admId);
 }

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/ImChatTemplateImpl.java

@@ -12,7 +12,6 @@ import com.ebaiyihui.family.doctor.common.dto.DoctorIdDTO;
 import com.ebaiyihui.family.doctor.server.common.constants.CommonConstants;
 import com.ebaiyihui.family.doctor.server.common.constants.IMInformConstants;
 import com.ebaiyihui.family.doctor.server.common.constants.ImConstants;
-import com.ebaiyihui.family.doctor.server.common.enums.ContentType;
 import com.ebaiyihui.family.doctor.server.common.enums.SenderEnum;
 import com.ebaiyihui.family.doctor.server.entity.PatientSignEntity;
 import com.ebaiyihui.family.doctor.server.exception.BusinessException;
@@ -143,21 +142,19 @@ public class ImChatTemplateImpl implements ImChatTemplate {
     }
 
     @Override
-    public Boolean sendMsg(List<Components> componentsList, String admId, Integer contentType) {
+    public Boolean sendMsg(List<Components> componentsList, String admId) {
         if (!componentsList.isEmpty()) {
+            log.info("componentsList={}",componentsList);
             for (int i = 0; i <= componentsList.size(); i++) {
                 String content = componentsList.get(i).getContent();
                 List<MessageInfo> messageInfos = new ArrayList<>();
                 PatientSignInfo patientSignInfo = getPatientSignInfo(admId);
-                if (ContentType.DOCTOR.getValue().equals(contentType)) {
-                    content = MessageFormat.format(content, patientSignInfo.getDoctorName());
-                } else {
-                    content = MessageFormat.format(content, patientSignInfo.getPatientName());
-                }
                 MessageInfo messageInfo = new MessageInfo();
                 if (SenderEnum.DOCTOR.getDesc().equals(componentsList.get(i).getSender())) {
+                    content = MessageFormat.format(content, patientSignInfo.getDoctorName());
                     messageInfo = getDoctorInformRefreshPatientParam(patientSignInfo, IMInformConstants.REFRESH);
                 } else {
+                    content = MessageFormat.format(content, patientSignInfo.getPatientName());
                     messageInfo = getInformRefreshPatientParam(patientSignInfo, IMInformConstants.REFRESH);
                 }
                 messageInfos.add(messageInfo);

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/ImMsgTemplateServiceImpl.java

@@ -48,7 +48,7 @@ public class ImMsgTemplateServiceImpl implements ImMsgTemplateService {
         String components = imMsgTemplateEntity.getContent();
         MsgContent msgContent = JSON.parseObject(components, MsgContent.class);
         List<Components> componentsList = msgContent.getComponents().stream().sorted(Comparator.comparing(Components::getSort)).collect(Collectors.toList());
-        Boolean flag = imChatTemplate.sendMsg(componentsList, reqVo.getAdmId(), imMsgTemplateEntity.getContentType());
+        Boolean flag = imChatTemplate.sendMsg(componentsList, reqVo.getAdmId());
         if (!flag) {
             throw new BusinessException("消息推送失败");
         }