feat: 恢复误删

backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java

 package io.dataease.auth.entity;
 
 
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import java.io.Serializable;
 
 @Data

backend/src/main/java/io/dataease/commons/utils/AuthUtils.java

+package io.dataease.commons.utils;
+
+import io.dataease.auth.util.JWTUtils;
+import io.dataease.base.domain.SysUser;
+import io.dataease.service.sys.SysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AuthUtils {
+
+    private static SysUserService sysUserService;
+
+    @Autowired
+    public void setSysUserService(SysUserService sysUserService) {
+        AuthUtils.sysUserService = sysUserService;
+    }
+
+    public static SysUser getUser(){
+        String token = ServletUtils.getToken();
+        String username = JWTUtils.getUsername(token);
+        SysUser sysUser = new SysUser();
+        sysUser.setUsername(username);
+        SysUser user = sysUserService.findOne(sysUser);
+        return user;
+    }
+}

backend/src/main/java/io/dataease/dto/SystemParameterDTO.java

+package io.dataease.dto;
+
+import io.dataease.base.domain.SystemParameter;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.web.multipart.MultipartFile;
+
+public class SystemParameterDTO extends SystemParameter {
+    @ApiModelProperty("文件")
+    private MultipartFile file;
+    @ApiModelProperty("文件名称")
+    private String fileName;
+
+    public MultipartFile getFile() {
+        return file;
+    }
+
+    public void setFile(MultipartFile file) {
+        this.file = file;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+}

backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java

 package io.dataease.notice.sender;
 
+import io.dataease.base.domain.SysUser;
 import io.dataease.commons.constants.NoticeConstants;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.notice.domain.MessageDetail;
 import io.dataease.notice.domain.UserDetail;
-import io.dataease.service.UserService;
+/*import io.dataease.service.UserService;*/
+import io.dataease.service.sys.SysUserService;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.RegExUtils;
@@ -21,7 +23,7 @@ import java.util.stream.Collectors;
 
 public abstract class AbstractNoticeSender implements NoticeSender {
     @Resource
-    private UserService userService;
+    private SysUserService sysUserService;
 
     protected String getContext(MessageDetail messageDetail, NoticeModel noticeModel) {
         // 如果配置了模版就直接使用模版
@@ -104,7 +106,9 @@ public abstract class AbstractNoticeSender implements NoticeSender {
     }
 
     protected List<String> getUserPhones(List<String> userIds) {
-        List<UserDetail> list = userService.queryTypeByIds(userIds);
+        List<Long> userIdLists = userIds.stream().map(Long::parseLong).collect(Collectors.toList());
+        List<SysUser> list = sysUserService.users(userIdLists);
+        //List<UserDetail> list = userService.queryTypeByIds(userIds);
         List<String> phoneList = new ArrayList<>();
         list.forEach(u -> phoneList.add(u.getPhone()));
         LogUtil.info("收件人地址: " + phoneList);
@@ -112,7 +116,9 @@ public abstract class AbstractNoticeSender implements NoticeSender {
     }
 
     protected List<String> getUserEmails(List<String> userIds) {
-        List<UserDetail> list = userService.queryTypeByIds(userIds);
+        /*List<UserDetail> list = userService.queryTypeByIds(userIds);*/
+        List<Long> userIdLists = userIds.stream().map(Long::parseLong).collect(Collectors.toList());
+        List<SysUser> list = sysUserService.users(userIdLists);
         List<String> phoneList = new ArrayList<>();
         list.forEach(u -> phoneList.add(u.getEmail()));
         LogUtil.info("收件人地址: " + phoneList);

backend/src/main/java/io/dataease/notice/service/NoticeService.java

@@ -2,17 +2,16 @@ package io.dataease.notice.service;
 
 import io.dataease.base.domain.MessageTask;
 import io.dataease.base.domain.MessageTaskExample;
+import io.dataease.base.domain.SysUser;
 import io.dataease.base.mapper.MessageTaskMapper;
 import io.dataease.commons.exception.DEException;
-import io.dataease.commons.user.SessionUser;
-import io.dataease.commons.utils.SessionUtils;
+import io.dataease.commons.utils.AuthUtils;
 import io.dataease.i18n.Translator;
 import io.dataease.notice.domain.MessageDetail;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -24,13 +23,13 @@ public class NoticeService {
     private MessageTaskMapper messageTaskMapper;
 
     public void saveMessageTask(MessageDetail messageDetail) {
-        MessageTaskExample example = new MessageTaskExample();
+        /*MessageTaskExample example = new MessageTaskExample();
         example.createCriteria().andIdentificationEqualTo(messageDetail.getIdentification());
         List<MessageTask> messageTaskLists = messageTaskMapper.selectByExample(example);
         if (messageTaskLists.size() > 0) {
             delMessage(messageDetail.getIdentification());
         }
-        SessionUser user = SessionUtils.getUser();
+        SysUser user = AuthUtils.getUser();
         String orgId = user.getLastOrganizationId();
         long time = System.currentTimeMillis();
         String identification = messageDetail.getIdentification();
@@ -53,7 +52,7 @@ public class NoticeService {
             messageTask.setCreateTime(time);
             setTemplate(messageDetail, messageTask);
             messageTaskMapper.insert(messageTask);
-        }
+        }*/
     }
 
     private void setTemplate(MessageDetail messageDetail, MessageTask messageTask) {
@@ -102,14 +101,14 @@ public class NoticeService {
     }
 
     public List<MessageDetail> searchMessageByType(String type) {
-        SessionUser user = SessionUtils.getUser();
-        String orgId = user.getLastOrganizationId();
+        SysUser user = AuthUtils.getUser();
+        //String orgId = user.getLastOrganizationId();
         List<MessageDetail> messageDetails = new ArrayList<>();
 
         MessageTaskExample example = new MessageTaskExample();
         example.createCriteria()
-                .andTaskTypeEqualTo(type)
-                .andOrganizationIdEqualTo(orgId);
+                .andTaskTypeEqualTo(type);
+                //.andOrganizationIdEqualTo(orgId);
         List<MessageTask> messageTaskLists = messageTaskMapper.selectByExampleWithBLOBs(example);
 
         Map<String, List<MessageTask>> messageTaskMap = messageTaskLists.stream()

backend/src/main/java/io/dataease/service/sys/SysUserService.java

@@ -120,4 +120,9 @@ public class SysUserService {
         return null;
     }
 
+
+    public List<SysUser> users(List<Long> userIds){
+        return userIds.stream().map(sysUserMapper::selectByPrimaryKey).collect(Collectors.toList());
+    }
+
 }