多码融合表增加字段和逻辑

src/main/java/com/glxp/udidl/admin/controller/collect/ThirdAliDrugController.java

@@ -1,11 +1,13 @@
 package com.glxp.udidl.admin.controller.collect;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.udidl.admin.entity.collect.ThirdAliDrug;
 import com.glxp.udidl.admin.enums.ResultEnum;
+import com.glxp.udidl.admin.exception.JsonException;
 import com.glxp.udidl.admin.req.alihealth.AlihealthKytDrugrescodeReqeust;
 import com.glxp.udidl.admin.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust;
 import com.glxp.udidl.admin.req.collect.ThirdAliDrugAddRequest;
@@ -56,7 +58,6 @@ public class ThirdAliDrugController {
         List<ThirdAliDrug> list = thirdAliDrugService.filterList(thirdAliDrug);
         if (CollUtil.isEmpty(list)){
             ThirdAliDrugAddRequest thirdAliDrugAddRequest = new ThirdAliDrugAddRequest();
-            List<ThirdAliDrug> add  = null;
             AlihealthThirdAliDrugInsertReqeust request  = new AlihealthThirdAliDrugInsertReqeust();
             AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = new AlihealthKytDrugrescodeReqeust();
             alihealthKytDrugrescodeReqeust.setPhysic_name(thirdAliDrug.getCpmctymc());
@@ -69,17 +70,23 @@ public class ThirdAliDrugController {
             try {
                 BaseResponse<List<ThirdAliDrug>> baseResponse = alihealthUtils.thirdAliDrugInsertAll(request);
                 if(baseResponse.getCode() == 20000){
-                    add = baseResponse.getData();
+                    list = baseResponse.getData();
                 }else {
                     log.error("阿里访问失败==="+baseResponse.getMessage());
                 }
             }catch (Exception e){
                 log.error("阿里访问失败==="+e.getMessage());
             }
+            List<ThirdAliDrug> finalList = list;
+            ThreadUtil.execAsync(() -> {
+                try {
+                    thirdAliDrugAddRequest.setList(finalList);
+                    thirdAliDrugService.addThirdAliDrug(thirdAliDrugAddRequest);
+                } catch (Exception e) {
+                    log.error("异步更新阿里药品数据错误==="+e.getMessage());
+                }
+            });
 
-            thirdAliDrugAddRequest.setList(add);
-            thirdAliDrugService.addThirdAliDrug(thirdAliDrugAddRequest);
-            list = thirdAliDrugService.filterList(thirdAliDrug);
 
         }
         PageInfo<ThirdAliDrug> pageInfo = new PageInfo<>(list);

src/main/java/com/glxp/udidl/admin/controller/udchs/CodeRelController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.udidl.admin.dto.sys.CodeRelRequest;
 import com.glxp.udidl.admin.dto.udchs.BaseParam;
 import com.glxp.udidl.admin.entity.chs.CodeRel;
 import com.glxp.udidl.admin.entity.chs.YbDrug;

src/main/java/com/glxp/udidl/admin/dto/sys/CodeRelRequest.java

@@ -0,0 +1,93 @@
+package com.glxp.udidl.admin.dto.sys;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class CodeRelRequest {
+    @TableId(type = IdType.AUTO)
+    public Integer id;
+
+    /**
+     * 器械最小销售产品标识
+     */
+    @TableField(value = "diNameCode")
+    public String diNameCode;
+
+    /**
+     * 阿里药品标识码
+     */
+    @TableField(value = "drugCode")
+    public String drugCode;
+
+    /**
+     * 医保编码
+     */
+    @TableField(value = "ybbm")
+    public String ybbm;
+
+    /**
+     * 阳光采购平台编码
+     */
+    @TableField(value = "ycCode")
+    public String ycCode;
+
+    /**
+     * 商品条码
+     */
+    @TableField(value = "sptm")
+    public String sptm;
+
+    /**
+     * 药品本位码
+     */
+    @TableField(value = "ypbwm")
+    public String ypbwm;
+
+    /**
+     * 统一社会信用号
+     */
+    @TableField(value = "tyshxyh")
+    public String tyshxyh;
+
+    /**
+     * 国家编码9码
+     */
+    @TableField(value = "gjbm")
+    public String gjbm;
+
+    @TableField(value = "status")
+    public String status;
+
+    @TableField(value = "updateTime")
+    public Date updateTime;
+
+    @TableField(value = "createTime")
+    public Date createTime;
+
+    @TableField(value = "fromType")
+    public Integer fromType;
+    /**
+     * 层级单位
+     */
+    @TableField(value = "packUnit")
+    public String packUnit;
+    /**
+     * 下级数量
+     */
+    @TableField(value = "bhxjsl")
+    public Integer bhxjsl;
+    /**
+     * 下级单位
+     */
+    @TableField(value = "xjdw")
+    public String xjdw;
+    /**
+     * 医保包装规格
+     */
+    @TableField(value = "ybBzgg")
+    public String ybBzgg;
+}

src/main/java/com/glxp/udidl/admin/service/udchs/impl/CodeRelServiceImpl.java

@@ -32,12 +32,12 @@ public class CodeRelServiceImpl extends ServiceImpl<CodeRelMapper, CodeRel> {
     public void updateBatchByCodeRel(List<CodeRel> paramList) {
 
         for (int i = 0; i < paramList.size(); i++) {
-            if(i == 0){
-                CodeRel param = paramList.get(i);
-                this.remove(
-                        new QueryWrapper<CodeRel>().eq("ybbm",param.getYbbm())
-                );
-            }
+//            if(i == 0){
+//                CodeRel param = paramList.get(i);
+//                this.remove(
+//                        new QueryWrapper<CodeRel>().eq("ybbm",param.getYbbm())
+//                );
+//            }
             CodeRel param = paramList.get(i);
 
             if ( param == null ||