elink-star
/
esua-epdc-cloud
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

字典获取customerId,修改生成token逻辑

feature/dangjian
mkh 4 years ago
parent
ecff498043
commit
d92e6f0227
2 changed files with 26 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
  2. 14
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

23
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
View File

@ -86,6 +86,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
private CustomerDepartmentDao customerDepartmentDao;
@Resource
private CustomerGridDao customerGridDao;
@Resource
private SysDictDao sysDictDao;
private static final Logger logger = LoggerFactory.getLogger(SysDeptServiceImpl.class);
@ -147,12 +149,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
Result<CompleteDeptDTO> completeDeptDtoResult = this.getCompleteDept(entity.getId().toString());
groupFeignClient.createPartyGroup(completeDeptDtoResult.getData());
}
//查询字典获取customer_id
SysDictEntity sysDictEntity = sysDictDao.selectDcp();
if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
//同步customer_grid
CustomerGridEntity customerGridEntity = new CustomerGridEntity();
customerGridEntity.setId(entity.getId().toString());
customerGridEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
customerGridEntity.setCustomerId(sysDictEntity.getDictValue());
customerGridEntity.setPid(entity.getPid().toString());
customerGridEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":"));
customerGridEntity.setSyncFlag(NumConstant.ZERO_STR);
@ -166,7 +169,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity();
customerDepartmentEntity.setId(entity.getId().toString());
customerDepartmentEntity.setAgencyId(entity.getPid().toString());
customerDepartmentEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
customerDepartmentEntity.setCustomerId(sysDictEntity.getDictValue());
customerDepartmentEntity.setDepartmentName(entity.getName());
customerDepartmentEntity.setDepartmentDuty(entity.getName());
customerDepartmentEntity.setTotalUser(NumConstant.ZERO);
@ -176,7 +179,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
//同步agency
CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity();
customerAgencyEntity.setId(entity.getId().toString());
customerAgencyEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
customerAgencyEntity.setCustomerId(sysDictEntity.getDictValue());
customerAgencyEntity.setPid(entity.getPid().toString());
customerAgencyEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":"));
customerAgencyEntity.setSyncFlag(NumConstant.ZERO_STR);
@ -224,7 +227,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
// 发送消息
this.baseDao.updateById(entity);
//查询字典获取customer_id
SysDictEntity sysDictEntity = sysDictDao.selectDcp();
if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerGridEntity customerGridEntity = customerGridDao.selectById(dto.getId().toString());
if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
@ -236,12 +240,14 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
customerGridDao.updateById(customerGridEntity);
} else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity();
customerDepartmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity,customerDepartmentEntity);
customerDepartmentEntity.setTotalUser(customerGridEntity.getTotalUser());
customerDepartmentDao.insert(customerDepartmentEntity);
customerGridDao.deleteGridById(entity.getId().toString());
}else {
CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity();
customerAgencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity,customerAgencyEntity);
customerAgencyEntity.setTotalUser(customerGridEntity.getTotalUser());
customerAgencyDao.insert(customerAgencyEntity);
@ -251,6 +257,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
CustomerDepartmentEntity customerDepartmentEntity = customerDepartmentDao.selectById(dto.getId().toString());
if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerGridEntity customerGridEntity = new CustomerGridEntity();
customerGridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity,customerGridEntity);
customerGridEntity.setTotalUser(customerDepartmentEntity.getTotalUser());
customerGridDao.insert(customerGridEntity);
@ -261,6 +268,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
customerDepartmentDao.updateById(customerDepartmentEntity);
}else {
CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity();
customerAgencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity,customerAgencyEntity);
customerAgencyEntity.setTotalUser(customerDepartmentEntity.getTotalUser());
customerAgencyDao.insert(customerAgencyEntity);
@ -270,12 +278,14 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
CustomerAgencyEntity customerAgencyEntity = customerAgencyDao.selectById(dto.getId().toString());
if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerGridEntity customerGridEntity = new CustomerGridEntity();
customerGridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity,customerGridEntity);
customerGridEntity.setTotalUser(customerAgencyEntity.getTotalUser());
customerGridDao.insert(customerGridEntity);
customerAgencyDao.deleteAgencyById(entity.getId().toString());
} else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity();
customerDepartmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity,customerDepartmentEntity);
customerDepartmentEntity.setTotalUser(customerAgencyEntity.getTotalUser());
customerDepartmentDao.insert(customerDepartmentEntity);
@ -290,7 +300,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
}
private void packageGrid(SysDeptEntity entity,CustomerGridEntity customerGridEntity){
customerGridEntity.setId(entity.getId().toString());
customerGridEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
customerGridEntity.setPid(entity.getPid().toString());
customerGridEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":"));
customerGridEntity.setSyncFlag(NumConstant.ZERO_STR);
@ -299,7 +308,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
}
private void packageAgency(SysDeptEntity entity,CustomerAgencyEntity customerAgencyEntity){
customerAgencyEntity.setId(entity.getId().toString());
customerAgencyEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
customerAgencyEntity.setPid(entity.getPid().toString());
customerAgencyEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":"));
customerAgencyEntity.setSyncFlag(NumConstant.ZERO_STR);
@ -315,7 +323,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
}
private void packageDepartment(SysDeptEntity entity,CustomerDepartmentEntity customerDepartmentEntity){
customerDepartmentEntity.setId(entity.getId().toString());
customerDepartmentEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
customerDepartmentEntity.setAgencyId(entity.getPid().toString());
customerDepartmentEntity.setDepartmentName(entity.getName());
customerDepartmentEntity.setDepartmentDuty(entity.getName());

14
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
View File

@ -183,18 +183,21 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
sysDeptDao.updateGridTotalUser(dto.getDeptId().toString());
//同步插入customer_staff_grid
CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity();
gridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity, gridEntity);
customerStaffGridDao.insert(gridEntity);
} else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
sysDeptDao.updateDepartmentTotalUser(dto.getDeptId().toString());
//同步插入customer_staff_department
CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity();
departmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity, departmentEntity);
customerStaffDepartmentDao.insert(departmentEntity);
} else {
sysDeptDao.updateAgencyTotalUser(dto.getDeptId().toString());
//同步插入customer_staff_agency
CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity();
agencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity, agencyEntity);
customerStaffAgencyDao.insert(agencyEntity);
}
@ -225,6 +228,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
//更新用户
updateById(entity);
//查询字典获取customer_id
SysDictEntity sysDictEntity = sysDictDao.selectDcp();
//更新customer_staff
if (dto.getUserTagKey().equals("offers")) {
QueryWrapper<CustomerStaffEntity> queryWrapper = new QueryWrapper<>();
@ -253,6 +258,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateGridTotalUserAfter(deptEntity);
} else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity();
departmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity, departmentEntity);
customerStaffDepartmentDao.insert(departmentEntity);
customerStaffGridDao.deleteStaffGridById(entity.getId().toString());
@ -260,6 +266,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateDepartmentTotalUserAfter(deptEntity);
} else {
CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity();
agencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity, agencyEntity);
customerStaffAgencyDao.insert(agencyEntity);
customerStaffGridDao.deleteStaffGridById(entity.getId().toString());
@ -271,6 +278,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateDepartmentTotalUserBefore(sysDeptEntity);
if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity();
gridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity, gridEntity);
customerStaffGridDao.insert(gridEntity);
customerStaffDepartmentDao.deleteStaffDepartmentById(entity.getId().toString());
@ -282,6 +290,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateDepartmentTotalUserAfter(deptEntity);
} else {
CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity();
agencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity, agencyEntity);
customerStaffAgencyDao.insert(agencyEntity);
customerStaffDepartmentDao.deleteStaffDepartmentById(entity.getId().toString());
@ -293,6 +302,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateAgencyTotalUserBefore(sysDeptEntity);
if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity();
gridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity, gridEntity);
customerStaffGridDao.insert(gridEntity);
customerStaffAgencyDao.deleteStaffAgencyById(entity.getId().toString());
@ -300,6 +310,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateGridTotalUserAfter(deptEntity);
} else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity();
departmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity, departmentEntity);
customerStaffDepartmentDao.insert(departmentEntity);
customerStaffAgencyDao.deleteStaffAgencyById(entity.getId().toString());
@ -355,21 +366,18 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
private void packageGrid(SysUserEntity entity, CustomerStaffGridEntity gridEntity) {
gridEntity.setId(entity.getId().toString());
gridEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
gridEntity.setUserId(entity.getId().toString());
gridEntity.setGridId(entity.getDeptId().toString());
}
private void packageDepartment(SysUserEntity entity, CustomerStaffDepartmentEntity departmentEntity) {
departmentEntity.setId(entity.getId().toString());
departmentEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
departmentEntity.setUserId(entity.getId().toString());
departmentEntity.setDepartmentId(entity.getDeptId().toString());
}
private void packageAgency(SysUserEntity entity, CustomerStaffAgencyEntity agencyEntity) {
agencyEntity.setId(entity.getId().toString());
agencyEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
agencyEntity.setUserId(entity.getId().toString());
agencyEntity.setAgencyId(entity.getDeptId().toString());
}

Write Preview
Loading…
Cancel
Save