From 31144b596b429fc22587e80219060895d59d1567 Mon Sep 17 00:00:00 2001 From: yuanwei Date: Mon, 27 Nov 2023 19:49:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=8A=9F=E8=83=BD=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/BasicCorpController.java | 23 +++++++++++++ .../basic/UdiRelevanceController.java | 32 +++++++++++++++++++ .../controller/basic/UdiSyncController.java | 24 ++++++++++++++ src/main/java/com/glxp/api/dto/DictDto.java | 20 ++++++++++++ .../com/glxp/api/res/PageSimpleResponse.java | 4 +++ 5 files changed, 103 insertions(+) create mode 100644 src/main/java/com/glxp/api/dto/DictDto.java diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 56c454ea7..8ff361476 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import com.glxp.api.dto.DictDto; import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; @@ -89,6 +90,28 @@ public class BasicCorpController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @GetMapping("/udiwms/basic/unit/maintain/filterOptimize") + public BaseResponse filterBasicUnitMaintainOptimize(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List basicUnitMaintainEntities; + basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + List reList = basicUnitMaintainEntities.stream().map(s-> { + DictDto dictDto = new DictDto(s.getErpId(),s.getName()); + return dictDto; + }).collect(Collectors.toList()); + + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(reList); + + return ResultVOUtils.success(pageSimpleResponse); + } + @GetMapping("/udiwms/basic/unit/maintain/filter2") public BaseResponse filterBasicUnitMaintain2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 9586e6550..c34037d6a 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -2,6 +2,7 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.dto.DictDto; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductService; import org.springframework.beans.BeanUtils; @@ -535,6 +536,37 @@ public class UdiRelevanceController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + //获取产品信息详情（多平台） + @AuthRuleAnnotation("") + @GetMapping("/udiwms/udirel/thirdSys/filterOptimize") + public BaseResponse getThirdSysfilterOptimize(FilterUdiRelRequest filterUdiRelRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest(); + filterBasicThirdSysRequest.setEnabled(true); + List basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest); + List filterSysEntityList = new ArrayList(); + + filterSysEntityList.add(new DictDto(0, "全部")); + filterSysEntityList.add(new DictDto(1, "对照完成")); + filterSysEntityList.add(new DictDto(2, "未对照DI")); + if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) { + for (int i = 0; i < basicThirdSysEntities.size(); i++) { + filterSysEntityList.add(new DictDto(i + 3, "未对照" + basicThirdSysEntities.get(i).getThirdName())); + } + } + filterSysEntityList.add(new DictDto(10, "最新同步")); + PageInfo pageInfo; + pageInfo = new PageInfo<>(filterSysEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(filterSysEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + //获取对照过滤列表 @AuthRuleAnnotation("") diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index 26d7aa9a9..2c226c551 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -1,5 +1,7 @@ package com.glxp.api.controller.basic; +import com.github.pagehelper.Page; +import com.glxp.api.dto.DictDto; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -33,6 +35,7 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * 国家库产品信息相关接口 @@ -128,6 +131,27 @@ public class UdiSyncController { } } + //获取同步库医疗器械注册人信息 + @AuthRuleAnnotation("") + @GetMapping("udiwms/udiinfo/filterCompanyOptimize") + public BaseResponse filterCompanyOptimize(UdiCompanyRequest udiCompanyRequest) { + + try { + BaseResponse> udiDlDeviceResponse = syncUdiService.filterCompany(udiCompanyRequest); + List reList = udiDlDeviceResponse.getData().getResult().stream().map(s-> { + DictDto dictDto = new DictDto(s.getYlqxzcrbarmc(),s.getYlqxzcrbarmc()); + return dictDto; + }).collect(Collectors.toList()); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(udiDlDeviceResponse.getData().getTotal()); + pageSimpleResponse.setList(reList); + return ResultVOUtils.success(pageSimpleResponse); + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "连接UDI数据下载服务出错！"); + } + } + @Resource SpGetHttpClient spGetHttpClient; diff --git a/src/main/java/com/glxp/api/dto/DictDto.java b/src/main/java/com/glxp/api/dto/DictDto.java new file mode 100644 index 000000000..7be81b19f --- /dev/null +++ b/src/main/java/com/glxp/api/dto/DictDto.java @@ -0,0 +1,20 @@ +package com.glxp.api.dto; + +import lombok.Data; + +@Data +public class DictDto { + + private String code; + private String label; + + public DictDto(String code, String label) { + this.code = code; + this.label = label; + } + + public DictDto(Integer code, String label) { + this.code = code.toString(); + this.label = label; + } +} diff --git a/src/main/java/com/glxp/api/res/PageSimpleResponse.java b/src/main/java/com/glxp/api/res/PageSimpleResponse.java index a2a600048..ac58d04e1 100644 --- a/src/main/java/com/glxp/api/res/PageSimpleResponse.java +++ b/src/main/java/com/glxp/api/res/PageSimpleResponse.java @@ -20,6 +20,10 @@ public class PageSimpleResponse { public void setTotal(Long total) { + this.total = total.intValue(); + } + public void setTotal(Integer total) { + this.total = total.intValue(); } }