From 6903c9990b789d85c92f98c17356abe7faa9737d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Sun, 25 Jun 2023 16:48:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=BC=B3=E5=B7=9E=E4=B8=AD=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=E5=AE=A2=E6=88=B7=E7=AB=AF--=E6=99=BA=E4=B8=9A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=20=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/zzzyy/ZzzyyClient.java | 16 ++++++ .../res/udiwms/ZzzyyProductsResponse.java | 56 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 src/main/java/com/glxp/mipsdl/res/udiwms/ZzzyyProductsResponse.java diff --git a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java index 3cdd21a..2dace89 100644 --- a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java @@ -40,6 +40,7 @@ import com.glxp.mipsdl.req.post.PostThrProductsRequest; import com.glxp.mipsdl.req.zaxyy.ZaxzyyOrderRequest; import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest; import com.glxp.mipsdl.res.BaseResponse; +import com.glxp.mipsdl.res.udiwms.ZzzyyProductsResponse; import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService; @@ -154,6 +155,21 @@ public class ZzzyyClient implements BaseHttpClient { response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); + List zzzyyProductsResponse = (List) baseResponse.getData(); + for (ZzzyyProductsResponse productsResponse : zzzyyProductsResponse) { + //判断要是规格和型号一致就是取规格 不一致就合并 + if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isNotEmpty(productsResponse.getStandard())) { + if (productsResponse.getModel_number().equals(productsResponse.getStandard())) { + productsResponse.setStandard(productsResponse.getStandard()); + } else { + productsResponse.setStandard(productsResponse.getStandard() + productsResponse.getModel_number()); + } + } else if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isBlank(productsResponse.getStandard())) { + productsResponse.setStandard(productsResponse.getModel_number()); + } + baseResponse.setData(""); + baseResponse.setData(zzzyyProductsResponse); + } return baseResponse; } catch (Exception e) { log.error("解析漳州中医院智业接口返回产品信息字典数据异常，返回结果：{}", response); diff --git a/src/main/java/com/glxp/mipsdl/res/udiwms/ZzzyyProductsResponse.java b/src/main/java/com/glxp/mipsdl/res/udiwms/ZzzyyProductsResponse.java new file mode 100644 index 0000000..00c29bc --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/res/udiwms/ZzzyyProductsResponse.java @@ -0,0 +1,56 @@ +package com.glxp.mipsdl.res.udiwms; + +import cn.hutool.core.util.StrUtil; +import lombok.Data; + +import java.util.Date; + +@Data +public class ZzzyyProductsResponse { + + private Long id; + private String code; //产品编码 + private String name; + private String measname; //计量单位 + + + private String spec; //规格型号 + private String registerNo; //注册证号 + private String thirdSysFk; + private String manufactory; //生产厂家 + private String cplb; + private String flbm; + private String qxlb; + private String ybbm; + private String sptm; + private String tyshxydm; + private String zczbhhzbapzbh; + private String ylqxzcrbarmc; + private String ylqxzcrbarywmc; + private String cpms; + private String supName; //配送企业 + private String thirdSysName; + + + //辅助字段 + private boolean isChecked; + private String thirdSys; + + //添加字段 + private String model; //型号 + private String standard; //规格型号，二合一字段 + private String qtbm; //其他编码 + private String zczyxqz; //注册有效期截止时间 + private String price; + private String remark1; //备注1 + private String remark2; //备注2 + private String remark3; //备注3 + private String createUser; + private Date createTime; + private String updateUser; + private Date updateTime; + private String remark; + private String manufactoryCode; + private String supCode; + private String model_number; +} From e784b09f03e639aaac0c3bb12c263bdcb4ee82c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 26 Jun 2023 10:11:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=BC=B3=E5=B7=9E=E4=B8=AD=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=E5=AE=A2=E6=88=B7=E7=AB=AF--=E6=99=BA=E4=B8=9A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=20=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java index 2dace89..65fe998 100644 --- a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java @@ -58,6 +58,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * 漳州中医院客户端--智业接口对接 @@ -155,7 +156,8 @@ public class ZzzyyClient implements BaseHttpClient { response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - List zzzyyProductsResponse = (List) baseResponse.getData(); + Map map= (Map) baseResponse.getData(); + List zzzyyProductsResponse= (List) map.get("list"); for (ZzzyyProductsResponse productsResponse : zzzyyProductsResponse) { //判断要是规格和型号一致就是取规格 不一致就合并 if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isNotEmpty(productsResponse.getStandard())) { @@ -167,9 +169,10 @@ public class ZzzyyClient implements BaseHttpClient { } else if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isBlank(productsResponse.getStandard())) { productsResponse.setStandard(productsResponse.getModel_number()); } - baseResponse.setData(""); - baseResponse.setData(zzzyyProductsResponse); } + map.put("list",zzzyyProductsResponse); + baseResponse.setData(""); + baseResponse.setData(map); return baseResponse; } catch (Exception e) { log.error("解析漳州中医院智业接口返回产品信息字典数据异常，返回结果：{}", response); From f42233e14edd0748c44ada8982a8a16c7a206088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 27 Jun 2023 09:31:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=BC=B3=E5=B7=9E=E4=B8=AD=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=E5=AE=A2=E6=88=B7=E7=AB=AF--=E6=99=BA=E4=B8=9A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=20=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java index 65fe998..cb07142 100644 --- a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -157,7 +158,7 @@ public class ZzzyyClient implements BaseHttpClient { try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); Map map= (Map) baseResponse.getData(); - List zzzyyProductsResponse= (List) map.get("list"); + List zzzyyProductsResponse= JSON.parseArray(map.get("list")+ "",ZzzyyProductsResponse.class); for (ZzzyyProductsResponse productsResponse : zzzyyProductsResponse) { //判断要是规格和型号一致就是取规格 不一致就合并 if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isNotEmpty(productsResponse.getStandard())) { @@ -170,7 +171,7 @@ public class ZzzyyClient implements BaseHttpClient { productsResponse.setStandard(productsResponse.getModel_number()); } } - map.put("list",zzzyyProductsResponse); + map.put("list",JSON.toJSON(zzzyyProductsResponse)); baseResponse.setData(""); baseResponse.setData(map); return baseResponse;