diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index d601fe6..2dc0ed0 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -12,27 +12,34 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.exception.JsonException; +import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.purchase.FilterCertSetsRequest; import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicUdiRelResponse; import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.basic.BasicUdiRelService; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupCertSetService; import com.glxp.api.service.purchase.SupCompanyService; import com.glxp.api.service.purchase.SupManufacturerService; +import com.glxp.api.util.udi.FilterUdiUtils; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -42,7 +49,8 @@ import java.util.ListIterator; @RestController public class SupManufacturerController { - + @Resource + BasicUdiRelService basicUdiRelService; @Resource private AuthAdminService authAdminService; @Resource @@ -64,6 +72,28 @@ public class SupManufacturerController { return ResultVOUtils.error(500, "企业信息为空"); } + + + + + //获取同步库UDI信息 + @AuthRuleAnnotation("") + @ApiIgnore + @ApiOperation(value = "获取同步库UDI信息", response = BasicUdiRelResponse.class) + @GetMapping("/sup/manufacturer/getCompanyList") + public BaseResponse filterRel(FilterUdiRelRequest filterUdiRelRequest) { + System.out.println(filterUdiRelRequest.toString()); + List udiDlDeviceResponse = basicUdiRelService.filterList(filterUdiRelRequest); + PageInfo basicUdiRelResponsePageInfo = new PageInfo<>(udiDlDeviceResponse); + PageSimpleResponse basicUdiRelResponsePageSimpleResponse = new PageSimpleResponse<>(); + basicUdiRelResponsePageSimpleResponse.setTotal(basicUdiRelResponsePageInfo.getTotal()); + basicUdiRelResponsePageSimpleResponse.setList(udiDlDeviceResponse); + return ResultVOUtils.success(basicUdiRelResponsePageSimpleResponse); + } + + + + @AuthRuleAnnotation("") @GetMapping("/directToCpt/sup/manufacturer/getCompanyList") public BaseResponse getCompanyList(FilterSupManufacturerRequest filterSupManufacturerRequest) { diff --git a/src/main/java/com/glxp/api/dao/basic/BasicUdiRelMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicUdiRelMapper.java index 588eeb4..cf3e6d4 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicUdiRelMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicUdiRelMapper.java @@ -16,7 +16,7 @@ public interface BasicUdiRelMapper extends BaseMapper { List filterList(FilterUdiRelRequest filterUdiRelRequest); - + List filterBasicList(FilterUdiRelRequest filterUdiRelRequest); List findByNameCode(@Param("nameCode") String nameCode); diff --git a/src/main/java/com/glxp/api/service/basic/BasicUdiRelService.java b/src/main/java/com/glxp/api/service/basic/BasicUdiRelService.java index 9ffcdc5..f36ba60 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicUdiRelService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicUdiRelService.java @@ -33,7 +33,7 @@ public class BasicUdiRelService extends ServiceImpl + +