From 3aec8e1bea9fd4fafd7cf5bc462ceac47a7e7b92 Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 12 Jun 2023 10:58:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataUserSyncServiceImpl.java | 23 +++++++++++-------- .../impl/BasicDataSyncServiceImpl.java | 4 ++-- .../organization/entity/Organization.java | 11 ++++++--- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java index bc5c04b3..8f4b2d8f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java @@ -41,6 +41,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ @Override @Transactional public void syncUserFull(UserData user) { + log.info("同步用户【"+user.getId()+","+user.getCode()+"】"); //如果删除状态为空，则设置为不删除 if(user.getDeleted()==null) { user.setDeleted(false); @@ -56,6 +57,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ } a.setLoginName(user.getCode()); log.info("更新账号code"); + accountDao.update(a); }else { //新账户 a=new Account(); @@ -66,6 +68,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ a.setRegTime(LocalDateTime.now()); a.setSysId(user.getKid()); a.setStatus(1); + accountDao.save(a); log.info("账号不存在，新添加账号【"+user.getId()+"】"); } if(u!=null) { @@ -78,6 +81,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ if(user.getLearningDuration()>0) { //不大于0才会更新 u.setLearningDuration(user.getLearningDuration()); } + userDao.update(u); log.info("更新用户信息,学习时长，姓名，所在部门"); }else { //新建用户 @@ -99,6 +103,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ }else { u.setShowHome(true);//band16以下，及其它无bandLevel的信息 } + userDao.save(u); log.info("添加新用户"); } //对机构的判断，不为空时才会处理，为空时不处理 @@ -113,19 +118,16 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ org.setNamePath(user.getOrgNamePath()); org.setDeleted(false); org.setStatus(1); + orgDao.save(org); + }else { + org.setName(user.getDepartName()); + org.setNamePath(user.getOrgNamePath()); + orgDao.update(org); } - org.setName(user.getDepartName()); - org.setNamePath(user.getOrgNamePath()); - } - - accountDao.saveOrUpdate(a); - userDao.saveOrUpdate(u); + //先提交一下 userDao.flush(); - if(org!=null) { - orgDao.saveOrUpdate(org); - log.info("更新用户对应的机构信息"); - } + //老师信息 if(u.getUserType()!=null && u.getUserType()==2) { Teacher t = teacherDao.get(u.getId()); @@ -145,6 +147,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ log.info("教师身份已添加"); } } + log.info("同步用户完成"); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/old/service/impl/BasicDataSyncServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/old/service/impl/BasicDataSyncServiceImpl.java index 36e0bbe0..eca873ac 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/old/service/impl/BasicDataSyncServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/old/service/impl/BasicDataSyncServiceImpl.java @@ -69,8 +69,8 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{ hasOrg.setSysCreateTime(LocalDateTime.now()); hasOrg.setSysId(dto.getKid()); hasOrg.setSysParentId(dto.getParentId()); - hasOrg.setSysUpdateBy(""); - hasOrg.setSysUpdateTime(hasOrg.getSysCreateTime()); +// hasOrg.setSysUpdateBy(""); +// hasOrg.setSysUpdateTime(hasOrg.getSysCreateTime()); orgDao.save(hasOrg); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/organization/entity/Organization.java b/servers/boe-server-all/src/main/java/com/xboe/system/organization/entity/Organization.java index 61bf4fec..62c4ba2f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/organization/entity/Organization.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/organization/entity/Organization.java @@ -5,7 +5,8 @@ import javax.persistence.Entity; import javax.persistence.Table; import com.xboe.core.SysConstant; -import com.xboe.core.orm.BaseEntity; +import com.xboe.core.orm.IdBaseEntity; +import com.xboe.core.orm.annotation.MetaInfo; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,14 +18,18 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) @Entity @Table(name = SysConstant.TABLE_PRE + "organization") -public class Organization extends BaseEntity { - private static final long serialVersionUID = 1L; +public class Organization extends IdBaseEntity { + private static final long serialVersionUID = 1L; /** * 原系统ID */ @Column(name = "sys_id", length = 36) private String sysId; + + @MetaInfo("删除的") + @Column(name = "deleted", length = 1) + private Boolean deleted; /** * 旧系统父id