实现监考人员的数据同步

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetGraduatesController.java

@@ -66,10 +66,10 @@ public class CetGraduatesController extends JeecgController<CetGraduates, ICetGr
 	 */
 	@AutoLog(value = "研究生数据表-添加")
 	@ApiOperation(value="研究生数据表-添加", notes="研究生数据表-添加")
-	@RequiresPermissions("cet:cet_graduates:add")
+//	@RequiresPermissions("cet:cet_graduates:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CetGraduates cetGraduates) {
-		cetGraduatesService.save(cetGraduates);
+		cetGraduatesService.add(cetGraduates);
 		return Result.OK("添加成功！");
 	}
 	

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetInvigilateDataController.java

@@ -66,10 +66,10 @@ public class CetInvigilateDataController extends JeecgController<CetInvigilateDa
 	 */
 	@AutoLog(value = "数据总表-添加")
 	@ApiOperation(value="数据总表-添加", notes="数据总表-添加")
-	@RequiresPermissions("cet:cet_invigilate_data:add")
+//	@RequiresPermissions("cet:cet_invigilate_data:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CetInvigilateData cetInvigilateData) {
-		cetInvigilateDataService.save(cetInvigilateData);
+		cetInvigilateDataService.add(cetInvigilateData);
 		return Result.OK("添加成功！");
 	}
 	

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetNoTeachersController.java

@@ -66,10 +66,10 @@ public class CetNoTeachersController extends JeecgController<CetNoTeachers, ICet
 	 */
 	@AutoLog(value = "非教师数据表-添加")
 	@ApiOperation(value="非教师数据表-添加", notes="非教师数据表-添加")
-	@RequiresPermissions("cet:cet_no_teachers:add")
+//	@RequiresPermissions("cet:cet_no_teachers:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CetNoTeachers cetNoTeachers) {
-		cetNoTeachersService.save(cetNoTeachers);
+		cetNoTeachersService.add(cetNoTeachers);
 		return Result.OK("添加成功！");
 	}
 	

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetTeachersController.java

@@ -67,10 +67,10 @@ public class CetTeachersController extends JeecgController<CetTeachers, ICetTeac
 	 */
 	@AutoLog(value = "教师数据表-添加")
 	@ApiOperation(value="教师数据表-添加", notes="教师数据表-添加")
-	@RequiresPermissions("data:cet_teachers:add")
+//	@RequiresPermissions("data:cet_teachers:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CetTeachers cetTeachers) {
-		cetTeachersService.save(cetTeachers);
+		cetTeachersService.add(cetTeachers);
 		return Result.OK("添加成功！");
 	}
 	

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,6 +34,10 @@ 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 = "教师姓名")
@@ -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;
 }

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;
 }

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;
 }

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;
+
 }

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<CetGraduates> {
 
+    void add(CetGraduates cetGraduates);
 }

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<CetInvigilateData> {
 
+    void add(CetInvigilateData cetInvigilateData);
 }

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<CetNoTeachers> {
 
+    void add(CetNoTeachers cetNoTeachers);
 }

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<CetTeachers> {
 
+    void add(CetTeachers cetTeachers);
 }

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<CetGraduatesMapper, CetGraduates> 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);
+    }
 }

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<CetInvigilateDataMapper, CetInvigilateData> 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("请不要传递非法参数");
+        }
+    }
 }

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<CetNoTeachersMapper, CetNoTeachers> 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);
+    }
 }

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<CetTeachersMapper, CetTeachers> 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);
+    }
 }

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 设置