优化

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.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
 
@@ -63,4 +60,8 @@ public interface AppSubsetVersionFeign {
     @GetMapping("/getLastByAppSid")
     ResultBean<AppSubVersionVo> selectLast();
 
+    @ApiOperation("查询插件最新模块信息")
+    @GetMapping("/getLastRiskByAppSid")
+    ResultBean<AppSubVersionVo> getLastRiskByAppSid(@RequestParam("appSid") String appSid, @RequestParam("moduleAction")String moduleAction);
+
 }

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<AppSubVersionVo> selectLast() {
 		return null;
 	}
+
+	@Override
+	public ResultBean<AppSubVersionVo> getLastRiskByAppSid(String appSid,String moduleAction) {
+		return null;
+	}
 }

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<AppSubVersionVo> getLastRiskByAppSid(String appSid,String moduleAction) {
+        ResultBean<AppSubVersionVo> rb = ResultBean.fireFail();
+        AppSubVersionVo vo = new AppSubVersionVo();
+        ResultBean<AppSubsetVersionVo> 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);
+    }
 }

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<LoanFinOtherPolicyVos> details(@RequestParam("sid") String sid);
+
+    @GetMapping("selectList")
+    @ApiOperation("获取产品政策下其他融，或分公司下其他融")
+    ResultBean<List<OtherPolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam("sid") String sid);
 }

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

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<AppPolicyDetailsVo> getProductInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("已备案的产品政策（分公司，有效期内）")
+    @GetMapping("selectList")
+    ResultBean<List<PolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
 }

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

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<LoanFinOtherPolicy>
     LoanFinOtherPolicyVos details(String sid);
 
     AppOtherPolicyVo selectByMainSids(String sid);
+
+    List<OtherPolicyVo> selectListOne(String sid);
+
+    List<OtherPolicyVo> selectListTwo(String useOrgSid);
 }

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}
     </select>
+
+    <select id="selectListOne" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo">
+        select  lfo.sid,lfo.otherPolicyName as name from loan_fin_otherpolicy lfo where lfo.mainPolicySid = #{sid}
+    </select>
+
+    <select id="selectListTwo" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo">
+        select  lfo.sid,lfo.otherPolicyName as name from loan_fin_otherpolicy lfo where lfo.useOrgSid = #{sid}
+        and lfo.filingState = 2
+        and lfo.validDateTo > now()
+    </select>
 </mapper>

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<LoanFinOtherPolicyVos> details(String sid) {
         return loanFinOtherPolicyService.details(sid);
     }
+
+    @Override
+    public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid) {
+        return loanFinOtherPolicyService.selectList(orgPath,userSid,sid);
+    }
 }

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<LoanFinOtherPolicyMapper, LoanFinOtherPolicy> {
 
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+
     /**
      * 根据主产品sid查询
      *
@@ -45,4 +52,18 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
     public AppOtherPolicyVo selectByMainSids(String sid) {
         return baseMapper.selectByMainSids(sid);
     }
+
+    public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid) {
+        ResultBean<List<OtherPolicyVo>> rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        List<OtherPolicyVo> 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);
+
+    }
 }

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.*;
-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 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<LoanFinPolicy> {
     IPage<AppLoanFinPolicyVo> getProductList(IPage<LoanFinPolicy> page, @Param(Constants.WRAPPER) QueryWrapper<LoanFinPolicy> qw, @Param("name") String name);
 
     AppPolicyDetailsVo getProductInfo(String sid);
+
+    List<PolicyVo> selectListOne(String useOrgSid);
 }

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}
     </select>
+
+    <select id="selectListOne" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.PolicyVo">
+        select lfp.policyName, lfp.sid
+        from loan_fin_policy lfp
+        where lfp.filingState = 2
+          and lfp.useOrgSid = #{useOrgSid}
+          and lfp.validDateTo > now()
+    </select>
 </mapper>

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<AppPolicyDetailsVo> getProductInfo(String sid) {
         return loanFinPolicyService.getProductInfo(sid);
     }
+
+    @Override
+    public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid) {
+        return loanFinPolicyService.selectList(orgPath,userSid);
+    }
 }

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<LoanFinPolicyMapper
         }
         return rb.success().setData(appPolicyDetailsVo);
     }
+
+    public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid) {
+        ResultBean<List<PolicyVo>> rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        List<PolicyVo> list = baseMapper.selectListOne(useOrgSid);
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
+    }
 }

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

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<List<PublicModelVo>> getPublicModelList(@RequestParam("modelSid") String modelSid,@RequestParam("orgPath")String orgPath);
+    ResultBean<List<PublicModelVo>> 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<List<SystemVo>> getSystem(@RequestParam("orgPath")String orgPath);
+    ResultBean<List<SystemVo>> getSystem(@RequestParam("orgPath") String orgPath);
 
     @ApiOperation(value = "获取金融部门主管")
     @ResponseBody
     @GetMapping("/selectFinance")
-    ResultBean<List<FinanceVo>> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid);
+    ResultBean<List<FinanceVo>> selectFinance(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
+
+    @ApiOperation(value = "车型配置公共")
+    @ResponseBody
+    @GetMapping("/carDetails")
+    ResultBean<CarModelVo> carDetails(@RequestParam("orgPath") String orgPath, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
+
 }

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<List<FinanceVo>> selectFinance(String orgPath, String userSid) {
         return commonService.selectFinance(orgPath, userSid);
     }
+
+    @Override
+    public ResultBean<CarModelVo> carDetails(String orgPath, String modelSid, String configSid) {
+        return commonService.carDetails(orgPath, modelSid, configSid);
+    }
 }

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.*;
-import java.util.List;
-import java.util.Optional;
 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<List<PublicModelVo>> getPublicModelList(String modelSid, String orgPath) {
         ResultBean<List<PublicModelVo>> rb = ResultBean.fireFail();
@@ -72,4 +75,20 @@ public class CommonService {
         List<FinanceVo> 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<CarModelVo> carDetails(String orgPath, String modelSid, String configSid) {
+        ResultBean<CarModelVo> rb = ResultBean.fireFail();
+        String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c";
+        String moduleAction = "com.anrui.android.plugin.autoservice.common.CarModelActivity";
+        ResultBean<AppSubVersionVo> voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction);
+        AppSubVersionVo appSubVersionVo = voResultBean.getData();
+        CarModelVo carModelVo = new CarModelVo();
+        Map<String, Object> 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);
+    }
 }