风险评估消息推送主体文字修改

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -192,8 +192,8 @@ public class RiskPlanServiceImpl extends MPJBaseServiceImpl<RiskPlanMapper, Risk
         //使用Stream.concat连接原始用户数组和新用户，然后转换回数组
         workUsers = Stream.concat(Arrays.stream(workUsers), Stream.of(newUser))
                 .toArray(String[]::new);
-        //消息内容
-        String content = createUser.getNickName() + "创建了一条名为【" + riskPlan.getName() + "】的风险，请尽快处理！";
+        //消息内容  XXX创建了一条名为[xxx]的风险评估任务,请尽快处理!
+        String content = createUser.getNickName() + "创建了一条名为【" + riskPlan.getName() + "】的风险评估任务，请尽快处理！";
 
         for (int j = 0; j < workUsers.length; j++) {
             SysUser workUser = userService.selectUserById(Long.valueOf(workUsers[j]));
@@ -357,28 +357,29 @@ public class RiskPlanServiceImpl extends MPJBaseServiceImpl<RiskPlanMapper, Risk
 
                 //TODO  审批阶段待办推送
                 //获取当前人员
-                LoginUser loginUser = SecurityUtils.getLoginUser();
+                LoginUser user = SecurityUtils.getLoginUser();
+                SysUser loginUser = userService.selectUserById(user.getUserId());
                 //获取创建人
                 SysUser createUser = userService.selectUserById(riskPlan.getCreateUserId());
                 //获取负责人
                 SysUser leaderUser = userService.selectUserById(riskPlan.getLeaderUserId());
-                //消息内容
-                String content = loginUser.getUsername() + "给您发送了一条名为【" + riskPlan.getName() + "】的风险，请尽快处理！";
+                //消息内容  XXX给您发送一条名为[xxx]的风险评估审批,请尽快处理!
+                String content = loginUser.getNickName() + "给您发送了一条名为【" + riskPlan.getName() + "】的风险评估审批，请尽快处理！";
 
                 System.out.println("pid-->"+ riskPlan.getId() + ",manid-->" +riskPlan.getId() + ",backlog_by--?" + createUser.getUserName()
-                        + ",create_by-->" + loginUser.getUsername() + "content-->" + content
+                        + ",create_by-->" + loginUser.getNickName() + "content-->" + content
                 );
 
                 commonMessageInfoService.insertBacklogInfo(String.valueOf(riskPlan.getId()), "risk_confirm_sub", String.valueOf(riskPlan.getId()),
                         "风险审批", "风险",
                         content, "0", createUser.getUserName(),
-                        "风险审批", "riskTaskList" , "riskTaskList", loginUser.getUsername());
+                        "风险审批", "riskTaskList" , "riskTaskList", loginUser.getUserName());
 
                 //TODO  审批阶段消息推送
                 commonMessageInfoService.insertMessageInfo(String.valueOf(riskPlan.getId()) + "", "risk_confirm_sub", "风险评估"
                         , content
                         , "0", createUser.getUserName(), "风险评估", "", "riskTaskList",
-                        loginUser.getUsername());
+                        loginUser.getUserName());
 
 
 
@@ -424,7 +425,8 @@ public class RiskPlanServiceImpl extends MPJBaseServiceImpl<RiskPlanMapper, Risk
 
                 //TODO  审批完成消息推送
                 //获取当前人员
-                LoginUser loginUser = SecurityUtils.getLoginUser();
+                LoginUser user = SecurityUtils.getLoginUser();
+                SysUser loginUser = userService.selectUserById(user.getUserId());
                 //获取负责人
                 SysUser leaderUser = userService.selectUserById(riskPlan.getLeaderUserId());
                 //获取执行人员
@@ -433,14 +435,14 @@ public class RiskPlanServiceImpl extends MPJBaseServiceImpl<RiskPlanMapper, Risk
                 //使用Stream.concat连接原始用户数组和新用户，然后转换回数组
                 workUsers = Stream.concat(Arrays.stream(workUsers), Stream.of(newUser))
                         .toArray(String[]::new);
-                //消息内容
-                String content = "您有一条名为【" + riskPlan.getName() + "】的风险已完成评估！";
+                //消息内容  你参与的名为[xxx]风险评估任务已完成!
+                String content = "您参与的名为【" + riskPlan.getName() + "】的风险评估任务已完成！";
 
                 for (int i = 0; i < workUsers.length; i++) {
                     SysUser workUser = userService.selectUserById(Long.valueOf(workUsers[i]));
                     commonMessageInfoService.insertMessageInfo(String.valueOf(riskPlan.getId()) + "", "risk_confirm_sub",
                             "风险评估", content, "0", workUser.getUserName(), "风险评估",
-                            "", "riskTaskList", loginUser.getUsername());
+                            "", "riskTaskList", loginUser.getUserName());
                 }
 
             }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanUserBuildingServiceImpl.java

@@ -152,27 +152,28 @@ public class RiskPlanUserBuildingServiceImpl
 
         //TODO  执行阶段待办推送
         //获取当前人员
-        LoginUser loginUser = SecurityUtils.getLoginUser();
+        LoginUser user = SecurityUtils.getLoginUser();
+        SysUser loginUser = userService.selectUserById(user.getUserId());
         //获取创建人
         SysUser createUser = userService.selectUserById(riskPlan.getCreateUserId());
         //获取负责人
         SysUser leaderUser = userService.selectUserById(riskPlan.getLeaderUserId());
-        //消息内容
-        String content = loginUser.getUsername() + "给您发送了一条名为【" + riskPlan.getName() + "】的风险，请尽快处理！";
+        //消息内容  XXX给您发送了一条名为[xxx]的风险验收审批,请尽快处理
+        String content = loginUser.getNickName() + "给您发送了一条名为【" + riskPlan.getName() + "】风险验收审批，请尽快处理！";
 
         System.out.println("pid-->"+ riskPlan.getId() + ",manid-->" +riskPlan.getId() + ",backlog_by--?" + leaderUser.getUserName()
-                + ",create_by-->" + loginUser.getUsername()
+                + ",create_by-->" + loginUser.getNickName()
         );
 
         commonMessageInfoService.insertBacklogInfo(String.valueOf(riskPlan.getId()), "risk_confirm_sub",
                 String.valueOf(riskPlan.getId()), "风险审批", "风险", content, "0", leaderUser.getUserName(),
-                "风险审批", "riskTaskList" , "riskTaskList", loginUser.getUsername());
+                "风险审批", "riskTaskList" , "riskTaskList", loginUser.getUserName());
 
 
         //TODO  审批阶段消息推送
         commonMessageInfoService.insertMessageInfo(String.valueOf(riskPlan.getId()) + "", "risk_confirm_sub", "风险评估"
                 , content, "0", leaderUser.getUserName(), "风险评估", "", "riskTaskList",
-                loginUser.getUsername());
+                loginUser.getUserName());
 
         return 1;
     }