From 1396007184e3e17c2465b1fea5ba5562daf7d157 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 02 六月 2021 16:02:59 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 78 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index afb33d1..65ad0e0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -4,11 +4,33 @@
using HDL_ON.DAL.Server;
using Newtonsoft.Json.Linq;
using System.Collections.Generic;
+using HDL_ON.Entity;
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
public class Send
{
+
+ /// <summary>
+ /// 璋冪敤鑾峰彇浣忓畢瀛愯处鍙峰垪琛�
+ /// </summary>
+ public static List<ResidenceMemberInfo> GetResidenceMemberAccount()
+ {
+
+ var responePack = new HttpServerRequest().GetResidenceMemberAccount();
+ if (responePack.Code == StateCode.SUCCESS)
+ {
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.Data.ToString());
+ }
+ //澶辫触
+ else
+ {
+ //鎻愮ず
+ IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code);
+ }
+ return new List<ResidenceMemberInfo>();
+ }
+
/// <summary>
/// 鑾峰彇閫昏緫ID鍒楄〃
/// </summary>
@@ -105,6 +127,29 @@
outputArray.Add(outputTypeJOb);
}
+
+ var noticeConfigJObject = new JObject();
+ noticeConfigJObject.Add("enable", logic.noticeConfig.enable);
+ noticeConfigJObject.Add("noticeContent", logic.noticeConfig.noticeContent);
+
+ var pushConfigsArray = new JArray { };
+ if (logic.pushConfigs.Count > 0)
+ { //聽鎺ㄩ�佹枃鏈�
+ foreach (var pushConfig in logic.pushConfigs)
+ {
+
+ var pushConfigJob = new JObject { };
+ pushConfigJob.Add("pushMethod", pushConfig.pushMethod);
+ var accountArray = new JArray { };
+ foreach (var account in pushConfig.pushTarget)
+ {
+ accountArray.Add(account);
+ }
+ pushConfigJob.Add("pushTarget", accountArray);
+ pushConfigsArray.Add(pushConfigJob);
+ }
+ }
+
var logicjArray = new JArray { };
var logicIfon = new JObject { };
logicIfon.Add("sid", logic.sid);
@@ -115,6 +160,8 @@
logicIfon.Add("cycle", cycleJObject);
logicIfon.Add("input", inputArray);
logicIfon.Add("output", outputArray);
+ logicIfon.Add("noticeConfig", noticeConfigJObject);
+ logicIfon.Add("pushConfigs", pushConfigsArray);
logicjArray.Add(logicIfon);
var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };
responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add);
@@ -124,14 +171,12 @@
RefreshToken();
AddLogic(logic);
}
-
+ Console.WriteLine("娣诲姞閫昏緫===" + logicjArray);
}
catch (Exception e)
{
var dd = e.Message;
}
-
-
return responsePackNew;
}
/// <summary>
@@ -192,6 +237,28 @@
outputArray.Add(outputTypeJOb);
}
+ var noticeConfigJObject = new JObject();
+ noticeConfigJObject.Add("enable", logic.noticeConfig.enable);
+ noticeConfigJObject.Add("noticeContent", logic.noticeConfig.noticeContent);
+
+ var pushConfigsArray = new JArray { };
+ if (logic.pushConfigs.Count > 0)
+ { //聽鎺ㄩ�佹枃鏈�
+ foreach (var pushConfig in logic.pushConfigs)
+ {
+
+ var pushConfigJob = new JObject { };
+ pushConfigJob.Add("pushMethod", pushConfig.pushMethod);
+ var accountArray = new JArray { };
+ foreach (var account in pushConfig.pushTarget)
+ {
+ accountArray.Add(account);
+ }
+ pushConfigJob.Add("pushTarget", accountArray);
+ pushConfigsArray.Add(pushConfigJob);
+ }
+ }
+
var logicjArray = new JArray { };
var logicIfon = new JObject { };
logicIfon.Add("userLogicId", logic.userLogicId);
@@ -203,6 +270,9 @@
logicIfon.Add("cycle", cycleJObject);
logicIfon.Add("input", inputArray);
logicIfon.Add("output", outputArray);
+ logicIfon.Add("noticeConfig", noticeConfigJObject);
+ logicIfon.Add("pushConfigs", pushConfigsArray);
+
logicjArray.Add(logicIfon);
var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };
responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update);
@@ -217,8 +287,6 @@
{
var dd = e.Message;
}
-
-
return responsePackNew;
}
/// <summary>
--
Gitblit v1.8.0