From 0c4632ade87429c8d3e1e0ccb0eedddc4290a185 Mon Sep 17 00:00:00 2001 From: yuanwei Date: Mon, 27 Nov 2023 20:06:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=BC=98=E5=8C=96=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 | 33 +++++++++++++++++++ .../controller/basic/UdiSyncController.java | 24 ++++++++++++++ src/main/java/com/glxp/api/dto/DictDto.java | 20 +++++++++++ 4 files changed, 100 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 60b73f6e..29366744 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -13,6 +13,7 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.SocketMsgType; import com.glxp.api.controller.BaseController; import com.glxp.api.controller.sync.SpsSyncWebSocket; +import com.glxp.api.dto.DictDto; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.sync.SocketMsgEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; @@ -94,6 +95,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 35babe7e..ff4b681a 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -16,6 +16,7 @@ import com.glxp.api.constant.SocketMsgType; import com.glxp.api.controller.BaseController; import com.glxp.api.controller.sync.SpsSyncWebSocket; import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.dto.DictDto; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.sync.SocketMsgEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; @@ -519,6 +520,38 @@ 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 c1ba51f5..97b36aaa 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -3,11 +3,13 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.Page; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.AsyncDiDlHelper; +import com.glxp.api.dto.DictDto; import com.glxp.api.entity.basic.*; import com.glxp.api.req.basic.*; import com.glxp.api.res.PageSimpleResponse; @@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 国家库产品信息相关接口 @@ -114,6 +117,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数据下载服务出错！"); + } + } + @AuthRuleAnnotation("") @GetMapping("udiwms/udiinfo/superSearch") public BaseResponse superSearch(FilterUdiInfoRequest filterUdiInfoRequest) { 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 00000000..7be81b19 --- /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; + } +}