Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

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<RelCodeBatch> {
+public interface RelCodeBatchMapper extends BaseMapperPlus<RelCodeBatchMapper, RelCodeBatch,RelCodeBatch> {
     List<RelCodeBatchResponse> filterList(RelCodeBatchRequest relCodeBatchRequest);
 
 }

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<RelCodeDetail> {
+public interface RelCodeDetailMapper extends BaseMapperPlus<RelCodeDetailMapper, RelCodeDetail,RelCodeDetail> {
     List<RelCodeDetailResponse> filterList(RelCodeDetailRequest relCodeDetailRequest);
 
 }

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;

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自助平台拉取基础数据
      */