From fa02aaa4395f38e55608f628159d2a1e271b0ffc Mon Sep 17 00:00:00 2001 From: qyt <123456> Date: Wed, 16 Oct 2024 09:50:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E8=80=97=E6=9D=90=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E4=BF=A1=E6=81=AF=E8=A1=A8=20=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E6=9C=89=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 4dea758b3..99735fdb0 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -229,7 +229,7 @@ public class UdiProductEntity { /** - * 产品类型 1:药品 2:耗材 + * 产品类型 1:耗材 2:药品 */ @TableField(value = "productsType") private Integer productsType; From dcfa320847af78262d0ae5ffefebf968ef9c4338 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Wed, 16 Oct 2024 10:16:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=8B=89=E5=8F=96=E5=A4=96=E7=BD=91?= =?UTF-8?q?=E8=8D=AF=E5=93=81=E5=85=B3=E8=81=94=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dao/collect/RelCodeBatchMapper.java | 3 +- .../api/dao/collect/RelCodeDetailMapper.java | 4 ++- .../glxp/api/service/sync/HeartService.java | 30 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java b/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java index 2d51b6b5b..d6570cf96 100644 --- a/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.collect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.req.collect.RelCodeBatchRequest; import com.glxp.api.res.collect.RelCodeBatchResponse; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface RelCodeBatchMapper extends BaseMapper { +public interface RelCodeBatchMapper extends BaseMapperPlus { List filterList(RelCodeBatchRequest relCodeBatchRequest); } diff --git a/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java b/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java index e5b5feabb..1b7aecefe 100644 --- a/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java @@ -1,6 +1,8 @@ package com.glxp.api.dao.collect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.req.collect.RelCodeDetailRequest; import com.glxp.api.res.collect.RelCodeDetailResponse; @@ -9,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface RelCodeDetailMapper extends BaseMapper { +public interface RelCodeDetailMapper extends BaseMapperPlus { List filterList(RelCodeDetailRequest relCodeDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 8bf07e686..d61cec085 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1,6 +1,8 @@ package com.glxp.api.service.sync; import cn.hutool.core.bean.BeanUtil; +import com.glxp.api.dao.collect.RelCodeBatchMapper; +import com.glxp.api.dao.collect.RelCodeDetailMapper; import com.glxp.api.dao.dev.*; import com.glxp.api.dao.thrsys.ThrManufacturerMapper; import com.glxp.api.entity.collect.RelCodeBatch; @@ -1802,6 +1804,9 @@ public class HeartService { case PRODUCE_BUSINESS_DATA: this.insertProBusinessData(bean.getFileContent()); break; + case DRUG_DATA_TASK: + this.insertDrugData(bean.getFileContent()); + break; } String taskId = bean.getTaskId(); if (StrUtil.isNotBlank(taskId)) { @@ -2188,6 +2193,31 @@ public class HeartService { } } + /** + * 批量 || 插入 药品关联信息 + * insertDrugData + */ + @Resource + RelCodeDetailMapper relCodeDetailMapper; + @Resource + RelCodeBatchMapper relCodeBatchMapper; + + @Transactional(propagation = Propagation.NESTED) + public void insertDrugData(String content){ + cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content); + SpsSyncDrugDataTaskResponse spsSyncDrugDataTaskResponse = JSONUtil.toBean(String.valueOf(jsonObject.get(SpsSyncDrugDataTaskResponse.class.getSimpleName())), SpsSyncDrugDataTaskResponse.class); + + if (CollectionUtil.isNotEmpty(spsSyncDrugDataTaskResponse.getRelCodeBatches())) { + for (RelCodeBatch entity : spsSyncDrugDataTaskResponse.getRelCodeBatches()) { + entity.setUpdateTime(null); + } + boolean b = relCodeBatchMapper.replaceBatchs(spsSyncDrugDataTaskResponse.getRelCodeBatches()); + } + if (CollectionUtil.isNotEmpty(spsSyncDrugDataTaskResponse.getRelCodeDetails())) { + boolean b = relCodeDetailMapper.replaceBatchs(spsSyncDrugDataTaskResponse.getRelCodeDetails()); + } + } + /** * 从UDI自助平台拉取基础数据 */