From 26d21c9bd11d1d71072b882b378c735b763e2022 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 21 Dec 2023 16:35:14 +0800
Subject: [PATCH] =?UTF-8?q?app=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/api/appversion/AppVersionFeign.java    |  7 ++++++-
 .../api/appversion/AppVersionFeignFallback.java   |  5 +++++
 .../portal/biz/appversion/AppVersionMapper.xml    |  2 +-
 .../portal/biz/appversion/AppVersionRest.java     | 15 ++++++++++++++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appversion/AppVersionFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appversion/AppVersionFeign.java
index 4c09c6d805..ae01e96ae2 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appversion/AppVersionFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appversion/AppVersionFeign.java
@@ -36,7 +36,7 @@ public interface AppVersionFeign {
     @ApiOperation(value = "获取最新版本")
     @ResponseBody
     @GetMapping("/selectNewAppVersion")
-    public ResultBean<Map<String, Object>>  selectNewAppVersion();
+    public ResultBean<Map<String, Object>> selectNewAppVersion();
 
     @ApiOperation("更新主框架")
     @ResponseBody
@@ -50,4 +50,9 @@ public interface AppVersionFeign {
     @GetMapping("/selectCodeImg")
     ResultBean<String> selectCodeImg();
 
+    @ApiOperation(value = "获取最新版本app地址")
+    @ResponseBody
+    @GetMapping("/selectNewAppVersion2")
+    public ResultBean<String> selectNewAppVersion2();
+
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appversion/AppVersionFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appversion/AppVersionFeignFallback.java
index 74f5f1a9a3..5461e03fe6 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appversion/AppVersionFeignFallback.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appversion/AppVersionFeignFallback.java
@@ -40,4 +40,9 @@ public class AppVersionFeignFallback implements AppVersionFeign {
 	public ResultBean<String> selectCodeImg() {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> selectNewAppVersion2() {
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionMapper.xml
index 058de02ef1..a277270db4 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionMapper.xml
@@ -29,7 +29,7 @@
                appSid,
                DATE_FORMAT(modifyTime, '%Y-%m-%d') as modifyTime
         FROM app_version
-        ORDER BY versionCode DESC
+        ORDER BY versionCode DESC,id desc
         LIMIT 1
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionRest.java
index 8ee4c35b93..90b93e4a9f 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionRest.java
@@ -49,7 +49,6 @@ import java.util.concurrent.Future;
 @RestController
 @RequestMapping("v1/appversion")
 public class AppVersionRest implements AppVersionFeign {
-
 	/**
 	 * 消息类型:0002手机端
 	 */
@@ -125,9 +124,23 @@ public class AppVersionRest implements AppVersionFeign {
 		File file = new File(fileUploadComponent.getUploadPath());
 		AppVersionVo appVersionVo = (AppVersionVo) resultBean.getData().get("appVersionVo");
 		QRCodeUtil.createCodeToFile(appVersionVo.getUpdateUrl(),file,"安瑞APP下载.png");
+		url = fileUploadComponent.getUploadPath()+"安瑞APP下载.png";
 		return rb.success().setData(url);
 	}
 
+	@Override
+	public ResultBean<String> selectNewAppVersion2() {
+        ResultBean<String> rb = ResultBean.fireFail();
+		AppVersionVo appVersionVo = appVersionService.selectNewAppVersion();
+		if(appVersionVo != null){
+			if(StringUtils.isNotBlank(appVersionVo.getIconUrl()))
+				appVersionVo.setIconUrl(fileUploadComponent.getUrlPrefix()+appVersionVo.getIconUrl());
+			if(StringUtils.isNotBlank(appVersionVo.getUpdateUrl()))
+				appVersionVo.setUpdateUrl(fileUploadComponent.getUrlPrefix()+appVersionVo.getUpdateUrl());
+		}
+        return rb.success().setData(appVersionVo.getUpdateUrl());
+	}
+
 	public ResultBean save2(AppVersionDto appVersionDto) {
 		AppVersion appVersion = new AppVersion();
 		appVersionDto.fillEntity(appVersion);