From 62089253d8a247063d83b8809279039623cf7af2 Mon Sep 17 00:00:00 2001 From: Balaji <104271023+tbalaji0001@users.noreply.github.com> Date: Sat, 18 Nov 2023 15:45:32 +0530 Subject: [PATCH] Application Menu view Order Added --- .../gccoffice/configuration/DataSourceConfig.java | 2 +- .../gccoffice/entity/AppModuleEntity.java | 15 ++++++++++++++- .../gccoffice/entity/MenuItemEntity.java | 14 ++++++++++++++ .../gccoffice/entity/SubMenuItemEntity.java | 13 +++++++++++++ .../gccoffice/repository/AppModuleRepository.java | 2 +- .../gccoffice/repository/MenuItemRepository.java | 4 ++-- .../repository/SubMenuItemRepository.java | 6 +++--- 7 files changed, 48 insertions(+), 8 deletions(-) diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java b/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java index e2acada..8e07597 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java @@ -35,7 +35,7 @@ public class DataSourceConfig { dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); dataSource.setUrl("jdbc:mysql://localhost:3306/gcc_apps"); dataSource.setUsername("root"); - dataSource.setPassword("1"); + dataSource.setPassword(""); return dataSource; } /* diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/entity/AppModuleEntity.java b/src/main/java/in/gov/chennaicorporation/gccoffice/entity/AppModuleEntity.java index 886792a..f49c7b5 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/entity/AppModuleEntity.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/entity/AppModuleEntity.java @@ -23,6 +23,9 @@ public class AppModuleEntity { @Column(name = "icon",nullable = true) private String icon; + + @Column(name = "orderby",nullable = false, columnDefinition = "INTEGER default 0") + private Integer orderby; @Column(name = "isdelete",nullable = false, columnDefinition = "Boolean default false") private Boolean isDelete; @@ -76,10 +79,20 @@ public class AppModuleEntity { this.icon = icon; } - + public void setModulePath(String modulePath) { this.modulePath = modulePath; } + + + public Integer getOrderby() { + return orderby; + } + + + public void setOrderby(Integer orderby) { + this.orderby = orderby; + } public Boolean getIsDelete() { diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/entity/MenuItemEntity.java b/src/main/java/in/gov/chennaicorporation/gccoffice/entity/MenuItemEntity.java index b008f71..b9712e4 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/entity/MenuItemEntity.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/entity/MenuItemEntity.java @@ -30,6 +30,9 @@ public class MenuItemEntity { @Column(name = "icon",nullable = true) private String icon; + @Column(name = "orderby",nullable = false, columnDefinition = "INTEGER default 0") + private Integer orderby; + @Column(name = "ishassub",nullable = false, columnDefinition = "Boolean default false") private Boolean hasSub; @@ -96,10 +99,21 @@ public class MenuItemEntity { } + public Integer getOrderby() { + return orderby; + } + + + public void setOrderby(Integer orderby) { + this.orderby = orderby; + } + + public void setIcon(String icon) { this.icon = icon; } + public Boolean getHasSub() { return hasSub; } diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/entity/SubMenuItemEntity.java b/src/main/java/in/gov/chennaicorporation/gccoffice/entity/SubMenuItemEntity.java index 5fc0979..c9f1add 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/entity/SubMenuItemEntity.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/entity/SubMenuItemEntity.java @@ -33,6 +33,9 @@ public class SubMenuItemEntity { @Column(name = "icon",nullable = true) private String icon; + + @Column(name = "orderby",nullable = false, columnDefinition = "INTEGER default 0") + private Integer orderby; @Column(name = "isdelete",nullable = false, columnDefinition = "Boolean default false") private Boolean isDelete; @@ -112,6 +115,16 @@ public class SubMenuItemEntity { } + public Integer getOrderby() { + return orderby; + } + + + public void setOrderby(Integer orderby) { + this.orderby = orderby; + } + + public Boolean getIsDelete() { return isDelete; } diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/repository/AppModuleRepository.java b/src/main/java/in/gov/chennaicorporation/gccoffice/repository/AppModuleRepository.java index 69bd530..66706f2 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/repository/AppModuleRepository.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/repository/AppModuleRepository.java @@ -16,7 +16,7 @@ public interface AppModuleRepository extends JpaRepository showAll(); @Query(value = "SELECT * FROM `modules` WHERE `id` IN (:checkModuleid) AND (`isactive`=1 AND `isdelete`=0) ORDER BY `id`", nativeQuery = true) diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/repository/MenuItemRepository.java b/src/main/java/in/gov/chennaicorporation/gccoffice/repository/MenuItemRepository.java index 967c6f1..6e01da5 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/repository/MenuItemRepository.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/repository/MenuItemRepository.java @@ -18,10 +18,10 @@ public interface MenuItemRepository extends JpaRepository getMenuItemByModuleId(@Param("module_id") int module_id); - @Query(value = "SELECT * FROM `menuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND (`module_id`=:module_id AND `id` IN (:checkMenuid))", nativeQuery = true) + @Query(value = "SELECT * FROM `menuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND (`module_id`=:module_id AND `id` IN (:checkMenuid)) ORDER BY `orderby`", nativeQuery = true) List getMenuItemByModuleIdAccess(@Param("module_id") int module_id, String[] checkMenuid); @Query(value = "SELECT * FROM `menuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND (`url`=:url) LIMIT 0,1", nativeQuery = true) diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/repository/SubMenuItemRepository.java b/src/main/java/in/gov/chennaicorporation/gccoffice/repository/SubMenuItemRepository.java index 882b02d..68b15ab 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/repository/SubMenuItemRepository.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/repository/SubMenuItemRepository.java @@ -18,13 +18,13 @@ public interface SubMenuItemRepository extends JpaRepository getSubMenuItemByModuleId(@Param("module_id") int module_id); - @Query(value = "SELECT * FROM `submenuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND `menuitem_id`=:menuitem_id", nativeQuery = true) + @Query(value = "SELECT * FROM `submenuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND `menuitem_id`=:menuitem_id ORDER BY `orderby`", nativeQuery = true) List getSubMenuItemByMenuItemId(@Param("menuitem_id") int menuitem_id); - @Query(value = "SELECT * FROM `submenuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND (`menuitem_id`=:menuitem_id AND `id` IN (:checkSubMenuid))", nativeQuery = true) + @Query(value = "SELECT * FROM `submenuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND (`menuitem_id`=:menuitem_id AND `id` IN (:checkSubMenuid)) ORDER BY `orderby`", nativeQuery = true) List getSubMenuItemByMenuItemIdAccess(@Param("menuitem_id") int menuitem_id,String[] checkSubMenuid); @Query(value = "SELECT * FROM `submenuitem` WHERE (`url`=:url) AND (`isactive`=1 AND `isdelete`=0) LIMIT 0,1", nativeQuery = true)