From a16ef1b5dae8eb6285115e7c9176a52e0a1f97d8 Mon Sep 17 00:00:00 2001 From: langmo <1026052783@qq.com> Date: Sun, 18 Jul 2021 09:18:19 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=BC=A0=E6=B5=A9=E9=92=A6=202021.7.18?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0chenxiuliezhang=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + swpu-spring-projects-chenxiuliezhang/pom.xml | 19 ++++++++++++++ .../swpu/SwpuSpringProjectsApplication.java | 26 +++++++++++++++++++ .../controller/JavaSpringBootController.java | 4 +++ .../src/main/resources/application.yml | 5 ++++ 5 files changed, 55 insertions(+) create mode 100644 swpu-spring-projects-chenxiuliezhang/pom.xml create mode 100644 swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/SwpuSpringProjectsApplication.java create mode 100644 swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/controller/JavaSpringBootController.java create mode 100644 swpu-spring-projects-chenxiuliezhang/src/main/resources/application.yml diff --git a/pom.xml b/pom.xml index e118f32..36e7a3e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,6 +5,7 @@ pom swpu-spring-projects-boot + swpu-spring-projects-chenxiuliezhang org.springframework.boot diff --git a/swpu-spring-projects-chenxiuliezhang/pom.xml b/swpu-spring-projects-chenxiuliezhang/pom.xml new file mode 100644 index 0000000..773116a --- /dev/null +++ b/swpu-spring-projects-chenxiuliezhang/pom.xml @@ -0,0 +1,19 @@ + + + + swpu-spring-projects + com.swpu + 0.0.1-SNAPSHOT + + 4.0.0 + + swpu-spring-projects-chenxiuliezhang + + + 11 + 11 + + + \ No newline at end of file diff --git a/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/SwpuSpringProjectsApplication.java b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/SwpuSpringProjectsApplication.java new file mode 100644 index 0000000..3cf0cf6 --- /dev/null +++ b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/SwpuSpringProjectsApplication.java @@ -0,0 +1,26 @@ +package com.swpu; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author zhanghaoqin + * + * main function + * + * + */ +@SpringBootApplication +public class SwpuSpringProjectsApplication { + + /** + * main function + * @param args + */ + public static void main(String[] args) { + SpringApplication.run(SwpuSpringProjectsApplication.class, args); + } +} diff --git a/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/controller/JavaSpringBootController.java b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/controller/JavaSpringBootController.java new file mode 100644 index 0000000..973d176 --- /dev/null +++ b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/controller/JavaSpringBootController.java @@ -0,0 +1,4 @@ +package com.swpu.controller; + +public class JavaSpringBootController { +} diff --git a/swpu-spring-projects-chenxiuliezhang/src/main/resources/application.yml b/swpu-spring-projects-chenxiuliezhang/src/main/resources/application.yml new file mode 100644 index 0000000..1a4c669 --- /dev/null +++ b/swpu-spring-projects-chenxiuliezhang/src/main/resources/application.yml @@ -0,0 +1,5 @@ +spring: + application: + name: swpu-spring-projects +server: + port: 8080 -- Gitee From 907a52a7b122c6fe04f17b4e5ce51b98e55fa691 Mon Sep 17 00:00:00 2001 From: langmo <1026052783@qq.com> Date: Sun, 18 Jul 2021 09:26:31 +0800 Subject: [PATCH 02/12] Merge branch 'master' of https://gitee.com/swpu-projects/swpu-spring-projects # Conflicts: # pom.xml --- .../src/main/resources/application.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/swpu-spring-projects-boot/src/main/resources/application.yml b/swpu-spring-projects-boot/src/main/resources/application.yml index 8594e42..b2ab5b7 100644 --- a/swpu-spring-projects-boot/src/main/resources/application.yml +++ b/swpu-spring-projects-boot/src/main/resources/application.yml @@ -1,5 +1,23 @@ spring: application: name: swpu-spring-projects + # 数据库连接信息 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/swpu_db + username: swpu_user + password: '123456789' + # 数据库连接池 + type: com.zaxxer.hikari.HikariDataSource + hikari: + maximum-pool-size: 10000 +# 项目端口 server: port: 20000 + +# MyBatis XML 配置 +mybatis: + mapper-locations: classpath:mapper/**.xml + # 开启 驼峰支持 + configuration: + map-underscore-to-camel-case: true -- Gitee From f9c20b443476d117ef39d3bf7c2b04d1add96a05 Mon Sep 17 00:00:00 2001 From: langmo <1026052783@qq.com> Date: Sun, 18 Jul 2021 09:27:22 +0800 Subject: [PATCH 03/12] Merge branch 'master' of https://gitee.com/swpu-projects/swpu-spring-projects # Conflicts: # pom.xml --- swpu-spring-projects-boot/pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/swpu-spring-projects-boot/pom.xml b/swpu-spring-projects-boot/pom.xml index de9b59b..615cf59 100644 --- a/swpu-spring-projects-boot/pom.xml +++ b/swpu-spring-projects-boot/pom.xml @@ -16,4 +16,21 @@ 11 + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + -- Gitee From b494026931fe8159545737ce9e6a2c87673b607a Mon Sep 17 00:00:00 2001 From: langmo <1026052783@qq.com> Date: Sun, 18 Jul 2021 09:27:59 +0800 Subject: [PATCH 04/12] Merge branch 'master' of https://gitee.com/swpu-projects/swpu-spring-projects # Conflicts: # pom.xml --- swpu-spring-projects-testify/pom.xml | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 swpu-spring-projects-testify/pom.xml diff --git a/swpu-spring-projects-testify/pom.xml b/swpu-spring-projects-testify/pom.xml new file mode 100644 index 0000000..b04dee2 --- /dev/null +++ b/swpu-spring-projects-testify/pom.xml @@ -0,0 +1,37 @@ + + + + swpu-spring-projects + com.swpu + 0.0.1-SNAPSHOT + + 4.0.0 + + swpu-spring-projects-testify + pom + + + 11 + 11 + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + -- Gitee From da7fcf04ef68606d58a8af92923440a70480b777 Mon Sep 17 00:00:00 2001 From: langmo <1026052783@qq.com> Date: Sun, 18 Jul 2021 09:29:39 +0800 Subject: [PATCH 05/12] Merge branch 'master' of https://gitee.com/swpu-projects/swpu-spring-projects # Conflicts: # --- sql/swpu_info.sql | 12 +++ sql/swpu_user.sql | 13 +++ .../swpu/SwpuSpringProjectsApplication.java | 5 +- .../swpu/controller/SwpuUserController.java | 99 +++++++++++++++++++ .../main/java/com/swpu/dao/SwpuUserDao.java | 30 ++++++ .../java/com/swpu/entity/SwpuUserEntity.java | 26 +++++ .../SwpuSpringProjectsTestifyAppliaction.java | 17 ++++ 7 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 sql/swpu_info.sql create mode 100644 sql/swpu_user.sql create mode 100644 swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java create mode 100644 swpu-spring-projects-boot/src/main/java/com/swpu/dao/SwpuUserDao.java create mode 100644 swpu-spring-projects-boot/src/main/java/com/swpu/entity/SwpuUserEntity.java create mode 100644 swpu-spring-projects-testify/src/main/java/com/swpu/SwpuSpringProjectsTestifyAppliaction.java diff --git a/sql/swpu_info.sql b/sql/swpu_info.sql new file mode 100644 index 0000000..0b54a2d --- /dev/null +++ b/sql/swpu_info.sql @@ -0,0 +1,12 @@ +create table swpu_info +( + id varchar(100) not null comment '主键ID' + primary key, + p_id int not null comment '联合ID', + contract_term double null comment '合同期限', + conversion_time date null comment '转正日期', + notWork_date date null comment '离职日期', + begin_contract date null comment '合同起始日期', + end_contract date null comment '合同终止日期', + work_age int null comment '工龄' +) charset = utf8; diff --git a/sql/swpu_user.sql b/sql/swpu_user.sql new file mode 100644 index 0000000..0970965 --- /dev/null +++ b/sql/swpu_user.sql @@ -0,0 +1,13 @@ +create table swpu_user +( + id varchar(100) not null comment '主键ID' + primary key, + department_id int null comment '所属部门', + job_level_id int null comment '职称ID', + posId int null comment '职位ID', + engage_form varchar(8) null comment '聘用形式', + specialty varchar(32) null comment '所属专业', + school varchar(32) null comment '毕业院校', + begin_date date null comment '入职日期', + work_id char(8) null comment '工号' +) charset = utf8; diff --git a/swpu-spring-projects-boot/src/main/java/com/swpu/SwpuSpringProjectsApplication.java b/swpu-spring-projects-boot/src/main/java/com/swpu/SwpuSpringProjectsApplication.java index 27dddf7..c53fcd7 100644 --- a/swpu-spring-projects-boot/src/main/java/com/swpu/SwpuSpringProjectsApplication.java +++ b/swpu-spring-projects-boot/src/main/java/com/swpu/SwpuSpringProjectsApplication.java @@ -1,5 +1,6 @@ package com.swpu; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -11,14 +12,16 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * */ +@MapperScan({"com.swpu.dao.**"}) @SpringBootApplication public class SwpuSpringProjectsApplication { /** * 主函数 仅仅只比我们的 Java-Base-Projects 项目多了一个 Spring 自己的 方法调用 - * @param args + * @param args args */ public static void main(String[] args) { SpringApplication.run(SwpuSpringProjectsApplication.class, args); diff --git a/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java b/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java new file mode 100644 index 0000000..8a516fe --- /dev/null +++ b/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java @@ -0,0 +1,99 @@ +package com.swpu.controller; + +import com.swpu.dao.SwpuUserDao; +import com.swpu.entity.SwpuUserEntity; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author wales + *

+ * 用户表相关接口功能对外暴露 + */ +@RestController +@RequestMapping(value = "/swpu/user") +public class SwpuUserController { + + /** + * 自动帮助我们 new SwpuUserDao + */ + @Resource + private SwpuUserDao swpuUserDao; + + /** + * 查询用户表中的所有数据 + * + * @return Object + */ + @GetMapping(value = "/findAll") + public Object findAll() { + List list = swpuUserDao.findAll(); + return list; + } + + /** + *

+ * + * @param id id + * @return {@link Object} + */ + @GetMapping(value = "/findById") + public Object findById(@RequestParam(value = "id") String id) { + return swpuUserDao.findById(id); + } + + /** + * 增加 + * + * @param swpuUserEntity {@link SwpuUserEntity} + * @return {@link Object} + */ + @PostMapping(value = "/insert") + public Object insert(@RequestBody SwpuUserEntity swpuUserEntity) { + int flag = swpuUserDao.insert(swpuUserEntity); + if (flag > 0) { + return "插入成功: " + flag + " 条"; + } else { + return "插入失败"; + } + } + + /** + * 更新操作 + * + * @param swpuUserEntity {@link SwpuUserEntity} + * @return {@link Object} + */ + @PutMapping(value = "/update") + public Object update(@RequestBody SwpuUserEntity swpuUserEntity) { + int flag = swpuUserDao.update(swpuUserEntity); + if (flag > 0) { + return "更新成功: " + flag + " 条"; + } else { + return "更新失败"; + } + } + + /** + * Delete + * + * @param id id + * @return {@link Object} + */ + @DeleteMapping(value = "/del") + public Object del(@RequestParam(value = "id") String id) { + int flag = swpuUserDao.delete(id); + if (flag > 0) { + return "删除成功: " + flag + " 条"; + } else { + return "删除失败"; + } + } + + +} diff --git a/swpu-spring-projects-boot/src/main/java/com/swpu/dao/SwpuUserDao.java b/swpu-spring-projects-boot/src/main/java/com/swpu/dao/SwpuUserDao.java new file mode 100644 index 0000000..7eb32e9 --- /dev/null +++ b/swpu-spring-projects-boot/src/main/java/com/swpu/dao/SwpuUserDao.java @@ -0,0 +1,30 @@ +package com.swpu.dao; + +import com.swpu.entity.SwpuUserEntity; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wales + *

+ * DAO 是 MyBatis 用作打通 与 XML 中的 SQL 的桥梁 + *

+ */ +public interface SwpuUserDao { + + SwpuUserEntity findById(@Param("id") String id); + + List findAll(); + + int insert(SwpuUserEntity entity); + + int update(SwpuUserEntity entity); + + int delete(@Param("id") String id); +} diff --git a/swpu-spring-projects-boot/src/main/java/com/swpu/entity/SwpuUserEntity.java b/swpu-spring-projects-boot/src/main/java/com/swpu/entity/SwpuUserEntity.java new file mode 100644 index 0000000..f4cbb65 --- /dev/null +++ b/swpu-spring-projects-boot/src/main/java/com/swpu/entity/SwpuUserEntity.java @@ -0,0 +1,26 @@ +package com.swpu.entity; + +import lombok.Data; + +/** + * @author wales + *

+ * 一个 Entity 对应一个数据库表和表中的字段 + */ +@Data +public class SwpuUserEntity { + + private String id; + + private int departmentId; + + private int jobLevelId; + + private int posId; + + private String engageForm; + + private String specialty; + + private String school; +} diff --git a/swpu-spring-projects-testify/src/main/java/com/swpu/SwpuSpringProjectsTestifyAppliaction.java b/swpu-spring-projects-testify/src/main/java/com/swpu/SwpuSpringProjectsTestifyAppliaction.java new file mode 100644 index 0000000..4f853b6 --- /dev/null +++ b/swpu-spring-projects-testify/src/main/java/com/swpu/SwpuSpringProjectsTestifyAppliaction.java @@ -0,0 +1,17 @@ +package com.swpu; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author wales + * + * Testify 入口类 主函数 + */ +@SpringBootApplication +public class SwpuSpringProjectsTestifyAppliaction { + + public static void main(String[] args) { + SpringApplication.run(SwpuSpringProjectsTestifyAppliaction.class, args); + } +} -- Gitee From f0d7f02acbc29cb380a8a74ed54c82b471906a26 Mon Sep 17 00:00:00 2001 From: langmo <1026052783@qq.com> Date: Sun, 18 Jul 2021 09:47:49 +0800 Subject: [PATCH 06/12] =?UTF-8?q?'fixed:zhanghaoqin,changes:=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=B0=8F=E7=BB=84moudle,time:2021.7.18'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- swpu-spring-projects-chenxiuliezhang/pom.xml | 16 ++++++++++++++++ .../com/swpu/controller/SwpuUserController.java | 4 ++++ .../src/main/java/com/swpu/dao/SwpuUserDao.java | 4 ++++ .../java/com/swpu/entity/SwpuUserEntity.java | 4 ++++ .../src/main/resources/mapper/SwpuUserMapper.xml | 10 ++++++++++ 5 files changed, 38 insertions(+) create mode 100644 swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/controller/SwpuUserController.java create mode 100644 swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/dao/SwpuUserDao.java create mode 100644 swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/entity/SwpuUserEntity.java create mode 100644 swpu-spring-projects-chenxiuliezhang/src/main/resources/mapper/SwpuUserMapper.xml diff --git a/swpu-spring-projects-chenxiuliezhang/pom.xml b/swpu-spring-projects-chenxiuliezhang/pom.xml index 773116a..cfe93a8 100644 --- a/swpu-spring-projects-chenxiuliezhang/pom.xml +++ b/swpu-spring-projects-chenxiuliezhang/pom.xml @@ -15,5 +15,21 @@ 11 11 + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + \ No newline at end of file diff --git a/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/controller/SwpuUserController.java b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/controller/SwpuUserController.java new file mode 100644 index 0000000..e22fea8 --- /dev/null +++ b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/controller/SwpuUserController.java @@ -0,0 +1,4 @@ +package com.swpu.controller; + +public class SwpuUserController { +} diff --git a/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/dao/SwpuUserDao.java b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/dao/SwpuUserDao.java new file mode 100644 index 0000000..be47e52 --- /dev/null +++ b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/dao/SwpuUserDao.java @@ -0,0 +1,4 @@ +package com.swpu.dao; + +public interface SwpuUserDao { +} diff --git a/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/entity/SwpuUserEntity.java b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/entity/SwpuUserEntity.java new file mode 100644 index 0000000..72fd2e6 --- /dev/null +++ b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/entity/SwpuUserEntity.java @@ -0,0 +1,4 @@ +package com.swpu.entity; + +public class SwpuUserEntity { +} diff --git a/swpu-spring-projects-chenxiuliezhang/src/main/resources/mapper/SwpuUserMapper.xml b/swpu-spring-projects-chenxiuliezhang/src/main/resources/mapper/SwpuUserMapper.xml new file mode 100644 index 0000000..41669a3 --- /dev/null +++ b/swpu-spring-projects-chenxiuliezhang/src/main/resources/mapper/SwpuUserMapper.xml @@ -0,0 +1,10 @@ + + + + + + + + -- Gitee From 181941789a44904cc3f9ab53e14c10ff71478855 Mon Sep 17 00:00:00 2001 From: langmo <1026052783@qq.com> Date: Sun, 18 Jul 2021 10:10:12 +0800 Subject: [PATCH 07/12] =?UTF-8?q?'fixed:zhanghaoqin,changes:=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=A0=B9=E7=9B=AE=E5=BD=95=E4=B8=AD=E6=96=87=E4=BB=B6?= =?UTF-8?q?pom.xml=E7=9A=84=E6=B3=A8=E9=87=8A=E5=AF=BC=E5=85=A5=E4=BE=9D?= =?UTF-8?q?=E8=B5=96,time:2021.7.18.10.10'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 28 +++++++++---------- .../swpu/SwpuSpringProjectsApplication.java | 3 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 36e7a3e..c12f124 100644 --- a/pom.xml +++ b/pom.xml @@ -48,25 +48,25 @@ - - - - + + org.springframework.boot + spring-boot-starter-data-redis + org.springframework.boot spring-boot-starter-web - - - - - + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.0 + - - - - - + + mysql + mysql-connector-java + runtime + org.projectlombok lombok diff --git a/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/SwpuSpringProjectsApplication.java b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/SwpuSpringProjectsApplication.java index 3cf0cf6..74bb434 100644 --- a/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/SwpuSpringProjectsApplication.java +++ b/swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/SwpuSpringProjectsApplication.java @@ -18,9 +18,10 @@ public class SwpuSpringProjectsApplication { /** * main function - * @param args + * @param args args */ public static void main(String[] args) { + SpringApplication.run(SwpuSpringProjectsApplication.class, args); } } -- Gitee From 2751294dd668fe4c047a7584d9958e271b7cf26c Mon Sep 17 00:00:00 2001 From: langmo <1026052783@qq.com> Date: Mon, 19 Jul 2021 18:28:28 +0800 Subject: [PATCH 08/12] =?UTF-8?q?'fixed:zhanghaoqin,chenged:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0service=E3=80=82time:2021.7.19.18.28'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swpu/controller/SwpuUserController.java | 2 +- .../swpu/SwpuSpringProjectsApplication.java | 3 +++ .../main/java/com/swpu/dao/SwpuUserDao.java | 27 +++++++++++++++++++ .../java/com/swpu/entity/SwpuUserEntity.java | 10 +++++++ .../com/swpu/service/SwpuUserService.java | 4 +++ .../service/impl/SwpuUserServiceImpl.java | 4 +++ .../main/resources/mapper/SwpuUserMapper.xml | 1 + 7 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/service/SwpuUserService.java create mode 100644 swpu-spring-projects-chenxiuliezhang/src/main/java/com/swpu/service/impl/SwpuUserServiceImpl.java diff --git a/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java b/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java index 8a516fe..87c396e 100644 --- a/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java +++ b/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java @@ -33,7 +33,7 @@ public class SwpuUserController { return list; } - /** + /** *