From 31baaef68a00059f10de4e123d0c639678cbcf1f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 25 Jul 2023 16:25:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppSubsetVersionFeign.java | 9 ++--- .../AppSubsetVersionFeignFallback.java | 5 +++ .../AppSubsetVersionRest.java | 13 +++++++ .../LoanFinOtherPolicyFeign.java | 6 ++++ .../api/loanfinotherPolicy/OtherPolicyVo.java | 18 ++++++++++ .../api/loanfinpolicy/LoanFinPolicyFeign.java | 6 ++++ .../api/loanfinpolicy/PolicyVo.java | 18 ++++++++++ .../LoanFinOtherPolicyMapper.java | 5 +++ .../LoanFinOtherPolicyMapper.xml | 10 ++++++ .../LoanFinOtherPolicyRest.java | 8 +++++ .../LoanFinOtherPolicyService.java | 21 ++++++++++++ .../loanfinpolicy/LoanFinPolicyMapper.java | 7 ++-- .../biz/loanfinpolicy/LoanFinPolicyMapper.xml | 8 +++++ .../biz/loanfinpolicy/LoanFinPolicyRest.java | 7 ++++ .../loanfinpolicy/LoanFinPolicyService.java | 8 +++++ .../terminal/api/base/common/CarModelVo.java | 34 +++++++++++++++++++ .../terminal/api/base/common/CommonFeign.java | 12 +++++-- .../terminal/biz/base/common/CommonRest.java | 5 +++ .../biz/base/common/CommonService.java | 25 ++++++++++++-- 19 files changed, 211 insertions(+), 14 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/OtherPolicyVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeign.java index 7dd9649dcc..288215e29d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeign.java @@ -4,10 +4,7 @@ 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.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -63,4 +60,8 @@ public interface AppSubsetVersionFeign { @GetMapping("/getLastByAppSid") ResultBean selectLast(); + @ApiOperation("查询插件最新模块信息") + @GetMapping("/getLastRiskByAppSid") + ResultBean getLastRiskByAppSid(@RequestParam("appSid") String appSid, @RequestParam("moduleAction")String moduleAction); + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeignFallback.java index a7c6b7a43b..5e72c7e10d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeignFallback.java @@ -53,4 +53,9 @@ public class AppSubsetVersionFeignFallback implements AppSubsetVersionFeign { public ResultBean selectLast() { return null; } + + @Override + public ResultBean getLastRiskByAppSid(String appSid,String moduleAction) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java index bfe9f23819..77b432e40a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java @@ -253,4 +253,17 @@ public class AppSubsetVersionRest implements AppSubsetVersionFeign { vo.setModuleAction("com.anrui.android.plugin.autoservice.common.CarlModelConfigDetailActivity"); return rb.success().setData(vo); } + + @Override + public ResultBean getLastRiskByAppSid(String appSid,String moduleAction) { + ResultBean rb = ResultBean.fireFail(); + AppSubVersionVo vo = new AppSubVersionVo(); + ResultBean resultBean = getLastByAppSid(appSid); + AppSubsetVersionVo appSubsetVersionVo = resultBean.getData(); + BeanUtil.copyProperties(appSubsetVersionVo, vo); + vo.setModuleVersion(appSubsetVersionVo.getVersionCode()); + vo.setPath(fileUploadComponent.getUrlPrefix() + appSubsetVersionVo.getUpdateUrl()); + vo.setModuleAction(moduleAction); + return rb.success().setData(vo); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java index 3df0d6c84c..83ee5c6c21 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java @@ -7,6 +7,8 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * @description: 其他融产品 * @author: dimengzhe @@ -23,4 +25,8 @@ public interface LoanFinOtherPolicyFeign { @GetMapping("details") @ApiOperation("详情") ResultBean details(@RequestParam("sid") String sid); + + @GetMapping("selectList") + @ApiOperation("获取产品政策下其他融，或分公司下其他融") + ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/OtherPolicyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/OtherPolicyVo.java new file mode 100644 index 0000000000..b574c2b185 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/OtherPolicyVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/25 + **/ +@Data +public class OtherPolicyVo implements Vo { + private static final long serialVersionUID = 699706797731138466L; + + private String sid; + + private String name; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java index 075078f15e..653fa6ea8b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java @@ -8,6 +8,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -52,4 +54,8 @@ public interface LoanFinPolicyFeign { @ApiOperation("app金融产品常规详情") @GetMapping("getProductInfo") ResultBean getProductInfo(@RequestParam("sid") String sid); + + @ApiOperation("已备案的产品政策（分公司，有效期内）") + @GetMapping("selectList") + ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java new file mode 100644 index 0000000000..ffa52b1cb5 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.riskcenter.api.loanfinpolicy; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/25 + **/ +@Data +public class PolicyVo implements Vo { + private static final long serialVersionUID = -2134939652790330324L; + + private String name; + + private String sid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java index 0130e30359..7e82ef1f41 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -24,4 +25,8 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper LoanFinOtherPolicyVos details(String sid); AppOtherPolicyVo selectByMainSids(String sid); + + List selectListOne(String sid); + + List selectListTwo(String useOrgSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml index 6a5b71bdb6..49a6ec6e7e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml @@ -34,4 +34,14 @@ from loan_fin_otherpolicy where mainPolicySid = #{sid} + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java index fabf4db2e8..091cf4390c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java @@ -2,12 +2,15 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyFeign; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -25,4 +28,9 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign { public ResultBean details(String sid) { return loanFinOtherPolicyService.details(sid); } + + @Override + public ResultBean> selectList(String orgPath, String userSid, String sid) { + return loanFinOtherPolicyService.selectList(orgPath,userSid,sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java index 3a0dde1201..909a6afd07 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java @@ -1,12 +1,16 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -17,6 +21,9 @@ import java.util.List; @Service public class LoanFinOtherPolicyService extends MybatisBaseService { + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + /** * 根据主产品sid查询 * @@ -45,4 +52,18 @@ public class LoanFinOtherPolicyService extends MybatisBaseService> selectList(String orgPath, String userSid, String sid) { + ResultBean> rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + List list = baseMapper.selectListOne(sid); + list.removeAll(Collections.singleton(null)); + if (list.isEmpty()) { + list = baseMapper.selectListTwo(useOrgSid); + list.removeAll(Collections.singleton(null)); + } + + return rb.success().setData(list); + + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java index bd1c35fb61..c35cf7256b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo; -import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppPolicyDetailsVo; -import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; -import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVos; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,4 +26,6 @@ public interface LoanFinPolicyMapper extends BaseMapper { IPage getProductList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); AppPolicyDetailsVo getProductInfo(String sid); + + List selectListOne(String useOrgSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml index d6baa75885..248e986460 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml @@ -86,4 +86,12 @@ from loan_fin_policy lfp where lfp.sid = #{sid} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java index d5c428e178..14e97c4e78 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java @@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -65,4 +67,9 @@ public class LoanFinPolicyRest implements LoanFinPolicyFeign { public ResultBean getProductInfo(String sid) { return loanFinPolicyService.getProductInfo(sid); } + + @Override + public ResultBean> selectList(String orgPath, String userSid) { + return loanFinPolicyService.selectList(orgPath,userSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index 63097ce37e..2f61204b76 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java @@ -489,4 +489,12 @@ public class LoanFinPolicyService extends MybatisBaseService> selectList(String orgPath, String userSid) { + ResultBean> rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + List list = baseMapper.selectListOne(useOrgSid); + list.removeAll(Collections.singleton(null)); + return rb.success().setData(list); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java new file mode 100644 index 0000000000..4e77c50a7f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.terminal.api.base.common; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/25 + **/ +@Data +public class CarModelVo implements Vo { + private static final long serialVersionUID = 765048085242343954L; + + @ApiModelProperty("版本编码") + private Integer moduleVersion; + + @ApiModelProperty("apk下载地址") + private String path; + + @ApiModelProperty("0.内置Activity 1.内置WebView 2.RePlugin插件") + private String type; + + @ApiModelProperty("插件名称") + private String modulePluginName; + + @ApiModelProperty("地址") + private String moduleAction; + + private String json; + + private String requestCode; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java index a18d3712ff..85b7876aea 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java @@ -26,7 +26,7 @@ public interface CommonFeign { @ApiOperation(value = "App-合格证公告型号") @ResponseBody @GetMapping("/publicModel") - ResultBean> getPublicModelList(@RequestParam("modelSid") String modelSid,@RequestParam("orgPath")String orgPath); + ResultBean> getPublicModelList(@RequestParam("modelSid") String modelSid, @RequestParam("orgPath") String orgPath); @ApiOperation(value = "获取上装配置") @ResponseBody @@ -36,10 +36,16 @@ public interface CommonFeign { @ApiOperation(value = "获取采购系统名称") @ResponseBody @GetMapping("/getSystem") - ResultBean> getSystem(@RequestParam("orgPath")String orgPath); + ResultBean> getSystem(@RequestParam("orgPath") String orgPath); @ApiOperation(value = "获取金融部门主管") @ResponseBody @GetMapping("/selectFinance") - ResultBean> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid); + ResultBean> selectFinance(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid); + + @ApiOperation(value = "车型配置公共") + @ResponseBody + @GetMapping("/carDetails") + ResultBean carDetails(@RequestParam("orgPath") String orgPath, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid); + } 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 index 40bba346b7..ae1f50fe06 100644 --- 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 @@ -43,4 +43,9 @@ public class CommonRest implements CommonFeign { public ResultBean> selectFinance(String orgPath, String userSid) { return commonService.selectFinance(orgPath, userSid); } + + @Override + public ResultBean carDetails(String orgPath, String modelSid, String configSid) { + return commonService.carDetails(orgPath, modelSid, configSid); + } } 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 index a340f9c506..892d0fbf44 100644 --- 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 @@ -2,6 +2,7 @@ package com.yxt.anrui.terminal.biz.base.common; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.base.api.basepurchasesystem.AppBasePurchSystemVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign; @@ -9,6 +10,8 @@ import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelQuery; import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelVo; import com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo; import com.yxt.anrui.base.api.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelFeign; +import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; +import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; import com.yxt.anrui.portal.api.sysorganization.SysFinanceVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.terminal.api.base.common.*; @@ -19,9 +22,7 @@ import com.yxt.common.core.vo.PagerVo; 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.*; import java.util.stream.Collectors; /** @@ -40,6 +41,8 @@ public class CommonService { private BasePurchaseSystemFeign basePurchaseSystemFeign; @Autowired private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private AppSubsetVersionFeign appSubsetVersionFeign; public ResultBean> getPublicModelList(String modelSid, String orgPath) { ResultBean> rb = ResultBean.fireFail(); @@ -72,4 +75,20 @@ public class CommonService { List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinanceVo.class)).collect(Collectors.toList()); return rb.success().setData(list); } + + public ResultBean carDetails(String orgPath, String modelSid, String configSid) { + ResultBean rb = ResultBean.fireFail(); + String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c"; + String moduleAction = "com.anrui.android.plugin.autoservice.common.CarModelActivity"; + ResultBean voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction); + AppSubVersionVo appSubVersionVo = voResultBean.getData(); + CarModelVo carModelVo = new CarModelVo(); + Map map = new HashMap<>(); + map.put("canNoCustomer", true); + map.put("selectType", 2); + appSubVersionVo.setJson(JSONObject.toJSONString(map)); + BeanUtil.copyProperties(appSubVersionVo, carModelVo); + carModelVo.setRequestCode("1001"); + return rb.success().setData(carModelVo); + } }