From 503f307367967f309c9f1abfcb71d306a286d93e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 13 Apr 2023 10:10:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basetrailer/BaseTrailerFeign.java | 4 +- .../basetrailer/BaseTrailerFeignFallback.java | 2 +- .../base/api/basetrailer/TraliveredVo.java | 20 +++ .../base/biz/basetrailer/BaseTrailerRest.java | 4 +- .../biz/basetrailer/BaseTrailerService.java | 12 +- .../retrieval/AppBusDeliveredApplyFeign.java | 7 +- .../AppBusDeliveredApplyFeignFallback.java | 5 + .../api/autoservice/retrieval/ConfigVo.java | 18 +++ .../retrieval/DeliveredTralierVo.java | 20 +++ .../retrieval/AppBusDeliveredApplyRest.java | 5 + .../AppBusDeliveredApplyService.java | 152 ++++++++++++++++++ 11 files changed, 238 insertions(+), 11 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/ConfigVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java index 5720c6e56b..0137f8710d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java @@ -33,8 +33,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: anrui-base(基础信息)
* File: BaseTrailerFeign.java
@@ -118,5 +116,5 @@ public interface BaseTrailerFeign { @ApiOperation("查询主车的挂车信息") @GetMapping("/trailerList") - ResultBean> trailerList(@RequestParam("vinSid") String vinSid); + ResultBean trailerList(@RequestParam("vinSid") String vinSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java index 5eb6b35520..e3b628481e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java @@ -85,7 +85,7 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign { } @Override - public ResultBean> trailerList(String vinSid) { + public ResultBean trailerList(String vinSid) { return null; } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java new file mode 100644 index 0000000000..b9246084ae --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.base.api.basetrailer; + +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/13 8:51 + * @Description + */ +@Data +public class TraliveredVo { + + private String vinNo; + + private String modelName; + + private List list; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java index ad0ce6e7a7..f5210d6fa6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java @@ -36,8 +36,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: anrui-base(基础信息)
* File: BaseTrailerFeignFallback.java
@@ -113,7 +111,7 @@ public class BaseTrailerRest implements BaseTrailerFeign { } @Override - public ResultBean> trailerList(String vinSid) { + public ResultBean trailerList(String vinSid) { return baseTrailerService.trailerList(vinSid); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index 65d2e26383..88ed1cf7ef 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -672,10 +672,16 @@ public class BaseTrailerService extends MybatisBaseService> trailerList(String vinSid) { - ResultBean> rb = ResultBean.fireFail(); + public ResultBean trailerList(String vinSid) { + ResultBean rb = ResultBean.fireFail(); + TraliveredVo traliveredVo = new TraliveredVo(); + //根据车辆sid查询车架号以及车型信息 + BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid); + traliveredVo.setVinNo(baseVehicle.getVinNo()); + traliveredVo.setModelName(baseVehicle.getModelName()); List voList = baseMapper.trailerList(vinSid); voList.removeAll(Collections.singleton(null)); - return rb.success().setData(voList); + traliveredVo.setList(voList); + return rb.success().setData(traliveredVo); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java index 05b56bd4d4..492e73ab26 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java @@ -96,7 +96,7 @@ public interface AppBusDeliveredApplyFeign { @GetMapping("/getRetrievalCarVin") @ResponseBody public ResultBean> getRetrievalCarVin(@RequestParam("sid") String sid); - + @ApiOperation("删除 出库申请记录") @DeleteMapping("/deleteRetrievalInfo") @ResponseBody @@ -131,4 +131,9 @@ public interface AppBusDeliveredApplyFeign { @GetMapping("/getFlowOperateTitle") @ResponseBody ResultBean getFlowOperateTitle(@Valid @SpringQueryMap RetrievalQuery query); + + @ApiOperation("主车的挂车信息") + @GetMapping("/tralieredDetailsList") + @ResponseBody + ResultBean tralieredDetailsList(@RequestParam("vinSid") String vinSid); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java index f2f4cc22c1..33814fa47f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java @@ -122,4 +122,9 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe public ResultBean getFlowOperateTitle(RetrievalQuery query) { return null; } + + @Override + public ResultBean tralieredDetailsList(String vinSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/ConfigVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/ConfigVo.java new file mode 100644 index 0000000000..7cef818188 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/ConfigVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.terminal.api.autoservice.retrieval; + +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/13 8:43 + * @Description + */ +@Data +public class ConfigVo { + + private Integer spanSize; + + private String name; + + private String value; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java new file mode 100644 index 0000000000..308d833ac9 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.terminal.api.autoservice.retrieval; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/13 8:42 + * @Description + */ +@Data +public class DeliveredTralierVo { + + @ApiModelProperty("车型信息") + private List modelInfo; + @ApiModelProperty("挂车列表信息") + private List> handCarInfo; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java index e6c42eea06..fc41d833ad 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java @@ -130,4 +130,9 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign { public ResultBean getFlowOperateTitle(RetrievalQuery query) { return appBusDeliveredApplyService.getFlowOperateTitle(query); } + + @Override + public ResultBean tralieredDetailsList(String vinSid) { + return appBusDeliveredApplyService.tralieredDetailsList(vinSid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index c32921cc83..ffeee11a3c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -27,6 +27,9 @@ package com.yxt.anrui.terminal.biz.autoservice.retrieval; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; +import com.yxt.anrui.base.api.basetrailer.TrailerVo; +import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.buscenter.api.busdelivered.*; import com.yxt.anrui.buscenter.api.busdeliveredapply.*; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo; @@ -41,6 +44,7 @@ import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery; import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery; import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.SubmitRetrievalDto; import com.yxt.anrui.terminal.config.CoverUtils; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -85,6 +89,8 @@ public class AppBusDeliveredApplyService { @Autowired private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private BaseTrailerFeign baseTrailerFeign; public ResultBean> getRetrievalNotList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -259,4 +265,150 @@ public class AppBusDeliveredApplyService { } return rb.success().setData(data); } + + public ResultBean tralieredDetailsList(String vinSid) { + ResultBean rb = ResultBean.fireFail(); + DeliveredTralierVo deliveredTralierVo = new DeliveredTralierVo(); + ResultBean resultBean = baseTrailerFeign.trailerList(vinSid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + TraliveredVo traliveredVo = resultBean.getData(); + List modelInfo = new ArrayList<>(); + List> handCarInfo = new ArrayList<>(); + String vinNo = traliveredVo.getVinNo(); + if (StringUtils.isNotBlank(vinNo)) { + modelInfo.add(getConfigValueSpanSize("车型信息", "", 2)); + modelInfo.add(getConfigValueSpanSize("主车车架号", vinNo, 1)); + } + String modelName = traliveredVo.getModelName(); + if (StringUtils.isNotBlank(modelName)) { + modelInfo.add(getConfigValueSpanSize("车型", modelName, 1)); + } + deliveredTralierVo.setModelInfo(modelInfo); + List list = traliveredVo.getList(); + for (int i = 0; i < list.size(); i++) { + TrailerVo trailerVo = list.get(i); + List configVoList = new ArrayList<>(); + configVoList.add(getConfigValueSpanSize("挂车" + i + 1, "", 2)); + //挂车车架号 + String trailerVinNo = trailerVo.getTrailerVinNo(); + configVoList.add(getConfigValueSpanSize("车架号", trailerVinNo, 1)); + //成交价 + String dealPrice = trailerVo.getDealPrice(); + configVoList.add(getConfigValueSpanSize("成交价", dealPrice, 1)); + //车辆品牌 + String brandName = trailerVo.getBrandName(); + configVoList.add(getConfigValueSpanSize("车辆品牌", brandName, 1)); + //车辆型号 + String carModelName = trailerVo.getCarModelName(); + configVoList.add(getConfigValueSpanSize("车辆型号", carModelName, 1)); + //生产厂商名称 + String manufacturerName = trailerVo.getManufacturerName(); + configVoList.add(getConfigValueSpanSize("生产厂商名称", manufacturerName, 2)); + //挂车类型 + String trailerTypeValue = trailerVo.getTrailerTypeValue(); + + configVoList.add(getConfigValueSpanSize("挂车类型", trailerTypeValue, 2)); + //外观尺寸 + String appearanceSizeAll = ""; + String appearanceSizeLong = trailerVo.getAppearanceSizeLong(); + if (StringUtils.isNotBlank(appearanceSizeLong)) { + appearanceSizeAll = appearanceSizeAll + "长 " + appearanceSizeLong + "mm,"; + } + String appearanceSizeWide = trailerVo.getAppearanceSizeWide(); + if (StringUtils.isNotBlank(appearanceSizeWide)) { + appearanceSizeAll = appearanceSizeAll + "宽 " + appearanceSizeWide + "mm,"; + } + //高 + String appearanceSizeHigh = trailerVo.getAppearanceSizeHigh(); + if (StringUtils.isNotBlank(appearanceSizeHigh)) { + appearanceSizeAll = appearanceSizeAll + "高 " + appearanceSizeHigh + "mm,"; + } + //总高 + String appearanceSizeTotalHigh = trailerVo.getAppearanceSizeTotalHigh(); + if (StringUtils.isNotBlank(appearanceSizeTotalHigh)) { + appearanceSizeAll = appearanceSizeAll + "总高 " + "mm"; + } + //外观尺寸 + configVoList.add(getConfigValueSpanSize("外观尺寸", appearanceSizeAll, 2)); + //内部尺寸 + String insideSizeAll = ""; + String insideSizeLong = trailerVo.getInsideSizeLong(); + if (StringUtils.isNotBlank(insideSizeLong)) { + insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm"; + } else { + insideSizeAll = insideSizeAll + "长 mm"; + } + String insideSizeWide = trailerVo.getInsideSizeWide(); + if (StringUtils.isNotBlank(insideSizeWide)) { + insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm"; + } else { + insideSizeAll = insideSizeAll + "宽 mm"; + } + String insideSizeHigh = trailerVo.getInsideSizeHigh(); + if (StringUtils.isNotBlank(insideSizeHigh)) { + insideSizeAll = insideSizeAll + "高 " + insideSizeHigh + "mm"; + } else { + insideSizeAll = insideSizeAll + "高 mm"; + } + configVoList.add(getConfigValueSpanSize("内部尺寸", insideSizeAll, 2)); + String saddleLeaveLandHigh = trailerVo.getSaddleLeaveLandHigh(); + configVoList.add(getConfigValueSpanSize("鞍座离地高度", saddleLeaveLandHigh, 2)); + //大梁尺寸 + String girderSizeAll = ""; + String girderSizeHigh = trailerVo.getGirderSizeHigh(); + if (StringUtils.isNotBlank(girderSizeHigh)) { + girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm"; + } + String girderSizeWide = trailerVo.getGirderSizeWide(); + if (StringUtils.isNotBlank(girderSizeWide)) { + girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm"; + } + String girderSizeStandPlate = trailerVo.getGirderSizeStandPlate(); + if (StringUtils.isNotBlank(girderSizeStandPlate)) { + girderSizeAll = girderSizeAll + "立板 " + girderSizeStandPlate + "mm"; + } + configVoList.add(getConfigValueSpanSize("大梁尺寸", girderSizeAll, 2)); + //牵引销 + String towPin = trailerVo.getTowPin(); + configVoList.add(getConfigValueSpanSize("牵引销(底盘)", towPin, 2)); + //板簧 + String plateSpring = trailerVo.getPlateSpring(); + configVoList.add(getConfigValueSpanSize("板簧(底盘)", plateSpring, 2)); + //车桥 + String axle = trailerVo.getAxle(); + configVoList.add(getConfigValueSpanSize("车桥(底盘)", axle, 2)); + //轮胎及钢圈 + String tyreAndSteelCircle = trailerVo.getTyreAndSteelCircle(); + configVoList.add(getConfigValueSpanSize("轮胎及钢圈(底盘)", tyreAndSteelCircle, 2)); + //底板 + String floorSize = trailerVo.getFloorSize(); + configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2)); + //门扇要求 + String doorFanRequirement = trailerVo.getDoorFanRequirement(); + configVoList.add(getConfigValueSpanSize("门扇要求", doorFanRequirement, 1)); + //箱体颜色 + String boxColor = trailerVo.getBoxColor(); + configVoList.add(getConfigValueSpanSize("门扇要求", boxColor, 1)); + //更多配置 + String moreConfig = trailerVo.getMoreConfig(); + configVoList.add(getConfigValueSpanSize("更多配置", moreConfig, 2)); + handCarInfo.add(configVoList); + } + deliveredTralierVo.setHandCarInfo(handCarInfo); + return rb.success().setData(deliveredTralierVo); + } + + private ConfigVo getConfigValueSpanSize(String configName, String configValue, Integer spanSize) { + ConfigVo configInfoSpanSize = new ConfigVo(); + configInfoSpanSize.setName(configName); + configInfoSpanSize.setSpanSize(spanSize); + if (configValue == null) { + configInfoSpanSize.setValue("-"); + } else { + configInfoSpanSize.setValue(configValue); + } + return configInfoSpanSize; + } } \ No newline at end of file