From b9887cb31827214b1ca7ed32659e3fdc052a593b Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 1 Aug 2022 14:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8F=92=E4=BB=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appsubsetversion/AppSubsetVersionMapper.java | 2 +- .../appsubsetversion/AppSubsetVersionMapper.xml | 15 +++++++-------- .../appsubsetversion/AppSubsetVersionRest.java | 8 ++++++-- .../appsubsetversion/AppSubsetVersionService.java | 4 ++-- .../yxt/anrui/portal/biz/index/AppIndexRest.java | 10 +++++----- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.java index 221d20a17a..bcd34d7212 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.java @@ -25,7 +25,7 @@ import java.util.List; @Mapper public interface AppSubsetVersionMapper extends BaseMapper { - List selectVersionList(String linkSid); + List selectVersionList(@Param("linkSid") String linkSid,@Param("path") String path); AppSubsetVersionVo selectByAppSid(String appSid); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.xml index 89d1244e36..342352b6e0 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.xml @@ -1,18 +1,17 @@ - - - SELECT asv.sortNo, asv.appName, asv.appSid, asv.versionCode, - asv.iconUrl, + concat(#{path}, asv.iconUrl) iconUrl, asv.linkSid, asv.versionName, - asv.updateUrl, - asv.updateUrl, + concat(#{path}, asv.updateUrl) updateUrl, asv.upgradeInfo, asv.type, asv.modulePluginName, @@ -25,7 +24,7 @@ AND id IN (SELECT MAX(id) FROM app_subset_version GROUP BY appSid) ORDER BY sortNo ASC - SELECT versionCode FROM app_subset_version WHERE appSid = #{appSid} @@ -33,7 +32,7 @@ LIMIT 1 - SELECT * FROM app_subset_version WHERE appSid = #{appSid} 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 389f0b1b9d..6a7d87eca5 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 @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.portal.api.appsubsetversion.*; import com.yxt.anrui.portal.api.appversion.VersionVo; import com.yxt.anrui.portal.biz.appversion.ApkUtil; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; @@ -38,12 +39,15 @@ public class AppSubsetVersionRest implements AppSubsetVersionFeign { private ApkUtil apkUtil; @Autowired private AppSubsetVersionService appSubsetVersionService; + @Autowired + private FileUploadComponent fileUploadComponent; @Override public ResultBean> selectVersionList() { //主框架sid String linkSid = LINKSID; - List appSubsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid); + String path = fileUploadComponent.getUrlPrefix(); + List appSubsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid,path); return new ResultBean>().success().setData(appSubsetVersionVoList); } @@ -112,7 +116,7 @@ public class AppSubsetVersionRest implements AppSubsetVersionFeign { } return ResultBean.fireSuccess().setMsg("保存成功"); } - + @Override public ResultBean update(AppSubsetVersionDto dto){ if (dto.getType().equals("2")) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionService.java index 36e70d5fa4..a3b4150d94 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionService.java @@ -23,8 +23,8 @@ import java.util.List; @Service public class AppSubsetVersionService extends MybatisBaseService { - public List selectVersionList(String linkSid) { - return baseMapper.selectVersionList(linkSid); + public List selectVersionList(String linkSid,String path) { + return baseMapper.selectVersionList(linkSid,path); } public AppSubsetVersionVo selectByAppSid(String appSid) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java index 7c86c5958c..a8bf5885bf 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java @@ -2,18 +2,16 @@ package com.yxt.anrui.portal.biz.index; import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo; import com.yxt.anrui.portal.api.banner.BannerVo; -import com.yxt.anrui.portal.api.formnotice.FormNotice; import com.yxt.anrui.portal.api.formnotice.FormNoticeQuery; import com.yxt.anrui.portal.api.formnotice.FormNoticeVo; import com.yxt.anrui.portal.api.index.AppIndexFeign; -import com.yxt.anrui.portal.api.index.AppIndexQuery; import com.yxt.anrui.portal.api.index.AppIndexVo; -import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.biz.appsubsetversion.AppSubsetVersionService; import com.yxt.anrui.portal.biz.banner.BannerService; import com.yxt.anrui.portal.biz.flow.FlowableService; import com.yxt.anrui.portal.biz.formnotice.FormNoticeService; import com.yxt.anrui.portal.biz.sysuser.SysUserService; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.DateUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -23,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -51,6 +48,8 @@ public class AppIndexRest implements AppIndexFeign { private FlowableService flowableService; @Autowired private MessageListFeign messageListFeign; + @Autowired + private FileUploadComponent fileUploadComponent; private String LINKSID="147694bb-c765-4426-8f67-d19a66585f31"; @@ -83,7 +82,8 @@ public class AppIndexRest implements AppIndexFeign { // 子应用列表 String linkSid = LINKSID; - List subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid); + String path = fileUploadComponent.getUrlPrefix(); + List subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid,path); subsetVersionVoList.stream().forEach(item -> { item.setCornerNum("3"); });