From c744a5a06d7cd35222538bd3fe5998332876996d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 23 Sep 2021 14:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayAnnouncementMessageController.java |  6 +++---
 .../controller/PayWorkingGroupController.java        |  6 +++---
 .../controller/PayWorkingGroupSubItemController.java |  8 ++++++++
 .../controller/SysMessageTemplateController.java     | 12 ++++++++++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/message/controller/PayAnnouncementMessageController.java b/jero-boot-incoming-payment/src/main/java/com/jero/message/controller/PayAnnouncementMessageController.java
index 62c46036..5e0e927d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/message/controller/PayAnnouncementMessageController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/message/controller/PayAnnouncementMessageController.java
@@ -55,7 +55,7 @@ public class PayAnnouncementMessageController extends JeroController<PayAnnounce
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		payAnnouncementMessage.setRecipient(sysUser.getUsername());
+		payAnnouncementMessage.setRecipient(sysUser.getId());
 		QueryWrapper<PayAnnouncementMessage> queryWrapper = QueryGenerator.initQueryWrapper(payAnnouncementMessage, req.getParameterMap());
 		Page<PayAnnouncementMessage> page = new Page<>(pageNo, pageSize);
 		IPage<PayAnnouncementMessage> pageList = payAnnouncementMessageService.page(page, queryWrapper);
@@ -69,8 +69,8 @@ public class PayAnnouncementMessageController extends JeroController<PayAnnounce
 	* @Return
 	* @Exception
 	*/
-	@AutoLog(value = "消息-添加")
-	@ApiOperation(value="消息-添加", notes="消息-添加")
+	@AutoLog(value = "消息-已读")
+	@ApiOperation(value="消息-已读", notes="消息-已读")
 	@PostMapping(value = "/add")
 	public Result<?> update(@RequestBody PayAnnouncementMessage payAnnouncementMessage) {
 		LambdaUpdateWrapper<PayAnnouncementMessage> update = new LambdaUpdateWrapper<>();
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index 83a4e173..1e2a2e7f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -111,13 +111,13 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	}
 
 	/**
-	* 校验登陆人是否可以操作工作组
+	* 校验登录人是否可以操作工作组
 	*
 	* @param id  工作组id
 	* @return
 	*/
-	@AutoLog(value = "工作组项目-校验登陆人是否可以操作工作组")
-	@ApiOperation(value="工作组项目-列表查询", notes="工作组项目-校验登陆人是否可以操作工作组")
+	@AutoLog(value = "工作组项目-校验登录人是否可以操作工作组")
+	@ApiOperation(value="工作组项目-列表查询", notes="工作组项目-校验登录人是否可以操作工作组")
 	@GetMapping(value = "/checkoutOperation")
 	public Result<?> checkoutOperation(@RequestParam("id") String id) {
 		if(StringUtils.isBlank(id)){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index 2a1f22b0..4fddc22c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -4,6 +4,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jero.common.api.dto.message.MessageDTO;
+import com.jero.common.api.dto.message.TemplateMessageDTO;
 import com.jero.common.api.vo.Result;
 import com.jero.message.entity.PayAnnouncementMessage;
 import com.jero.common.enums.MessageEnums;
@@ -170,6 +172,12 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 			 payAnnouncementMessage.setOperation(MessageEnums.MSG14.getDetail());
 			 payAnnouncementMessage.setBusId(p.getId());
 			 payAnnouncementMessageService.sendMessage(payAnnouncementMessage);
+			 TemplateMessageDTO templateMessageDTO = new TemplateMessageDTO();
+			 templateMessageDTO.setTitle(MessageEnums.MSG14.getValue());
+			 templateMessageDTO.setFromUser(sysUser.getId());
+			 templateMessageDTO.setToUser(sysUser.getUsername());
+			 templateMessageDTO.setTemplateCode("sys_ts_note");
+			 sysBaseAPI.sendTemplateAnnouncement(templateMessageDTO);
 		 });
 		 // todo 缺少发送消息
 		 return Result.OK("添加成功！");
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java b/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
index 07912458..e1175772 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
@@ -9,15 +9,15 @@ import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.util.encryption.AesEncryptUtil;
 import com.jero.modules.message.entity.MsgParams;
 import com.jero.modules.message.entity.SysMessageTemplate;
 import com.jero.modules.message.service.ISysMessageTemplateService;
 import com.jero.modules.message.util.PushMsgUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -72,6 +72,14 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
 	 */
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody SysMessageTemplate sysMessageTemplate) {
+		try {
+			if(!StringUtils.isBlank(sysMessageTemplate.getTemplateContent())){
+				sysMessageTemplate.setTemplateContent(AesEncryptUtil.desEncrypt(sysMessageTemplate.getTemplateContent()));
+			}
+		}catch (Exception e){
+			log.error("解密异常",e);
+			return Result.error("添加失败！");
+		}
 		sysMessageTemplateService.save(sysMessageTemplate);
         return Result.OK("添加成功！");
 	}