From 7937b1fa73d05f9003d53119e030c88fb68285b1 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 24 Feb 2025 09:34:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=A1=A5=E6=95=91=E6=9C=89?= =?UTF-8?q?=E4=BA=9B=E7=A0=81=E6=B2=A1=E6=8B=89=E5=88=B0=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alihealth/AlihealthBusController.java | 64 +++++++++++++++++++ .../inout/IoCodeTempController.java | 3 + .../dao/collect/IoCollectCodeBackMapper.java | 3 + .../glxp/api/http/sync/SpGetHttpClient.java | 12 ++++ .../local/AlihealthGetRelCodeReqeust.java | 12 ++++ .../collect/IoCollectCodeBackMapper.xml | 10 +++ 6 files changed, 104 insertions(+) create mode 100644 src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java create mode 100644 src/main/java/com/glxp/api/req/alihealth/local/AlihealthGetRelCodeReqeust.java diff --git a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java new file mode 100644 index 000000000..0c8feec52 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java @@ -0,0 +1,64 @@ +package com.glxp.api.controller.alihealth; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; + +import com.glxp.api.dao.collect.IoCollectCodeBackMapper; +import com.glxp.api.entity.collect.IoCollectCodeBackup; +import com.glxp.api.http.sync.SpGetHttpClient; +import com.glxp.api.req.alihealth.local.AlihealthGetRelCodeReqeust; +import com.glxp.api.req.collect.IoCollectCodeRequest; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Slf4j +@RestController +public class AlihealthBusController extends BaseController { + @Resource + private IoCollectCodeBackMapper ioCollectCodeBackMapper; + @Resource + private SpGetHttpClient spGetHttpClient; + + /** + * 阿里手动拉取完成单大级码没有关联关系的接口 + * + * @return + */ + @PostMapping("/spms/alihealth/getAliCode") + @Log(title = "获取阿里药品的采购单码明细", businessType = BusinessType.OTHER) + public BaseResponse getAliCode() { + + List list = ioCollectCodeBackMapper.filterNotRelCode(new IoCollectCodeRequest()); + if(list!=null && list.size() >1){ + AlihealthGetRelCodeReqeust alihealthGetRelCodeReqeust = new AlihealthGetRelCodeReqeust(); + alihealthGetRelCodeReqeust.setIoCollectCodeBackupList(list); + BaseResponse baseResponse = spGetHttpClient.getAliCode(alihealthGetRelCodeReqeust); + return baseResponse; + + }else { + return ResultVOUtils.success("没有需要调用关联关系的码列表"); + + } + } + +} diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 5b62b948e..23fb6d0a7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1651,6 +1651,9 @@ public class IoCodeTempController extends BaseController { codeEnttity.setBatchNo(codeMan.getBatchNo()); codeEnttity.setProduceDate(codeMan.getProductDate()); codeEnttity.setExpireDate(codeMan.getExpireDate()); + }else { + //三期补救 + } RelCodeDetailResponse codeRelEntity = relCodeDetailService.findByCode(code); diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectCodeBackMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectCodeBackMapper.java index 190e18a04..1452d62a0 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectCodeBackMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectCodeBackMapper.java @@ -12,4 +12,7 @@ import java.util.List; public interface IoCollectCodeBackMapper extends BaseMapper { List filterList(IoCollectCodeRequest ioCollectCodeRequest); + + List filterNotRelCode(IoCollectCodeRequest ioCollectCodeRequest); + } diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index 96f08f4c1..a389344f8 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -20,6 +20,7 @@ import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.entity.thrsys.ThirdAliDrug; import com.glxp.api.idc.service.FileService; import com.glxp.api.req.alihealth.AlihealthRelCodeInsertReqeust; +import com.glxp.api.req.alihealth.local.AlihealthGetRelCodeReqeust; import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust; import com.glxp.api.req.basic.BasicDataRequest; import com.glxp.api.req.basic.DeleteBasicDataRequest; @@ -684,4 +685,15 @@ public class SpGetHttpClient { } return response; } + public BaseResponse getAliCode(AlihealthGetRelCodeReqeust alihealthGetRelCodeReqeust) { + String json = JSONUtil.toJsonStr(alihealthGetRelCodeReqeust); + String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/spms/alihealth/getAliCode", json, buildHeader()); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference() { + }); + if(response == null){ + return ResultVOUtils.error("访问供应商平台访问不到"); + } + return response; + } } diff --git a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthGetRelCodeReqeust.java b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthGetRelCodeReqeust.java new file mode 100644 index 000000000..150d8bb37 --- /dev/null +++ b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthGetRelCodeReqeust.java @@ -0,0 +1,12 @@ +package com.glxp.api.req.alihealth.local; + +import com.glxp.api.entity.collect.IoCollectCodeBackup; +import lombok.Data; + +import java.util.List; + +@Data +public class AlihealthGetRelCodeReqeust { + + private List ioCollectCodeBackupList; +} diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml index 5155ec2c7..e450595e9 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml @@ -45,4 +45,14 @@ group by iccb.id order by bp.nameCode,iccb.code + +