jiangjiazhi / center

Download as
Browse Code »

Commit 1b1ab1380db22bcb45fc425532a9af0c1b567757

Authored by fangcheng
1 parent 3d3371fbed
Exists in master

推送模块代码添加

Showing 8 changed files with 96 additions and 10 deletions

parent/base.common/src/main/java/com/lyms/base/common/enums/SyncParamEnum.java View file @ 1b1ab13
... ... @@ -7,7 +7,26 @@
7 7  
8 8 USER_INSERT(com.lyms.base.common.service.user.impl.UsersServiceImpl.class.getName(),"addUser"),
9 9 USER_UPDATE(com.lyms.base.common.service.user.impl.UsersServiceImpl.class.getName(),"updateUser"),
10   - USER_DELETE(com.lyms.base.common.service.user.impl.UsersServiceImpl.class.getName(),"delete");
  10 + USER_DELETE(com.lyms.base.common.service.user.impl.UsersServiceImpl.class.getName(),"deleteLogicById"),
  11 +
  12 + ROLE_INSERT(com.lyms.base.common.service.role.impl.RolesServiceImpl.class.getName(),"createRole"),
  13 + ROLE_UPDATE(com.lyms.base.common.service.role.impl.RolesServiceImpl.class.getName(),"updateRole"),
  14 + ROLE_DELETE(com.lyms.base.common.service.role.impl.RolesServiceImpl.class.getName(),"deleteLogicById"),
  15 +
  16 +
  17 + ORG_INSERT(com.lyms.base.common.service.organ.impl.OrganizationsServiceImpl.class.getName(),"addOrg"),
  18 + ORG_UPDATE(com.lyms.base.common.service.organ.impl.OrganizationsServiceImpl.class.getName(),"updateOrg"),
  19 + ORG_DELETE(com.lyms.base.common.service.organ.impl.OrganizationsServiceImpl.class.getName(),"deleteOrganById"),
  20 +
  21 + ORG_GROUP_INSERT(com.lyms.base.common.service.organ.impl.OrganGroupServiceImpl.class.getName(),"create"),
  22 + ORG_GROUP_UPDATE(com.lyms.base.common.service.organ.impl.OrganGroupServiceImpl.class.getName(),"updateGroup"),
  23 + ORG_GROUP_DELETE(com.lyms.base.common.service.organ.impl.OrganGroupServiceImpl.class.getName(),"deleteGroupById"),
  24 +
  25 +
  26 + DEPART_INSERT(com.lyms.base.common.service.organ.impl.DepartmentsServiceImpl.class.getName(),"createDepart"),
  27 + DEPART_UPDATE(com.lyms.base.common.service.organ.impl.DepartmentsServiceImpl.class.getName(),"updateDepart"),
  28 + DEPART_DELETE(com.lyms.base.common.service.organ.impl.DepartmentsServiceImpl.class.getName(),"deleteDepartById"),
  29 + ;
11 30  
12 31  
13 32 private String remoteClazz;
parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/DepartmentsServiceImpl.java View file @ 1b1ab13
... ... @@ -3,13 +3,16 @@
3 3 import java.io.Serializable;
4 4  
5 5 import org.apache.commons.lang3.StringUtils;
  6 +import org.springframework.beans.factory.annotation.Autowired;
6 7 import org.springframework.stereotype.Service;
7 8 import org.springframework.transaction.annotation.Transactional;
8 9  
9 10 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
10 11 import com.lyms.base.common.dao.organ.DepartmentsMapper;
11 12 import com.lyms.base.common.entity.organ.Departments;
  13 +import com.lyms.base.common.enums.SyncParamEnum;
12 14 import com.lyms.base.common.service.organ.DepartmentsService;
  15 +import com.lyms.base.common.utils.SyncComponent;
13 16 import com.lyms.exception.SystemException;
14 17 import com.lyms.util.StrUtils;
15 18  
... ... @@ -24,6 +27,9 @@
24 27 @Service
25 28 public class DepartmentsServiceImpl extends ServiceImpl<DepartmentsMapper, Departments> implements DepartmentsService {
26 29  
  30 + @Autowired
  31 + private SyncComponent syncComponent;
  32 +
27 33 public Integer deleteLogicById(Serializable id) {
28 34 return baseMapper.deleteLogicById(id);
29 35 }
... ... @@ -39,6 +45,9 @@
39 45 departments.setId(StrUtils.uuid());
40 46 }
41 47 Integer tag = baseMapper.insert(departments);
  48 + if(tag >= 1){
  49 + syncComponent.addPushSyncOperation(SyncParamEnum.DEPART_INSERT, departments);
  50 + }
42 51 return tag != null && tag >= 1;
43 52 }
44 53  
... ... @@ -48,6 +57,9 @@
48 57 if (StringUtils.isBlank(id))
49 58 return false;
50 59 Integer tag = baseMapper.deleteLogicById(id);
  60 + if(tag >= 1){
  61 + syncComponent.addPushSyncOperation(SyncParamEnum.DEPART_DELETE, id);
  62 + }
51 63 return tag != null && tag > 0;
52 64 }
53 65  
... ... @@ -57,6 +69,9 @@
57 69 if (departments == null)
58 70 return false;
59 71 Integer tag = baseMapper.updateById(departments);
  72 + if(tag >= 1){
  73 + syncComponent.addPushSyncOperation(SyncParamEnum.DEPART_UPDATE, departments);
  74 + }
60 75 return tag != null && tag > 0;
61 76 }
62 77 }
parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java View file @ 1b1ab13
... ... @@ -14,8 +14,10 @@
14 14 import com.lyms.base.common.dao.organ.OrganGroupMapsMapper;
15 15 import com.lyms.base.common.entity.organ.OrganGroup;
16 16 import com.lyms.base.common.entity.organ.OrganGroupMaps;
  17 +import com.lyms.base.common.enums.SyncParamEnum;
17 18 import com.lyms.base.common.service.organ.OrganGroupMapsService;
18 19 import com.lyms.base.common.service.organ.OrganGroupService;
  20 +import com.lyms.base.common.utils.SyncComponent;
19 21 import com.lyms.exception.SystemException;
20 22 import com.lyms.util.InstanceUtils;
21 23 import com.lyms.util.StrUtils;
... ... @@ -33,6 +35,9 @@
33 35  
34 36 @Autowired
35 37 private OrganGroupMapsMapper organGroupMapsMapper;
  38 +
  39 + @Autowired
  40 + private SyncComponent syncComponent;
36 41  
37 42 @Transactional
38 43 public Integer deleteLogicById(Serializable id) {
... ... @@ -60,7 +65,9 @@
60 65 organGroup.setOrgnumber(mapsList.size());
61 66 }
62 67 Integer tag = baseMapper.insert(organGroup);
63   -
  68 + if(tag >= 1){
  69 + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_GROUP_INSERT, organGroup);
  70 + }
64 71 return tag != null && tag > 0;
65 72  
66 73 }
67 74  
... ... @@ -68,10 +75,12 @@
68 75 @Override
69 76 @Transactional
70 77 public boolean deleteGroupById(String groupId) throws SystemException {
71   -
72 78 if (StringUtils.isBlank(groupId))
73 79 return false;
74 80 Integer tag = baseMapper.deleteById(groupId);
  81 + if(tag >= 1){
  82 + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_GROUP_DELETE, groupId);
  83 + }
75 84 return tag != null && tag > 0;
76 85  
77 86 }
... ... @@ -96,7 +105,9 @@
96 105 organGroup.setOrgnumber(mapsList.size());
97 106 }
98 107 Integer tag = baseMapper.updateById(organGroup);
99   -
  108 + if(tag >= 1){
  109 + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_GROUP_UPDATE, organGroup);
  110 + }
100 111 return tag != null && tag > 0;
101 112  
102 113 }
parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java View file @ 1b1ab13
... ... @@ -2,16 +2,17 @@
2 2  
3 3 import java.io.Serializable;
4 4  
5   -import org.apache.commons.lang3.ArrayUtils;
  5 +import org.springframework.beans.factory.annotation.Autowired;
6 6 import org.springframework.stereotype.Service;
7 7 import org.springframework.transaction.annotation.Transactional;
8 8  
9 9 import com.baomidou.mybatisplus.plugins.Page;
10 10 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
11 11 import com.lyms.base.common.dao.organ.OrganizationsMapper;
12   -import com.lyms.base.common.entity.organ.OrganGroup;
13 12 import com.lyms.base.common.entity.organ.Organizations;
  13 +import com.lyms.base.common.enums.SyncParamEnum;
14 14 import com.lyms.base.common.service.organ.OrganizationsService;
  15 +import com.lyms.base.common.utils.SyncComponent;
15 16 import com.lyms.exception.SystemException;
16 17 import com.lyms.util.CollectionUtils;
17 18 import com.lyms.util.StrUtils;
... ... @@ -27,6 +28,9 @@
27 28 @Service
28 29 public class OrganizationsServiceImpl extends ServiceImpl<OrganizationsMapper, Organizations>
29 30 implements OrganizationsService {
  31 +
  32 + @Autowired
  33 + private SyncComponent syncComponent;
30 34  
31 35 public Integer deleteLogicById(Serializable id) {
32 36 return baseMapper.deleteLogicById(id);
... ... @@ -39,6 +43,9 @@
39 43 return false;
40 44 organizations.setId(StrUtils.uuid());
41 45 Integer tag = baseMapper.insert(organizations);
  46 + if(tag >= 1){
  47 + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_INSERT, organizations);
  48 + }
42 49 return tag != null && tag >= 1;
43 50 }
44 51  
... ... @@ -48,6 +55,9 @@
48 55 if (organizations == null)
49 56 return false;
50 57 Integer tag = baseMapper.updateById(organizations);
  58 + if(tag >= 1){
  59 + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_UPDATE, organizations);
  60 + }
51 61 return tag != null && tag >= 1;
52 62 }
53 63  
... ... @@ -55,6 +65,9 @@
55 65 @Transactional
56 66 public boolean deleteOrganById(String id) throws SystemException {
57 67 Integer tag = baseMapper.deleteLogicById(id);
  68 + if(tag >= 1){
  69 + syncComponent.addPushSyncOperation(SyncParamEnum.ORG_INSERT, id);
  70 + }
58 71 return tag != null && tag >= 1;
59 72 }
60 73  
parent/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolesServiceImpl.java View file @ 1b1ab13
... ... @@ -12,8 +12,10 @@
12 12 import com.lyms.base.common.dao.role.RolesMapper;
13 13 import com.lyms.base.common.entity.role.RolePermissionMaps;
14 14 import com.lyms.base.common.entity.role.Roles;
  15 +import com.lyms.base.common.enums.SyncParamEnum;
15 16 import com.lyms.base.common.service.role.RolePermissionMapsService;
16 17 import com.lyms.base.common.service.role.RolesService;
  18 +import com.lyms.base.common.utils.SyncComponent;
17 19  
18 20 /**
19 21 * <p>
20 22  
... ... @@ -28,9 +30,14 @@
28 30  
29 31 @Autowired
30 32 private RolePermissionMapsService sysRolePermissionMapsService;
  33 +
  34 + @Autowired
  35 + private SyncComponent syncComponent;
31 36  
32 37 public Integer deleteLogicById(Serializable id) {
33   - return baseMapper.deleteLogicById(id);
  38 + Integer tag = baseMapper.deleteLogicById(id);
  39 + syncComponent.addPushSyncOperation(SyncParamEnum.ROLE_DELETE, id);
  40 + return tag;
34 41 }
35 42  
36 43 @Override
... ... @@ -38,6 +45,7 @@
38 45 public boolean createRole(Roles role, List<RolePermissionMaps> rpList) {
39 46 baseMapper.insert(role);
40 47 sysRolePermissionMapsService.insertBatch(rpList);
  48 + syncComponent.addPushSyncOperation(SyncParamEnum.ROLE_INSERT, role,rpList);
41 49 return true;
42 50 }
43 51  
... ... @@ -51,6 +59,7 @@
51 59 if (!rpList.isEmpty()) {
52 60 sysRolePermissionMapsService.insertBatch(rpList);
53 61 }
  62 + syncComponent.addPushSyncOperation(SyncParamEnum.ROLE_UPDATE, role,rpList);
54 63 return true;
55 64 }
56 65  
parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java View file @ 1b1ab13
... ... @@ -101,7 +101,9 @@
101 101 if (userRoleMapsList != null && !userRoleMapsList.isEmpty()) {
102 102 sysUserRoleMapsService.insertBatch(userRoleMapsList);
103 103 }
104   - syncComponent.addPushSyncOperation(SyncParamEnum.USER_INSERT, user,userRoleMapsList);
  104 + if(tag >= 1){
  105 + syncComponent.addPushSyncOperation(SyncParamEnum.USER_INSERT, user,userRoleMapsList);
  106 + }
105 107 return tag != null && tag >= 1;
106 108 }
107 109  
... ... @@ -142,6 +144,9 @@
142 144 if (!userRoleMapsList.isEmpty()) {
143 145 sysUserRoleMapsService.insertBatch(userRoleMapsList);
144 146 }
  147 + if(tag >= 1){
  148 + syncComponent.addPushSyncOperation(SyncParamEnum.USER_UPDATE, user,userRoleMapsList);
  149 + }
145 150 return tag != null && tag >= 1;
146 151 }
147 152  
... ... @@ -154,7 +159,6 @@
154 159 @Override
155 160 @Transactional
156 161 public boolean delete(String userId) throws SystemException {
157   -
158 162 if (StringUtils.isBlank(userId))
159 163 return false;
160 164 // TODO 通过sql 修改
... ... @@ -168,6 +172,9 @@
168 172 }
169 173 user.setIfdel(ifDel);
170 174 Integer tag = userMapper.updateById(user);
  175 + if(tag >= 1){
  176 + syncComponent.addPushSyncOperation(SyncParamEnum.USER_DELETE, userId);
  177 + }
171 178 return tag != null && tag >= 1;
172 179 }
173 180 return false;
... ... @@ -175,7 +182,11 @@
175 182  
176 183 @Override
177 184 public Integer deleteLogicById(Serializable id) {
178   - return baseMapper.deleteLogicById(id);
  185 + Integer tag = baseMapper.deleteLogicById(id);
  186 + if(tag >= 1){
  187 + syncComponent.addPushSyncOperation(SyncParamEnum.USER_DELETE, id);
  188 + }
  189 + return tag;
179 190 }
180 191  
181 192 @Override
parent/base.common/src/main/java/com/lyms/base/common/utils/SyncComponent.java View file @ 1b1ab13
... ... @@ -2,6 +2,8 @@
2 2  
3 3 import java.util.List;
4 4  
  5 +import org.slf4j.Logger;
  6 +import org.slf4j.LoggerFactory;
5 7 import org.springframework.beans.factory.annotation.Autowired;
6 8 import org.springframework.stereotype.Component;
7 9  
... ... @@ -18,6 +20,8 @@
18 20  
19 21 @Component
20 22 public class SyncComponent {
  23 +
  24 + private static final Logger log = LoggerFactory.getLogger(SyncComponent.class);
21 25  
22 26 @Autowired
23 27 public SyncCenter center;
... ... @@ -50,6 +54,7 @@
50 54 */
51 55 public boolean addPushSyncOperation(SyncParamEnum syncParamConf, Object... data) {
52 56 if(SyncConf.isCenterOperateSyncToNode){
  57 + log.debug("添加推送队列");
53 58 List<String> ipList = getAllGroupIpList();
54 59 ParamsAdpter adpter = null;
55 60 if (data != null && data.length > 0) {
parent/core.sdk/src/main/java/com/lyms/sync/SyncCenter.java View file @ 1b1ab13
... ... @@ -3,6 +3,8 @@
3 3 import java.util.concurrent.Executors;
4 4 import java.util.concurrent.ScheduledExecutorService;
5 5  
  6 +import org.springframework.stereotype.Component;
  7 +
6 8 import com.lyms.sync.channel.ChannelData;
7 9 import com.lyms.sync.queue.SyncQueue;
8 10 import com.lyms.util.HttpUtils;
... ... @@ -14,6 +16,7 @@
14 16 * <li>@date 2017年3月13日
15 17 * <li>
16 18 */
  19 +@Component
17 20 public class SyncCenter {
18 21  
19 22 public static ScheduledExecutorService scheduledPool = Executors.newScheduledThreadPool(5);