From cff770689d04694fd361af73687a46b69b50fc0c Mon Sep 17 00:00:00 2001 From: linrf Date: Fri, 9 Jun 2023 09:24:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4basic=20collectService?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/basic/http/BasicRestController.java | 10 +++++----- .../collect/basic/ws/impl/BasicServerImpl.java | 12 ++++++------ .../record/service/impl/TBasicServiceImpl.java | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java index 9579758..fd4eb50 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java @@ -7,9 +7,9 @@ import com.docus.log.context.TrackHelper; import com.docus.server.collect.IConverter; import com.docus.server.collect.IHttpResult; import com.docus.server.collect.web.enums.CollectTypeEnum; -import com.docus.server.record.pojo.dto.TBasicDTO; -import com.docus.server.record.service.ITBasicService; import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.service.CollectService; +import com.docus.server.record.pojo.dto.TBasicDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -36,7 +36,7 @@ import javax.annotation.Resource; @RequestMapping("/api/rest/basic") public class BasicRestController { @Resource - private ITBasicService tBasicService; + private CollectService collectService; /** * 被动http 新增基础数据接收，进行操作 @@ -52,7 +52,7 @@ public class BasicRestController { processor = VisitorProcessor.class) public CommonResult insertHttpPassiveBasic(@RequestBody String message) { log.info("新增基础数据：{}", message); - tBasicService.insertTBasic(getValue()); + collectService.insertOrUpdateBasic(getValue()); return null; } @@ -70,7 +70,7 @@ public class BasicRestController { processor = VisitorProcessor.class) public CommonResult updateHttpPassiveBasic(@RequestBody String message) { log.info("编辑基础数据：{}", message); - tBasicService.updateTBasic(getValue()); + collectService.insertOrUpdateBasic(getValue()); return null; } diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java index fbf13c1..17309ff 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java @@ -5,11 +5,11 @@ import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.IConverter; import com.docus.server.collect.IWsResult; +import com.docus.server.collect.basic.ws.IBasicServer; import com.docus.server.collect.web.enums.CollectTypeEnum; -import com.docus.server.record.pojo.dto.TBasicDTO; -import com.docus.server.record.service.ITBasicService; import com.docus.server.collect.web.processor.VisitorProcessor; -import com.docus.server.collect.basic.ws.IBasicServer; +import com.docus.server.collect.web.service.CollectService; +import com.docus.server.record.pojo.dto.TBasicDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -27,7 +27,7 @@ import javax.annotation.Resource; @Slf4j public class BasicServerImpl implements IBasicServer { @Resource - private ITBasicService tBasicService; + private CollectService collectService; @Override @TrackGroup( @@ -36,7 +36,7 @@ public class BasicServerImpl implements IBasicServer { processor = VisitorProcessor.class) public String setTBasic(String message) { log.info("新增基础数据：{}", message); - tBasicService.insertTBasic(getValue()); + collectService.insertOrUpdateBasic(getValue()); return null; } @@ -47,7 +47,7 @@ public class BasicServerImpl implements IBasicServer { processor = VisitorProcessor.class) public String updateTBasic(String message) { log.info("修改基础数据：{}", message); - tBasicService.updateTBasic(getValue()); + collectService.insertOrUpdateBasic(getValue()); return null; } diff --git a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java index ac1210d..4c2bd09 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java @@ -30,11 +30,11 @@ public class TBasicServiceImpl extends ServiceImpl impleme @Transactional(rollbackFor = Exception.class) public void insertTBasic(TBasicDTO tBasicDTO) { //判断jzh是否重复 - Integer num = tBasicMapper.selectOne(tBasicDTO.getJzh()); - if (num > 0) { - updateTBasic(tBasicDTO); - return; - } +// Integer num = tBasicMapper.selectOne(tBasicDTO.getJzh()); +// if (num > 0) { +// updateTBasic(tBasicDTO); +// return; +// } Long patientId = idService.getDateSeq(); //数据类型转化，格式处理