diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java index 8fc61be7c..87d2fd04d 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java @@ -113,6 +113,16 @@ public class AppMenuDTO extends TreeNode implements Serializable { */ private String menuCode; + /** + * 备注 + */ + private String remark; + + /** + * 子模板ID + */ + private String templateId; + @NotBlank(message = "{sysmenu.name.require}", groups = DefaultGroup.class) private String name; } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java index 928a887fb..c122c04e2 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java @@ -30,6 +30,8 @@ import com.elink.esua.epdc.service.AppMenuTemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; +import java.util.List; import java.util.Map; @@ -52,6 +54,12 @@ public class AppMenuTemplateController { return new Result>().ok(page); } + @GetMapping("list") + public Result> list(){ + List list = appMenuTemplateService.list(new HashMap<>()); + return new Result>().ok(list); + } + @GetMapping("{id}") public Result get(@PathVariable("id") String id){ AppMenuTemplateDTO data = appMenuTemplateService.get(id); diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java index 596a0520e..db0dc964e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java @@ -45,4 +45,11 @@ public interface AppMenuDao extends BaseDao { * @date 2019/11/19 13:43 */ List selectListAppMenu(@Param("type") Integer type, @Param("language") String language); + + /** + * 获取菜单详细信息 + * @param id + * @return + */ + AppMenuDTO selectByIdDIY(@Param("id") String id, @Param("language") String language); } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java index cd878c267..d4b730baa 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java @@ -94,4 +94,14 @@ public class AppMenuEntity extends BaseEntity { */ private String menuCode; + /** + * 备注 + */ + private String remark; + + /** + * 子模板ID + */ + private String templateId; + } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java index 97258fec1..22aed7f0a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java @@ -87,8 +87,8 @@ public class AppMenuServiceImpl extends BaseServiceImpl + + \ No newline at end of file