add internal notify

src/main/java/com/imyeyu/api/modules/common/service/NotifyDetailService.java

@@ -34,6 +34,19 @@ public interface NotifyDetailService extends BaseService<NotifyDetail, String> {
 	/// @return 站内通知分页结果
 	PageResult<NotifyDetail> pageInternalByUserId(Page<NotifyDetail> page, String userId, boolean unreadOnly);
 
+	/// 查询当前用户拥有的站内通知详情
+	///
+	/// @param detailId 通知详情 ID
+	/// @param userId 用户 ID
+	/// @return 通知详情
+	NotifyDetail getInternalByUserId(String detailId, String userId);
+
+	/// 删除当前用户拥有的站内通知详情
+	///
+	/// @param detailId 通知详情 ID
+	/// @param userId 用户 ID
+	void deleteInternalByUserId(String detailId, String userId);
+
 	/// 查询用户未读站内通知数量
 	///
 	/// @param userId 用户 ID

src/main/java/com/imyeyu/api/modules/common/service/implement/NotifyDetailServiceImplement.java

@@ -141,6 +141,33 @@ public class NotifyDetailServiceImplement extends AbstractEntityService<NotifyDe
 		return result;
 	}
 
+	/// 查询当前用户拥有的站内通知详情
+	///
+	/// @param detailId 通知详情 ID
+	/// @param userId 用户 ID
+	/// @return 通知详情
+	@Override
+	public NotifyDetail getInternalByUserId(String detailId, String userId) {
+		TimiException.required(detailId, "未找到通知详情 ID");
+		TimiException.required(userId, "未找到用户 ID");
+		NotifyDetail detail = mapper.selectSiteByIdAndUserId(detailId, userId);
+		TimiException.required(detail, "未找到站内通知");
+		return detail;
+	}
+
+	/// 删除当前用户拥有的站内通知详情
+	///
+	/// @param detailId 通知详情 ID
+	/// @param userId 用户 ID
+	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	public void deleteInternalByUserId(String detailId, String userId) {
+		TimiException.required(detailId, "未找到通知详情 ID");
+		TimiException.required(userId, "未找到用户 ID");
+		int affected = mapper.deleteSiteByIdAndUserId(detailId, userId);
+		TimiException.requiredTrue(0 < affected, "未找到站内通知");
+	}
+
 	/// 查询用户未读站内通知数量
 	///
 	/// @param userId 用户 ID

src/main/java/com/imyeyu/api/modules/common/service/implement/NotifyServiceImplement.java

@@ -4,10 +4,11 @@ import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
 import com.imyeyu.api.modules.common.entity.Notify;
 import com.imyeyu.api.modules.common.entity.NotifyDetail;
 import com.imyeyu.api.modules.common.mapper.NotifyMapper;
-import com.imyeyu.api.modules.common.service.NotifyService;
 import com.imyeyu.api.modules.common.service.NotifyDetailService;
+import com.imyeyu.api.modules.common.service.NotifyService;
 import com.imyeyu.api.modules.system.entity.Logger;
 import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiCode;
 import com.imyeyu.java.bean.timi.TimiException;
@@ -31,8 +32,9 @@ import java.util.List;
 @RequiredArgsConstructor
 public class NotifyServiceImplement extends AbstractEntityService<Notify, String> implements NotifyService {
 
-	private final NotifyDetailService detailService;
 	private final LoggerService loggerService;
+	private final UserLoginService userLoginService;
+	private final NotifyDetailService detailService;
 
 	private final NotifyMapper mapper;
 
@@ -53,8 +55,15 @@ public class NotifyServiceImplement extends AbstractEntityService<Notify, String
 			TimiException.required(notify.getDetailList(), "未找到通知详情列表");
 			super.create(notify);
 
+			String sendFrom = null;
+			if (userLoginService.isLogged()) {
+				sendFrom = userLoginService.getRequireLoginUserId();
+			}
 			for (NotifyDetail detail : notify.getDetailList()) {
 				detail.setNotifyId(notify.getId());
+				if (TimiJava.isNotEmpty(sendFrom)) {
+					detail.setSendFrom(sendFrom);
+				}
 				detailService.create(detail);
 			}
 			logger.setLevel(Logger.Level.INFO);