修改参数

ldt-core/src/main/java/org/springblade/ldt/notice/controller/NoticeManagementContentController.java

@@ -16,15 +16,16 @@
  */
 package org.springblade.ldt.notice.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.ldt.notice.entity.NoticeManagementContent;
@@ -32,12 +33,11 @@ import org.springblade.ldt.notice.service.INoticeManagementContentService;
 import org.springblade.ldt.notice.vo.NoticeManagementContentVO;
 import org.springblade.ldt.notice.wrapper.NoticeManagementContentWrapper;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
 
 /**
- *  控制器
+ * 控制器
  *
  * @author BladeX
  * @since 2021-11-09
@@ -114,7 +114,6 @@ public class NoticeManagementContentController extends BladeController {
 		return R.status(noticeContentService.saveOrUpdate(noticeContent));
 	}
 
-
 	/**
 	 * 删除
 	 */
@@ -125,4 +124,14 @@ public class NoticeManagementContentController extends BladeController {
 		return R.status(noticeContentService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 新增通知内容并选择发布
+	 */
+	@PostMapping("/submitAndPush")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入noticeContent")
+	public R submitAndPush(@Valid @RequestBody NoticeManagementContentVO noticeContent, BladeUser bladeUser) {
+		return noticeContentService.submitAndPush(noticeContent, bladeUser);
+	}
+
 }

ldt-core/src/main/java/org/springblade/ldt/notice/controller/NoticeManagementController.java

@@ -25,7 +25,6 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.ldt.notice.entity.NoticeManagement;
@@ -93,8 +92,8 @@ public class NoticeManagementController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入notice")
-	public R save(@Valid @RequestBody NoticeManagementVO notice, BladeUser bladeUser) {
-		return noticeService.saveNotice(notice, bladeUser);
+	public R save(@Valid @RequestBody NoticeManagementVO notice) {
+		return R.status(noticeService.save(notice));
 	}
 
 	/**
@@ -113,8 +112,8 @@ public class NoticeManagementController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入notice")
-	public R submit(@Valid @RequestBody NoticeManagementVO notice, BladeUser bladeUser) {
-		return noticeService.saveNotice(notice, bladeUser);
+	public R submit(@Valid @RequestBody NoticeManagementVO notice) {
+		return R.status(noticeService.saveOrUpdate(notice));
 	}
 
 

ldt-core/src/main/java/org/springblade/ldt/notice/entity/NoticeManagement.java

@@ -23,6 +23,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.tenant.mp.TenantEntity;
 
 /**
  * 通知表实体类
@@ -34,7 +35,7 @@ import io.swagger.annotations.ApiModelProperty;
 @TableName("ldt_notice")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "Notice对象", description = "通知表")
-public class NoticeManagement extends BaseEntity {
+public class NoticeManagement extends TenantEntity {
 
 	private static final long serialVersionUID = 1L;
 

ldt-core/src/main/java/org/springblade/ldt/notice/entity/NoticeManagementContent.java

@@ -16,13 +16,16 @@
  */
 package org.springblade.ldt.notice.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.springblade.common.enums.SenderType;
-import org.springblade.core.mp.base.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.common.enums.ReceiverType;
+import org.springblade.common.enums.SenderType;
+import org.springblade.core.tenant.mp.TenantEntity;
 
 /**
  * 实体类
@@ -34,35 +37,39 @@ import io.swagger.annotations.ApiModelProperty;
 @TableName("ldt_notice_content")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "NoticeContent对象", description = "NoticeContent对象")
-public class NoticeManagementContent extends BaseEntity {
+public class NoticeManagementContent extends TenantEntity {
 
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 标题
-	*/
-		@ApiModelProperty(value = "标题")
-		private String title;
+	 * 标题
+	 */
+	@ApiModelProperty(value = "标题")
+	private String title;
 	/**
-	* 内容
-	*/
-		@ApiModelProperty(value = "内容")
-		private String content;
+	 * 内容
+	 */
+	@ApiModelProperty(value = "内容")
+	private String content;
 	/**
-	* 发送人Id
-	*/
-		@ApiModelProperty(value = "发送人Id")
-		private Long senderId;
+	 * 发送人Id
+	 */
+	@ApiModelProperty(value = "发送人Id")
+	private Long senderId;
 	/**
-	* 发送人昵称
-	*/
-		@ApiModelProperty(value = "发送人昵称")
-		private String sender;
+	 * 发送人昵称
+	 */
+	@ApiModelProperty(value = "发送人昵称")
+	private String sender;
 	/**
-	* 发送人类型（商户，平台，商家）
-	*/
-		@ApiModelProperty(value = "发送人类型（商户，平台，商家）")
-		private SenderType senderType;
+	 * 发送人类型（商户，平台，商家）
+	 */
+	@ApiModelProperty(value = "发送人类型（商户，平台，商家）")
+	private SenderType senderType;
+
+	@TableField(typeHandler = JacksonTypeHandler.class)
+	@ApiModelProperty(value = "指定接收人类型：平台（商户，商家，C端用户）、商场（商家，会员）、商家（会员）")
+	private ReceiverType[] receiverTypes;
 
 
 }

ldt-core/src/main/java/org/springblade/ldt/notice/service/INoticeManagementContentService.java

@@ -19,6 +19,8 @@ package org.springblade.ldt.notice.service;
 
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.tool.api.R;
 import org.springblade.ldt.notice.entity.NoticeManagementContent;
 import org.springblade.ldt.notice.vo.NoticeManagementContentVO;
 
@@ -39,4 +41,11 @@ public interface INoticeManagementContentService extends BaseService<NoticeManag
 	 */
 	IPage<NoticeManagementContentVO> selectNoticeContentPage(IPage<NoticeManagementContentVO> page, NoticeManagementContentVO noticeContent);
 
+	/**
+	 * 新增通知内容并选择发布
+	 * @param noticeContent 信息内容
+	 * @param bladeUser 当前用户信息
+	 * @return 状态
+	 */
+    R submitAndPush(NoticeManagementContentVO noticeContent, BladeUser bladeUser);
 }

ldt-core/src/main/java/org/springblade/ldt/notice/service/INoticeManagementService.java

@@ -18,8 +18,6 @@ package org.springblade.ldt.notice.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.tool.api.R;
 import org.springblade.ldt.notice.entity.NoticeManagement;
 import org.springblade.ldt.notice.vo.NoticeManagementVO;
 
@@ -40,13 +38,4 @@ public interface INoticeManagementService extends BaseService<NoticeManagement>
 	 */
 	IPage<NoticeManagementVO> selectNoticePage(IPage<NoticeManagementVO> page, NoticeManagementVO notice);
 
-	/**
-	 * @param notice : 通知信息
-	 * @param bladeUser
-	 * @Return R
-	 * @Author July
-	 * @Description 发布通知消息
-	 * @Date 2021/11/4 17:29
-	 */
-	R saveNotice(NoticeManagementVO notice, BladeUser bladeUser);
 }

ldt-core/src/main/java/org/springblade/ldt/notice/service/impl/NoticeManagementContentServiceImpl.java

@@ -16,21 +16,45 @@
  */
 package org.springblade.ldt.notice.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.AllArgsConstructor;
+import org.springblade.common.enums.ReceiverType;
+import org.springblade.common.enums.SenderType;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.tool.api.R;
+import org.springblade.ldt.mall.entity.Mall;
+import org.springblade.ldt.mall.service.IMallService;
+import org.springblade.ldt.notice.entity.NoticeManagement;
 import org.springblade.ldt.notice.entity.NoticeManagementContent;
 import org.springblade.ldt.notice.mapper.NoticeManagementContentMapper;
 import org.springblade.ldt.notice.service.INoticeManagementContentService;
+import org.springblade.ldt.notice.service.INoticeManagementService;
 import org.springblade.ldt.notice.vo.NoticeManagementContentVO;
+import org.springblade.ldt.shop.entity.Shop;
+import org.springblade.ldt.shop.service.IShopService;
+import org.springblade.ldt.user.entity.LoginUser;
+import org.springblade.ldt.user.entity.Member;
+import org.springblade.ldt.user.service.ILoginUserService;
+import org.springblade.ldt.user.service.IMemberService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
- *  服务实现类
+ * 服务实现类
  *
  * @author BladeX
  * @since 2021-11-09
  */
 @Service
+@AllArgsConstructor
 public class NoticeManagementContentServiceImpl extends BaseServiceImpl<NoticeManagementContentMapper, NoticeManagementContent> implements INoticeManagementContentService {
 
 	@Override
@@ -38,4 +62,65 @@ public class NoticeManagementContentServiceImpl extends BaseServiceImpl<NoticeMa
 		return page.setRecords(baseMapper.selectNoticeContentPage(page, noticeContent));
 	}
 
+	private IMallService mallService;
+	private IShopService shopService;
+	private IMemberService memberService;
+	private ILoginUserService loginUserService;
+	private INoticeManagementService noticeService;
+
+	@Override
+	@Transactional
+	public R submitAndPush(NoticeManagementContentVO notice, BladeUser bladeUser) {
+		Mall mall = null;
+		if (notice.getSenderType().equals(SenderType.MALL)) {
+			mall = mallService.getOne(Wrappers.<Mall>lambdaQuery().eq(Mall::getTenantId, bladeUser.getTenantId()));
+		}
+		Map<ReceiverType, Map<Long, String>> receiver = new HashMap<>();
+		for (ReceiverType receiverType : notice.getReceiverTypes()) {
+			if (receiverType.equals(ReceiverType.MALL)) {//平台可发
+				List<Mall> malls = mallService.list();
+				receiver.put(ReceiverType.MALL, malls.stream().collect(Collectors.toMap(Mall::getId, Mall::getMallName)));
+			}
+			if (receiverType.equals(ReceiverType.SHOP)) {//平台，商场可发
+				List<Shop> shops = shopService.list(Wrappers.<Shop>lambdaQuery()
+					.eq(notice.getSenderType().equals(SenderType.MALL) && mall != null, Shop::getMallId, mall.getId()));
+				receiver.put(ReceiverType.SHOP, shops.stream().collect(Collectors.toMap(Shop::getId, Shop::getName)));
+			}
+			if (receiverType.equals(ReceiverType.MEMBER)) {//商场可发
+				List<Member> members = memberService.list(Wrappers.<Member>lambdaQuery().eq(mall != null, Member::getMallId, mall.getId()));
+				receiver.put(ReceiverType.MEMBER, members.stream().collect(Collectors.toMap(Member::getId, Member::getNickName)));
+			}
+			if (receiverType.equals(ReceiverType.CONSUMER)) {//平台可发
+				List<LoginUser> loginUsers = loginUserService.list();
+				receiver.put(ReceiverType.CONSUMER, loginUsers.stream().collect(Collectors.toMap(LoginUser::getId, LoginUser::getNickName)));
+			}
+		}
+
+		//保存通知内容
+		if (notice.getSenderType().equals(SenderType.MALL)) {
+			notice.setSenderId(mall.getId());
+			notice.setSender(mall.getMallName());
+		} else {
+			notice.setSenderId(bladeUser.getUserId());
+			notice.setSender("[平台]");
+		}
+		saveOrUpdate(notice);
+
+		//发布给指定人
+		List<NoticeManagement> noticeManagements = new ArrayList<>();
+		for (Map.Entry<ReceiverType, Map<Long, String>> data : receiver.entrySet()) {
+			for (Map.Entry<Long, String> item : data.getValue().entrySet()) {
+				NoticeManagement noticeManagement = new NoticeManagement();
+				noticeManagement.setReceiver(item.getValue());
+				noticeManagement.setReceiverId(item.getKey());
+				noticeManagement.setReceiverType(data.getKey());
+				noticeManagement.setContentId(notice.getId());
+				noticeManagement.setIsRead(false);
+				noticeManagements.add(noticeManagement);
+			}
+		}
+		noticeService.saveBatch(noticeManagements);
+		return R.status(true);
+	}
+
 }

ldt-core/src/main/java/org/springblade/ldt/notice/service/impl/NoticeManagementServiceImpl.java

@@ -19,19 +19,11 @@ package org.springblade.ldt.notice.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.tool.api.R;
-import org.springblade.ldt.mall.service.IMallService;
 import org.springblade.ldt.notice.entity.NoticeManagement;
 import org.springblade.ldt.notice.mapper.NoticeManagementMapper;
 import org.springblade.ldt.notice.service.INoticeManagementService;
 import org.springblade.ldt.notice.vo.NoticeManagementVO;
-import org.springblade.ldt.shop.service.IShopService;
-import org.springblade.ldt.user.service.ILoginUserService;
-import org.springblade.ldt.user.service.IMemberService;
-import org.springblade.modules.system.service.IUserService;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 通知表 服务实现类
@@ -48,59 +40,4 @@ public class NoticeManagementServiceImpl extends BaseServiceImpl<NoticeManagemen
 		return page.setRecords(baseMapper.selectNoticePage(page, notice));
 	}
 
-	private IMallService mallService;
-	private IShopService shopService;
-	private IMemberService memberService;
-	private IUserService userService;
-	private ILoginUserService loginUserService;
-
-	@Override
-	@Transactional
-	public R saveNotice(NoticeManagementVO notice, BladeUser bladeUser) {
-		return null;
-//		Mall mall = null;
-//		if (notice.getSenderType().equals(SenderType.MALL)) {
-//			mall = mallService.getOne(Wrappers.<Mall>lambdaQuery().eq(Mall::getTenantId, bladeUser.getTenantId()));
-//		}
-//		Map<ReceiverType, Map<Long, String>> receiver = new HashMap<>();
-//		for (ReceiverType receiverType : notice.getReceiverTypes()) {
-//			if (receiverType.equals(ReceiverType.MALL)) {//平台可发
-//				List<Mall> malls = mallService.list();
-//				receiver.put(ReceiverType.MALL, malls.stream().collect(Collectors.toMap(Mall::getId, Mall::getMallName)));
-//			}
-//			if (receiverType.equals(ReceiverType.SHOP)) {//平台，商场可发
-//				List<Shop> shops = shopService.list(Wrappers.<Shop>lambdaQuery()
-//					.eq(notice.getSenderType().equals(SenderType.MALL) && mall != null, Shop::getMallId, mall.getId()));
-//				receiver.put(ReceiverType.SHOP, shops.stream().collect(Collectors.toMap(Shop::getId, Shop::getName)));
-//			}
-//			if (receiverType.equals(ReceiverType.MEMBER)) {//商场可发
-//				List<Member> members = memberService.list(Wrappers.<Member>lambdaQuery().eq(mall != null, Member::getMallId, mall.getId()));
-//				receiver.put(ReceiverType.MEMBER, members.stream().collect(Collectors.toMap(Member::getId, Member::getNickName)));
-//			}
-//			if (receiverType.equals(ReceiverType.CONSUMER)) {//平台可发
-//				List<LoginUser> loginUsers = loginUserService.list();
-//				receiver.put(ReceiverType.CONSUMER, loginUsers.stream().collect(Collectors.toMap(LoginUser::getId, LoginUser::getNickName)));
-//			}
-//		}
-//
-//		List<NoticeManagement> notices = new ArrayList<>();
-//		for (Map.Entry<ReceiverType, Map<Long, String>> data : receiver.entrySet()) {
-//			for (Map.Entry<Long, String> item : data.getValue().entrySet()) {
-//				notice.setReceiver(item.getValue());
-//				notice.setReceiverId(item.getKey());
-//				notice.setReceiverType(data.getKey());
-//				notice.setIsRead(false);
-//				if (notice.getSenderType().equals(SenderType.MALL)) {
-//					notice.setSenderId(mall.getId());
-//					notice.setSender(mall.getMallName());
-//				} else {
-//					notice.setSenderId(bladeUser.getUserId());
-//					notice.setSender("[平台]");
-//				}
-//				notices.add(notice);
-//			}
-//		}
-//		return R.data(saveBatch(notices));
-	}
-
 }

ldt-core/src/main/java/org/springblade/ldt/notice/vo/NoticeManagementContentVO.java

@@ -19,6 +19,7 @@ package org.springblade.ldt.notice.vo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
+import org.springblade.common.enums.ReceiverType;
 import org.springblade.ldt.notice.entity.NoticeManagementContent;
 
 /**
@@ -33,4 +34,5 @@ import org.springblade.ldt.notice.entity.NoticeManagementContent;
 public class NoticeManagementContentVO extends NoticeManagementContent {
 	private static final long serialVersionUID = 1L;
 
+	private ReceiverType[] receiverTypes;
 }

ldt-core/src/main/java/org/springblade/ldt/notice/vo/NoticeManagementVO.java

@@ -35,8 +35,6 @@ import org.springblade.ldt.notice.entity.NoticeManagementContent;
 public class NoticeManagementVO extends NoticeManagement {
 	private static final long serialVersionUID = 1L;
 
-	private ReceiverType[] receiverTypes;
-
 	private NoticeManagementContent noticeManagementContent;
 
 }

ldt-core/src/main/resources/log/logback-test.xml

@@ -25,7 +25,7 @@
     <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件输出的文件名 -->
-            <FileNamePattern>/home/ldt/server/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>/home/application/ldt/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
@@ -42,7 +42,7 @@
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件输出的文件名 -->
-            <FileNamePattern>/home/ldt/server/log/error-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>/home/application/ldt/log/error-%d{yyyy-MM-dd}.log</FileNamePattern>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>