From eac8d933ef1ecfa064984a545050c1f3c2e32412 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 28 Oct 2022 11:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BB=A5=E5=8F=8A=E5=BA=94=E7=94=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/sysmobilemenu/SysMobileMenu.java | 3 ++ .../sysmobilemenu/SysMobileMenuDetailsVo.java | 39 +++++++++++++++++++ .../api/sysmobilemenu/SysMobileMenuDto.java | 6 ++- .../api/sysmobilemenu/SysMobileMenuFeign.java | 15 +++++-- .../SysMobileMenuFeignFallback.java | 10 +++++ .../api/sysmobilemenu/SysMobileMenuVo.java | 12 +++++- .../sysmobilemenu/SysMobileMenuMapper.java | 3 ++ .../biz/sysmobilemenu/SysMobileMenuMapper.xml | 21 ++++++++-- .../biz/sysmobilemenu/SysMobileMenuRest.java | 11 ++++++ .../sysmobilemenu/SysMobileMenuService.java | 26 +++++++++++-- 10 files changed, 133 insertions(+), 13 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDetailsVo.java diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java index 571394ac26..cf11a45c6f 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java @@ -21,6 +21,9 @@ public class SysMobileMenu extends BaseEntity { @ApiModelProperty("插件sid") private String linkSid; + @ApiModelProperty("插件的appName") + private String linkName; + @ApiModelProperty("应用图标") private String iconUrl; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDetailsVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDetailsVo.java new file mode 100644 index 0000000000..84e6e25ced --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDetailsVo.java @@ -0,0 +1,39 @@ +package com.yxt.anrui.portal.api.sysmobilemenu; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/28 10:18 + * @Description + */ +@Data +public class SysMobileMenuDetailsVo implements Vo { + private static final long serialVersionUID = -2338377632853435516L; + @ApiModelProperty("应用分类") + private String titleGroup; + + @ApiModelProperty("应用名称") + private String title; + + @ApiModelProperty("应用图标") + private String iconUrl; + + @ApiModelProperty("应用路由") + private String path; + + @ApiModelProperty("json") + private String json; + + @ApiModelProperty("排序号") + private String sortNo; + + @ApiModelProperty("插件sid") + private String linkSid; + + @ApiModelProperty("插件的appName") + private String linkName; + +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDto.java index 55ead8cbdd..71dca4d298 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDto.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDto.java @@ -14,6 +14,8 @@ public class SysMobileMenuDto implements Dto { private static final long serialVersionUID = 2939430292974122530L; @ApiModelProperty("插件appSid") private String linkSid; + @ApiModelProperty("插件的appName") + private String linkName; private String sid; @ApiModelProperty("应用分类") @@ -31,6 +33,8 @@ public class SysMobileMenuDto implements Dto { @ApiModelProperty("排序") private String sortNo; - @ApiModelProperty(value = "父级sid",example = "0") + @ApiModelProperty(value = "父级sid", example = "0") private String psid; + + } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeign.java index 92d58aa14c..8dfe874c87 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeign.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.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * @Author dimengzhe @@ -31,4 +28,14 @@ public interface SysMobileMenuFeign { @GetMapping("/list") @ResponseBody ResultBean list(); + + @ApiOperation("应用详情、初始化") + @GetMapping("/details") + @ResponseBody + ResultBean details(@RequestParam("sid") String sid); + + @ApiOperation("删除应用") + @DeleteMapping("/deleteMenu") + @ResponseBody + ResultBean deleteMenu(@RequestParam("sid") String sid); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeignFallback.java index 337bb76faa..aeb271c10a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeignFallback.java @@ -21,4 +21,14 @@ public class SysMobileMenuFeignFallback implements SysMobileMenuFeign{ public ResultBean list() { return null; } + + @Override + public ResultBean details(String sid) { + return null; + } + + @Override + public ResultBean deleteMenu(String sid) { + return null; + } } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuVo.java index 2bfc46a3f6..7107f390ee 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuVo.java @@ -29,8 +29,18 @@ public class SysMobileMenuVo implements Vo { @ApiModelProperty("应用路由：sorceAction") private String sourceAction; - private String sid; +// private String sid; private String appSid; private List mobileMenuList; + @ApiModelProperty("主框架的appSId") + private String linkSid; + @ApiModelProperty("插件名称") + private String modulePluginName; + + @ApiModelProperty("包名") + private String sourcePackage; + + @ApiModelProperty("type") + private String type; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.java index 8f7c87838c..2369a73fcd 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.java @@ -2,6 +2,7 @@ package com.yxt.anrui.portal.biz.sysmobilemenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu; +import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuDetailsVo; import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,6 @@ public interface SysMobileMenuMapper extends BaseMapper { List listAll(@Param("path") String path, @Param("linkSid") String linkSid); List getMenu(String appSid); + + SysMobileMenuDetailsVo details(@Param("sid") String sid, @Param("path") String path); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.xml index f763fa8f11..0091996840 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.xml @@ -9,9 +9,12 @@ if(length(asv.iconUrl) > 0, concat(#{path}, asv.iconUrl), '') as iconUrl, asv.versionName, asv.`id`, - asv.sid, DATE_FORMAT(asv.modifyTime, '%Y-%m-%d') as modifyTime, - asv.sourceAction + asv.sourceAction, + asv.linkSid, + asv.modulePluginName, + asv.sourcePackage, + asv.type FROM app_subset_version asv WHERE linkSid = #{linkSid} AND id IN (SELECT MAX(id) FROM app_subset_version GROUP BY appSid) @@ -20,7 +23,6 @@ - @@ -74,4 +76,17 @@ from sys_mobile_menu where linkSid = #{appSid} + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuRest.java index 057ea3b889..7ae1c2b08f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuRest.java @@ -1,6 +1,7 @@ package com.yxt.anrui.portal.biz.sysmobilemenu; import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuAllVo; +import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuDetailsVo; import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuDto; import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuFeign; import com.yxt.common.core.result.ResultBean; @@ -31,4 +32,14 @@ public class SysMobileMenuRest implements SysMobileMenuFeign { public ResultBean list() { return sysMobileMenuService.listAll(); } + + @Override + public ResultBean details(String sid) { + return sysMobileMenuService.details(sid); + } + + @Override + public ResultBean deleteMenu(String sid) { + return sysMobileMenuService.deleteMenu(sid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java index f4c869d91f..ce8ca008b2 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java @@ -2,10 +2,7 @@ package com.yxt.anrui.portal.biz.sysmobilemenu; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.portal.api.appversion.AppVersionVo; -import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu; -import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuAllVo; -import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuDto; -import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuVo; +import com.yxt.anrui.portal.api.sysmobilemenu.*; import com.yxt.anrui.portal.biz.appversion.AppVersionService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -68,4 +65,25 @@ public class SysMobileMenuService extends MybatisBaseService getMenu(String appSid) { return baseMapper.getMenu(appSid); } + + public ResultBean details(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysMobileMenu sysMobileMenu = fetchBySid(sid); + if (sysMobileMenu == null) { + return rb.setMsg("该应用不存在"); + } + String path = fileUploadComponent.getUrlPrefix(); + SysMobileMenuDetailsVo sysMobileMenuDetailsVo = baseMapper.details(sid, path); + return rb.success().setData(sysMobileMenuDetailsVo); + } + + public ResultBean deleteMenu(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysMobileMenu sysMobileMenu = fetchBySid(sid); + if (sysMobileMenu == null) { + return rb.setMsg("该应用不存在"); + } + deleteBySid(sid); + return rb.success(); + } }