From 1b1ab1380db22bcb45fc425532a9af0c1b567757 Mon Sep 17 00:00:00 2001 From: fangcheng Date: Wed, 3 May 2017 18:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=A8=A1=E5=9D=97=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/base/common/enums/SyncParamEnum.java | 21 ++++++++++++++++++++- .../service/organ/impl/DepartmentsServiceImpl.java | 15 +++++++++++++++ .../service/organ/impl/OrganGroupServiceImpl.java | 17 ++++++++++++++--- .../organ/impl/OrganizationsServiceImpl.java | 17 +++++++++++++++-- .../common/service/role/impl/RolesServiceImpl.java | 11 ++++++++++- .../common/service/user/impl/UsersServiceImpl.java | 17 ++++++++++++++--- .../com/lyms/base/common/utils/SyncComponent.java | 5 +++++ .../src/main/java/com/lyms/sync/SyncCenter.java | 3 +++ 8 files changed, 96 insertions(+), 10 deletions(-) diff --git a/parent/base.common/src/main/java/com/lyms/base/common/enums/SyncParamEnum.java b/parent/base.common/src/main/java/com/lyms/base/common/enums/SyncParamEnum.java index 1a41908..4c72ea2 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/enums/SyncParamEnum.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/enums/SyncParamEnum.java @@ -7,7 +7,26 @@ public enum SyncParamEnum { USER_INSERT(com.lyms.base.common.service.user.impl.UsersServiceImpl.class.getName(),"addUser"), USER_UPDATE(com.lyms.base.common.service.user.impl.UsersServiceImpl.class.getName(),"updateUser"), - USER_DELETE(com.lyms.base.common.service.user.impl.UsersServiceImpl.class.getName(),"delete"); + USER_DELETE(com.lyms.base.common.service.user.impl.UsersServiceImpl.class.getName(),"deleteLogicById"), + + ROLE_INSERT(com.lyms.base.common.service.role.impl.RolesServiceImpl.class.getName(),"createRole"), + ROLE_UPDATE(com.lyms.base.common.service.role.impl.RolesServiceImpl.class.getName(),"updateRole"), + ROLE_DELETE(com.lyms.base.common.service.role.impl.RolesServiceImpl.class.getName(),"deleteLogicById"), + + + ORG_INSERT(com.lyms.base.common.service.organ.impl.OrganizationsServiceImpl.class.getName(),"addOrg"), + ORG_UPDATE(com.lyms.base.common.service.organ.impl.OrganizationsServiceImpl.class.getName(),"updateOrg"), + ORG_DELETE(com.lyms.base.common.service.organ.impl.OrganizationsServiceImpl.class.getName(),"deleteOrganById"), + + ORG_GROUP_INSERT(com.lyms.base.common.service.organ.impl.OrganGroupServiceImpl.class.getName(),"create"), + ORG_GROUP_UPDATE(com.lyms.base.common.service.organ.impl.OrganGroupServiceImpl.class.getName(),"updateGroup"), + ORG_GROUP_DELETE(com.lyms.base.common.service.organ.impl.OrganGroupServiceImpl.class.getName(),"deleteGroupById"), + + + DEPART_INSERT(com.lyms.base.common.service.organ.impl.DepartmentsServiceImpl.class.getName(),"createDepart"), + DEPART_UPDATE(com.lyms.base.common.service.organ.impl.DepartmentsServiceImpl.class.getName(),"updateDepart"), + DEPART_DELETE(com.lyms.base.common.service.organ.impl.DepartmentsServiceImpl.class.getName(),"deleteDepartById"), + ; private String remoteClazz; diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/DepartmentsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/DepartmentsServiceImpl.java index 46d9ff4..c9b3c2b 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/DepartmentsServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/DepartmentsServiceImpl.java @@ -3,13 +3,16 @@ package com.lyms.base.common.service.organ.impl; import java.io.Serializable; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.base.common.dao.organ.DepartmentsMapper; import com.lyms.base.common.entity.organ.Departments; +import com.lyms.base.common.enums.SyncParamEnum; import com.lyms.base.common.service.organ.DepartmentsService; +import com.lyms.base.common.utils.SyncComponent; import com.lyms.exception.SystemException; import com.lyms.util.StrUtils; @@ -24,6 +27,9 @@ import com.lyms.util.StrUtils; @Service public class DepartmentsServiceImpl extends ServiceImpl implements DepartmentsService { + @Autowired + private SyncComponent syncComponent; + public Integer deleteLogicById(Serializable id) { return baseMapper.deleteLogicById(id); } @@ -39,6 +45,9 @@ public class DepartmentsServiceImpl extends ServiceImpl= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.DEPART_INSERT, departments); + } return tag != null && tag >= 1; } @@ -48,6 +57,9 @@ public class DepartmentsServiceImpl extends ServiceImpl= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.DEPART_DELETE, id); + } return tag != null && tag > 0; } @@ -57,6 +69,9 @@ public class DepartmentsServiceImpl extends ServiceImpl= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.DEPART_UPDATE, departments); + } return tag != null && tag > 0; } } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java index 4af8779..2f1d8b9 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java @@ -14,8 +14,10 @@ import com.lyms.base.common.dao.organ.OrganGroupMapper; import com.lyms.base.common.dao.organ.OrganGroupMapsMapper; import com.lyms.base.common.entity.organ.OrganGroup; import com.lyms.base.common.entity.organ.OrganGroupMaps; +import com.lyms.base.common.enums.SyncParamEnum; import com.lyms.base.common.service.organ.OrganGroupMapsService; import com.lyms.base.common.service.organ.OrganGroupService; +import com.lyms.base.common.utils.SyncComponent; import com.lyms.exception.SystemException; import com.lyms.util.InstanceUtils; import com.lyms.util.StrUtils; @@ -33,6 +35,9 @@ public class OrganGroupServiceImpl extends ServiceImpl= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_GROUP_INSERT, organGroup); + } return tag != null && tag > 0; } @@ -68,10 +75,12 @@ public class OrganGroupServiceImpl extends ServiceImpl= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_GROUP_DELETE, groupId); + } return tag != null && tag > 0; } @@ -96,7 +105,9 @@ public class OrganGroupServiceImpl extends ServiceImpl= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_GROUP_UPDATE, organGroup); + } return tag != null && tag > 0; } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java index fb939ef..353497c 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java @@ -2,16 +2,17 @@ package com.lyms.base.common.service.organ.impl; import java.io.Serializable; -import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.base.common.dao.organ.OrganizationsMapper; -import com.lyms.base.common.entity.organ.OrganGroup; import com.lyms.base.common.entity.organ.Organizations; +import com.lyms.base.common.enums.SyncParamEnum; import com.lyms.base.common.service.organ.OrganizationsService; +import com.lyms.base.common.utils.SyncComponent; import com.lyms.exception.SystemException; import com.lyms.util.CollectionUtils; import com.lyms.util.StrUtils; @@ -27,6 +28,9 @@ import com.lyms.util.StrUtils; @Service public class OrganizationsServiceImpl extends ServiceImpl implements OrganizationsService { + + @Autowired + private SyncComponent syncComponent; public Integer deleteLogicById(Serializable id) { return baseMapper.deleteLogicById(id); @@ -39,6 +43,9 @@ public class OrganizationsServiceImpl extends ServiceImpl= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_INSERT, organizations); + } return tag != null && tag >= 1; } @@ -48,6 +55,9 @@ public class OrganizationsServiceImpl extends ServiceImpl= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_UPDATE, organizations); + } return tag != null && tag >= 1; } @@ -55,6 +65,9 @@ public class OrganizationsServiceImpl extends ServiceImpl= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_INSERT, id); + } return tag != null && tag >= 1; } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolesServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolesServiceImpl.java index 7e2e548..a16b2ce 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolesServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolesServiceImpl.java @@ -12,8 +12,10 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.base.common.dao.role.RolesMapper; import com.lyms.base.common.entity.role.RolePermissionMaps; import com.lyms.base.common.entity.role.Roles; +import com.lyms.base.common.enums.SyncParamEnum; import com.lyms.base.common.service.role.RolePermissionMapsService; import com.lyms.base.common.service.role.RolesService; +import com.lyms.base.common.utils.SyncComponent; /** *

@@ -28,9 +30,14 @@ public class RolesServiceImpl extends ServiceImpl implements @Autowired private RolePermissionMapsService sysRolePermissionMapsService; + + @Autowired + private SyncComponent syncComponent; public Integer deleteLogicById(Serializable id) { - return baseMapper.deleteLogicById(id); + Integer tag = baseMapper.deleteLogicById(id); + syncComponent.addPushSyncOperation(SyncParamEnum.ROLE_DELETE, id); + return tag; } @Override @@ -38,6 +45,7 @@ public class RolesServiceImpl extends ServiceImpl implements public boolean createRole(Roles role, List rpList) { baseMapper.insert(role); sysRolePermissionMapsService.insertBatch(rpList); + syncComponent.addPushSyncOperation(SyncParamEnum.ROLE_INSERT, role,rpList); return true; } @@ -51,6 +59,7 @@ public class RolesServiceImpl extends ServiceImpl implements if (!rpList.isEmpty()) { sysRolePermissionMapsService.insertBatch(rpList); } + syncComponent.addPushSyncOperation(SyncParamEnum.ROLE_UPDATE, role,rpList); return true; } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java index 786aac1..ce49a47 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java @@ -101,7 +101,9 @@ public class UsersServiceImpl extends ServiceImpl implements if (userRoleMapsList != null && !userRoleMapsList.isEmpty()) { sysUserRoleMapsService.insertBatch(userRoleMapsList); } - syncComponent.addPushSyncOperation(SyncParamEnum.USER_INSERT, user,userRoleMapsList); + if(tag >= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.USER_INSERT, user,userRoleMapsList); + } return tag != null && tag >= 1; } @@ -142,6 +144,9 @@ public class UsersServiceImpl extends ServiceImpl implements if (!userRoleMapsList.isEmpty()) { sysUserRoleMapsService.insertBatch(userRoleMapsList); } + if(tag >= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.USER_UPDATE, user,userRoleMapsList); + } return tag != null && tag >= 1; } @@ -154,7 +159,6 @@ public class UsersServiceImpl extends ServiceImpl implements @Override @Transactional public boolean delete(String userId) throws SystemException { - if (StringUtils.isBlank(userId)) return false; // TODO 通过sql 修改 @@ -168,6 +172,9 @@ public class UsersServiceImpl extends ServiceImpl implements } user.setIfdel(ifDel); Integer tag = userMapper.updateById(user); + if(tag >= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.USER_DELETE, userId); + } return tag != null && tag >= 1; } return false; @@ -175,7 +182,11 @@ public class UsersServiceImpl extends ServiceImpl implements @Override public Integer deleteLogicById(Serializable id) { - return baseMapper.deleteLogicById(id); + Integer tag = baseMapper.deleteLogicById(id); + if(tag >= 1){ + syncComponent.addPushSyncOperation(SyncParamEnum.USER_DELETE, id); + } + return tag; } @Override diff --git a/parent/base.common/src/main/java/com/lyms/base/common/utils/SyncComponent.java b/parent/base.common/src/main/java/com/lyms/base/common/utils/SyncComponent.java index 1bdb4a5..758694d 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/utils/SyncComponent.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/utils/SyncComponent.java @@ -2,6 +2,8 @@ package com.lyms.base.common.utils; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -18,6 +20,8 @@ import com.lyms.util.StrUtils; @Component public class SyncComponent { + + private static final Logger log = LoggerFactory.getLogger(SyncComponent.class); @Autowired public SyncCenter center; @@ -50,6 +54,7 @@ public class SyncComponent { */ public boolean addPushSyncOperation(SyncParamEnum syncParamConf, Object... data) { if(SyncConf.isCenterOperateSyncToNode){ + log.debug("添加推送队列"); List ipList = getAllGroupIpList(); ParamsAdpter adpter = null; if (data != null && data.length > 0) { diff --git a/parent/core.sdk/src/main/java/com/lyms/sync/SyncCenter.java b/parent/core.sdk/src/main/java/com/lyms/sync/SyncCenter.java index 5a9889c..65b9a65 100644 --- a/parent/core.sdk/src/main/java/com/lyms/sync/SyncCenter.java +++ b/parent/core.sdk/src/main/java/com/lyms/sync/SyncCenter.java @@ -3,6 +3,8 @@ package com.lyms.sync; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import org.springframework.stereotype.Component; + import com.lyms.sync.channel.ChannelData; import com.lyms.sync.queue.SyncQueue; import com.lyms.util.HttpUtils; @@ -14,6 +16,7 @@ import com.lyms.util.HttpUtils; *

  • @date 2017年3月13日 *
  • */ +@Component public class SyncCenter { public static ScheduledExecutorService scheduledPool = Executors.newScheduledThreadPool(5); -- 1.8.3.1