From 3c4e13470d6f00eab9d42751cd97f4c66e334805 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 10 Dec 2024 18:30:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?12/10=20=E5=8D=95=E6=8D=AE=E5=AE=A1?= =?UTF-8?q?=E6=A0=B82.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoCollectCodeBackupController.java | 15 ---- .../IoCollectOrderCodeManController.java | 21 ++++++ .../collect/CollectOrderCodeManRequest.java | 3 + .../collect/IoCollectCodeBackService.java | 59 ---------------- .../collect/IoCollectOrderCodeManService.java | 68 +++++++++++++++++-- 5 files changed, 88 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java index 6d2e33a92..93ec4ad8a 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java @@ -145,20 +145,5 @@ public class IoCollectCodeBackupController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } - @AuthRuleAnnotation("") - @PostMapping("/udiwms/basic/collect/ioCollectCode/checkCode") - public BaseResponse checkCode(@RequestBody IoCollectCodeRequest filterCodeRequest){ - ExecutorService executor = Executors.newSingleThreadExecutor(); - Future future = executor.submit(() -> ioCollectCodeBackService.CheckCode(filterCodeRequest)); - BaseResponse response = null; - try { - response = future.get(); - } catch (Exception e) { - e.printStackTrace(); - } finally { - executor.shutdown(); - } - return response; - } } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 4ce3076d7..20c213e0d 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -16,6 +17,7 @@ import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderCodeMan; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectOrderCodeManRequest; +import com.glxp.api.req.collect.IoCollectCodeRequest; import com.glxp.api.req.inout.AddTagCodeReqeust; import com.glxp.api.req.inout.DeleteTageCodeRequest; import com.glxp.api.res.PageSimpleResponse; @@ -39,6 +41,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.stream.Collectors; @Slf4j @@ -334,4 +339,20 @@ public class IoCollectOrderCodeManController extends BaseController { return ResultVOUtils.error(501, messages.toString()); } + + @PostMapping("/udiwms/basic/collect/IoCollectOrderCodeMan/checkCode") + public BaseResponse checkCollectOrderManCode(@RequestBody CollectOrderCodeManRequest request){ + ExecutorService executor = Executors.newSingleThreadExecutor(); + Future future = executor.submit(() -> collectOrderCodeManService.CheckCode(request)); + BaseResponse response = null; + try { + response = future.get(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + executor.shutdown(); + } + return response; + } + } diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderCodeManRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderCodeManRequest.java index 149bcd301..cb01f6bde 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderCodeManRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderCodeManRequest.java @@ -4,6 +4,7 @@ import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class CollectOrderCodeManRequest extends ListPageRequest { @@ -31,4 +32,6 @@ public class CollectOrderCodeManRequest extends ListPageRequest { private Long bizIdFk; private String busType; + private List udiCodeList; + } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java index 0af47f089..6c823d7e1 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java @@ -32,12 +32,6 @@ import java.util.List; @Service public class IoCollectCodeBackService extends ServiceImpl { - @Resource - IoCollectCodeBackMapper ioCollectCodeBackMapper; - - @Resource - UdiRelevanceService udiRelevanceService; - /** * 追溯码查询 @@ -57,58 +51,5 @@ public class IoCollectCodeBackService extends ServiceImpl() - .eq(IoCollectCodeBackup::getBillNo, filterCodeRequest.getBillNo()) - .eq(IoCollectCodeBackup::getCode, filterCodeRequest.getCode())); - if (ioCollectCodeBackup == null){ - BaseResponse response = new BaseResponse(); - response.setData(filterCodeRequest.getCode()); - response.setCode(500); - response.setMessage("追溯码不存在"); - return response; - } - UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode()); - UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); - udiEntity.setCode(filterCodeRequest.getCode()); - - AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, udiRelevanceResponse); - return ResultVOUtils.success(addEnterCodeResponse); - }else { - List vailCodeResultResponses = new ArrayList<>(); - for (String code : filterCodeRequest.getCodeList()){ - IoCollectCodeBackup ioCollectCodeBackup = ioCollectCodeBackMapper.selectOne(new LambdaQueryWrapper() - .eq(IoCollectCodeBackup::getBillNo, filterCodeRequest.getBillNo()) - .eq(IoCollectCodeBackup::getCode, code)); - VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse(); - if (ioCollectCodeBackup != null){ - vailCodeResultResponse.setStatus(1); - vailCodeResultResponse.setCode(code); - vailCodeResultResponse.setSucMsg("校验成功"); - vailCodeResultResponses.add(vailCodeResultResponse); - }else { - vailCodeResultResponse.setStatus(2); - vailCodeResultResponse.setCode(code); - vailCodeResultResponse.setErrMsg("追溯码不存在"); - vailCodeResultResponses.add(vailCodeResultResponse); - } - } - return ResultVOUtils.success(vailCodeResultResponses); - } - } - - public AddEnterCodeResponse setAddEnterCodeResponse(UdiEntity udiEntity, UdiRelevanceResponse checkUdi) { - AddEnterCodeResponse addEnterCodeResponse = new AddEnterCodeResponse(); - BeanUtils.copyProperties(udiEntity, addEnterCodeResponse); - addEnterCodeResponse.setBzgg(checkUdi.getBzgg()); - addEnterCodeResponse.setCpmctymc(checkUdi.getCpmctymc()); - addEnterCodeResponse.setPrepnSpec(checkUdi.getPrepnSpec()); - addEnterCodeResponse.setPrepnUnit(checkUdi.getPrepnUnit()); - addEnterCodeResponse.setPackUnit(checkUdi.getPackUnit()); - addEnterCodeResponse.setGgxh(checkUdi.getGgxh()); - return addEnterCodeResponse; - } } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 5a386ed85..77ded458c 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.WorkOperType; @@ -17,10 +18,7 @@ import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.basic.SysWorkplacePutRel; import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.collect.IoCollectOrder; -import com.glxp.api.entity.collect.IoCollectOrderBiz; -import com.glxp.api.entity.collect.IoCollectOrderCodeMan; -import com.glxp.api.entity.collect.RelCodeDetail; +import com.glxp.api.entity.collect.*; import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoSplitCodeEntity; @@ -33,6 +31,8 @@ import com.glxp.api.req.inout.AddTagCodeReqeust; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.CollectOrderCodeManResponse; import com.glxp.api.res.collect.RelCodeDetailResponse; +import com.glxp.api.res.inout.AddEnterCodeResponse; +import com.glxp.api.res.inout.VailCodeResultResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.auth.SysWorkplaceService; @@ -52,6 +52,7 @@ import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -653,4 +654,63 @@ public class IoCollectOrderCodeManService extends ServiceImpl() + .eq(IoCollectOrderCodeMan::getOrderIdFk, request.getOrderIdFk()) + .eq(IoCollectOrderCodeMan::getUdiCode, request.getUdiCode())); + if (ioCollectOrderCodeMan == null){ + BaseResponse response = new BaseResponse(); + response.setData(request.getUdiCode()); + response.setCode(500); + response.setMessage("追溯码不存在"); + return response; + } + UdiEntity udiEntity = FilterUdiUtils.getUdi(request.getUdiCode()); + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); + udiEntity.setCode(request.getUdiCode()); + + AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, udiRelevanceResponse); + return ResultVOUtils.success(addEnterCodeResponse); + }else { + List vailCodeResultResponses = new ArrayList<>(); + for (String code : request.getUdiCodeList()){ + IoCollectOrderCodeMan ioCollectOrderCodeMan = collectOrderCodeManMapper.selectOne(new LambdaQueryWrapper() + .eq(IoCollectOrderCodeMan::getOrderIdFk, request.getOrderIdFk()) + .eq(IoCollectOrderCodeMan::getUdiCode, code)); + VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse(); + if (ioCollectOrderCodeMan != null){ + vailCodeResultResponse.setStatus(1); + vailCodeResultResponse.setCode(code); + vailCodeResultResponse.setSucMsg("校验成功"); + vailCodeResultResponses.add(vailCodeResultResponse); + }else { + vailCodeResultResponse.setStatus(2); + vailCodeResultResponse.setCode(code); + vailCodeResultResponse.setErrMsg("追溯码不存在"); + vailCodeResultResponses.add(vailCodeResultResponse); + } + } + return ResultVOUtils.success(vailCodeResultResponses); + } + } + + + public AddEnterCodeResponse setAddEnterCodeResponse(UdiEntity udiEntity, UdiRelevanceResponse checkUdi) { + AddEnterCodeResponse addEnterCodeResponse = new AddEnterCodeResponse(); + BeanUtils.copyProperties(udiEntity, addEnterCodeResponse); + addEnterCodeResponse.setBzgg(checkUdi.getBzgg()); + addEnterCodeResponse.setCpmctymc(checkUdi.getCpmctymc()); + addEnterCodeResponse.setPrepnSpec(checkUdi.getPrepnSpec()); + addEnterCodeResponse.setPrepnUnit(checkUdi.getPrepnUnit()); + addEnterCodeResponse.setPackUnit(checkUdi.getPackUnit()); + addEnterCodeResponse.setGgxh(checkUdi.getGgxh()); + return addEnterCodeResponse; + } } From 54eeaa4d4f73900b2a4a808771ce3c59c44e5fa5 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 10 Dec 2024 18:38:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E5=8C=BB=E4=BF=9D=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E8=BD=AC=E6=8D=A2=E9=97=AE=E9=A2=98=20=E6=80=8E?= =?UTF-8?q?=E4=B9=88=E6=A0=B7=E9=83=BD=E6=98=AF=E5=A4=B1=E8=B4=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/http/ErpBasicClient.java | 17 +++++++++++------ .../collect/IoCollectOrderBackupService.java | 10 ++++++---- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index f44eff817..b172ff341 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -1,6 +1,9 @@ package com.glxp.api.http; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; @@ -271,20 +274,22 @@ public class ErpBasicClient { * @param postOrderRequest * @return */ - public BaseResponse postOrder(PostCollectOrderRequest postOrderRequest) { + public BaseResponse postOrder(PostCollectOrderRequest postOrderRequest) { ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(postOrderRequest.getThirdSys()); String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/uploadCollectOrder"; + String response=null; try { - String response = httpOkClient.uCloudPost(url, postOrderRequest); + response = HttpUtil.post(url,JSONUtil.toJsonStr(postOrderRequest)); +// response = httpOkClient.uCloudPost(url, postOrderRequest); if (StrUtil.isEmpty(response)) { return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); } - BaseResponse listBaseResponse = - JSONObject.parseObject(response, new TypeReference>() { - }); + // 判断不是 - return listBaseResponse; + return JSONUtil.toBean(response,BaseResponse.class); } catch (Exception e) { + log.error("获取医保单据信息原来数据==="+response); + log.error("获取医保单据信息", e); return ResultVOUtils.error(500, "连接第三方系统接口服务出错" + e.getMessage()); } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 0b98a6540..1a7428edd 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -315,7 +315,7 @@ public class IoCollectOrderBackupService extends ServiceImpl baseResponse = erpBasicClient.postOrder(orderRequest); + BaseResponse baseResponse = erpBasicClient.postOrder(orderRequest); log.debug("单据返回=========" + baseResponse); if (baseResponse.getCode() == 20000) { // 触发上传 转发至中继服务 到外网 再到国家同步库 @@ -327,12 +327,14 @@ public class IoCollectOrderBackupService extends ServiceImpl