admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

三江统一登录代码修改

Browse Source
This commit is contained in:
Administrator 2023-03-30 16:29:06 +08:00
parent 166a4c1cb3
commit 8beac86ac9
3 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/zhgd/sjmq/service/SjMqService.java
View File

@ -6,8 +6,10 @@ import com.chinacreator.c2.uop.sync.message.categoryorg.CategoryOrgDeleteMessage
import com.chinacreator.c2.uop.sync.message.categoryorg.CategoryOrgUpdateMessage; import com.chinacreator.c2.uop.sync.message.categoryorg.CategoryOrgUpdateMessage;
import com.chinacreator.c2.uop.sync.message.org.*; import com.chinacreator.c2.uop.sync.message.org.*;
import com.chinacreator.c2.uop.sync.message.user.*; import com.chinacreator.c2.uop.sync.message.user.*;
import com.zhgd.xmgl.modules.basicdata.entity.BaseModuleUser;
import com.zhgd.xmgl.modules.basicdata.entity.Company; import com.zhgd.xmgl.modules.basicdata.entity.Company;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.mapper.BaseModuleUserMapper;
import com.zhgd.xmgl.modules.basicdata.mapper.CompanyMapper; import com.zhgd.xmgl.modules.basicdata.mapper.CompanyMapper;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -15,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map; import java.util.Map;
@Component @Component
@ -24,6 +27,8 @@ public class SjMqService {
private CompanyMapper companyMapper; private CompanyMapper companyMapper;
@Autowired @Autowired
private SystemUserMapper systemUserMapper; private SystemUserMapper systemUserMapper;
@Autowired
private BaseModuleUserMapper baseModuleUserMapper;
private Company convertToCompany(OrgCreateMessage orgCreateMessage) { private Company convertToCompany(OrgCreateMessage orgCreateMessage) {
String id = orgCreateMessage.getId(); String id = orgCreateMessage.getId();
@ -207,25 +212,32 @@ public class SjMqService {
//复制 新增用户 //复制 新增用户
SystemUser systemUser = convertToSystemUser(userOrgChangeMessage); SystemUser systemUser = convertToSystemUser(userOrgChangeMessage);
systemUserMapper.insert(systemUser); systemUserMapper.insert(systemUser);
insertBaseModuleUser(systemUser);
} else if (type.equals(UserOrgChangeType.MOVE)) { } else if (type.equals(UserOrgChangeType.MOVE)) {
//移动用户 //移动用户，什么不用做
SystemUser systemUser = systemUserMapper.selectOne(new LambdaQueryWrapper<SystemUser>().eq(SystemUser::getSjUnifiedAuthenticationUserId, userOrgChangeMessage.getId()));
if (systemUser != null) {
systemUser.setSn(userOrgChangeMessage.getOldOrgId());
systemUserMapper.updateById(systemUser);
}
} else if (type.equals(UserOrgChangeType.DELETE)) { } else if (type.equals(UserOrgChangeType.DELETE)) {
//删除用户 //删除用户
systemUserMapper.delete(new LambdaQueryWrapper<SystemUser>().eq(SystemUser::getSjUnifiedAuthenticationUserId, userOrgChangeMessage.getId())); systemUserMapper.delete(new LambdaQueryWrapper<SystemUser>().eq(SystemUser::getSjUnifiedAuthenticationUserId, userOrgChangeMessage.getId()));
} }
} }
private SystemUser convertToSystemUser(UserOrgChangeMessage userOrgChangeMessage) { /**
String oldOrgId = userOrgChangeMessage.getOldOrgId(); * 添加模块人员数据，菜单
Company company = companyMapper.selectOne(new LambdaQueryWrapper<Company>().eq(Company::getCompanySn, oldOrgId)); *
if (company == null) { * @param systemUser
throw new RuntimeException("三江mq同步用户，用户的企业查询为空！"); */
private void insertBaseModuleUser(SystemUser systemUser) {
//查询yb123的模块人员数据，添加到其他账号中
List<BaseModuleUser> baseModuleUsers = baseModuleUserMapper.selectList(new LambdaQueryWrapper<BaseModuleUser>().eq(BaseModuleUser::getUserId, "1621447260403818497"));
System.out.println(baseModuleUsers);
for (BaseModuleUser baseModuleUser : baseModuleUsers) {
baseModuleUser.setId(null);
baseModuleUser.setUserId(systemUser.getUserId());
baseModuleUserMapper.insert(baseModuleUser);
} }
}
private SystemUser convertToSystemUser(UserOrgChangeMessage userOrgChangeMessage) {
Map<String, Object> userMap = userOrgChangeMessage.getUser(); Map<String, Object> userMap = userOrgChangeMessage.getUser();
String account = String.valueOf(userMap.get("certificateNum")); String account = String.valueOf(userMap.get("certificateNum"));
String name = String.valueOf(userMap.get("name")); String name = String.valueOf(userMap.get("name"));
@ -237,8 +249,8 @@ public class SjMqService {
systemUser.setShowPassword("123456"); systemUser.setShowPassword("123456");
systemUser.setRealName(name); systemUser.setRealName(name);
systemUser.setUserTel(phone); systemUser.setUserTel(phone);
systemUser.setSn(oldOrgId); systemUser.setSn("B386480F85E84592B8E102224D090794");
systemUser.setAccountType(getAccountType(company.getCompanyType())); systemUser.setAccountType(7);
systemUser.setSjUnifiedAuthenticationUserId(userOrgChangeMessage.getId()); systemUser.setSjUnifiedAuthenticationUserId(userOrgChangeMessage.getId());
return systemUser; return systemUser;
} }

29
src/main/java/com/zhgd/sjmq/service/UopCustomMessageReceiverServiceImpl.java
View File

@ -26,7 +26,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.Map; import java.util.Map;
/** /**
@ -39,7 +38,9 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
private SjMqService service; private SjMqService service;
public void init() { public void init() {
service = (SjMqService) SpringContextUtils.getBean("sjMqService"); if (service == null) {
service = (SjMqService) SpringContextUtils.getBean("sjMqService");
}
} }
@Override @Override
@ -47,7 +48,7 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
try { try {
init(); init();
log.info("sj的mq接收：{}", JSON.toJSONString(orgCreateMessage)); log.info("sj的mq接收：{}", JSON.toJSONString(orgCreateMessage));
service.onOrgCreated(orgCreateMessage); //service.onOrgCreated(orgCreateMessage);
} catch (Exception e) { } catch (Exception e) {
log.error("mqError：", e); log.error("mqError：", e);
} }
@ -59,7 +60,7 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
try { try {
init(); init();
log.info("sj的mq接收：{}", JSON.toJSONString(orgUpdateMessage)); log.info("sj的mq接收：{}", JSON.toJSONString(orgUpdateMessage));
service.onOrgUpdated(orgUpdateMessage); //service.onOrgUpdated(orgUpdateMessage);
} catch (Exception e) { } catch (Exception e) {
log.error("mqError：", e); log.error("mqError：", e);
} }
@ -70,7 +71,7 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
try { try {
init(); init();
log.info("sj的mq接收：{}", JSON.toJSONString(orgDeleteMessage)); log.info("sj的mq接收：{}", JSON.toJSONString(orgDeleteMessage));
service.onOrgDeleted(orgDeleteMessage); //service.onOrgDeleted(orgDeleteMessage);
} catch (Exception e) { } catch (Exception e) {
log.error("mqError：", e); log.error("mqError：", e);
} }
@ -81,7 +82,7 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
try { try {
init(); init();
log.info("sj的mq接收：{}", JSON.toJSONString(orgCategoryChangeMessage)); log.info("sj的mq接收：{}", JSON.toJSONString(orgCategoryChangeMessage));
service.onOrgCategoryChanged(orgCategoryChangeMessage); //service.onOrgCategoryChanged(orgCategoryChangeMessage);
} catch (Exception e) { } catch (Exception e) {
log.error("mqError：", e); log.error("mqError：", e);
} }
@ -92,7 +93,7 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
try { try {
init(); init();
log.info("sj的mq接收：{}", JSON.toJSONString(arg0)); log.info("sj的mq接收：{}", JSON.toJSONString(arg0));
service.onBatchOrgCategoryChanged(arg0); //service.onBatchOrgCategoryChanged(arg0);
} catch (Exception e) { } catch (Exception e) {
log.error("mqError：", e); log.error("mqError：", e);
} }
@ -103,7 +104,7 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
try { try {
init(); init();
log.info("sj的mq接收：{}", JSON.toJSONString(arg0)); log.info("sj的mq接收：{}", JSON.toJSONString(arg0));
service.onCategoryOrgCreate(arg0); //service.onCategoryOrgCreate(arg0);
} catch (Exception e) { } catch (Exception e) {
log.error("mqError：", e); log.error("mqError：", e);
} }
@ -114,7 +115,7 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
try { try {
init(); init();
log.info("sj的mq接收：{}", JSON.toJSONString(categoryOrgUpdateMessage)); log.info("sj的mq接收：{}", JSON.toJSONString(categoryOrgUpdateMessage));
service.onCategoryOrgUpdate(categoryOrgUpdateMessage); //service.onCategoryOrgUpdate(categoryOrgUpdateMessage);
} catch (Exception e) { } catch (Exception e) {
log.error("mqError：", e); log.error("mqError：", e);
} }
@ -125,7 +126,7 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
try { try {
init(); init();
log.info("sj的mq接收：{}", JSON.toJSONString(categoryOrgDeleteMessage)); log.info("sj的mq接收：{}", JSON.toJSONString(categoryOrgDeleteMessage));
service.onCategoryOrgDelete(categoryOrgDeleteMessage); //service.onCategoryOrgDelete(categoryOrgDeleteMessage);
} catch (Exception e) { } catch (Exception e) {
log.error("mqError：", e); log.error("mqError：", e);
} }
@ -147,7 +148,7 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
try { try {
init(); init();
log.info("sj的mq接收：{}", JSON.toJSONString(userCreateMessage)); log.info("sj的mq接收：{}", JSON.toJSONString(userCreateMessage));
service.onUserCreated(userCreateMessage); //service.onUserCreated(userCreateMessage);
} catch (Exception e) { } catch (Exception e) {
log.error("mqError：", e); log.error("mqError：", e);
} }
@ -164,12 +165,16 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList
} }
} }
/**
* 删除用户不调用此方法
* @param userDeleteMessage
*/
@Override @Override
public void onUserDeleted(UserDeleteMessage userDeleteMessage) { public void onUserDeleted(UserDeleteMessage userDeleteMessage) {
try { try {
init(); init();
log.info("sj的mq接收：{}", JSON.toJSONString(userDeleteMessage)); log.info("sj的mq接收：{}", JSON.toJSONString(userDeleteMessage));
service.onUserDeleted(userDeleteMessage); //service.onUserDeleted(userDeleteMessage);
} catch (Exception e) { } catch (Exception e) {
log.error("mqError：", e); log.error("mqError：", e);
} }

2
src/main/resources/application-sjjt-gsx.properties
View File

@ -87,4 +87,4 @@ sj.unifiedAuthentication.login.url=http://116.169.63.183:30913
#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u8DF3\u8F6C\u540E\u63A5\u6536code\u7684\u5730\u5740 #\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u8DF3\u8F6C\u540E\u63A5\u6536code\u7684\u5730\u5740
sj.unifiedAuthentication.login.code.url=http://wbtqry.natappfree.cc/xmgl/sj/unifiedAuthentication/getTokenByCode sj.unifiedAuthentication.login.code.url=http://wbtqry.natappfree.cc/xmgl/sj/unifiedAuthentication/getTokenByCode
#\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u540E\u8DF3\u8F6Curl #\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u540E\u8DF3\u8F6Curl
sj.unifiedAuthentication.success.redirect = "http://192.168.34.150:8080/index.html#/login?UID="; sj.unifiedAuthentication.success.redirect=http://192.168.34.150:8081/index.html#/login?UID=