From 2f7c611b8268e77f063b9b83adfa3f4d4ce45845 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 6 Apr 2021 10:22:15 +0800
Subject: [PATCH] 20210406v1.1

---
 .../com/ccsens/tall/aspect/RobotAspect.java     |  2 +-
 .../java/com/ccsens/tall/bean/vo/MessageVo.java | 17 +++++++++++++++++
 .../com/ccsens/tall/service/RobotService.java   |  6 +++---
 .../com/ccsens/tall/web/InputDocController.java |  8 ++++----
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/aspect/RobotAspect.java b/tall/src/main/java/com/ccsens/tall/aspect/RobotAspect.java
index 32dc3edb..4bbd4c16 100644
--- a/tall/src/main/java/com/ccsens/tall/aspect/RobotAspect.java
+++ b/tall/src/main/java/com/ccsens/tall/aspect/RobotAspect.java
@@ -44,7 +44,7 @@ public class RobotAspect {
         RobotUtil.Message message = RobotUtil.getRobotMessage();
         MessageVo.Inform inform = RobotUtil.getInform();
         WxTemplateMessage wxTemplate = RobotUtil.getWxTemplate();
-        // 3.机器人通知
+        // 3.企业微信群机器人通知
         asyncService.sendRobotMessage(operateType,message);
         // 4.ws和公众号通知
         asyncService.sendMessage(operateType, inform, wxTemplate);
diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/MessageVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/MessageVo.java
index a09d3c7d..97b0dabd 100644
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/MessageVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/MessageVo.java
@@ -204,4 +204,21 @@ public class MessageVo {
                 .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName));
         return inform;
     }
+
+    /**
+     * 上传输入文档
+     * @param userId
+     * @param userName
+     * @param projectId
+     * @param projectName
+     * @param taskName
+     * @return
+     */
+    public static Inform uploadForDocComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName) {
+        MessageVo.Inform inform = new MessageVo.Inform(projectId, userId);
+        inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName))
+                .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId)))
+                .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName));
+        return inform;
+    }
 }
diff --git a/tall/src/main/java/com/ccsens/tall/service/RobotService.java b/tall/src/main/java/com/ccsens/tall/service/RobotService.java
index 9ebd1475..0ccc1521 100644
--- a/tall/src/main/java/com/ccsens/tall/service/RobotService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/RobotService.java
@@ -172,18 +172,18 @@ public class RobotService implements IRobotService{
 
     @Override
     public void addTaskRobotSend(Long currentUserId, SysProject project, String taskName, Long executorId) throws Exception {
-
+        //通过userID获取用户名
         String userName = userService.getUserNameByUserId(currentUserId);
 
         String projectName = "";
-
+        //获取项目名
         if(ObjectUtil.isNotNull(project)){
             projectName = project.getName();
         }
         // 获取角色名
         TaskVo.RoleCheckList role = proRoleService.selectRoleByCheckOrExecutor(executorId);
         String executorName = ObjectUtil.isNotNull(role) ? role.getName() : "";
-
+        //将需填充的信息放到消息内
         RobotUtil.Message message = new RobotUtil.Message(project.getId());
         message.appendParams(
                 new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName),
diff --git a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java
index ec6a0e91..7d20d2e6 100644
--- a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java
@@ -45,7 +45,7 @@ public class InputDocController {
         return JsonResponse.newInstance().ok();
     }*/
 
-    @MustLogin
+    @MustLoginTall
     @ApiOperation(value = "通过任务id查询输入文档", notes = "1007:通过任务id查询输入文档")
     @RequestMapping(value = "/docByTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<List<InputDocVo.DocOfTask>> findDocByTask(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.FindDocByTask> params) {
@@ -56,7 +56,7 @@ public class InputDocController {
     }
 
     @OperateType(value = 15)
-    @MustLogin
+    @MustLoginTall
     @ApiOperation(value = "给输入文档上传文件", notes = "1007:给输入文档上传文件")
     @RequestMapping(value = "/uploadForDoc", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse uploadForDoc(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.UploadForDoc> params) {
@@ -66,7 +66,7 @@ public class InputDocController {
         return JsonResponse.newInstance().ok();
     }
 
-    @MustLogin
+    @MustLoginTall
     @ApiOperation(value = "查看文档上传历史记录", notes = "1007:查看文档上传历史记录")
     @RequestMapping(value = "/viewDocHistory", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse viewDocHistory(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.ViewDocHistory> params) {
@@ -76,7 +76,7 @@ public class InputDocController {
         return JsonResponse.newInstance().ok(historyRecords);
     }
 
-    @MustLogin
+    @MustLoginTall
     @ApiOperation(value = "添加输入文档", notes = "1007:添加输入文档")
     @RequestMapping(value = "/addDoc", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse addDoc(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.AddDoc> params) {