From 4cf197f3ae852bb6d509d44170e50877366a5a50 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 8 Nov 2024 11:48:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=98=BF=E9=87=8C=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThirdAliDrugController.java | 46 ++++++++ .../api/dao/thrsys/ThirdAliDrugMapper.java | 3 + .../api/req/thrsys/ThirdAliDrugRequest.java | 109 ++++++++++++++++++ .../service/thrsys/ThirdAliDrugService.java | 17 ++- .../mapper/thrsys/ThirdAliDrugMapper.xml | 29 +++++ 5 files changed, 200 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/thrsys/ThirdAliDrugRequest.java diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java index 125cdfb0..0db55abe 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java @@ -1,18 +1,31 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.annotation.RepeatSubmit; +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.RedissonCacheKey; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.thrsys.ThirdAliDrug; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.req.thrsys.ThirdAliDrugRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.collect.RelCodeDetailResponse; +import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.service.thrsys.ThirdAliDrugService; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.List; @RestController public class ThirdAliDrugController extends BaseController { @@ -35,4 +48,37 @@ public class ThirdAliDrugController extends BaseController { return ResultVOUtils.successMsg("上传成功！"); } + + @GetMapping("/udiwms/aliDrug/getDrugLevelList") + public BaseResponse getDrugLevelList(ThirdAliDrugRequest thirdAliDrug, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List list = thirdAliDrugService.filterList(thirdAliDrug); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/aliDrug/getDrugLevelListBycode") + public BaseResponse getDrugLevelListBycode(ThirdAliDrugRequest thirdAliDrug, BindingResult bindingResult) { + String nameCode = thirdAliDrug.getNameCode(); + if (StrUtil.isEmpty(nameCode)){ + return ResultVOUtils.error("标识参数不能为空"); + } + ThirdAliDrug one = thirdAliDrugService.getOne(new LambdaQueryWrapper().eq(ThirdAliDrug::getNameCode, nameCode)); + if (one == null) { + return ResultVOUtils.error("标识参数错误"); + } + + List list = thirdAliDrugService.list(new LambdaQueryWrapper() + .eq(ThirdAliDrug::getForm, one.getForm()) + .eq(ThirdAliDrug::getFormSpec, one.getFormSpec()) + .eq(ThirdAliDrug::getPackRatio, one.getPackRatio())); + + return ResultVOUtils.success(list); + } + } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThirdAliDrugMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThirdAliDrugMapper.java index eefce3ae..91e0c436 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThirdAliDrugMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThirdAliDrugMapper.java @@ -2,6 +2,8 @@ package com.glxp.api.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.thrsys.ThirdAliDrug; +import com.glxp.api.req.thrsys.ThirdAliDrugRequest; +import com.glxp.api.res.collect.RelCodeDetailResponse; import org.apache.ibatis.annotations.*; import java.util.List; @@ -13,4 +15,5 @@ public interface ThirdAliDrugMapper extends BaseMapper { int saveOrUpdateBatch(@Param("list") List list); + List filterList(ThirdAliDrugRequest thirdAliDrug); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/thrsys/ThirdAliDrugRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThirdAliDrugRequest.java new file mode 100644 index 00000000..ca51f1a5 --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/ThirdAliDrugRequest.java @@ -0,0 +1,109 @@ +package com.glxp.api.req.thrsys; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.glxp.api.util.page.ListPageRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class ThirdAliDrugRequest extends ListPageRequest { + + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "") + private Integer id; + + /** + * 药品类型 + */ + @TableField(value = "`type`") + @ApiModelProperty(value = "药品类型") + private String type; + + /** + * 生产企业 + */ + @TableField(value = "manufacturer") + @ApiModelProperty(value = "生产企业") + private String manufacturer; + + /** + * 产品名称通用名称 + */ + @TableField(value = "cpmctymc") + @ApiModelProperty(value = "产品名称通用名称") + private String cpmctymc; + + /** + * 剂型 + */ + @TableField(value = "form") + @ApiModelProperty(value = "剂型") + private String form; + + /** + * 剂型规格 + */ + @TableField(value = "formSpec") + @ApiModelProperty(value = "剂型规格") + private String formSpec; + + /** + * 包装规格 + */ + @TableField(value = "bzgg") + @ApiModelProperty(value = "包装规格") + private String bzgg; + + /** + * 商品名称 + */ + @TableField(value = "spmc") + @ApiModelProperty(value = "商品名称") + private String spmc; + + /** + * 层级标识 + */ + @TableField(value = "nameCode") + @ApiModelProperty(value = "层级标识") + private String nameCode; + + /** + * 包装比例 + */ + @TableField(value = "packRatio") + @ApiModelProperty(value = "包装比例") + private String packRatio; + + /** + * 包装级别 + */ + @TableField(value = "packLevel") + @ApiModelProperty(value = "包装级别") + private String packLevel; + /** + * 包装级别 + */ + @TableField(value = "erpId") + @ApiModelProperty(value = "包装级别") + private String erpId; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java b/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java index 70746ab4..66282e94 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java @@ -3,7 +3,9 @@ package com.glxp.api.service.thrsys; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; import com.glxp.api.exception.JsonException; +import com.glxp.api.req.thrsys.ThirdAliDrugRequest; import com.glxp.api.service.auth.CustomerService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -11,10 +13,7 @@ import org.springframework.stereotype.Service; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.thrsys.ThirdAliDrugMapper; @@ -224,4 +223,14 @@ public class ThirdAliDrugService extends ServiceImpl filterList(ThirdAliDrugRequest thirdAliDrug) { + if (thirdAliDrug == null) { + return Collections.emptyList(); + } + if (thirdAliDrug.getPage() != null) { + int offset = (thirdAliDrug.getPage() - 1) * thirdAliDrug.getLimit(); + PageHelper.offsetPage(offset, thirdAliDrug.getLimit()); + } + return this.baseMapper.filterList(thirdAliDrug); + } } diff --git a/src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml b/src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml index 2ba3fa63..7055aaaf 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml @@ -52,4 +52,33 @@ + + + + \ No newline at end of file