移动端获取车型的公告型号列表接口、注释生成合同的转pdf功能

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;
+}

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<BaseVehmodelAnnouncementmodelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("销售订单-app查询合格证公告型号")
+    @GetMapping("/getAnnounceList")
+    @ResponseBody
+    ResultBean<List<AnnouncementVo>> getAnnounceList(@RequestParam("modelSid")String modelSid);
 }

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<List<AnnouncementVo>> getAnnounceList(String modelSid) {
+		return null;
+	}
 }

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<BaseVehm
 
     @Select("select * from base_vehmodel_announcementmodel")
     List<BaseVehmodelAnnouncementmodelVo> selectListVo();
+
+    List<AnnouncementVo> getAnnounceList(String modelSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.xml

@@ -54,4 +54,18 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="getAnnounceList" resultType="com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo">
+        SELECT
+            ba.`announcementmodelName` as dictValue,
+            ba.sid as dictKey,
+            ba.sid
+        FROM
+            base_vehmodel_announcementmodel bva
+                LEFT JOIN base_announcementmodel ba
+                          ON bva.`announcementmodelSid` = ba.`sid`
+                LEFT JOIN base_announcementmodel_param bap
+                          ON bva.`announcementmodelParamSid` = bap.`sid`
+        where bva.vehModelSid = #{modelSid}
+    </select>
 </mapper>

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<List<AnnouncementVo>> getAnnounceList(String modelSid) {
+		return baseVehmodelAnnouncementmodelService.getAnnounceList(modelSid);
+	}
 }

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<Bas
     }
 
 
+    public ResultBean<List<AnnouncementVo>> getAnnounceList(String modelSid) {
+        ResultBean<List<AnnouncementVo>> rb = ResultBean.fireFail();
+        List<AnnouncementVo> list = baseMapper.getAnnounceList(modelSid);
+        return rb.success().setData(list);
+    }
 }

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<CommonContractMapp
         String totalPrice = priceInfo.getTotalPrice();
         String priceRemarks = "";
         //车价合计大写
-//        String priceRemarks = MoneyToChineseUtils.convert(Double.valueOf(totalPrice).doubleValue());
         if(StringUtils.isNotBlank(totalPrice)){
             priceRemarks = TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(totalPrice).doubleValue()));
         }
@@ -1388,7 +1386,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             ExecutorService pool = new ThreadPoolExecutor(2, 100,
                     0L, TimeUnit.MILLISECONDS,
                     new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-            Future<String> future1 = pool.submit(() -> {
+           /* Future<String> future1 = pool.submit(() -> {
                 return genCarSaleContract(dto, map, appOrderDetailsVo);
             });
             PrintConfirmVo printConfirmVo = null;
@@ -1416,7 +1414,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future2.get());
                 list.add(printConfirmVo);
                 url = url + "," + future2.get();
-            }
+            }*/
             //生成合同数据
             //根据销售订单sid查询合同表中是否存在
             CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.base.common;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/9 12:59
+ * @Description
+ */
+@Api(tags = "app公共")
+@FeignClient(
+        contextId = "anrui-terminal-Common",
+        name = "anrui-terminal",
+        path = "/base/v1",
+        fallback = CommonFeignFallback.class)
+public interface CommonFeign {
+
+    @ApiOperation(value = "App-合格证公告型号")
+    @ResponseBody
+    @GetMapping("/publicModel")
+    ResultBean<List<PublicModelVo>> getPublicModelList(@RequestParam("modelSid") String modelSid);
+}

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 {
+}

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;
+}

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<List<PublicModelVo>> getPublicModelList(String modelSid) {
+        return commonService.getPublicModelList(modelSid);
+    }
+}

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<List<PublicModelVo>> getPublicModelList(String modelSid) {
+        ResultBean<List<PublicModelVo>> rb = ResultBean.fireFail();
+        ResultBean<List<AnnouncementVo>> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid);
+        List<PublicModelVo> 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);
+    }
+}