Skip to content

Commit 4ba5136

Browse files
xlornexlorne
committed
remove application
1 parent ffc0e92 commit 4ba5136

File tree

12 files changed

+171
-80
lines changed

12 files changed

+171
-80
lines changed

‎example/example-app/example-app-cmd-domain/src/main/java/com/codingapi/example/app/cmd/domain/configuration/LeaveDomainConfiguration.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.codingapi.example.app.cmd.domain.configuration;
2+
3+
import com.codingapi.example.domain.leave.repository.LeaveRepository;
4+
import com.codingapi.example.domain.leave.service.LeaveService;
5+
import org.springframework.context.annotation.Bean;
6+
import org.springframework.context.annotation.Configuration;
7+
8+
@Configuration
9+
public class LeaveDomainConfiguration {
10+
11+
@Bean
12+
public LeaveService leaveService(LeaveRepository leaveRepository){
13+
return new LeaveService(leaveRepository);
14+
}
15+
}

‎example/example-infra/example-infra-jpa/src/main/java/com/codingapi/example/infra/db/AutoDomainConfiguration.java renamed to ‎example/example-app/example-app-cmd-domain/src/main/java/com/codingapi/example/app/cmd/domain/configuration/UserDomainConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.codingapi.example.infra.db;
1+
package com.codingapi.example.app.cmd.domain.configuration;
22

33
import com.codingapi.example.domain.user.gateway.PasswordEncoder;
44
import com.codingapi.example.domain.user.repository.UserRepository;
@@ -7,7 +7,7 @@
77
import org.springframework.context.annotation.Configuration;
88

99
@Configuration
10-
public class AutoDomainConfiguration {
10+
public class UserDomainConfiguration {
1111

1212
@Bean
1313
public UserService userService(UserRepository userRepository, PasswordEncoder passwordEncoder) {

‎example/example-app/example-app-cmd-domain/src/main/java/com/codingapi/example/app/cmd/domain/pojo/UserCmd.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.codingapi.example.app.cmd.domain.pojo;
22

3+
import com.codingapi.example.domain.user.entity.UserMetric;
34
import lombok.Getter;
45
import lombok.Setter;
56

@@ -12,6 +13,11 @@ public static class UpdateRequest{
1213
private String name;
1314
private String username;
1415
private String password;
16+
17+
public UserMetric toMetric(){
18+
return new UserMetric(name, username, password);
19+
}
20+
1521
private boolean flowManager;
1622

1723
public boolean hasId(){

‎example/example-app/example-app-cmd-domain/src/main/java/com/codingapi/example/app/cmd/domain/router/UserRouter.java

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,37 @@
11
package com.codingapi.example.app.cmd.domain.router;
22

33
import com.codingapi.example.app.cmd.domain.pojo.UserCmd;
4-
import com.codingapi.example.domain.user.entity.User;
5-
import com.codingapi.example.domain.user.gateway.PasswordEncoder;
6-
import com.codingapi.example.domain.user.repository.UserRepository;
4+
import com.codingapi.example.domain.user.service.UserService;
75
import lombok.AllArgsConstructor;
86
import org.springframework.stereotype.Component;
97

108
@Component
119
@AllArgsConstructor
1210
public class UserRouter {
1311

14-
private final UserRepository userRepository;
15-
private final PasswordEncoder passwordEncoder;
12+
private final UserService userService;
1613

17-
public void createOrUpdate(UserCmd.UpdateRequest request){
18-
if(request.hasId()){
19-
User user = userRepository.getUserById(request.getId());
20-
user.setName(request.getName());
21-
user.setPassword(request.getPassword());
22-
user.setFlowManager(request.isFlowManager());
23-
user.encodePassword(passwordEncoder);
24-
userRepository.save(user);
25-
}else {
26-
User user = new User();
27-
user.setName(request.getName());
28-
user.setPassword(request.getPassword());
29-
user.setFlowManager(request.isFlowManager());
30-
user.encodePassword(passwordEncoder);
31-
userRepository.save(user);
14+
public void createOrUpdate(UserCmd.UpdateRequest request) {
15+
if (request.hasId()) {
16+
userService.update(request.getId(), request.toMetric());
17+
} else {
18+
userService.create(request.toMetric());
3219
}
3320
}
3421

3522
public void removeEntrust(long id) {
36-
User user = userRepository.getUserById(id);
37-
if(user!=null){
38-
user.removeEntrust();
39-
userRepository.save(user);
40-
}
23+
userService.removeEntrust(id);
4124
}
4225

43-
public void createEntrust(UserCmd.EntrustRequest request){
44-
User user = userRepository.getUserById(request.getId());
45-
if(user!=null){
46-
User entrustOperator = userRepository.getUserById(request.getEntrustUserId());
47-
user.setEntrustOperator(entrustOperator);
48-
userRepository.save(user);
49-
}
26+
public void createEntrust(UserCmd.EntrustRequest request) {
27+
userService.createEntrust(request.getId(),request.getEntrustUserId());
5028
}
5129

52-
public void changeManager(long id){
53-
User user = userRepository.getUserById(id);
54-
if(user!=null){
55-
user.changeManager();
56-
userRepository.save(user);
57-
}
30+
public void changeManager(long id) {
31+
userService.changeManager(id);
5832
}
5933

60-
public void removeUser(long id){
61-
User user = userRepository.getUserById(id);
62-
if(user!=null){
63-
userRepository.delete(id);
64-
}
34+
public void removeUser(long id) {
35+
userService.removeUser(id);
6536
}
66-
6737
}

‎example/example-domain/example-domain-leave/src/main/java/com/codingapi/example/domain/leave/service/LeaveService.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.codingapi.example.domain.leave.service;
2+
3+
import com.codingapi.example.domain.leave.entity.Leave;
4+
import com.codingapi.example.domain.leave.repository.LeaveRepository;
5+
import lombok.AllArgsConstructor;
6+
7+
@AllArgsConstructor
8+
public class LeaveService {
9+
10+
private final LeaveRepository leaveRepository;
11+
12+
public void create(Leave leave) {
13+
leaveRepository.save(leave);
14+
}
15+
}

‎example/example-domain/example-domain-user/src/main/java/com/codingapi/example/domain/user/entity/User.java

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,37 @@
1010
@NoArgsConstructor
1111
public class User {
1212

13+
public final static String USER_ADMIN_USERNAME = "admin";
14+
public final static String USER_ADMIN_PASSWORD = "admin";
15+
public final static String USER_ADMIN_NAME = "admin";
16+
1317
private long id;
14-
private String name;
15-
private String username;
16-
private String password;
18+
private UserMetric userMetric;
1719
private boolean isFlowManager;
1820
private User entrustOperator;
1921
private long createTime;
2022

21-
public User(String name, PasswordEncoder passwordEncoder) {
22-
this.name = name;
23-
this.username = name;
24-
this.password = passwordEncoder.encode(name);
25-
}
26-
27-
2823
public static User admin(PasswordEncoder passwordEncoder) {
24+
UserMetric metric = UserMetric.createAdmin();
25+
2926
User user = new User();
30-
user.setName("admin");
31-
user.setUsername("admin");
32-
user.setPassword("admin");
27+
user.setUserMetric(metric);
3328
user.encodePassword(passwordEncoder);
3429
return user;
3530
}
3631

32+
public String getName(){
33+
return userMetric.getName();
34+
}
35+
36+
public String getUsername(){
37+
return userMetric.getUsername();
38+
}
39+
40+
public String getPassword(){
41+
return userMetric.getPassword();
42+
}
43+
3744
public void removeEntrust() {
3845
this.entrustOperator = null;
3946
}
@@ -43,6 +50,6 @@ public void changeManager() {
4350
}
4451

4552
public void encodePassword(PasswordEncoder passwordEncoder) {
46-
this.password = passwordEncoder.encode(this.password);
53+
this.userMetric.encodePassword(passwordEncoder);
4754
}
4855
}

‎example/example-domain/example-domain-user/src/main/java/com/codingapi/example/domain/user/entity/UserMetric.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.codingapi.example.domain.user.entity;
2+
3+
import com.codingapi.example.domain.user.gateway.PasswordEncoder;
4+
import lombok.AllArgsConstructor;
5+
import lombok.Getter;
6+
import lombok.Setter;
7+
8+
@Setter
9+
@Getter
10+
@AllArgsConstructor
11+
public class UserMetric {
12+
13+
private String name;
14+
private String username;
15+
private String password;
16+
17+
public void encodePassword(PasswordEncoder passwordEncoder) {
18+
this.password = passwordEncoder.encode(this.password);
19+
}
20+
21+
public static UserMetric createAdmin() {
22+
return new UserMetric(User.USER_ADMIN_NAME, User.USER_ADMIN_USERNAME, User.USER_ADMIN_PASSWORD);
23+
}
24+
25+
}

‎example/example-domain/example-domain-user/src/main/java/com/codingapi/example/domain/user/service/UserService.java

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,71 @@
11
package com.codingapi.example.domain.user.service;
22

33
import com.codingapi.example.domain.user.entity.User;
4+
import com.codingapi.example.domain.user.entity.UserMetric;
45
import com.codingapi.example.domain.user.gateway.PasswordEncoder;
56
import com.codingapi.example.domain.user.repository.UserRepository;
67
import lombok.AllArgsConstructor;
78

9+
import static com.codingapi.example.domain.user.entity.User.USER_ADMIN_USERNAME;
10+
811
@AllArgsConstructor
912
public class UserService {
1013

1114
private final UserRepository userRepository;
1215
private final PasswordEncoder passwordEncoder;
1316

14-
public final static String USER_ADMIN = "admin";
15-
1617
public void initAdmin() {
17-
User admin = userRepository.getUserByUsername(USER_ADMIN);
18+
User admin = userRepository.getUserByUsername(USER_ADMIN_USERNAME);
1819
if (admin == null) {
1920
admin = User.admin(passwordEncoder);
2021
userRepository.save(admin);
2122
}
2223
}
2324

25+
public void create(UserMetric userMetric) {
26+
User user = new User();
27+
user.setUserMetric(userMetric);
28+
user.encodePassword(passwordEncoder);
29+
userRepository.save(user);
30+
}
31+
32+
33+
public void update(long id, UserMetric metric) {
34+
User user = userRepository.getUserById(id);
35+
user.setUserMetric(metric);
36+
user.encodePassword(passwordEncoder);
37+
userRepository.save(user);
38+
}
39+
40+
public void removeEntrust(long id) {
41+
User user = userRepository.getUserById(id);
42+
if(user!=null){
43+
user.removeEntrust();
44+
userRepository.save(user);
45+
}
46+
}
47+
48+
public void createEntrust(long userId,long entrustId) {
49+
User user = userRepository.getUserById(userId);
50+
if(user!=null){
51+
User entrustOperator = userRepository.getUserById(entrustId);
52+
user.setEntrustOperator(entrustOperator);
53+
userRepository.save(user);
54+
}
55+
}
56+
57+
public void changeManager(long id){
58+
User user = userRepository.getUserById(id);
59+
if(user!=null){
60+
user.changeManager();
61+
userRepository.save(user);
62+
}
63+
}
64+
65+
public void removeUser(long id){
66+
User user = userRepository.getUserById(id);
67+
if(user!=null){
68+
userRepository.delete(id);
69+
}
70+
}
2471
}

‎example/example-infra/example-infra-flow/src/main/java/com/codingapi/example/infra/flow/form/LeaveForm.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.codingapi.example.infra.flow.form;
22

3+
import com.codingapi.example.domain.leave.entity.Leave;
34
import com.codingapi.springboot.flow.bind.IBindData;
45
import lombok.AllArgsConstructor;
56
import lombok.Getter;
@@ -17,4 +18,15 @@ public class LeaveForm implements IBindData {
1718
private String username;
1819
private long createTime;
1920

21+
22+
public Leave toLeave() {
23+
Leave leave = new Leave();
24+
leave.setId(id);
25+
leave.setUsername(username);
26+
leave.setCreateTime(createTime);
27+
leave.setDays(days);
28+
leave.setDesc(desc);
29+
return leave;
30+
}
31+
2032
}

‎example/example-infra/example-infra-jpa/src/main/java/com/codingapi/example/infra/db/convert/UserConvertor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ public static User convert(UserEntity entity, UserEntityRepository userEntityRep
1212
}
1313
User user = new User();
1414
user.setId(entity.getId());
15-
user.setName(entity.getName());
16-
user.setUsername(entity.getUsername());
17-
user.setPassword(entity.getPassword());
15+
user.setUserMetric(entity.getUserMetric());
1816
user.setFlowManager(entity.isFlowManager());
1917
user.setCreateTime(entity.getCreateTime());
2018
if (entity.getEntrustOperatorId() != 0) {

‎example/example-infra/example-infra-jpa/src/main/java/com/codingapi/example/infra/db/entity/UserEntity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.codingapi.example.infra.db.entity;
22

3+
import com.codingapi.example.domain.user.entity.UserMetric;
34
import jakarta.persistence.*;
45
import lombok.Getter;
56
import lombok.Setter;
@@ -27,4 +28,8 @@ public class UserEntity {
2728
private String entrustOperatorName;
2829

2930
private long createTime;
31+
32+
public UserMetric getUserMetric() {
33+
return new UserMetric(name,username,password);
34+
}
3035
}

‎example/example-interface/src/main/java/com/codingapi/example/handler/LeaveHandler.java

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.codingapi.example.handler;
22

3-
import com.codingapi.example.domain.leave.entity.Leave;
4-
import com.codingapi.example.domain.leave.repository.LeaveRepository;
3+
import com.codingapi.example.domain.leave.service.LeaveService;
54
import com.codingapi.example.infra.flow.form.LeaveForm;
65
import com.codingapi.springboot.flow.event.FlowApprovalEvent;
76
import com.codingapi.springboot.framework.event.IHandler;
@@ -12,21 +11,13 @@
1211
@AllArgsConstructor
1312
public class LeaveHandler implements IHandler<FlowApprovalEvent> {
1413

15-
private final LeaveRepository leaveRepository;
14+
private final LeaveService leaveService;
1615

1716
@Override
1817
public void handler(FlowApprovalEvent event) {
19-
if(event.isFinish() && event.match(LeaveForm.class)){
20-
LeaveForm form = (LeaveForm)event.getBindData();
21-
22-
Leave leave = new Leave();
23-
leave.setId(form.getId());
24-
leave.setUsername(form.getUsername());
25-
leave.setCreateTime(form.getCreateTime());
26-
leave.setDays(form.getDays());
27-
leave.setDesc(form.getDesc());
28-
29-
leaveRepository.save(leave);
18+
if (event.isFinish() && event.match(LeaveForm.class)) {
19+
LeaveForm form = (LeaveForm) event.getBindData();
20+
leaveService.create(form.toLeave());
3021
}
3122
}
3223
}

0 commit comments

Comments
 (0)