From 215665d32e1398ea6871d1e1d504ef8c59ac7a9f Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 19 Oct 2022 21:46:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=94=A8=E6=88=B7=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/primary/dao/MainTeacherDao.java | 19 -- .../com/xboe/primary/entity/MainTeacher.java | 190 ------------------ .../service/impl/MainDbSyncServiceImpl.java | 6 +- 3 files changed, 1 insertion(+), 214 deletions(-) delete mode 100644 servers/org-user-sync/src/main/java/com/xboe/primary/dao/MainTeacherDao.java delete mode 100644 servers/org-user-sync/src/main/java/com/xboe/primary/entity/MainTeacher.java diff --git a/servers/org-user-sync/src/main/java/com/xboe/primary/dao/MainTeacherDao.java b/servers/org-user-sync/src/main/java/com/xboe/primary/dao/MainTeacherDao.java deleted file mode 100644 index 6b79d93d..00000000 --- a/servers/org-user-sync/src/main/java/com/xboe/primary/dao/MainTeacherDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.xboe.primary.dao; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - -import com.xboe.primary.entity.MainTeacher; -import org.springframework.transaction.annotation.Transactional; - - -@Repository("teacherAllDao") -public interface MainTeacherDao extends JpaRepository { - - @Modifying - @Query(value = "update MainTeacher set waitStatus=?2 where id=?1") - @Transactional(rollbackFor = Exception.class) - public void updateStatus(String id,Integer status); -} diff --git a/servers/org-user-sync/src/main/java/com/xboe/primary/entity/MainTeacher.java b/servers/org-user-sync/src/main/java/com/xboe/primary/entity/MainTeacher.java deleted file mode 100644 index 2e62c8a4..00000000 --- a/servers/org-user-sync/src/main/java/com/xboe/primary/entity/MainTeacher.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.xboe.primary.entity; - -import java.time.LocalDate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.xboe.core.SysConstant; -import com.xboe.core.orm.BaseEntity; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name = SysConstant.TABLE_PRE + "teacher") -public class MainTeacher extends BaseEntity { - - private static final long serialVersionUID = 1L; - - - /** - * 系统id - */ - @Column(name = "sys_id", length = 36) - private String sysId; - - @Column(name = "photo", length = 100) - private String photo; - - /** - * 姓名 - */ - @Column(name = "name", length = 30) - private String name; - - /** - * 所属机构 - */ - @Column(name = "depart_id", length = 18) - private String departId; - - /** - * 性别 1:男 2：女 - */ - @Column(name = "gender", length = 1) - private Integer gender; - - /** - * 身份证号 - */ - @Column(name = "id_number", length = 18) - private String idNumber; - - /** - * 生日 - */ - @Column(name = "birthday") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate birthday; - - /** - * 手机号 - */ - @Column(name = "mobile", length = 11) - private String mobile; - - @Column(name = "email", length = 100) - private String email; - - /** - * 家庭电话 - */ - @Column(name = "home_phone_no", length = 50) - private String homePhoneNo; - - /** - * 个人标签 - */ - @Column(name = "personal_label", length = 100) - private String personalLabel; - - /** - * 所在公司 - */ - @Column(name = "company_id", length = 36) - private String companyId; - - /** - * 所在域 - */ - @Column(name = "domain_id", length = 36) - private String domainId; - - /** - * 岗位 - */ - @Column(name = "operating_post", length = 100) - private String operatingPost; - - /** - * 直线经理 - */ - @Column(name = "superior_manager", length = 32) - private String superiorManager; - - /** - * 位置 - */ - @Column(name = "address", length = 200) - private String address; - - /** - * 描述 - */ - @Column(name = "description",columnDefinition = "text") - private String description; - - /** - * 授课时长 - */ - @Column(name = "teaching") - private String teaching; - - /** - * 在职状态 在职: 0 离职: 1 - */ - @Column(name = "wait_status") - private Integer waitStatus; - - /**状态,0表临时， 1表启用，2表停用的*/ - @Column(name = "status",length = 1) - private Integer status; - - /** - * 认证状态,0表未认证，1表已认证 - */ - @Column(name = "cert_status",length = 1) - private Integer certStatus; - - /** - * 擅长课程 - */ - @Column(name = "courses") - private String courses; - - /** - * 发薪地id - */ - @Column(name = "salary_id",length=36) - private String salaryId; - - /** - * 发薪地名称 - */ - @Column(name = "salary_name",length=50) - private String salaryName; - - /** - * 所属体系id - * */ - @Column(name = "t_system_id",length = 36) - private String tsystemId; - - /** - * 所属体系name - * */ - @Column(name = "t_system_name",length = 30) - private String tsystemName; - - /** - * 所属级别id - * */ - @Column(name = "t_level_id",length = 36) - private String tlevelId; - - /** - * 所属级别名称 - * */ - @Column(name = "t_level_name",length = 30) - private String tlevelName; - - /**讲师备注*/ - @Column(name = "remark",length = 500) - private String remark; - -} diff --git a/servers/org-user-sync/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java b/servers/org-user-sync/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java index 288b37ef..6f585806 100644 --- a/servers/org-user-sync/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java +++ b/servers/org-user-sync/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java @@ -2,14 +2,13 @@ package com.xboe.primary.service.impl; import java.util.List; -import com.xboe.common.utils.IDGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.xboe.common.utils.IDGenerator; import com.xboe.primary.dao.MainAccountDao; import com.xboe.primary.dao.MainOrganizationDao; -import com.xboe.primary.dao.MainTeacherDao; import com.xboe.primary.dao.MainUserDao; import com.xboe.primary.entity.MainOrganization; import com.xboe.primary.entity.MainUser; @@ -30,9 +29,6 @@ public class MainDbSyncServiceImpl implements IMainDbSyncService { @Autowired MainAccountDao accountDao; - @Autowired - MainTeacherDao teacherDao; - @Override @Transactional("transactionManagerPrimary") public MainOrganization findByKid(String kid) {