From 3d0050d46bc93e74ebb21df9506bd65488272657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BA=AA=E5=AF=92?= <2533659732@qq.com> Date: Tue, 31 Oct 2023 16:37:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chatrecord/ChatRecordController.java | 1 - .../ConsultationInfoController.java | 20 +++++-------------- .../IConsultationInfoService.java | 2 +- .../impl/ConsultationInfoServiceImpl.java | 13 +++++++----- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/chatrecord/ChatRecordController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/chatrecord/ChatRecordController.java index 81c117c..80070d2 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/chatrecord/ChatRecordController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/chatrecord/ChatRecordController.java @@ -58,7 +58,6 @@ public class ChatRecordController extends BaseController { /** * 修改已读状态 */ - @Log(title = "图文咨询-聊天记录", businessType = BusinessType.UPDATE) @PutMapping(value = "updateReadStatus") public AjaxResult updateReadStatus(@RequestBody ChatRecord chatRecord) { return toAjax(chatRecordService.updateChatRecord(chatRecord)); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java index a0dbeea..1a3afe0 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java @@ -2,33 +2,25 @@ package com.xinelu.applet.controller.consultationInfo; import com.xinelu.applet.dto.consultationInfo.ConsultationInfoDTO; import com.xinelu.applet.service.consultationInfo.IConsultationInfoService; -import com.xinelu.common.annotation.Log; import com.xinelu.common.constant.Constants; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.domain.R; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.custominterface.Insert; -import com.xinelu.common.enums.BusinessType; import com.xinelu.manage.domain.consultationInfo.ConsultationInfo; import com.xinelu.manage.vo.consultationInfo.ConsultationInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Objects; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.List; +import java.util.Objects; + /** * 在线问诊-问诊信息Controller * @@ -65,16 +57,14 @@ public class ConsultationInfoController extends BaseController { /** * 新增在线问诊-问诊信息 */ - @Log(title = "在线问诊-问诊信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@Validated(Insert.class) @RequestBody ConsultationInfoDTO consultationInfoDTO) { - return toAjax(consultationInfoService.insertConsultationInfo(consultationInfoDTO)); + return consultationInfoService.insertConsultationInfo(consultationInfoDTO); } /** * 修改在线问诊-问诊信息(修改问诊状态) */ - @Log(title = "在线问诊-问诊信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ConsultationInfo consultationInfo) { return toAjax(consultationInfoService.updateConsultationInfo(consultationInfo)); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/consultationInfo/IConsultationInfoService.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/consultationInfo/IConsultationInfoService.java index 866e524..e7aa4e3 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/consultationInfo/IConsultationInfoService.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/consultationInfo/IConsultationInfoService.java @@ -40,7 +40,7 @@ public interface IConsultationInfoService { * @param consultationInfoDTO 在线问诊-问诊信息（图文和视频问诊基本信息） * @return 结果 */ - public int insertConsultationInfo(ConsultationInfoDTO consultationInfoDTO); + public AjaxResult insertConsultationInfo(ConsultationInfoDTO consultationInfoDTO); /** * 修改在线问诊-问诊信息（图文和视频问诊基本信息） diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/consultationInfo/impl/ConsultationInfoServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/consultationInfo/impl/ConsultationInfoServiceImpl.java index 79568a2..fdab9fd 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/consultationInfo/impl/ConsultationInfoServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/consultationInfo/impl/ConsultationInfoServiceImpl.java @@ -16,6 +16,7 @@ import com.xinelu.manage.vo.consultationInfo.ConsultationInfoVO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -46,9 +47,9 @@ public class ConsultationInfoServiceImpl implements IConsultationInfoService { @Override public ConsultationInfoDTO selectConsultationInfoById(Long id) { ConsultationInfoDTO consultationInfoDTO = consultationInfoMapper.selectConsultationInfoById(id); - if (consultationInfoDTO != null) { - consultationInfoDTO.setFileUrls(consultationInfoMapper.getConsultationFiles(id)); - } + if (consultationInfoDTO != null) { + consultationInfoDTO.setFileUrls(consultationInfoMapper.getConsultationFiles(id)); + } return consultationInfoDTO; } @@ -69,8 +70,9 @@ public class ConsultationInfoServiceImpl implements IConsultationInfoService { * @param consultationInfoDTO 在线问诊-问诊信息（图文和视频问诊基本信息） * @return 结果 */ + @Transactional(rollbackFor = Exception.class) @Override - public int insertConsultationInfo(ConsultationInfoDTO consultationInfoDTO) { + public AjaxResult insertConsultationInfo(ConsultationInfoDTO consultationInfoDTO) { consultationInfoDTO.setCreateTime(DateUtils.getNowDate()); ConsultationInfo consultationInfo = new ConsultationInfo(); BeanUtils.copyBeanProp(consultationInfo, consultationInfoDTO); @@ -79,8 +81,9 @@ public class ConsultationInfoServiceImpl implements IConsultationInfoService { if (CollectionUtils.isNotEmpty(consultationInfoDTO.getFileUrls())) { consultationInfoMapper.insertConsultationFile(consultationInfo.getId(), consultationInfoDTO.getFileUrls()); } + return AjaxResult.success(consultationInfo); } - return count; + return AjaxResult.error(); } /**