Skip to content

Commit 7a2a61c

Browse files
committed
set id 1
1 parent 6a6b171 commit 7a2a61c

File tree

5 files changed

+9
-20
lines changed

5 files changed

+9
-20
lines changed

components-server/components/menu/menu-domain/src/main/java/com/codingapi/components/menu/config/MenuDomainConfiguration.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.codingapi.components.menu.config;
22

3+
import com.codingapi.components.menu.context.MenuContextRegister;
34
import com.codingapi.components.menu.domain.Menu;
45
import com.codingapi.components.menu.repository.MenuRepository;
56
import com.codingapi.components.menu.service.MenuService;
6-
import com.codingapi.components.menu.context.MenuContextRegister;
77
import com.codingapi.springboot.framework.dto.request.PageRequest;
88
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
99
import org.springframework.context.annotation.Bean;
@@ -46,10 +46,6 @@ public Menu tree() {
4646
return null;
4747
}
4848

49-
@Override
50-
public void afterPropertiesSet() throws Exception {
51-
52-
}
5349
};
5450
}
5551

components-server/components/menu/menu-domain/src/main/java/com/codingapi/components/menu/domain/Menu.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public class Menu extends Tree<Menu> {
2222

2323
private String icon;
2424

25-
@ManyToOne
26-
private Menu parent;
25+
private Integer parentId;
2726

2827
public static Menu root() {
2928
Menu root = new Menu();
@@ -32,8 +31,7 @@ public static Menu root() {
3231
return root;
3332
}
3433

35-
@Override
36-
public int getParentId() {
37-
return parent != null ? parent.getId() : 1;
34+
public int parentId() {
35+
return parentId==null?0:parentId;
3836
}
3937
}

components-server/components/menu/menu-domain/src/main/java/com/codingapi/components/menu/domain/Tree.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ public void addChild(T child){
2121
}
2222

2323
@JsonIgnore
24-
public abstract int getParentId();
24+
public abstract int parentId();
2525
}

components-server/components/menu/menu-domain/src/main/java/com/codingapi/components/menu/repository/MenuRepository.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import com.codingapi.components.menu.domain.Menu;
44
import com.codingapi.springboot.framework.dto.request.PageRequest;
5-
import org.springframework.beans.factory.InitializingBean;
65
import org.springframework.data.domain.Page;
76

87
import java.util.List;
98

10-
public interface MenuRepository extends InitializingBean {
9+
public interface MenuRepository {
1110

1211
void save(Menu menu);
1312

components-server/components/menu/menu-infrastructure-db/src/main/java/com/codingapi/components/infrastructure/menu/repository/impl/MenuRepositoryImpl.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.springframework.data.domain.Sort;
1010

1111
import java.util.List;
12-
import java.util.stream.Collectors;
1312

1413
@AllArgsConstructor
1514
public class MenuRepositoryImpl implements MenuRepository {
@@ -38,23 +37,20 @@ public List<Menu> findAll() {
3837

3938
@Override
4039
public Menu tree() {
41-
List<Menu> list = findAll().stream().filter(item->item.getParentId()!=1).collect(Collectors.toList());
40+
List<Menu> list = findAll();
4241
Menu root = Menu.root();
4342
fetchChildren(root, list);
4443
return root;
4544
}
4645

4746
private void fetchChildren(Menu parent, List<Menu> typeList) {
4847
for (Menu type : typeList) {
49-
if (type.getParentId() == parent.getId()) {
48+
if (parent.getId() == type.parentId()) {
5049
parent.addChild(type);
5150
fetchChildren(type, typeList);
5251
}
5352
}
5453
}
5554

56-
@Override
57-
public void afterPropertiesSet() throws Exception {
58-
jpaParameterRepository.save(Menu.root());
59-
}
55+
6056
}

0 commit comments

Comments
 (0)