Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit f0dd9772 by 李小龙
Options

整理代码

parent 75984da1
Inline Side-by-side
Showing with 54 additions and 40 deletions
server-common/src/main/java/com/makeit/config/global/swagger/model/ConfigPlugin.java
...@@ -21,7 +21,7 @@ public class ConfigPlugin implements ModelPropertyBuilderPlugin { ...@@ -21,7 +21,7 @@ public class ConfigPlugin implements ModelPropertyBuilderPlugin {
private <T> void fill(String categoryCode, ModelPropertyContext context) { private <T> void fill(String categoryCode, ModelPropertyContext context) {
TenantIdUtil.execute(IdConst.DEFAULT_FACTORY_ID, () -> { TenantIdUtil.execute(IdConst.DEFAULT_TENANT_ID, () -> {
// String s = "配置 分类code:" + categoryCode + " " + // String s = "配置 分类code:" + categoryCode + " " +
// TntConfigUtil.viewListByCategoryCode(categoryCode).stream().map(e -> e.getCode() + "-" + e.getValue() + "-" + e.getName()).collect(Collectors.joining(",")); // TntConfigUtil.viewListByCategoryCode(categoryCode).stream().map(e -> e.getCode() + "-" + e.getValue() + "-" + e.getName()).collect(Collectors.joining(","));
......
server-common/src/main/java/com/makeit/enums/id/IdConst.java
...@@ -7,7 +7,7 @@ public class IdConst { ...@@ -7,7 +7,7 @@ public class IdConst {
public static final String DEFAULT_ID_ONE = "1"; public static final String DEFAULT_ID_ONE = "1";
//todo 这个id待确认 //todo 这个id待确认
public static final String DEFAULT_FACTORY_ID = "1544975976697262082"; public static final String DEFAULT_TENANT_ID = "0";
public static final String ROLE_COMMON_USER_NAME="普通用户"; public static final String ROLE_COMMON_USER_NAME="普通用户";
......
server-common/src/main/java/com/makeit/module/system/service/impl/SysConfigServiceImpl.java
...@@ -368,12 +368,12 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig ...@@ -368,12 +368,12 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
public void copyForTenant(PlatTenantDTOVO factory) { public void copyForTenant(PlatTenantDTOVO factory) {
List<SysConfigCategory> configCategoryList = List<SysConfigCategory> configCategoryList =
sysConfigCategoryService.list(new QueryWrapper<SysConfigCategory>().lambda() sysConfigCategoryService.list(new QueryWrapper<SysConfigCategory>().lambda()
.eq(SysConfigCategory::getTenantId, IdConst.DEFAULT_FACTORY_ID) .eq(SysConfigCategory::getTenantId, IdConst.DEFAULT_TENANT_ID)
); );
List<SysConfig> configList = List<SysConfig> configList =
list(new QueryWrapper<SysConfig>().lambda() list(new QueryWrapper<SysConfig>().lambda()
.eq(SysConfig::getTenantId, IdConst.DEFAULT_FACTORY_ID) .eq(SysConfig::getTenantId, IdConst.DEFAULT_TENANT_ID)
); );
Map<String, SysConfigCategory> tntConfigCategoryMap = StreamUtil.toMap(configCategoryList, SysConfigCategory::getId); Map<String, SysConfigCategory> tntConfigCategoryMap = StreamUtil.toMap(configCategoryList, SysConfigCategory::getId);
......
server-common/src/main/java/com/makeit/utils/msg/MsgSendUtil.java
package com.makeit.utils.msg; package com.makeit.utils.msg;
import com.makeit.utils.msg.dto.MsgSendDTO; import com.makeit.utils.msg.dto.MsgSendDTO;
import com.makeit.utils.msg.sender.IMsgSender;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Collection; import java.util.List;
@Component @Component
public class MsgSendUtil { public class MsgSendUtil {
@Autowired
private List<IMsgSender> msgSenderList;
/**
* 发送消息
*/
public void send(SendTypeEnum sendTypeEnum, Collection<String> receiverList, String content){
switch (sendTypeEnum){
case SMS:
break;
case MAIL:
break;
case VOICE_SMS:
break;
case JINGQI:
break;
case YUNLING:
break;
case CHILD_WECHAT:
break;
}
}
/** /**
* 发送消息 * 发送消息
*/ */
public void send(MsgSendDTO msgSendDTO){ public void send(MsgSendDTO msgSendDTO){
switch (msgSendDTO.getSendTypeEnum()){ for (IMsgSender msgSender : msgSenderList) {
case SMS: if(msgSender.support(msgSendDTO.getSendTypeEnum())){
break; msgSender.send(msgSendDTO);
case MAIL: }
break;
case VOICE_SMS:
break;
case JINGQI:
break;
case YUNLING:
break;
case CHILD_WECHAT:
break;
} }
} }
} }
server-common/src/main/java/com/makeit/utils/msg/sender/IMsgSender.java
package com.makeit.utils.msg.sender; package com.makeit.utils.msg.sender;
import com.makeit.utils.msg.SendTypeEnum;
import com.makeit.utils.msg.dto.MsgSendDTO; import com.makeit.utils.msg.dto.MsgSendDTO;
...@@ -9,4 +10,6 @@ public interface IMsgSender { ...@@ -9,4 +10,6 @@ public interface IMsgSender {
* @param msgData 消息数据 * @param msgData 消息数据
*/ */
void send(MsgSendDTO msgDTO); void send(MsgSendDTO msgDTO);
boolean support(SendTypeEnum sendTypeEnum);
} }
server-common/src/main/java/com/makeit/utils/msg/sender/MailMsgSender.java
package com.makeit.utils.msg.sender; package com.makeit.utils.msg.sender;
import com.makeit.exception.BusinessException; import com.makeit.exception.BusinessException;
import com.makeit.utils.msg.SendTypeEnum;
import com.makeit.utils.msg.dto.MsgSendDTO; import com.makeit.utils.msg.dto.MsgSendDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -22,7 +23,12 @@ public class MailMsgSender implements IMsgSender { ...@@ -22,7 +23,12 @@ public class MailMsgSender implements IMsgSender {
@Autowired @Autowired
private JavaMailSender mailSender; private JavaMailSender mailSender;
private SendTypeEnum sendTypeEnum = SendTypeEnum.MAIL;
@Override
public boolean support(SendTypeEnum param) {
return this.sendTypeEnum == param;
}
@Override @Override
public void send(MsgSendDTO msgDTO) { public void send(MsgSendDTO msgDTO) {
...@@ -39,4 +45,5 @@ public class MailMsgSender implements IMsgSender { ...@@ -39,4 +45,5 @@ public class MailMsgSender implements IMsgSender {
} }
} }
} }
server-common/src/main/java/com/makeit/utils/msg/sender/SmsMsgSender.java
...@@ -3,6 +3,7 @@ package com.makeit.utils.msg.sender; ...@@ -3,6 +3,7 @@ package com.makeit.utils.msg.sender;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.makeit.exception.BusinessException; import com.makeit.exception.BusinessException;
import com.makeit.utils.msg.SendTypeEnum;
import com.makeit.utils.msg.config.SmsConfig; import com.makeit.utils.msg.config.SmsConfig;
import com.makeit.utils.msg.dto.MsgSendDTO; import com.makeit.utils.msg.dto.MsgSendDTO;
import com.makeit.utils.old.encode.CryptoUtil; import com.makeit.utils.old.encode.CryptoUtil;
...@@ -24,6 +25,13 @@ public class SmsMsgSender implements IMsgSender{ ...@@ -24,6 +25,13 @@ public class SmsMsgSender implements IMsgSender{
@Autowired @Autowired
private SmsConfig smsConfig; private SmsConfig smsConfig;
private SendTypeEnum sendTypeEnum = SendTypeEnum.SMS;
@Override
public boolean support(SendTypeEnum param) {
return this.sendTypeEnum == param;
}
/** /**
* 发送消息 * 发送消息
* *
......
server-common/src/main/java/com/makeit/utils/msg/sender/SmsVoiceSender.java
...@@ -3,6 +3,7 @@ package com.makeit.utils.msg.sender; ...@@ -3,6 +3,7 @@ package com.makeit.utils.msg.sender;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.makeit.exception.BusinessException; import com.makeit.exception.BusinessException;
import com.makeit.utils.msg.SendTypeEnum;
import com.makeit.utils.msg.config.SmsVoiceConfig; import com.makeit.utils.msg.config.SmsVoiceConfig;
import com.makeit.utils.msg.dto.MsgSendDTO; import com.makeit.utils.msg.dto.MsgSendDTO;
import com.makeit.utils.old.encode.CryptoUtil; import com.makeit.utils.old.encode.CryptoUtil;
...@@ -26,6 +27,13 @@ public class SmsVoiceSender implements IMsgSender{ ...@@ -26,6 +27,13 @@ public class SmsVoiceSender implements IMsgSender{
@Autowired @Autowired
private SmsVoiceConfig smsVoiceConfig; private SmsVoiceConfig smsVoiceConfig;
private SendTypeEnum sendTypeEnum = SendTypeEnum.VOICE_SMS;
@Override
public boolean support(SendTypeEnum param) {
return this.sendTypeEnum == param;
}
/** /**
* 发送消息 * 发送消息
* *
......
server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.common.entity.BaseBusEntity;
import com.makeit.common.entity.BaseEntity; import com.makeit.common.entity.BaseEntity;
import com.makeit.common.page.PageReqDTO; import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
...@@ -40,6 +41,7 @@ import com.makeit.utils.user.plat.PlatUserVO; ...@@ -40,6 +41,7 @@ import com.makeit.utils.user.plat.PlatUserVO;
import com.makeit.utils.user.plat.TntUserJoinUtil; import com.makeit.utils.user.plat.TntUserJoinUtil;
import com.makeit.utils.user.wechat.WechatUserInfo; import com.makeit.utils.user.wechat.WechatUserInfo;
import com.makeit.utils.user.wechat.WechatUserUtil; import com.makeit.utils.user.wechat.WechatUserUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -50,6 +52,7 @@ import java.util.ArrayList; ...@@ -50,6 +52,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
/** /**
* @author lixl * @author lixl
...@@ -233,10 +236,11 @@ implements PlatTenantService { ...@@ -233,10 +236,11 @@ implements PlatTenantService {
checkDate(dto); checkDate(dto);
PlatTenant tntTenant = BeanDtoVoUtils.convert(dto, PlatTenant.class); PlatTenant tntTenant = BeanDtoVoUtils.convert(dto, PlatTenant.class);
PlatTenant platTenant = getById(tntTenant.getId()); PlatTenant platTenant = getById(tntTenant.getId());
updateById(tntTenant); //更新同步到iot
iotOrgService.updateIotOrgInfo(tntTenant.getIotOrgId(),dto.getName()); iotOrgService.updateIotOrgInfo(tntTenant.getIotOrgId(),dto.getName());
updateById(tntTenant);
//更新用户的tenantId //更新用户的tenantId
if(!StringUtils.equals(dto.getPlatUserId(),platTenant.getPlatUserId())) { if(!StringUtils.equals(dto.getPlatUserId(),platTenant.getPlatUserId())) {
platUserService.updatePlatUserTenantId(null, dto.getPlatUserId()); platUserService.updatePlatUserTenantId(null, dto.getPlatUserId());
...@@ -260,7 +264,7 @@ implements PlatTenantService { ...@@ -260,7 +264,7 @@ implements PlatTenantService {
platOrg.setName(platTenant.getName()); platOrg.setName(platTenant.getName());
platOrg.setStatus(platTenant.getStatus()); platOrg.setStatus(platTenant.getStatus());
platOrg.setId(platTenant.getId()); platOrg.setId(platTenant.getId());
platOrg.setPath(""); platOrg.setPath("1");
//租户没有父级 //租户没有父级
platOrg.setParentId("1"); platOrg.setParentId("1");
return platOrg; return platOrg;
...@@ -274,6 +278,14 @@ implements PlatTenantService { ...@@ -274,6 +278,14 @@ implements PlatTenantService {
saasOperationLogService.add("saas端-租户账号-详情", id); saasOperationLogService.add("saas端-租户账号-详情", id);
LambdaQueryWrapper<PlatTenantMenu> tenantMenuLambdaQueryWrapper = new LambdaQueryWrapper<PlatTenantMenu>()
.eq(BaseBusEntity::getTenantId, id);
List<PlatTenantMenu> list = platTenantMenuService.list(tenantMenuLambdaQueryWrapper);
if(CollectionUtils.isNotEmpty(list)){
List<String> menuList = list.stream().map(PlatTenantMenu::getMenuId).collect(Collectors.toList());
userVO.setMenuIdList(menuList);
}
return userVO; return userVO;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment