移动端菜单修复+车辆合格证识别

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java

@@ -91,7 +91,13 @@ public class AppSubsetVersionRest implements AppSubsetVersionFeign {
             appSubsetVersionOneDto.setModulePluginName("");
         }
         appSubsetVersionOneDto.setAppName(dto.getAppName());
-        appSubsetVersionOneDto.setIconUrl(dto.getIconUrl());
+        if (StringUtils.isNotBlank(dto.getIconUrl())) {
+            if (dto.getIconUrl().contains(fileUploadComponent.getUrlPrefix())) {
+                appSubsetVersionOneDto.setIconUrl(dto.getIconUrl().replace(fileUploadComponent.getUrlPrefix(), ""));
+            } else {
+                appSubsetVersionOneDto.setIconUrl(dto.getIconUrl());
+            }
+        }
         appSubsetVersionOneDto.setUpgradeInfo(dto.getUpgradeInfo());
         appSubsetVersionOneDto.setType(dto.getType());
         appSubsetVersionOneDto.setSortNo(dto.getSortNo());

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionMapper.xml

@@ -12,7 +12,7 @@
 	</select>
 
 	<select id="selectNewAppVersion" resultType="com.yxt.anrui.portal.api.appversion.AppVersionVo">
-        SELECT appName, versionCode, versionName, updateUrl, upgradeInfo, iconUrl
+        SELECT appName, versionCode, versionName, updateUrl, upgradeInfo, iconUrl,appSid
         FROM app_version
         ORDER BY versionCode DESC
         LIMIT 1

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionRest.java

@@ -100,7 +100,7 @@ public class AppVersionRest implements AppVersionFeign {
 		appVersionDto.setVersionName(versionVo.getVersionName());
 		appVersionDto.setUpgradeInfo(upgradeInfo);
 		appVersionDto.setVersionCode(versionVo.getVersionCode());
-		appVersionDto.setAppSid("147694bb-c765-4426-8f67-d19a66585f30");
+		appVersionDto.setAppSid("147694bb-c765-4426-8f67-d19a66585f31");
 		ResultBean resultBean = save2(appVersionDto);
 		if (!resultBean.getSuccess()) {
 			return ResultBean.fireFail().setMsg(resultBean.getMsg());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/baidu/BaiDuFeign.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.base.baidu;
+
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/31 11:43
+ * @Description
+ */
+@Api(tags = "百度")
+@FeignClient(
+        contextId = "anrui-terminal-BaiDu",
+        name = "anrui-terminal",
+        path = "/base/v1/baidu",
+        fallback = BaiDuFeignFallback.class)
+public interface BaiDuFeign {
+
+    @ApiOperation(value = "移动：百度-车辆合格证识别")
+    @ResponseBody
+    @PostMapping("/vehicleCertificate")
+    ResultBean<Map<String, Object>> vehicleCertificate(@RequestParam("imageB64") String imageB64);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/baidu/BaiDuFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.terminal.api.base.baidu;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/31 11:44
+ * @Description
+ */
+@Component
+public class BaiDuFeignFallback {
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/baidu/BaiDuRest.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.terminal.biz.base.baidu;
+
+import com.yxt.anrui.terminal.api.base.baidu.BaiDuFeign;
+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.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/31 13:31
+ * @Description
+ */
+@Api(tags = "百度车辆合格证")
+@Controller
+@RequestMapping("/base/v1/baidu")
+public class BaiDuRest implements BaiDuFeign {
+
+    @Autowired
+    private BaiDuService baiDuService;
+
+    @Override
+    public ResultBean<Map<String, Object>> vehicleCertificate(String imageB64) {
+        return baiDuService.vehicleCertificate(imageB64);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/baidu/BaiDuService.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.biz.base.baidu;
+
+import com.yxt.anrui.portal.api.index.IndexFeign;
+import com.yxt.anrui.portal.api.index.IndexQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/31 13:32
+ * @Description
+ */
+@Service
+public class BaiDuService {
+
+    @Autowired
+    private IndexFeign indexFeign;
+
+    public ResultBean<Map<String, Object>> vehicleCertificate(String imageB64) {
+        IndexQuery indexQuery = new IndexQuery();
+        indexQuery.setImage(imageB64);
+        ResultBean<Map<String, Object>> resultBean = indexFeign.getVehicleCertificate(indexQuery);
+        return resultBean;
+    }
+}