diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/AnnouncementVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/AnnouncementVo.java new file mode 100644 index 0000000000..0ce51f6c2f --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/AnnouncementVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.base.api.basevehmodelannouncementmodel; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/9 12:49 + * @Description + */ +@Data +public class AnnouncementVo implements Vo { + private static final long serialVersionUID = -347631276593210436L; + @ApiModelProperty("公告型号sid") + private String sid; + @ApiModelProperty("公告型号sid") + private String dictKey; + @ApiModelProperty("公告型号名称") + private String dictValue; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeign.java index c1d6a53f80..227faf5611 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeign.java @@ -80,4 +80,9 @@ public interface BaseVehmodelAnnouncementmodelFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("销售订单-app查询合格证公告型号") + @GetMapping("/getAnnounceList") + @ResponseBody + ResultBean> getAnnounceList(@RequestParam("modelSid")String modelSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeignFallback.java index 83d82f001a..474353cb6e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeignFallback.java @@ -74,4 +74,9 @@ public class BaseVehmodelAnnouncementmodelFeignFallback implements BaseVehmodelA ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-base/basevehmodelannouncementmodel/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean> getAnnounceList(String modelSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.java index 43640c5be9..4fed59ca53 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo; import com.yxt.anrui.base.api.basevehmodelannouncementmodel.BaseAnnouncementmodelAndParamVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -66,4 +67,6 @@ public interface BaseVehmodelAnnouncementmodelMapper extends BaseMapper selectListVo(); + + List getAnnounceList(String modelSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.xml index 9efbe729f5..f6d9afe48c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.xml @@ -54,4 +54,18 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelRest.java index 80dca605e5..b1571d0920 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelRest.java @@ -97,4 +97,9 @@ public class BaseVehmodelAnnouncementmodelRest implements BaseVehmodelAnnounceme BaseVehmodelAnnouncementmodelDetailsVo vo = baseVehmodelAnnouncementmodelService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean> getAnnounceList(String modelSid) { + return baseVehmodelAnnouncementmodelService.getAnnounceList(modelSid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelService.java index a7a9cf9003..9f2ee3bb0f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelService.java @@ -28,15 +28,13 @@ package com.yxt.anrui.base.biz.basevehmodelannouncementmodel; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.api.R; import com.yxt.anrui.base.api.basevehmodelannouncementmodel.*; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -128,4 +126,9 @@ public class BaseVehmodelAnnouncementmodelService extends MybatisBaseService> getAnnounceList(String modelSid) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.getAnnounceList(modelSid); + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 5a06f37a65..10d17e716a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -74,7 +74,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.math.BigDecimal; -import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; @@ -1342,7 +1341,6 @@ public class CommonContractService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - Future future1 = pool.submit(() -> { + /* Future future1 = pool.submit(() -> { return genCarSaleContract(dto, map, appOrderDetailsVo); }); PrintConfirmVo printConfirmVo = null; @@ -1416,7 +1414,7 @@ public class CommonContractService extends MybatisBaseService> getPublicModelList(@RequestParam("modelSid") String modelSid); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeignFallback.java new file mode 100644 index 0000000000..8f22f2c7d2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.terminal.api.base.common; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/11/9 13:00 + * @Description + */ +@Component +public class CommonFeignFallback { +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/PublicModelVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/PublicModelVo.java new file mode 100644 index 0000000000..5046708daa --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/PublicModelVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.base.common; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/9 13:00 + * @Description + */ +@Data +public class PublicModelVo implements Vo { + private static final long serialVersionUID = 207273803006524752L; + @ApiModelProperty("公告型号sid") + private String sid; + @ApiModelProperty("公告型号sid") + private String dictKey; + @ApiModelProperty("公告型号名称") + private String dictValue; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java new file mode 100644 index 0000000000..84a0f18680 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.terminal.biz.base.common; + +import com.yxt.anrui.terminal.api.base.common.CommonFeign; +import com.yxt.anrui.terminal.api.base.common.PublicModelVo; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/11/9 13:05 + * @Description + */ +@Api(tags = "app公共") +@Controller +@RequestMapping("/base/v1") +public class CommonRest implements CommonFeign { + + @Autowired + private CommonService commonService; + + @Override + public ResultBean> getPublicModelList(String modelSid) { + return commonService.getPublicModelList(modelSid); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java new file mode 100644 index 0000000000..3e1f9dd83a --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.terminal.biz.base.common; + +import com.alibaba.fastjson.JSON; +import com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo; +import com.yxt.anrui.base.api.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelFeign; +import com.yxt.anrui.terminal.api.base.common.PublicModelVo; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * @Author dimengzhe + * @Date 2022/11/9 13:05 + * @Description + */ +@Service +public class CommonService { + + @Autowired + private BaseVehmodelAnnouncementmodelFeign baseVehmodelAnnouncementmodelFeign; + + public ResultBean> getPublicModelList(String modelSid) { + ResultBean> rb = ResultBean.fireFail(); + ResultBean> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid); + List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), PublicModelVo.class)).collect(Collectors.toList()); + return rb.success().setData(list); + } +}