diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java index 109cee99..71f6d038 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java @@ -12,9 +12,10 @@ import java.util.List; /** * 体格检查工具配置表 + * * @TableName vp_config_physical_tool */ -@TableName(value ="vp_config_physical_tool",autoResultMap = true) +@TableName(value = "vp_config_physical_tool", autoResultMap = true) @Data public class ConfigPhysicalTool implements Serializable { /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Patient.java b/virtual-patient-model/src/main/java/com/supervision/model/Patient.java index 9bea01b5..a54154e8 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Patient.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Patient.java @@ -1,22 +1,22 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.supervision.handler.StringListTypeHandler; +import lombok.Data; + import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -import com.supervision.handler.StringListTypeHandler; -import lombok.Data; - /** * 病人表 + * * @TableName vp_patient */ -@TableName(value ="vp_patient") +@TableName(value = "vp_patient", autoResultMap = true) @Data public class Patient implements Serializable { /** diff --git a/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalToolMapper.xml b/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalToolMapper.xml index 290923c8..f65668af 100644 --- a/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalToolMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalToolMapper.xml @@ -5,20 +5,22 @@ - - - - - - - - - - + + + + + + + + + + - id,tool_class,code, + id + ,tool_class,code, tool_name,require_location,create_user_id, create_time,update_user_id,update_time diff --git a/virtual-patient-model/src/main/resources/mapper/PatientMapper.xml b/virtual-patient-model/src/main/resources/mapper/PatientMapper.xml index 188cb150..3d1f1cf2 100644 --- a/virtual-patient-model/src/main/resources/mapper/PatientMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/PatientMapper.xml @@ -5,22 +5,24 @@ - - - - - - - - - - - - + + + + + + + + + + + + - id,name,gender, + id + ,name,gender, age,symptoms,height, weight,disease_list,create_user_id, create_time,update_user_id,update_time diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskServiceImpl.java index 6488a518..144ab387 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskServiceImpl.java @@ -13,6 +13,7 @@ import com.supervision.websocket.cache.WebSocketUserCache; import com.supervision.websocket.dto.ActionDTO; import com.supervision.websocket.dto.SocketMessageDTO; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.socket.TextMessage; @@ -21,6 +22,7 @@ import org.springframework.web.socket.WebSocketSession; import java.io.IOException; import java.util.List; +@Slf4j @Service @RequiredArgsConstructor public class AskServiceImpl implements AskService { @@ -42,17 +44,18 @@ public class AskServiceImpl implements AskService { } // 进行rasa对话 List rasaResultList = RasaUtil.talkRasa(text, socketMessageDTO.getSocketId()); + log.info("问题:{},rasa回复:{}", text, JSONUtil.toJsonStr(rasaResultList)); WebSocketSession session = WebSocketUserCache.getSession(socketMessageDTO.getSocketId()); for (String rasaResult : rasaResultList) { - if (StrUtil.isNotBlank(rasaResult)){ + if (StrUtil.isNotBlank(rasaResult)) { // 这里校验,rasa回复的结果是不是action // 这里设置的模板,对于action的动作全部是用---进行标记,详情看生成rasa的yml的代码:RasaServiceImpl.generateDomain // ---ancillary---xxx // ---tool---xxx - if (rasaResult.startsWith("---")){ + if (rasaResult.startsWith("---")) { // ["","ancillary","xxx"] List actionList = StrUtil.split(rasaResult, "---"); - if (actionList.size() > 2){ + if (actionList.size() > 2) { ActionDTO actionDTO = new ActionDTO(); actionDTO.setActionType(actionList.get(1)); actionDTO.setActionId(actionList.get(2)); @@ -65,7 +68,7 @@ public class AskServiceImpl implements AskService { session.sendMessage(new TextMessage(JSONUtil.toJsonStr(res))); return; } - }else { + } else { // 走到这里,说明是文字,这个时候文字转语音 String replyVoiceResVO = TtsUtil.ttsTransform(rasaResult); // 在这里给socket回复 @@ -87,6 +90,7 @@ public class AskServiceImpl implements AskService { res.setTextMessage("医生,我们有听懂您说的什么"); res.setType(1); session.sendMessage(new TextMessage(JSONUtil.toJsonStr(res))); + log.info("兜底话术,需要检查上面是不是出什么问题了"); } @Override