Merge remote-tracking branch 'origin/master'

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;
 

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

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

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<SysMobileMenuAllVo> list();
+
+    @ApiOperation("应用详情、初始化")
+    @GetMapping("/details")
+    @ResponseBody
+    ResultBean<SysMobileMenuDetailsVo> details(@RequestParam("sid") String sid);
+
+    @ApiOperation("删除应用")
+    @DeleteMapping("/deleteMenu")
+    @ResponseBody
+    ResultBean deleteMenu(@RequestParam("sid") String sid);
 }

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<SysMobileMenuAllVo> list() {
         return null;
     }
+
+    @Override
+    public ResultBean<SysMobileMenuDetailsVo> details(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteMenu(String sid) {
+        return null;
+    }
 }

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<SysMobileMenuListVo> mobileMenuList;
+    @ApiModelProperty("主框架的appSId")
+    private String linkSid;
+    @ApiModelProperty("插件名称")
+    private String modulePluginName;
+
+    @ApiModelProperty("包名")
+    private String sourcePackage;
+
+    @ApiModelProperty("type")
+    private String type;
 }

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<SysMobileMenu> {
     List<SysMobileMenuVo> listAll(@Param("path") String path, @Param("linkSid") String linkSid);
 
     List<SysMobileMenu> getMenu(String appSid);
+
+    SysMobileMenuDetailsVo details(@Param("sid") String sid, @Param("path") String path);
 }

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 @@
 
     <resultMap id="listMap" type="com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuVo">
         <result column="appName" jdbcType="VARCHAR" property="appName"/>
-        <result column="sid" jdbcType="VARCHAR" property="sid"/>
         <result column="iconUrl" jdbcType="VARCHAR" property="iconUrl"/>
         <result column="versionName" jdbcType="INTEGER" property="versionName"/>
         <result column="modifyTime" jdbcType="VARCHAR" property="modifyTime"/>
@@ -74,4 +76,17 @@
         from sys_mobile_menu
         where linkSid = #{appSid}
     </select>
+
+    <select id="details" resultType="com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuDetailsVo">
+        select titleGroup,
+               title,
+               if(length(iconUrl) > 0, concat(#{path}, iconUrl), '') as iconUrl,
+               path,
+               json,
+               sortNo,
+               linkSid,
+               linkName
+        from sys_mobile_menu
+        where sid = #{sid}
+    </select>
 </mapper>

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<SysMobileMenuAllVo> list() {
         return sysMobileMenuService.listAll();
     }
+
+    @Override
+    public ResultBean<SysMobileMenuDetailsVo> details(String sid) {
+        return sysMobileMenuService.details(sid);
+    }
+
+    @Override
+    public ResultBean deleteMenu(String sid) {
+        return sysMobileMenuService.deleteMenu(sid);
+    }
 }

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<SysMobileMenuMapper
     public List<SysMobileMenu> getMenu(String appSid) {
         return baseMapper.getMenu(appSid);
     }
+
+    public ResultBean<SysMobileMenuDetailsVo> details(String sid) {
+        ResultBean<SysMobileMenuDetailsVo> 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();
+    }
 }