From 4dbd9c3981754cc51a22e0384772980f606b5ecf Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 7 Jun 2024 17:29:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E8=AF=9D=E6=9C=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xinelu/common/constant/Constants.java | 10 +++++++ .../termbank/TermBankController.java | 8 +++-- .../service/termbank/ITermBankService.java | 6 ++-- .../termbank/impl/TermBankServiceImpl.java | 29 ++++++++++++++++--- 4 files changed, 45 insertions(+), 8 deletions(-) diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java index 456772f8..8cf3f493 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java @@ -358,4 +358,14 @@ public class Constants { * 泉医微信小程序ACCESS_TOKEN前缀(测试使用) */ public static final String NURSE_STATION_APPLET_ACCESS_TOKEN = "NURSE_STATION_APPLET_ACCESS_TOKEN"; + + /** + * 常用术语最大层数 + */ + public static final Long TERM_MAX_LEVEL = 3L; + + /** + * 常用术语最大层数 + */ + public static final Long TERM_MIN_LEVEL = 1L; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java index 8d048f96..a10df819 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java @@ -8,6 +8,7 @@ import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.termbank.TermBank; import com.xinelu.manage.service.termbank.ITermBankService; +import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -71,7 +72,10 @@ public class TermBankController extends BaseController { @Log(title = "常用术语(知识库)", businessType = BusinessType.INSERT) @PostMapping("/add") public AjaxResult add(@RequestBody TermBank termBank) { - return toAjax(termBankService.insertTermBank(termBank)); + if (StringUtils.isBlank(termBank.getTermContent())) { + return AjaxResult.success(); + } + return termBankService.insertTermBank(termBank); } /** @@ -81,7 +85,7 @@ public class TermBankController extends BaseController { @Log(title = "常用术语(知识库)", businessType = BusinessType.UPDATE) @PutMapping("/edit") public AjaxResult edit(@RequestBody TermBank termBank) { - return toAjax(termBankService.updateTermBank(termBank)); + return termBankService.updateTermBank(termBank); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/ITermBankService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/ITermBankService.java index c06fb870..7140df6e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/ITermBankService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/ITermBankService.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.termbank; +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.termbank.TermBank; import java.util.List; @@ -26,6 +27,7 @@ public interface ITermBankService { * @return 常用术语(知识库)集合 */ List list(TermBank termBank); + List selectTermBankList(TermBank termBank); /** @@ -34,7 +36,7 @@ public interface ITermBankService { * @param termBank 常用术语(知识库) * @return 结果 */ - int insertTermBank(TermBank termBank); + AjaxResult insertTermBank(TermBank termBank); /** * 修改常用术语(知识库) @@ -42,7 +44,7 @@ public interface ITermBankService { * @param termBank 常用术语(知识库) * @return 结果 */ - int updateTermBank(TermBank termBank); + AjaxResult updateTermBank(TermBank termBank); /** * 批量删除常用术语(知识库) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java index 3dd00e56..dfeae0ac 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java @@ -1,16 +1,19 @@ package com.xinelu.manage.service.termbank.impl; import com.xinelu.common.constant.Constants; +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.codes.GenerateSystemCodeUtil; import com.xinelu.manage.domain.termbank.TermBank; import com.xinelu.manage.mapper.termbank.TermBankMapper; import com.xinelu.manage.service.termbank.ITermBankService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; /** * 常用术语(知识库)Service业务层处理 @@ -59,11 +62,20 @@ public class TermBankServiceImpl implements ITermBankService { * @return 结果 */ @Override - public int insertTermBank(TermBank termBank) { + public AjaxResult insertTermBank(TermBank termBank) { + if (Objects.nonNull(termBank) && StringUtils.isBlank(termBank.getParentTermCode())) { + termBank.setTermLevel(Constants.TERM_MIN_LEVEL); + } + if (Objects.nonNull(termBank) && Objects.nonNull(termBank.getTermLevel()) && termBank.getTermLevel() < Constants.TERM_MAX_LEVEL) { + termBank.setTermLevel(termBank.getTermLevel() + 1); + } + if (Objects.nonNull(termBank) && Objects.nonNull(termBank.getTermLevel()) && termBank.getTermLevel().equals(Constants.TERM_MAX_LEVEL)) { + return AjaxResult.error("常用话术层数最大值为" + Constants.TERM_MAX_LEVEL + "层"); + } termBank.setCreateTime(LocalDateTime.now()); termBank.setCreateBy(SecurityUtils.getUsername()); termBank.setTermCode(Constants.TERM_CODE + generateSystemCodeUtil.generateSystemCode(Constants.TERM_CODE)); - return termBankMapper.insertTermBank(termBank); + return AjaxResult.success(termBankMapper.insertTermBank(termBank)); } /** @@ -73,9 +85,18 @@ public class TermBankServiceImpl implements ITermBankService { * @return 结果 */ @Override - public int updateTermBank(TermBank termBank) { + public AjaxResult updateTermBank(TermBank termBank) { + if (Objects.nonNull(termBank) && StringUtils.isBlank(termBank.getParentTermCode())) { + termBank.setTermLevel(Constants.TERM_MIN_LEVEL); + } + if (Objects.nonNull(termBank) && Objects.nonNull(termBank.getTermLevel()) && termBank.getTermLevel() < Constants.TERM_MAX_LEVEL) { + termBank.setTermLevel(termBank.getTermLevel() + 1); + } + if (Objects.nonNull(termBank) && Objects.nonNull(termBank.getTermLevel()) && termBank.getTermLevel().equals(Constants.TERM_MAX_LEVEL)) { + return AjaxResult.error("常用话术层数最大值为" + Constants.TERM_MAX_LEVEL + "层"); + } termBank.setUpdateTime(LocalDateTime.now()); - return termBankMapper.updateTermBank(termBank); + return AjaxResult.success(termBankMapper.updateTermBank(termBank)); } /**