Merge pull request 'bug:消息修改' (#16) from feature-jie into develop

Reviewed-on: #16
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>

src/main/java/com/jsl/oa/aspect/BusinessAop.java

@@ -94,7 +94,9 @@ public class BusinessAop {
         }
         Object result = pjp.proceed();
         log.info("<==[DAO] 返回数据类型 {}", declaringType.descriptorString());
-        log.debug("\t> 传出信息：{}", result.toString());
+        if (result != null) {
+            log.debug("\t> 传出信息：{}", result);
+        }
         return result;
     }
 }

src/main/java/com/jsl/oa/mapper/ProjectMapper.java

@@ -126,7 +126,7 @@ public interface ProjectMapper {
 
 
     @Select("select * from organize_oa.oa_project_child where "
-            + "DATE (created_at) = DATE (#{threeDaysLater}) and status = 0")
+            + "DATE (created_at) = DATE (#{threeDaysLater}) ")
     List<ProjectChildDO> getProjectChildByTime(LocalDateTime threeDaysLater);
 
 

src/main/java/com/jsl/oa/model/dodata/MessageDO.java

@@ -26,6 +26,8 @@ public class MessageDO {
     private String title;
     private String text;
     private Integer isDelete;
+    private String type;
+    private Long toId;
     private Timestamp createdAt;
     private Timestamp deletedAt;
 

src/main/java/com/jsl/oa/model/vodata/MessageAddVO.java

@@ -13,6 +13,6 @@ public class MessageAddVO {
     private Long uid;
     private Long sid;
     private String type;
-    private Integer toId;
+    private Long toId;
 
 }

src/main/java/com/jsl/oa/model/vodata/MessageGetVO.java

@@ -9,9 +9,12 @@ import java.sql.Timestamp;
 @Accessors(chain = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class MessageGetVO {
+    private Long id;
     private String text;
     private String title;
     private Timestamp createdAt;
     private String senderName;
+    private String type;
+    private Long toId;
 
 }

src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java

@@ -1,6 +1,4 @@
 package com.jsl.oa.services.impl;
-
-import com.jsl.oa.annotations.UserAbleToUse;
 import com.jsl.oa.dao.UserDAO;
 import com.jsl.oa.mapper.MessageMapper;
 import com.jsl.oa.mapper.ProjectMapper;
@@ -39,7 +37,7 @@ public class MessageServiceImpl implements MessageService {
     private final ProjectMapper projectMapper;
 
     @Override
-    @UserAbleToUse
+
     public BaseResponse messageDelete(Long mid, HttpServletRequest request) {
         //获取消息数据
         MessageDO messageDO = messageMapper.getMessageById(mid);
@@ -57,7 +55,7 @@ public class MessageServiceImpl implements MessageService {
 
     @SuppressWarnings("checkstyle:Regexp")
     @Override
-    @UserAbleToUse
+
     public BaseResponse messageGet(LocalDateTime beginTime,
                                    LocalDateTime endTime,
                                    Integer page,
@@ -73,12 +71,19 @@ public class MessageServiceImpl implements MessageService {
         List<MessageGetVO> messageGetVOList = new ArrayList<>();
         for (MessageDO messageDO : messageDOList) {
             MessageGetVO messageGetVO1 = new MessageGetVO();
+            messageGetVO1.setId(messageDO.getId());
             messageGetVO1.setText(messageDO.getText());
             messageGetVO1.setTitle(messageDO.getTitle());
             messageGetVO1.setCreatedAt(messageDO.getCreatedAt());
             if (messageDO.getSid() != null) {
                 messageGetVO1.setSenderName(userDAO.getUserById(messageDO.getSid()).getUsername());
             }
+            if (messageDO.getToId() != null) {
+                messageGetVO1.setToId(messageDO.getToId());
+            }
+            if (messageDO.getType() != null) {
+                messageGetVO1.setType(messageDO.getType());
+            }
             messageGetVOList.add(messageGetVO1);
         }
         //分页返回
@@ -123,7 +128,7 @@ public class MessageServiceImpl implements MessageService {
             String moddleName = projectMapper.getModuleById(moddleId).getName();
             messageAddVO.setText(senderName + "指派了" + projectName + "项目的" + systemName + "子系统的" + moddleName + "子模块给您");
         }
-        messageAddVO.setType("跳转审批页");
+        messageAddVO.setType("Review");
         messageMapper.messageAdd(messageAddVO);
     }
 
@@ -159,7 +164,7 @@ public class MessageServiceImpl implements MessageService {
         } else {
             messageAddVO.setText("您申请的" + projectName + "项目的" + systemName + "系统的" + moddleName + "模块负责人未通过");
         }
-        messageAddVO.setType("消息详情");
+        messageAddVO.setType("Message");
         messageMapper.messageAdd(messageAddVO);
     }
 
@@ -195,8 +200,8 @@ public class MessageServiceImpl implements MessageService {
             } else if (type == 1) {
                 messageAddVO.setText("项目负责人" + senderName + "上传了文档到" + projectName + "项目");
             }
-            messageAddVO.setType("跳转项目页");
-            messageAddVO.setToId(pId);
+            messageAddVO.setType("Project");
+            messageAddVO.setToId(pId.longValue());
             messageMapper.messageAdd(messageAddVO);
         }
     }
@@ -244,8 +249,8 @@ public class MessageServiceImpl implements MessageService {
                     messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的"
                             + systemName + "系统的系统周期/工作量");
                 }
-                messageAddVO.setType("跳转系统页");
-                messageAddVO.setToId(systmeId);
+                messageAddVO.setType("Project_child");
+                messageAddVO.setToId(systmeId.longValue());
                 messageMapper.messageAdd(messageAddVO);
             }
         }
@@ -308,8 +313,8 @@ public class MessageServiceImpl implements MessageService {
                 String moddleName = projectWorkDO.getName();
                 messageAddVO.setText("您负责的" + projectName + "项目的" + systemName + "系统的" + moddleName + "模块"
                         + "还有七天就要到期了，请及时处理");
-                messageAddVO.setType("跳转模块页");
-                messageAddVO.setToId(projectWorkDO.getId().intValue());
+                messageAddVO.setType("Project_module");
+                messageAddVO.setToId(projectWorkDO.getId());
                 messageMapper.messageAdd(messageAddVO);
             }
         }
@@ -327,8 +332,8 @@ public class MessageServiceImpl implements MessageService {
                 String moddleName = projectWorkDO.getName();
                 messageAddVO.setText("您负责的" + projectName + "项目的" + systemName + "系统的" + moddleName + "模块"
                         + "还有三天就要到期了，请及时处理");
-                messageAddVO.setType("跳转模块页");
-                messageAddVO.setToId(projectWorkDO.getId().intValue());
+                messageAddVO.setType("Project_module");
+                messageAddVO.setToId(projectWorkDO.getId());
                 messageMapper.messageAdd(messageAddVO);
             }
         }
@@ -344,8 +349,8 @@ public class MessageServiceImpl implements MessageService {
                 String projectName = projectMapper.tgetProjectById(projectChildDO.getProjectId().intValue()).getName();
                 String systemName = projectChildDO.getName();
                 messageAddVO.setText("您负责的" + projectName + "项目的" + systemName + "系统还有七天就要到期了，请及时处理");
-                messageAddVO.setType("跳转系统页");
-                messageAddVO.setToId(projectChildDO.getId().intValue());
+                messageAddVO.setType("Project_child");
+                messageAddVO.setToId(projectChildDO.getId());
                 messageMapper.messageAdd(messageAddVO);
             }
         }
@@ -360,8 +365,8 @@ public class MessageServiceImpl implements MessageService {
                 String projectName = projectMapper.tgetProjectById(projectChildDO.getProjectId().intValue()).getName();
                 String systemName = projectChildDO.getName();
                 messageAddVO.setText("您负责的" + projectName + "项目的" + systemName + "系统还有三天就要到期了，请及时处理");
-                messageAddVO.setType("跳转系统页");
-                messageAddVO.setToId(projectChildDO.getId().intValue());
+                messageAddVO.setType("Project_child");
+                messageAddVO.setToId(projectChildDO.getId());
                 messageMapper.messageAdd(messageAddVO);
             }
 

src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java

@@ -157,7 +157,7 @@ public class UserServiceImpl implements UserService {
                     if (roleUserDO == null) {
                         return ResultUtil.error(ErrorCode.NOT_PERMISSION);
                     }
-                    RoleDO roleDO = roleDAO.getRoleByRoleName("admin");
+                    RoleDO roleDO = roleDAO.getRoleByRoleName("console");
                     if (!roleUserDO.getRid().equals(roleDO.getId())) {
                         return ResultUtil.error(ErrorCode.NOT_PERMISSION);
                     }

src/main/java/com/jsl/oa/utils/Processing.java

@@ -363,8 +363,8 @@ public class Processing {
         projectSimpleVO.setId(projectDO.getId());
         projectSimpleVO.setName(projectDO.getName());
         projectSimpleVO.setTags(projectDO.getTags());
-        projectSimpleVO.setCycle(Long.valueOf(projectDO.getCycle()));
-        projectSimpleVO.setWorkLoad(Long.valueOf(projectDO.getWorkLoad()));
+        projectSimpleVO.setCycle(projectDO.getCycle().longValue());
+        projectSimpleVO.setWorkLoad(projectDO.getWorkLoad().longValue());
         projectSimpleVO.setPrincipalUser(userDAO.getUserById(projectDO.getPrincipalId()).getUsername());
         // 解析JSON字符串
         JsonNode rootNode = null;