From 6eb21769c74cfcd10084f73ff3f212355849a3c7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 17 五月 2021 15:00:13 +0800
Subject: [PATCH] 2021-5-17-2
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 168 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 130 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 5807ebf..65ad0e0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -1,40 +1,50 @@
-锘縰sing System;
+using System;
using System.IO;
using System.Net;
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>
- ///// 浣忓畢ID
- ///// </summary>
- //public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID;
- ///// <summary>
- ///// 缃戝叧ID
- ///// </summary>
- //public static string gatewayId = DriverLayer.Control.Ins.GatewayId;
/// <summary>
- /// 浣忓畢ID
+ /// 璋冪敤鑾峰彇浣忓畢瀛愯处鍙峰垪琛�
/// </summary>
- public static string homeId = "1333723044544233473";
- /// <summary>
- /// 缃戝叧ID
- /// </summary>
- public static string gatewayId = "1333723647223775233";
+ 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>
/// <returns></returns>
- public static ResponsePackNew getLogicIdList()
+ public static ResponsePackNew GetLogicIdList()
{
- var jObject = new JObject { { "homeId", homeId } };
+ var jObject = new JObject { { "homeId", LogicMethod.HomeId } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_List);
+ //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
+ if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+ {
+ RefreshToken();
+ GetLogicIdList();
+ }
return responsePackNew;
}
/// <summary>
@@ -42,7 +52,7 @@
/// </summary>
/// <param name="listIdList">閫昏緫ID鍒楄〃</param>
/// <returns></returns>
- public static ResponsePackNew getLogic(List<string> listIdList)
+ public static ResponsePackNew GetLogic(List<string> listIdList)
{
var jArray = new JArray { };
for (int i = 0; i < listIdList.Count; i++)
@@ -51,10 +61,16 @@
}
var jObject = new JObject { { "userLogicIds", jArray } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Info);
+ //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
+ if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+ {
+ RefreshToken();
+ GetLogic(listIdList);
+ }
return responsePackNew;
}
/// <summary>
- /// 娣诲姞鑷姩鍖栧懡浠�
+ /// 娣诲姞鑷姩鍖栧懡浠�
/// </summary>
/// <param name="logic"></param>
/// <returns></returns>
@@ -111,27 +127,56 @@
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);
- logicIfon.Add("gatewayId", gatewayId);
+ logicIfon.Add("gatewayId", LogicMethod.GatewayId);
logicIfon.Add("name", logic.name);
logicIfon.Add("relation", logic.relation);
logicIfon.Add("enable", logic.enable);
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", homeId }, { "logics", logicjArray } };
+ var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };
responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add);
-
+ //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
+ if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+ {
+ RefreshToken();
+ AddLogic(logic);
+ }
+ Console.WriteLine("娣诲姞閫昏緫===" + logicjArray);
}
catch (Exception e)
{
var dd = e.Message;
}
-
-
return responsePackNew;
}
/// <summary>
@@ -139,7 +184,7 @@
/// </summary>
/// <param name="logic"></param>
/// <returns></returns>
- public static ResponsePackNew updateLogic(Logic logic)
+ public static ResponsePackNew UpdateLogic(Logic logic)
{
ResponsePackNew responsePackNew = null;
try
@@ -192,60 +237,100 @@
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);
logicIfon.Add("sid", logic.sid);
- logicIfon.Add("gatewayId", gatewayId);
+ logicIfon.Add("gatewayId", LogicMethod.GatewayId);
logicIfon.Add("name", logic.name);
logicIfon.Add("relation", logic.relation);
logicIfon.Add("enable", logic.enable);
logicIfon.Add("cycle", cycleJObject);
logicIfon.Add("input", inputArray);
logicIfon.Add("output", outputArray);
- logicjArray.Add(logicIfon);
- var jObject = new JObject { { "homeId", homeId }, { "logics", logicjArray } };
- responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update);
+ 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);
+ //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
+ if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+ {
+ RefreshToken();
+ UpdateLogic(logic);
+ }
}
catch (Exception e)
{
var dd = e.Message;
}
-
-
return responsePackNew;
- }
+ }
/// <summary>
/// 鍒犻櫎閫昏緫
/// </summary>
/// <returns></returns>
- public static ResponsePackNew delLogic(Logic logic)
+ public static ResponsePackNew DelLogic(Logic logic)
{
var jArray = new JArray { };
jArray.Add(logic.userLogicId);
var jObject = new JObject { { "userLogicIds", jArray } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Delete);
+ //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
+ if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+ {
+ RefreshToken();
+ DelLogic(logic);
+ }
return responsePackNew;
}
- /// <summary>
+ /// <summary>
/// 閫昏緫寮�鍏�
/// </summary>
/// <returns></returns>
- public static ResponsePackNew switchLogic(Logic logic)
+ public static ResponsePackNew SwitchLogic(Logic logic)
{
var jArray = new JArray { };
var job = new JObject { { "userLogicId", logic.userLogicId } , { "enable", logic.enable } };
jArray.Add(job);
var jObject = new JObject { { "logics", jArray } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Enable);
+ //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
+ if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+ {
+ RefreshToken();
+ SwitchLogic(logic);
+ }
return responsePackNew;
}
/// <summary>
- ///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛�
+ ///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛�
/// </summary>
/// <returns></returns>
- public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 10)
+ public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 3)
{
var requestJson = HttpUtil.GetSignRequestJson(o);
return HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
@@ -261,6 +346,13 @@
return HttpUtil.RequestHttpsPost(api_Url, requestJson);
}
-
+ /// <summary>
+ /// 鍒锋柊Token
+ /// </summary>
+ public static void RefreshToken()
+ {
+ IMessageCommon.Current.StartRefreshToken();
+ }
+
}
}
--
Gitblit v1.8.0