From 98340d67429b4620b79ea3d5a3635bae307cc202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=AD=E9=9D=92=E5=8D=8E=E5=B9=B4?= <2957899895@qq.com> Date: Thu, 12 Jun 2025 13:13:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=9B=91=E8=80=83=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=9A=84=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CetGraduatesController.java | 4 +-- .../CetInvigilateDataController.java | 4 +-- .../controller/CetNoTeachersController.java | 4 +-- .../controller/CetTeachersController.java | 4 +-- .../jeecg/modules/entity/CetGraduates.java | 14 +++++++++- .../modules/entity/CetInvigilateData.java | 17 +++++++++--- .../jeecg/modules/entity/CetNoTeachers.java | 4 +++ .../org/jeecg/modules/entity/CetTeachers.java | 13 +++++++++ .../modules/service/ICetGraduatesService.java | 1 + .../service/ICetInvigilateDataService.java | 1 + .../service/ICetNoTeachersService.java | 1 + .../modules/service/ICetTeachersService.java | 1 + .../service/impl/CetGraduatesServiceImpl.java | 16 +++++++++++ .../impl/CetInvigilateDataServiceImpl.java | 27 +++++++++++++++++++ .../impl/CetNoTeachersServiceImpl.java | 15 +++++++++++ .../service/impl/CetTeachersServiceImpl.java | 15 +++++++++++ .../src/main/resources/application-dev.yml | 6 ++--- 17 files changed, 132 insertions(+), 15 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetGraduatesController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetGraduatesController.java index 90067b1d..91e9b114 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetGraduatesController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetGraduatesController.java @@ -66,10 +66,10 @@ public class CetGraduatesController extends JeecgController add(@RequestBody CetGraduates cetGraduates) { - cetGraduatesService.save(cetGraduates); + cetGraduatesService.add(cetGraduates); return Result.OK("添加成功！"); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetInvigilateDataController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetInvigilateDataController.java index ea35e439..179b5a8f 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetInvigilateDataController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetInvigilateDataController.java @@ -66,10 +66,10 @@ public class CetInvigilateDataController extends JeecgController add(@RequestBody CetInvigilateData cetInvigilateData) { - cetInvigilateDataService.save(cetInvigilateData); + cetInvigilateDataService.add(cetInvigilateData); return Result.OK("添加成功！"); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetNoTeachersController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetNoTeachersController.java index 282b90cb..cfb5062a 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetNoTeachersController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetNoTeachersController.java @@ -66,10 +66,10 @@ public class CetNoTeachersController extends JeecgController add(@RequestBody CetNoTeachers cetNoTeachers) { - cetNoTeachersService.save(cetNoTeachers); + cetNoTeachersService.add(cetNoTeachers); return Result.OK("添加成功！"); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetTeachersController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetTeachersController.java index 44a9bc97..928140c1 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetTeachersController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetTeachersController.java @@ -67,10 +67,10 @@ public class CetTeachersController extends JeecgController add(@RequestBody CetTeachers cetTeachers) { - cetTeachersService.save(cetTeachers); + cetTeachersService.add(cetTeachers); return Result.OK("添加成功！"); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetGraduates.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetGraduates.java index c957711a..3ba8990a 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetGraduates.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetGraduates.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -33,7 +34,11 @@ public class CetGraduates implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private String id; - /**教师姓名*/ + /**学号*/ + @Excel(name = "学号", width = 15) + @ApiModelProperty(value = "学号") + private String studentNumber; + /**教师姓名*/ @Excel(name = "教师姓名", width = 15) @ApiModelProperty(value = "教师姓名") private String graduatesName; @@ -49,6 +54,10 @@ public class CetGraduates implements Serializable { @Excel(name = "校区", width = 15) @ApiModelProperty(value = "校区") private String campus; + /**校区*/ + @Excel(name = "学院", width = 15) + @ApiModelProperty(value = "学院") + private String college; /**照片地址*/ @Excel(name = "照片地址", width = 15) @ApiModelProperty(value = "照片地址") @@ -72,4 +81,7 @@ public class CetGraduates implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private String sysOrgCode; + /**类型*/ + @TableField(exist = false) + private Integer type; } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetInvigilateData.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetInvigilateData.java index b8662528..b2868d7f 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetInvigilateData.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetInvigilateData.java @@ -33,6 +33,14 @@ public class CetInvigilateData implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private String id; + /**学号*/ + @Excel(name = "学号", width = 15) + @ApiModelProperty(value = "学号") + private String studentNumber; + /**工号*/ + @Excel(name = "工号", width = 15) + @ApiModelProperty(value = "工号") + private Integer jobNumber; /**教师姓名*/ @Excel(name = "教师姓名", width = 15) @ApiModelProperty(value = "教师姓名") @@ -49,13 +57,14 @@ public class CetInvigilateData implements Serializable { @Excel(name = "校区", width = 15) @ApiModelProperty(value = "校区") private String campus; + /**学院*/ + @Excel(name = "学院", width = 15) + @ApiModelProperty(value = "学院") + private String college; /**照片地址*/ @Excel(name = "照片地址", width = 15) @ApiModelProperty(value = "照片地址") private String photoAddress; - @Excel(name = "照片地址", width = 15) - @ApiModelProperty(value = "照片地址") - private String type; /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy; @@ -75,4 +84,6 @@ public class CetInvigilateData implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private String sysOrgCode; + /**类型*/ + private Integer type; } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetNoTeachers.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetNoTeachers.java index d941fd19..354ec82a 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetNoTeachers.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetNoTeachers.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -72,4 +73,7 @@ public class CetNoTeachers implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private String sysOrgCode; + /**类型*/ + @TableField(exist = false) + private Integer type; } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetTeachers.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetTeachers.java index d3381dd1..4ac81b91 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetTeachers.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetTeachers.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -33,6 +34,10 @@ public class CetTeachers implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private String id; + /**工号*/ + @Excel(name = "工号", width = 15) + @ApiModelProperty(value = "工号") + private Integer jobNumber; /**教师姓名*/ @Excel(name = "教师姓名", width = 15) @ApiModelProperty(value = "教师姓名") @@ -49,6 +54,10 @@ public class CetTeachers implements Serializable { @Excel(name = "校区", width = 15) @ApiModelProperty(value = "校区") private String campus; + /**学院*/ + @Excel(name = "学院", width = 15) + @ApiModelProperty(value = "学院") + private String college; /**照片地址*/ @Excel(name = "照片地址", width = 15) @ApiModelProperty(value = "照片地址") @@ -72,4 +81,8 @@ public class CetTeachers implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private String sysOrgCode; + /**类型*/ + @TableField(exist = false) + private Integer type; + } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetGraduatesService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetGraduatesService.java index 26eeff85..c519c84b 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetGraduatesService.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetGraduatesService.java @@ -12,4 +12,5 @@ import org.jeecg.modules.entity.CetGraduates; */ public interface ICetGraduatesService extends IService { + void add(CetGraduates cetGraduates); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetInvigilateDataService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetInvigilateDataService.java index c5b932f9..0104c299 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetInvigilateDataService.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetInvigilateDataService.java @@ -12,4 +12,5 @@ import org.jeecg.modules.entity.CetInvigilateData; */ public interface ICetInvigilateDataService extends IService { + void add(CetInvigilateData cetInvigilateData); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetNoTeachersService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetNoTeachersService.java index 6793c72f..922d7640 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetNoTeachersService.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetNoTeachersService.java @@ -12,4 +12,5 @@ import org.jeecg.modules.entity.CetNoTeachers; */ public interface ICetNoTeachersService extends IService { + void add(CetNoTeachers cetNoTeachers); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetTeachersService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetTeachersService.java index 2b4c656f..58470bef 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetTeachersService.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICetTeachersService.java @@ -12,4 +12,5 @@ import org.jeecg.modules.entity.CetTeachers; */ public interface ICetTeachersService extends IService { + void add(CetTeachers cetTeachers); } \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetGraduatesServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetGraduatesServiceImpl.java index 24cc4f43..58a942ff 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetGraduatesServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetGraduatesServiceImpl.java @@ -1,11 +1,16 @@ package org.jeecg.modules.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; import org.jeecg.modules.entity.CetGraduates; +import org.jeecg.modules.entity.CetInvigilateData; import org.jeecg.modules.mapper.CetGraduatesMapper; import org.jeecg.modules.service.ICetGraduatesService; +import org.jeecg.modules.service.ICetInvigilateDataService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 研究生数据表 @@ -14,6 +19,17 @@ import org.springframework.stereotype.Service; * @Version: V1.0 */ @Service +@RequiredArgsConstructor public class CetGraduatesServiceImpl extends ServiceImpl implements ICetGraduatesService { + private final ICetInvigilateDataService cetInvigilateDataService; + + @Override + @Transactional(rollbackFor = Exception.class) + public void add(CetGraduates cetGraduates) { + save(cetGraduates); + CetInvigilateData cetInvigilateData = BeanUtil.copyProperties(cetGraduates, CetInvigilateData.class); + cetInvigilateData.setName(cetGraduates.getGraduatesName()); + cetInvigilateDataService.save(cetInvigilateData); + } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetInvigilateDataServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetInvigilateDataServiceImpl.java index f260ef0f..08728056 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetInvigilateDataServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetInvigilateDataServiceImpl.java @@ -1,12 +1,18 @@ package org.jeecg.modules.service.impl; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.toolkit.Db; +import org.jeecg.modules.entity.CetGraduates; import org.jeecg.modules.entity.CetInvigilateData; +import org.jeecg.modules.entity.CetNoTeachers; +import org.jeecg.modules.entity.CetTeachers; import org.jeecg.modules.mapper.CetInvigilateDataMapper; import org.jeecg.modules.service.ICetInvigilateDataService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 数据总表 @@ -17,4 +23,25 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class CetInvigilateDataServiceImpl extends ServiceImpl implements ICetInvigilateDataService { + @Override + @Transactional(rollbackFor = Exception.class) + public void add(CetInvigilateData cetInvigilateData) { + save(cetInvigilateData); + switch (cetInvigilateData.getType()) { + case 1: + CetTeachers cetTeachers = BeanUtil.copyProperties(cetInvigilateData, CetTeachers.class); + cetTeachers.setTeacherName(cetInvigilateData.getName()); + Db.save(cetTeachers); + case 2: + CetGraduates cetGraduates = BeanUtil.copyProperties(cetInvigilateData, CetGraduates.class); + cetGraduates.setGraduatesName(cetInvigilateData.getName()); + Db.save(cetGraduates); + case 3: + Db.save(BeanUtil.copyProperties(cetInvigilateData, CetNoTeachers.class)); + default: + // TODO 测试使用 + Db.save(BeanUtil.copyProperties(cetInvigilateData, CetNoTeachers.class)); +// new Exception("请不要传递非法参数"); + } + } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetNoTeachersServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetNoTeachersServiceImpl.java index 101fd82a..8e27a055 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetNoTeachersServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetNoTeachersServiceImpl.java @@ -1,12 +1,17 @@ package org.jeecg.modules.service.impl; +import cn.hutool.core.bean.BeanUtil; +import lombok.RequiredArgsConstructor; +import org.jeecg.modules.entity.CetInvigilateData; import org.jeecg.modules.entity.CetNoTeachers; import org.jeecg.modules.mapper.CetNoTeachersMapper; +import org.jeecg.modules.service.ICetInvigilateDataService; import org.jeecg.modules.service.ICetNoTeachersService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 非教师数据表 @@ -15,6 +20,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@RequiredArgsConstructor public class CetNoTeachersServiceImpl extends ServiceImpl implements ICetNoTeachersService { + private final ICetInvigilateDataService cetInvigateDataService; + + @Override + @Transactional(rollbackFor = Exception.class) + public void add(CetNoTeachers cetNoTeachers) { + save(cetNoTeachers); + CetInvigilateData cetInvigilateData = BeanUtil.copyProperties(cetNoTeachers, CetInvigilateData.class); + cetInvigateDataService.save(cetInvigilateData); + } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetTeachersServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetTeachersServiceImpl.java index c25f2d37..84e86384 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetTeachersServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetTeachersServiceImpl.java @@ -1,11 +1,16 @@ package org.jeecg.modules.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import org.jeecg.modules.entity.CetInvigilateData; import org.jeecg.modules.entity.CetTeachers; import org.jeecg.modules.mapper.CetTeachersMapper; +import org.jeecg.modules.service.ICetInvigilateDataService; import org.jeecg.modules.service.ICetTeachersService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 教师数据表 @@ -14,6 +19,16 @@ import org.springframework.stereotype.Service; * @Version: V1.0 */ @Service +@RequiredArgsConstructor public class CetTeachersServiceImpl extends ServiceImpl implements ICetTeachersService { + private final ICetInvigilateDataService cetInvigilateDataServiceImpl; + + @Transactional(rollbackFor = Exception.class) + public void add(CetTeachers cetTeachers) { + save(cetTeachers); + CetInvigilateData cetInvigilateData= BeanUtil.copyProperties(cetTeachers, CetInvigilateData.class); + cetInvigilateData.setName(cetTeachers.getTeacherName()); + cetInvigilateDataServiceImpl.save(cetInvigilateData); + } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 33a80ad2..c8e02586 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -156,9 +156,9 @@ spring: slow-sql-millis: 5000 datasource: master: - url: jdbc:mysql://62.234.217.137:3306/jeecg-boot2?characterEncoding=UTF-8&rewriteBatchedStatements=true&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://43.138.83.20:3306/jeecg-boot2?characterEncoding=UTF-8&rewriteBatchedStatements=true&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: nWZpHMb8mNxWE5Xk + password: dbb4acbf6b676522 driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -169,7 +169,7 @@ spring: #redis 配置 redis: database: 2 - host: 62.234.217.137 + host: 43.138.83.20 port: 6379 password: LSHCwjr6ZN4hzCxS #mybatis plus 设置