diff --git a/src/main/java/com/ceis/convert/controller/IndexController.java b/src/main/java/com/ceis/convert/controller/IndexController.java new file mode 100644 index 0000000..7d17224 --- /dev/null +++ b/src/main/java/com/ceis/convert/controller/IndexController.java @@ -0,0 +1,48 @@ +package com.ceis.convert.controller; + +import com.ceis.convert.entity.mssql.User; +import com.ceis.convert.service.MssqlUserService; +import com.ceis.convert.service.MysqlUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import java.util.List; + +@RestController +public class IndexController { + + @Autowired + private MssqlUserService mssqlUserService; + + @Autowired + private MysqlUserService mysqlUserService; + + @GetMapping("mssql/user") + public Flux> getMsUser(){ + List list= mssqlUserService.findAll(); + return Flux.just(list); + } + + @GetMapping("mysql/user") + public Flux> getMyUser(){ + List list= mysqlUserService.findAll(); + return Flux.just(list); + } + + @GetMapping("mssql/save") + public Mono saveMsUser(){ + User user = mssqlUserService.save("nelson mssql"); + return Mono.just(user); + } + + + @GetMapping("mysql/save") + public Mono saveMyUser(){ + com.ceis.convert.entity.mysql.User user = mysqlUserService.save("nelson mysql"); + return Mono.just(user); + } +} diff --git a/src/main/java/com/ceis/convert/entity/mssql/User.java b/src/main/java/com/ceis/convert/entity/mssql/User.java index ff1aa2e..28457fb 100644 --- a/src/main/java/com/ceis/convert/entity/mssql/User.java +++ b/src/main/java/com/ceis/convert/entity/mssql/User.java @@ -1,7 +1,9 @@ package com.ceis.convert.entity.mssql; import com.ceis.convert.entity.IDEntity; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import javax.persistence.Entity; import javax.persistence.Table; @@ -9,6 +11,8 @@ import javax.persistence.Table; @Data @Entity @Table(name = "tb_user") +@AllArgsConstructor +@NoArgsConstructor public class User extends IDEntity { private String userName; } diff --git a/src/main/java/com/ceis/convert/entity/mysql/Admin.java b/src/main/java/com/ceis/convert/entity/mysql/Admin.java deleted file mode 100644 index 881497a..0000000 --- a/src/main/java/com/ceis/convert/entity/mysql/Admin.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ceis.convert.entity.mysql; - -import com.ceis.convert.entity.IDEntity; -import lombok.Data; - -import javax.persistence.Entity; -import javax.persistence.Table; - -@Data -@Entity -@Table(name = "tb_admin") -public class Admin extends IDEntity { - private String adminName; -} diff --git a/src/main/java/com/ceis/convert/entity/mysql/User.java b/src/main/java/com/ceis/convert/entity/mysql/User.java new file mode 100644 index 0000000..337a14a --- /dev/null +++ b/src/main/java/com/ceis/convert/entity/mysql/User.java @@ -0,0 +1,18 @@ +package com.ceis.convert.entity.mysql; + +import com.ceis.convert.entity.IDEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Entity; +import javax.persistence.Table; + +@Data +@Entity +@Table(name = "tb_user") +@AllArgsConstructor +@NoArgsConstructor +public class User extends IDEntity { + private String userName; +} diff --git a/src/main/java/com/ceis/convert/repository/mssql/UserDao.java b/src/main/java/com/ceis/convert/repository/mssql/MsUserDao.java similarity index 54% rename from src/main/java/com/ceis/convert/repository/mssql/UserDao.java rename to src/main/java/com/ceis/convert/repository/mssql/MsUserDao.java index f86c6de..ff710ea 100644 --- a/src/main/java/com/ceis/convert/repository/mssql/UserDao.java +++ b/src/main/java/com/ceis/convert/repository/mssql/MsUserDao.java @@ -2,6 +2,8 @@ package com.ceis.convert.repository.mssql; import com.ceis.convert.entity.mssql.User; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; -public interface UserDao extends JpaRepository{ +@Repository +public interface MsUserDao extends JpaRepository{ } diff --git a/src/main/java/com/ceis/convert/repository/mysql/AdminDao.java b/src/main/java/com/ceis/convert/repository/mysql/AdminDao.java deleted file mode 100644 index 59dd89e..0000000 --- a/src/main/java/com/ceis/convert/repository/mysql/AdminDao.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ceis.convert.repository.mysql; - -import com.ceis.convert.entity.mysql.Admin; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface AdminDao extends JpaRepository { -} diff --git a/src/main/java/com/ceis/convert/repository/mysql/MyUserDao.java b/src/main/java/com/ceis/convert/repository/mysql/MyUserDao.java new file mode 100644 index 0000000..ba99245 --- /dev/null +++ b/src/main/java/com/ceis/convert/repository/mysql/MyUserDao.java @@ -0,0 +1,9 @@ +package com.ceis.convert.repository.mysql; + +import com.ceis.convert.entity.mysql.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MyUserDao extends JpaRepository { +} diff --git a/src/main/java/com/ceis/convert/service/MssqlUserService.java b/src/main/java/com/ceis/convert/service/MssqlUserService.java new file mode 100644 index 0000000..0e12ab4 --- /dev/null +++ b/src/main/java/com/ceis/convert/service/MssqlUserService.java @@ -0,0 +1,26 @@ +package com.ceis.convert.service; + + +import com.ceis.convert.entity.mssql.User; +import com.ceis.convert.repository.mssql.MsUserDao; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional +public class MssqlUserService { + @Autowired + private MsUserDao userDao; + + public List findAll() { + return userDao.findAll(); + } + + public User save(String name) { + User user = new User(name); + return userDao.saveAndFlush(user); + } +} diff --git a/src/main/java/com/ceis/convert/service/MysqlUserService.java b/src/main/java/com/ceis/convert/service/MysqlUserService.java new file mode 100644 index 0000000..e3740de --- /dev/null +++ b/src/main/java/com/ceis/convert/service/MysqlUserService.java @@ -0,0 +1,25 @@ +package com.ceis.convert.service; + +import com.ceis.convert.entity.mysql.User; +import com.ceis.convert.repository.mysql.MyUserDao; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional +public class MysqlUserService { + @Autowired + private MyUserDao userDao; + + public List findAll() { + return userDao.findAll(); + } + + public User save(String name) { + User user = new User(name); + return userDao.saveAndFlush(user); + } +}