ntminer 6 years ago
parent
commit
fdbb1caec1

+ 1 - 1
src/AppModels/Vms/ServerMessageViewModel.cs

@@ -81,7 +81,7 @@ namespace NTMiner.Vms {
                     return;
                 }
                 this.ShowDialog(new DialogWindowViewModel(message: $"您确定标记删除'{this.Content}'这条消息吗?", title: "确认", onYes: () => {
-                    VirtualRoot.Execute(new DeleteServerMessageCommand(this.Id));
+                    VirtualRoot.Execute(new MarkDeleteServerMessageCommand(this.Id));
                 }));
             });
             this.Save = new DelegateCommand(() => {

+ 7 - 1
src/NTMiner.Controllers/IServerMessageController.cs

@@ -4,8 +4,14 @@ using System.Collections.Generic;
 
 namespace NTMiner.Controllers {
     public interface IServerMessageController {
+        /// <summary>
+        /// 注意:更新时如果没有更新Timestamp服务器自动将Timestamp更新为当前时间
+        /// </summary>
         ResponseBase AddOrUpdateServerMessage(DataRequest<ServerMessageData> request);
-        ResponseBase RemoveServerMessage(DataRequest<Guid> request);
+        /// <summary>
+        /// 注意:此为标记删除,效果是将IsDeleted更新为true并更新Timestamp为当前时间。
+        /// </summary>
+        ResponseBase MarkDeleteServerMessage(DataRequest<Guid> request);
         DataResponse<List<ServerMessageData>> ServerMessages(ServerMessagesRequest request);
     }
 }

+ 1 - 1
src/NTMinerRpcClient/OfficialServer.partials.ServerMessageServiceFace.cs

@@ -71,7 +71,7 @@ namespace NTMiner {
                 DataRequest<Guid> request = new DataRequest<Guid>() {
                     Data = id
                 };
-                PostAsync(SControllerName, nameof(IServerMessageController.RemoveServerMessage), request.ToQuery(SingleUser.LoginName, SingleUser.PasswordSha1), request, callback);
+                PostAsync(SControllerName, nameof(IServerMessageController.MarkDeleteServerMessage), request.ToQuery(SingleUser.LoginName, SingleUser.PasswordSha1), request, callback);
             }
             #endregion
         }

+ 1 - 1
src/NTMinerServices/Controllers/ServerMessageController.cs

@@ -33,7 +33,7 @@ namespace NTMiner.Controllers {
             }
         }
 
-        public ResponseBase RemoveServerMessage(DataRequest<Guid> request) {
+        public ResponseBase MarkDeleteServerMessage(DataRequest<Guid> request) {
             if (request == null || request.Data == Guid.Empty) {
                 return ResponseBase.InvalidInput("参数错误");
             }

+ 2 - 2
src/NTMinerlib/Messages.cs

@@ -194,8 +194,8 @@ namespace NTMiner {
     }
 
     [MessageType(description: "标记删除服务器消息")]
-    public class DeleteServerMessageCommand : RemoveEntityCommand {
-        public DeleteServerMessageCommand(Guid id) : base(id) {
+    public class MarkDeleteServerMessageCommand : RemoveEntityCommand {
+        public MarkDeleteServerMessageCommand(Guid id) : base(id) {
 
         }
     }

+ 1 - 2
src/NTMinerlib/ServerMessage/LocalServerMessageSet.cs

@@ -22,8 +22,7 @@ namespace NTMiner.ServerMessage {
 
                 VirtualRoot.Execute(new LoadNewServerMessageCommand());
             });
-            // 标记删除
-            VirtualRoot.BuildCmdPath<DeleteServerMessageCommand>(action: message => {
+            VirtualRoot.BuildCmdPath<MarkDeleteServerMessageCommand>(action: message => {
 
                 VirtualRoot.Execute(new LoadNewServerMessageCommand());
             });