合并编辑角色和分配菜单接口

saas-module/src/main/java/com/makeit/controller/plat/PlatRoleController.java

@@ -131,6 +131,7 @@ public class PlatRoleController {
 
     @Action(module = "平台端-角色", name = "分配菜单", code = "tnt:role:assignMenuList")
     @ApiOperation("分配菜单")
+    @Deprecated
     @PostMapping("assignMenuList")
     public ApiResponseEntity<Void> assignMenuList(@RequestBody PlatRoleMenuDTO roleMenuDTO) {
         platRoleService.assignMenuList(roleMenuDTO);

saas-module/src/main/java/com/makeit/controller/saas/PlatTenantController.java

@@ -120,6 +120,7 @@ public class PlatTenantController {
     @Action(module = "租户管理-租户", name = "租户分配菜单", code = "saas:tenant:assignMenuList")
     @ApiOperation("租户分配菜单")
     @PostMapping("assignMenuList")
+    @Deprecated
     public ApiResponseEntity<?> assignMenuList(@RequestBody PlatTenantMenuDTO tntTenantMenuDTO){
         platTenantService.assignMenuList(tntTenantMenuDTO);
         return ApiResponseUtils.success();

saas-module/src/main/java/com/makeit/controller/saas/SaasRoleController.java

@@ -3,6 +3,8 @@ package com.makeit.controller.saas;
 
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.dto.StatusDTO;
+import com.makeit.common.page.PageReqDTO;
+import com.makeit.common.page.PageVO;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.global.annotation.Action;
@@ -38,14 +40,21 @@ public class SaasRoleController {
     private SaasRoleService saasRoleService;
 
     @Action(module = "saas端-角色", name = "列表", code = "saas:role:list")
-    @ApiOperation("列表")
+    @ApiOperation("列表不分页")
     @PostMapping("list")
     public ApiResponseEntity<List<SaasRoleDTOVO>> list(@RequestBody SaasRoleDTOVO dto){
         return ApiResponseUtils.success(saasRoleService.list(dto));
     }
 
+    @Action(module = "saas端-角色", name = "列表", code = "saas:role:page")
+    @ApiOperation("列表分页")
+    @PostMapping("page")
+    public ApiResponseEntity<PageVO<SaasRoleDTOVO>> page(@RequestBody PageReqDTO<SaasRoleDTOVO> dto){
+        return ApiResponseUtils.success(saasRoleService.page(dto));
+    }
+
 
-    @ApiOperation("列表(AuthIgnore)")
+    @ApiOperation("列表不分页(AuthIgnore)")
     @PostMapping("listAuthIgnore")
     public ApiResponseEntity<List<SaasRoleDTOVO>> listAuthIgnore(@RequestBody SaasRoleDTOVO dto){
         return ApiResponseUtils.success(saasRoleService.list(dto));
@@ -109,6 +118,7 @@ public class SaasRoleController {
     @Action(module = "saas端-角色", name = "分配菜单", code = "saas:role:assignMenuList")
     @ApiOperation("分配菜单")
     @PostMapping("assignMenuList")
+    @Deprecated
     public ApiResponseEntity<?> assignMenuList(@RequestBody SaasRoleMenuDTO roleMenuDTO){
         saasRoleService.assignMenuList(roleMenuDTO);
         return ApiResponseUtils.success();

server-common/src/main/java/com/makeit/module/admin/dto/plat/PlatRoleDTOVO.java

@@ -32,4 +32,7 @@ public class PlatRoleDTOVO extends BaseOrgDTO implements Serializable {
     @ApiModelProperty(value = "角色名称集合")
     private List<String> nameList;
 
+    @ApiModelProperty(value = "菜单集合id")
+    private List<String> menuIdList;
+
 }

server-common/src/main/java/com/makeit/module/admin/dto/plat/PlatTenantDTOVO.java

@@ -51,4 +51,7 @@ public class PlatTenantDTOVO extends BaseIdDTO {
     @ApiModelProperty(value = "告警渠道")
     private String alertChannel;
 
+    @ApiModelProperty(value = "菜单id集合")
+    private List<String> menuIdList;
+
 }

server-common/src/main/java/com/makeit/module/admin/dto/saas/SaasRoleDTOVO.java

@@ -11,6 +11,7 @@ import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @ApiModel("SAAS端角色 列表 新增 编辑 详情")
 @Data
@@ -52,5 +53,8 @@ public class SaasRoleDTOVO extends BaseIdDTO implements Serializable {
     @ApiModelProperty(value = "关键词 查询用")
     private String keyword;
 
+    @ApiModelProperty(value = "菜单id集合")
+    private List<String> menuIdList;
+
 
 }

server-common/src/main/java/com/makeit/module/admin/dto/saas/SaasUserDTOVO.java

@@ -65,4 +65,8 @@ public class SaasUserDTOVO extends BaseIdDTO implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "角色集合")
     private List<SaasRoleDTOVO> roleList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "角色id集合")
+    private List<String> roleIdList;
 }

server-common/src/main/java/com/makeit/utils/msg/MsgUtil.java

+package com.makeit.utils.msg;
+
+import com.makeit.utils.msg.dto.MsgDTO;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MsgUtil {
+
+    /**
+     * 发送消息并保存记录
+     */
+    public void send(MsgDTO msgDTO){
+
+    }
+}

server-common/src/main/java/com/makeit/utils/msg/SendTypeEnum.java

+package com.makeit.utils.msg;
+
+import com.makeit.enums.BaseEnum;
+import com.makeit.utils.sys.SysDictUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum SendTypeEnum implements BaseEnum {
+    //1-短信 2-邮件 3-语音短信 4-云龄工单 5-晶奇工单
+    SMS("alarm.sendType.sms"),
+    MAIL("alarm.sendType.mail"),
+    VOICE_SMS("alarm.sendType.voiceSms"),
+    YUNLING("alarm.sendType.yunling"),
+    JINGQI("alarm.sendType.jingqi");
+
+
+    private String code;
+
+    public String getValue() {
+        return SysDictUtil.getValue(code);
+    }
+}

server-common/src/main/java/com/makeit/utils/msg/dto/MsgDTO.java

+package com.makeit.utils.msg.dto;
+
+import com.makeit.utils.msg.SendTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MsgDTO {
+
+    private SendTypeEnum sendTypeEnum;
+
+    private String subject;
+
+    private List<String> receiverList;
+
+    private String oriContent;
+
+    private String[] param;
+
+    private String sendContent;
+
+    public void setParam(String... param) {
+        this.param = param;
+    }
+
+    public String getSendContent() {
+        replaceParam();
+        return sendContent;
+    }
+
+    private void replaceParam(){
+        if(StringUtils.isNotBlank(sendContent)){
+            return;
+        }
+        Pattern p = Pattern.compile("\\[#\\d+\\]|\\[#[\\p{IsHan}]+\\]|\\[#[^\\]]*\\]");
+        Matcher m = p.matcher(oriContent);
+        StringBuffer sb = new StringBuffer();
+        if(!m.find()){
+            sendContent= oriContent;
+        }
+        m.reset();
+        int i = 0;
+        while (m.find()) {
+            m.appendReplacement(sb, param[i]);
+            i++;
+        }
+        m.appendTail(sb);
+        sendContent=sb.toString();
+    }
+}

server-common/src/main/java/com/makeit/utils/msg/dto/SendResult.java

+package com.makeit.utils.msg.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * <pre>
+ * 发送结果
+ * </pre>
+ *
+ * @author <a href="https://github.com/rememberber">RememBerBer</a>
+ * @since 2019/6/15.
+ */
+@Getter
+@Setter
+@ToString
+public class SendResult {
+    private boolean success = false;
+
+    private String info;
+}

server-common/src/main/java/com/makeit/utils/msg/sender/IMsgSender.java

+package com.makeit.utils.msg.sender;
+
+import com.makeit.utils.msg.dto.MsgDTO;
+import com.makeit.utils.msg.dto.SendResult;
+
+
+public interface IMsgSender {
+    /**
+     * 发送消息
+     * @param msgData 消息数据
+     */
+    SendResult send(MsgDTO MsgDTO);
+}

server-common/src/main/java/com/makeit/utils/msg/sender/MailMsgSender.java

+package com.makeit.utils.msg.sender;
+
+import com.makeit.utils.msg.dto.MsgDTO;
+import com.makeit.utils.msg.dto.SendResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Component;
+
+import javax.mail.internet.MimeMessage;
+
+@Component
+@Slf4j
+public class MailMsgSender implements IMsgSender {
+
+
+    @Value("${spring.mail.username}")
+    private String from;
+
+    @Autowired
+    private JavaMailSender mailSender;
+
+
+
+    @Override
+    public SendResult send(MsgDTO msgDTO) {
+        SendResult sendResult = new SendResult();
+        try {
+            MimeMessage message = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(message, true);
+            helper.setFrom(from);
+            helper.setTo(msgDTO.getReceiverList().toArray(new String[msgDTO.getReceiverList().size()]));
+            helper.setSubject(msgDTO.getSubject());
+            helper.setText(msgDTO.getSendContent(), false);
+            mailSender.send(message);
+        } catch (Exception e) {
+            sendResult.setSuccess(false);
+            sendResult.setInfo(e.getMessage());
+        }
+        sendResult.setSuccess(true);
+        return sendResult;
+
+    }
+
+}

server-module/src/main/java/com/makeit/module/controller/alarm/PlatAlarmRecordController.java

@@ -8,6 +8,8 @@ import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
+import com.makeit.utils.msg.dto.MsgDTO;
+import com.makeit.utils.msg.sender.MailMsgSender;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collections;
+
 @Api(tags = "告警记录")
 @RestController
 @RequestMapping("/plat/alarm-record")
@@ -48,5 +52,18 @@ public class PlatAlarmRecordController {
         return ApiResponseUtils.success();
     }
 
+    @Autowired
+    private MailMsgSender mailMsgSender;
+
+    @ApiOperation("测试消息")
+    @PostMapping("testMsg")
+    public ApiResponseEntity<Void> testMsg(@RequestBody BaseIdDTO dto) {
+        MsgDTO msgDTO = new MsgDTO();
+        msgDTO.setSubject("测试消息");
+        msgDTO.setReceiverList(Collections.singletonList("994997968@qq.com"));
+        msgDTO.setOriContent("测试发送邮箱");
+        mailMsgSender.send(msgDTO);
+        return ApiResponseUtils.success();
+    }
 }
 

server-module/src/main/java/com/makeit/module/controller/wechat/alarm/WechatPlatAlarmRecordController.java

+package com.makeit.module.controller.wechat.alarm;
+
+
+import com.makeit.common.dto.BaseIdDTO;
+import com.makeit.common.page.PageReqDTO;
+import com.makeit.common.page.PageVO;
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
+import com.makeit.service.platform.alarm.PlatAlarmRecordService;
+import com.makeit.utils.msg.dto.MsgDTO;
+import com.makeit.utils.msg.sender.MailMsgSender;
+import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Collections;
+
+@Api(tags = "小程序-告警记录")
+@RestController
+@RequestMapping("/wechat/plat/alarm-record")
+public class WechatPlatAlarmRecordController {
+
+    @Autowired
+    private PlatAlarmRecordService platAlarmRecordService;
+
+    @ApiOperation("列表")
+    @PostMapping("page")
+    public ApiResponseEntity<PageVO<PlatAlarmRecordVO>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
+        return ApiResponseUtils.success(platAlarmRecordService.page(dto));
+    }
+    @ApiOperation("查看")
+    @PostMapping("view")
+    public ApiResponseEntity<PlatAlarmRecordVO> view(@RequestBody BaseIdDTO dto) {
+        return ApiResponseUtils.success(platAlarmRecordService.view(dto.getId()));
+    }
+    @ApiOperation("处理")
+    @PostMapping("deal")
+    public ApiResponseEntity<Void> deal(@RequestBody BaseIdDTO dto) {
+        platAlarmRecordService.deal(dto.getId());
+        return ApiResponseUtils.success();
+    }
+    @ApiOperation("通知家属")
+    @PostMapping("notice")
+    public ApiResponseEntity<Void> notice(@RequestBody BaseIdDTO dto) {
+        platAlarmRecordService.notice(dto.getId());
+        return ApiResponseUtils.success();
+    }
+
+    @Autowired
+    private MailMsgSender mailMsgSender;
+
+    @ApiOperation("测试消息")
+    @PostMapping("testMsg")
+    public ApiResponseEntity<Void> testMsg(@RequestBody BaseIdDTO dto) {
+        MsgDTO msgDTO = new MsgDTO();
+        msgDTO.setSubject("测试消息");
+        msgDTO.setReceiverList(Collections.singletonList("994997968@qq.com"));
+        msgDTO.setOriContent("测试发送邮箱");
+        mailMsgSender.send(msgDTO);
+        return ApiResponseUtils.success();
+    }
+}
+

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -10,17 +10,21 @@ import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
 import com.makeit.entity.platform.alarm.PlatAlarmRecord;
 import com.makeit.enums.CommonEnum;
 import com.makeit.mapper.platform.alarm.PlatAlarmRecordMapper;
+import com.makeit.service.platform.alarm.PlatAlarmConfigService;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.PageUtil;
+import com.makeit.utils.sql.join.JoinUtil;
 import com.makeit.utils.user.common.CommonUserUtil;
 import com.makeit.utils.user.common.CommonUserVO;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 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 java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -32,6 +36,8 @@ import java.util.Objects;
 @Service
 public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMapper, PlatAlarmRecord>
 implements PlatAlarmRecordService{
+    @Autowired
+    private PlatAlarmConfigService platAlarmConfigService;
 
     @Override
     public PageVO<PlatAlarmRecordVO> page(PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
@@ -41,6 +47,11 @@ implements PlatAlarmRecordService{
         Page<PlatAlarmRecord> page = page(mpPage, lambdaQueryWrapper);
         List<PlatAlarmRecord> records = page.getRecords();
         List<PlatAlarmRecordVO> dtos = BeanDtoVoUtils.listVo(records, PlatAlarmRecordVO.class);
+
+        JoinUtil.join(dtos,platAlarmConfigService,PlatAlarmRecordVO::getAlarmId,BaseEntity::getId,(t,m)->{
+            t.setNotifyRelation(m.getNotifyRelation());
+        });
+
         return PageUtil.toPageVO(dtos,page);
     }
 
@@ -61,6 +72,9 @@ implements PlatAlarmRecordService{
     public PlatAlarmRecordVO view(String recordId) {
         PlatAlarmRecord platAlarmRecord = getById(recordId);
         PlatAlarmRecordVO vo = BeanDtoVoUtils.convert(platAlarmRecord, PlatAlarmRecordVO.class);
+        JoinUtil.join(Arrays.asList(vo),platAlarmConfigService,PlatAlarmRecordVO::getAlarmId,BaseEntity::getId,(t,m)->{
+            t.setNotifyRelation(m.getNotifyRelation());
+        });
         return vo;
     }
 

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatRoleServiceImpl.java

@@ -22,6 +22,7 @@ import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.IsTenantAccountEnum;
 import com.makeit.exception.BusinessException;
+import com.makeit.global.aspect.tenant.TenantIdUtil;
 import com.makeit.mapper.platform.auth.PlatRoleMapper;
 import com.makeit.module.admin.dto.plat.PlatRoleDTOVO;
 import com.makeit.service.platform.auth.PlatOrgService;
@@ -160,7 +161,9 @@ implements PlatRoleService {
     @Override
     public String add(PlatRoleDTOVO dto) {
         check(dto);
-        save(BeanDtoVoUtils.convert(dto, PlatRole.class));
+        PlatRole platRole = BeanDtoVoUtils.convert(dto, PlatRole.class);
+        save(platRole);
+        assignMenuList(platRole.getId(),dto.getMenuIdList());
         return dto.getId();
     }
 
@@ -169,7 +172,9 @@ implements PlatRoleService {
     public void edit(PlatRoleDTOVO dto) {
         adminRoleCantDo(dto.getId());
         check(dto);
-        updateById(BeanDtoVoUtils.convert(dto, PlatRole.class));
+        PlatRole platRole = BeanDtoVoUtils.convert(dto, PlatRole.class);
+        updateById(platRole);
+        assignMenuList(platRole.getId(),dto.getMenuIdList());
     }
 
     @Override
@@ -233,16 +238,23 @@ implements PlatRoleService {
     @Override
     public void assignMenuList(PlatRoleMenuDTO roleMenuDTO) {
 
-        adminRoleCantDo(roleMenuDTO.getRoleId());
+        assignMenuList(roleMenuDTO.getRoleId(),roleMenuDTO.getMenuIdList());
+    }
+
+    @Transactional
+    public void assignMenuList(String roleId,List<String> menuIdList) {
+        String tenantId = TenantIdUtil.getTenantId();
+
+        //adminRoleCantDo(roleId);
 
         platRoleMenuService.remove(new QueryWrapper<PlatRoleMenu>().lambda()
-                .eq(PlatRoleMenu::getRoleId, roleMenuDTO.getRoleId()));
+                .eq(PlatRoleMenu::getRoleId, roleId));
 
-        List<PlatRoleMenu> roleMenuList = StreamUtil.map(roleMenuDTO.getMenuIdList(), e -> {
+        List<PlatRoleMenu> roleMenuList = StreamUtil.map(menuIdList, e -> {
             PlatRoleMenu tntRoleMenu = new PlatRoleMenu();
-            tntRoleMenu.setRoleId(roleMenuDTO.getRoleId());
+            tntRoleMenu.setRoleId(roleId);
             tntRoleMenu.setMenuId(e);
-            tntRoleMenu.setTenantId(roleMenuDTO.getTenantId());
+            tntRoleMenu.setTenantId(tenantId);
 
             return tntRoleMenu;
         });

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -755,10 +755,10 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         platUserRoleService.remove(new QueryWrapper<PlatUserRole>().lambda()
                 .eq(PlatUserRole::getUserId, dto.getId()));
         if (dto.getRoleList() != null) {
-            List<PlatUserRole> userRoleList = StreamUtil.map(dto.getRoleList(), e -> {
+            List<PlatUserRole> userRoleList = StreamUtil.map(dto.getRoleIdList(), e -> {
                 PlatUserRole tntUserRole = new PlatUserRole();
                 tntUserRole.setUserId(dto.getId());
-                tntUserRole.setRoleId(e.getId());
+                tntUserRole.setRoleId(e);
 
                 return tntUserRole;
             });

server-service/src/main/java/com/makeit/service/saas/SaasRoleService.java

@@ -2,6 +2,8 @@ package com.makeit.service.saas;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.makeit.common.dto.StatusDTO;
+import com.makeit.common.page.PageReqDTO;
+import com.makeit.common.page.PageVO;
 import com.makeit.entity.saas.SaasRole;
 import com.makeit.module.admin.dto.saas.SaasRoleDTOVO;
 import com.makeit.module.admin.dto.saas.SaasRoleMenuDTO;
@@ -18,6 +20,8 @@ public interface SaasRoleService extends IService<SaasRole> {
 
     List<SaasRoleDTOVO> list(SaasRoleDTOVO dto);
 
+    PageVO<SaasRoleDTOVO> page(PageReqDTO<SaasRoleDTOVO> dto);
+
     void add(SaasRoleDTOVO dto);
 
     void edit(SaasRoleDTOVO dto);

server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java

@@ -175,19 +175,24 @@ implements PlatTenantService {
     @Override
     public void assignMenuList(PlatTenantMenuDTO tntTenantMenuDTO) {
 
+        assignMenuList(tntTenantMenuDTO.getTenantId(),tntTenantMenuDTO.getMenuIdList());
+
+    }
+
+    @Transactional
+    public void assignMenuList(String tenantId,List<String> menuIdList) {
         platTenantMenuService.remove(new QueryWrapper<PlatTenantMenu>().lambda()
-                .eq(PlatTenantMenu::getTenantId, tntTenantMenuDTO.getTenantId()));
+                .eq(PlatTenantMenu::getTenantId, tenantId));
 
-        List<PlatTenantMenu> tntTenantMenuList = StreamUtil.map(tntTenantMenuDTO.getMenuIdList(), e -> {
+        List<PlatTenantMenu> tntTenantMenuList = StreamUtil.map(menuIdList, e -> {
             PlatTenantMenu tntTenantMenu = new PlatTenantMenu();
             tntTenantMenu.setMenuId(e);
-            tntTenantMenu.setTenantId(tntTenantMenuDTO.getTenantId());
+            tntTenantMenu.setTenantId(tenantId);
 
             return tntTenantMenu;
         });
 
         platTenantMenuService.saveBatch(tntTenantMenuList);
-
     }
 
 
@@ -216,6 +221,8 @@ implements PlatTenantService {
         PlatOrg platOrg = convertToPlatOrg(tntTenant);
         platOrgService.save(platOrg);
 
+        //分配菜单
+        assignMenuList(tntTenant.getId(),dto.getMenuIdList());
         return tntTenant.getId();
     }
 
@@ -238,6 +245,9 @@ implements PlatTenantService {
         //更新组织表
         platOrgService.edit(platOrg);
 
+        //分配菜单
+        assignMenuList(tntTenant.getId(),dto.getMenuIdList());
+
         saasOperationLogService.add("saas端-租户账号-编辑", dto.getId());
 
     }

server-service/src/main/java/com/makeit/service/saas/impl/SaasRoleServiceImpl.java

 package com.makeit.service.saas.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.common.dto.StatusDTO;
+import com.makeit.common.page.PageReqDTO;
+import com.makeit.common.page.PageVO;
 import com.makeit.entity.saas.SaasRole;
 import com.makeit.entity.saas.SaasRoleMenu;
 import com.makeit.entity.saas.SaasUserRole;
@@ -17,6 +21,7 @@ import com.makeit.service.saas.SaasRoleMenuService;
 import com.makeit.service.saas.SaasRoleService;
 import com.makeit.service.saas.SaasUserRoleService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
+import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +50,14 @@ implements SaasRoleService{
 
     @Override
     public List<SaasRoleDTOVO> list(SaasRoleDTOVO dto) {
-        List<SaasRole> platRoleList = list(new QueryWrapper<SaasRole>().lambda()
+        List<SaasRole> platRoleList = list(getQueryWrapper(dto)
+        );
+
+        return BeanDtoVoUtils.listVo(platRoleList, SaasRoleDTOVO.class);
+    }
+
+    private LambdaQueryWrapper<SaasRole> getQueryWrapper(SaasRoleDTOVO dto) {
+        return new QueryWrapper<SaasRole>().lambda()
                 .like(StringUtils.isNotBlank(dto.getName()), SaasRole::getName, dto.getName())
                 .like(StringUtils.isNotBlank(dto.getCode()), SaasRole::getCode, dto.getCode())
                 .and(StringUtils.isNotBlank(dto.getKeyword()), qw -> {
@@ -54,10 +66,17 @@ implements SaasRoleService{
                             .like(StringUtils.isNotBlank(dto.getKeyword()), SaasRole::getCode, dto.getKeyword());
                 })
                 .eq(StringUtils.isNotBlank(dto.getStatus()), SaasRole::getStatus, dto.getStatus())
-                .orderByDesc(SaasRole::getCreateDate)
-        );
+                .orderByDesc(SaasRole::getCreateDate);
+    }
 
-        return BeanDtoVoUtils.listVo(platRoleList, SaasRoleDTOVO.class);
+    @Override
+    public PageVO<SaasRoleDTOVO> page(PageReqDTO<SaasRoleDTOVO> pageReqDTO) {
+        SaasRoleDTOVO data = pageReqDTO.getData();
+        Page<SaasRole> mpPage = PageUtil.toMpPage(pageReqDTO);
+        Page<SaasRole> page = page(mpPage, getQueryWrapper(data));
+        List<SaasRole> records = page.getRecords();
+        List<SaasRoleDTOVO> saasRoleDTOVOS = BeanDtoVoUtils.listVo(records, SaasRoleDTOVO.class);
+        return PageUtil.toPageVO(saasRoleDTOVOS,page);
     }
 
     private void check(SaasRoleDTOVO dto) {
@@ -78,14 +97,18 @@ implements SaasRoleService{
     @Override
     public void add(SaasRoleDTOVO dto) {
         check(dto);
-        save(BeanDtoVoUtils.convert(dto, SaasRole.class));
+        SaasRole saasRole = BeanDtoVoUtils.convert(dto, SaasRole.class);
+        save(saasRole);
+        assignMenuList(saasRole.getId(),dto.getMenuIdList());
     }
 
     @Transactional
     @Override
     public void edit(SaasRoleDTOVO dto) {
         check(dto);
-        updateById(BeanDtoVoUtils.convert(dto, SaasRole.class));
+        SaasRole saasRole = BeanDtoVoUtils.convert(dto, SaasRole.class);
+        updateById(saasRole);
+        assignMenuList(saasRole.getId(),dto.getMenuIdList());
     }
 
     @Override
@@ -142,11 +165,16 @@ implements SaasRoleService{
     public void assignMenuList(SaasRoleMenuDTO roleMenuDTO) {
         //removeAssignMenuList(roleMenuDTOList);
 
-        saasRoleMenuService.remove(new QueryWrapper<SaasRoleMenu>().lambda().eq(SaasRoleMenu::getRoleId, roleMenuDTO.getRoleId()));
+        assignMenuList(roleMenuDTO.getRoleId(),roleMenuDTO.getMenuIdList());
+    }
+
+    @Transactional
+    public void assignMenuList(String roleId,List<String> menuIdList) {
+        saasRoleMenuService.remove(new QueryWrapper<SaasRoleMenu>().lambda().eq(SaasRoleMenu::getRoleId, roleId));
 
-        List<SaasRoleMenu> roleMenuList = StreamUtil.map(roleMenuDTO.getMenuIdList(), e -> {
+        List<SaasRoleMenu> roleMenuList = StreamUtil.map(menuIdList, e -> {
             SaasRoleMenu platRoleMenu = new SaasRoleMenu();
-            platRoleMenu.setRoleId(roleMenuDTO.getRoleId());
+            platRoleMenu.setRoleId(roleId);
             platRoleMenu.setMenuId(e);
             return platRoleMenu;
         });

server-service/src/main/java/com/makeit/service/saas/impl/SaasUserServiceImpl.java

@@ -187,12 +187,12 @@ implements SaasUserService{
         saasUserRoleService.remove(new QueryWrapper<SaasUserRole>().lambda()
                 .eq(SaasUserRole::getUserId, dto.getId()));
         if (CollectionUtils.isNotEmpty(dto.getRoleList())) {
-            List<SaasUserRole> userRoleList = StreamUtil.map(dto.getRoleList(), e -> {
-                SaasUserRole platUserRole = new SaasUserRole();
-                platUserRole.setUserId(dto.getId());
-                platUserRole.setRoleId(e.getId());
+            List<SaasUserRole> userRoleList = StreamUtil.map(dto.getRoleIdList(), e -> {
+                SaasUserRole saasUserRole = new SaasUserRole();
+                saasUserRole.setUserId(dto.getId());
+                saasUserRole.setRoleId(e);
 
-                return platUserRole;
+                return saasUserRole;
             });
             saasUserRoleService.saveBatch(userRoleList);
 

server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java

@@ -22,7 +22,13 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value="PlatAlarmRecord对象", description="告警记录")
 public class PlatAlarmRecordVO extends BaseTenantDTO {
+    /**
+     * 关联告警配置
+     */
+    private String alarmId;
 
+    @ApiModelProperty(value = "通知家属 数据字典 1、同步通知 2 可选通知 3 不通知")
+    private String notifyRelation;
 
     @ApiModelProperty(value = "告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常")
     private String alarmType;

server-service/src/main/java/com/makeit/vo/platform/auth/PlatPersonDTOVO.java

@@ -77,4 +77,8 @@ public class PlatPersonDTOVO extends BaseIdDTO {
     @ApiModelProperty(value = "角色集合")
     private List<PlatRoleDTOVO> roleList;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "角色Id集合")
+    private List<String> roleIdList;
+
 }

server-web/src/main/resources/application-dev.yml

@@ -32,6 +32,24 @@ spring:
     #redis库
     database: 1
 
+
+  #邮件发送配置
+  mail:
+    host: smtp.qq.com
+    username: 994997968@qq.com
+    password: jctyarhjddstbfef
+    protocol: smtps
+    default-encoding: UTF-8
+    properties:
+      default-encoding: utf-8
+      mail:
+        smtp:
+          port: 587
+          auth: true
+          starttls:
+            enable: true
+            required: true
+
 sign:
   flag: false