Merge remote-tracking branch 'origin/feature/1221-suggest' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/SysMessageController.java

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.SysMessageQueryInfo;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
 import com.yonge.cooleshow.biz.dal.wrapper.SysMessageWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -71,13 +72,13 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation("一键已读")
 	@PostMapping("batchSetRead")
-	public Object batchSetRead(@RequestBody SysMessageWrapper.MessageRead messageRead) {
+	public Object batchSetRead(@RequestParam(value = "messageType", required = false) MessageTypeEnum messageType) {
 		int status = 1;
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"STUDENT",messageRead) > 0 );
+		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"STUDENT",messageType) > 0 );
 	}
 
 	@ApiOperation("设置已读")

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/SysMessageController.java

@@ -6,8 +6,8 @@ import com.yonge.cooleshow.biz.dal.dao.AppVersionInfoDao;
 import com.yonge.cooleshow.biz.dal.dto.search.SysMessageQueryInfo;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
-import com.yonge.cooleshow.biz.dal.wrapper.SysMessageWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.entity.Mapper;
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -81,13 +82,13 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation("一键已读")
 	@PostMapping("batchSetRead")
-	public Object batchSetRead(@RequestBody SysMessageWrapper.MessageRead messageRead) {
+	public Object batchSetRead(@RequestParam(value = "messageType", required = false) MessageTypeEnum messageType) {
 		int status = 1;
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER",messageRead) > 0 );
+		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER",messageType) > 0 );
 	}
 
 	@ApiOperation("设置已读")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysMessageService.java

@@ -32,9 +32,6 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 			Integer readStatus, String url,String jpushType, Object... args);
 
 
-	void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Long, String> receivers, Date triggerTime, Integer readStatus,
-						  String url, String jpushType, String title, Object... args);
-
 	public void batchSendMessage(MessageSender messageSender, String title, String content, Map<Long, String> receivers, Date triggerTime,
 								 Integer readStatus, String url, String jpushType, Object... args);
 
@@ -89,7 +86,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param status 状态/1 已读,0未读
 	 * @return
 	 */
-	public int updateStatus(Long userId, int status,String jpushType,SysMessageWrapper.MessageRead messageRead);
+	public int updateStatus(Long userId, int status,String jpushType,MessageTypeEnum messageType);
 
 	/**
 	 * 修改单条消息状态

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMessageServiceImpl.java

@@ -137,12 +137,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	@Override
 	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Long, String> receivers, Date triggerTime, Integer readStatus,
-								 String url, String jpushType, Object... args) {
-		batchSendMessage(messageSender, type, receivers, triggerTime, readStatus, url, jpushType, null, args);
-	}
-	@Override
-	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Long, String> receivers, Date triggerTime, Integer readStatus,
-			String url,String jpushType,String title, Object... args) {
+								 String url,String jpushType, Object... args) {
 		LOGGER.info("batchSendMessage msgSender {}, type {}, receivers {} ", messageSender, type, receivers);
 		if (receivers == null || receivers.size() == 0) {
 			LOGGER.error("接收地址不能为空");
@@ -156,10 +151,10 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if(messageSender.getSendMode().equals(MessageSender.JIGUANG.getSendMode())) {
 			tos= new String[receivers.size()];
 			tos = receivers.entrySet()
-						   .stream()
-						   .map(longStringEntry -> String.valueOf(longStringEntry.getKey()))
-						   .collect(Collectors.toList())
-						   .toArray(tos);
+					.stream()
+					.map(longStringEntry -> String.valueOf(longStringEntry.getKey()))
+					.collect(Collectors.toList())
+					.toArray(tos);
 		} else {
 			tos = receivers.values().toArray(new String[receivers.size()]);
 		}
@@ -173,17 +168,13 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		Date date = new Date();
 		SendStatusEnum status = SendStatusEnum.WAIT;
 		String errorMsg = null;
-		String msgTitle = title;
-		if(StringUtils.isEmpty(msgTitle)){
-			msgTitle = messageConfig.getDescription();
-		}
 		// 立即发送
 		if (triggerTime == null || date.after(triggerTime)) {
 			status = SendStatusEnum.SENDING;
 			try {
 				if (isSendRemoteMessage(messageSender)) {
-					errorMsg = messageSenderPluginContext.batchSend(messageSender, msgTitle,
-														 MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,"default",null);
+					errorMsg = messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
+							MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,"default",null);
 					if (StringUtils.isEmpty(errorMsg)) {
 						status = SendStatusEnum.SUCCESSED;
 					}  else {
@@ -203,10 +194,10 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		} else if (messageSender.getSendMode().equals("EMAIL")) {
 			mode = MessageSendMode.EMAIL;
 		}
-        if (ClientEnum.TENANT_STUDENT.getCode().equals(jpushType)) {
-            jpushType = ClientEnum.STUDENT.getCode();
-        }
-		addMessage(receivers, title, MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, mode, status, errorMsg, readStatus,
+		if (ClientEnum.TENANT_STUDENT.getCode().equals(jpushType)) {
+			jpushType = ClientEnum.STUDENT.getCode();
+		}
+		addMessage(receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, mode, status, errorMsg, readStatus,
 				url, messageConfig.getGroup(),jpushType,messageConfig.getId());
 	}
 
@@ -386,9 +377,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public int updateStatus(Long userId, int status,String jpushType,SysMessageWrapper.MessageRead messageRead) {
+	public int updateStatus(Long userId, int status,String jpushType,MessageTypeEnum messageType) {
 		// 按照类型设置一键已读
-		MessageTypeEnum messageType = messageRead.getMessageType();
 		Long messageConfigId = null;
 		if (messageType != null) {
 			SysMessageConfig sysMessageConfig = sysMessageConfigService.queryByType(messageType.getCode());

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/SysMessageController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.biz.dal.dao.AppVersionInfoDao;
 import com.yonge.cooleshow.biz.dal.dto.search.SysMessageQueryInfo;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
 import com.yonge.cooleshow.biz.dal.wrapper.SysMessageWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -76,13 +77,13 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation("一键已读")
 	@PostMapping("batchSetRead")
-	public Object batchSetRead(@RequestBody SysMessageWrapper.MessageRead messageRead) {
+	public Object batchSetRead(@RequestParam(value = "messageType", required = false) MessageTypeEnum messageType) {
 		int status = 1;
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"STUDENT",messageRead) > 0 );
+		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"STUDENT",messageType) > 0 );
 	}
 
 	@ApiOperation("设置已读")

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SysMessageController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.biz.dal.dao.AppVersionInfoDao;
 import com.yonge.cooleshow.biz.dal.dto.search.SysMessageQueryInfo;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
 import com.yonge.cooleshow.biz.dal.wrapper.SysMessageWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -76,13 +77,13 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation("一键已读")
 	@PostMapping("batchSetRead")
-	public Object batchSetRead(@RequestBody SysMessageWrapper.MessageRead messageRead) {
+	public Object batchSetRead(@RequestParam(value = "messageType", required = false) MessageTypeEnum messageType) {
 		int status = 1;
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER",messageRead) > 0 );
+		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER",messageType) > 0 );
 	}
 
 	@ApiOperation("设置已读")