From 60c3bc8bf17d83e105acfb4b5219643b7aa875f1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 26 九月 2022 19:53:03 +0800
Subject: [PATCH] 设备维修申请接口开发
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Logs/2022-09-23.TXT | 54 +++
VueWebApi/Image/app_4_5.png | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Models/AnDnDate.cs | 20 +
VueWebApi/obj/Release/TransformWebConfig/original/Web.config | 1
VueWebApi/DLL/BLL/AppDeviceManageBLL.cs | 35 +
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/VueWebApi.csproj | 6
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Hubs/HubsMessage1.html | 2
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 353 ++++++++++++++++++++++-
VueWebApi/Controllers/DeviceManagerController.cs | 2
VueWebApi/Logs/2022-09-26.TXT | 0
VueWebApi/Hubs/ChatHub.cs | 22 +
VueWebApi/obj/Release/Package/PackageTmp/Web.config | 1
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/bin/VueWebApi.dll.config | 1
VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config | 1
VueWebApi/Controllers/AppDeviceManageController.cs | 81 ++++
VueWebApi/obj/Release/Package/PackageTmp/Hubs/HubsMessage2.html | 48 ++-
VueWebApi/Hubs/HubsMessage2.html | 48 ++-
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 20
VueWebApi/Web.config | 1
VueWebApi/bin/VueWebApi.xml | 48 ++
VueWebApi/obj/Release/Package/PackageTmp/Hubs/HubsMessage1.html | 2
/dev/null | 58 ---
VueWebApi/Logs/2022-09-24.TXT | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 44 ++
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 2
33 files changed, 684 insertions(+), 169 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 40e24a6..73340b6 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/AppDeviceManageController.cs b/VueWebApi/Controllers/AppDeviceManageController.cs
index 697f7f5..4343ce7 100644
--- a/VueWebApi/Controllers/AppDeviceManageController.cs
+++ b/VueWebApi/Controllers/AppDeviceManageController.cs
@@ -1,8 +1,10 @@
锘縰sing System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Web;
using System.Web.Http;
using VueWebApi.DLL.BLL;
using VueWebApi.Models;
@@ -105,7 +107,7 @@
/// <returns></returns>
[Route(template: "AppDeviceRepairSave")]
[HttpPost]
- public HttpResponseMessage AppDeviceRepairSave(string username,string maintcyc, AppDevicecCheck json)
+ public HttpResponseMessage AppDeviceRepairSave(string username, string maintcyc, AppDevicecCheck json)
{
mes = AppDeviceManageBLL.AppDeviceRepairSave(username, maintcyc, json);
return TJson.toJson(mes);
@@ -113,30 +115,91 @@
#endregion
- #region[璁惧缁翠慨,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
+ #region[璁惧缁翠慨鐢宠,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
/// <summary>
- /// 璁惧缁翠慨,鎵弿宸ヤ綅/璁惧浜岀淮鐮�
+ /// 璁惧缁翠慨鐢宠,鎵弿宸ヤ綅/璁惧浜岀淮鐮�
/// </summary>
/// <param name="eqpcode">璁惧缂栫爜</param>
/// <returns></returns>
- [Route(template: "MaintainScanDeviceQrCodeData")]
+ [Route(template: "MaintainScanDeviceApplyQrCodeData")]
[HttpGet]
- public HttpResponseMessage MaintainScanDeviceQrCodeData(string eqpcode)
+ public HttpResponseMessage MaintainScanDeviceApplyQrCodeData(string eqpcode)
{
- mes = AppDeviceManageBLL.MaintainScanDeviceQrCodeData(eqpcode);
+ mes = AppDeviceManageBLL.MaintainScanDeviceApplyQrCodeData(eqpcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨]
+ [Route(template: "MaintainScanDeviceApplySave")]
+ [HttpPost]
+ public HttpResponseMessage MaintainScanDeviceApplySave()
+ {
+ string username = HttpContext.Current.Request["username"].ToString();//鎿嶄綔浜哄憳
+ string eqpcode = HttpContext.Current.Request["eqpcode"].ToString();//璁惧缂栫爜
+ string wkshpcode = HttpContext.Current.Request["wkshpcode"].ToString(); //杞﹂棿缂栫爜
+ string faultsourcecode = HttpContext.Current.Request["faultsourcecode"].ToString(); //鏁呴殰鏉ユ簮缂栫爜
+ string faultdescr = HttpContext.Current.Request["faultdescr"].ToString(); //鏁呴殰鎻忚堪
+ HttpFileCollection files = HttpContext.Current.Request.Files;
+ mes = AppDeviceManageBLL.MaintainScanDeviceApplySave(username, eqpcode, wkshpcode, faultsourcecode, faultdescr, files);
return TJson.toJson(mes);
}
#endregion
- #region[娴嬭瘯瀹夌伅鍛煎彨]
+
+
+
+ #region[瀹夌伅鍛煎彨鎵弿宸ヤ綅]
+ /// <summary>
+ /// 瀹夌伅鍛煎彨鎵弿宸ヤ綅
+ /// </summary>
+ /// <param name="eqpcode">璁惧鐮�</param>
+ /// <returns></returns>
+ [Route(template: "AppDeviceAnDengCallScanSearch")]
+ [HttpPost]
+ public HttpResponseMessage AppDeviceAnDengCallScanSearch(string eqpcode)
+ {
+ mes = AppDeviceManageBLL.AppDeviceAnDengCallScanSearch(eqpcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅鍛煎彨,閫夋嫨鎵弿宸ヤ綅甯﹀嚭鍛煎彨绫诲瀷閫夐」鍙婂搴斾汉鍛樻暟鎹甝
+ /// <summary>
+ /// 瀹夌伅鍛煎彨,閫夋嫨鎵弿宸ヤ綅甯﹀嚭鍛煎彨绫诲瀷閫夐」鍙婂搴斾汉鍛樻暟鎹�
+ /// </summary>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "AppDeviceAnDengCallItemSearch")]
+ [HttpPost]
+ public HttpResponseMessage AppDeviceAnDengCallItemSearch(string eqpcode, string wkshpcode)
+ {
+ mes = AppDeviceManageBLL.AppDeviceAnDengCallItemSearch(eqpcode, wkshpcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅鍛煎彨鎻愪氦]
+ /// <summary>
+ /// 瀹夌伅鍛煎彨鎻愪氦
+ /// </summary>
+ /// <param name="username">鐧诲綍浜哄憳</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
[Route(template: "AppDeviceAnDengCallSave")]
[HttpPost]
- public HttpResponseMessage AppDeviceAnDengCallSave(string eqpcode)
+ public HttpResponseMessage AppDeviceAnDengCallSave(string username, string eqpcode, string wkshpcode, List<AnDnDate> json)
{
- mes = AppDeviceManageBLL.AppDeviceAnDengCallSave(eqpcode);
+ mes = AppDeviceManageBLL.AppDeviceAnDengCallSave(username, eqpcode, wkshpcode, json);
return TJson.toJson(mes);
}
#endregion
+
+
+
}
}
diff --git a/VueWebApi/Controllers/DeviceManagerController.cs b/VueWebApi/Controllers/DeviceManagerController.cs
index 64e8c12..058f743 100644
--- a/VueWebApi/Controllers/DeviceManagerController.cs
+++ b/VueWebApi/Controllers/DeviceManagerController.cs
@@ -667,7 +667,7 @@
#region[璁惧鐐规璁板綍鏄庣粏鏌ヨ]
/// <summary>
- /// 璁惧淇濆吇璁板綍鏄庣粏鏌ヨ
+ /// 璁惧鐐规璁板綍鏄庣粏鏌ヨ
/// </summary>
/// <param name="djwo">璁惧鐐规鍗曞彿</param>
/// <returns></returns>
diff --git a/VueWebApi/DLL/BLL/AppDeviceManageBLL.cs b/VueWebApi/DLL/BLL/AppDeviceManageBLL.cs
index 611f8d8..c7188b6 100644
--- a/VueWebApi/DLL/BLL/AppDeviceManageBLL.cs
+++ b/VueWebApi/DLL/BLL/AppDeviceManageBLL.cs
@@ -56,10 +56,17 @@
- #region[璁惧缁翠慨,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
- public static ToMessage MaintainScanDeviceQrCodeData(string eqpcode)
+ #region[璁惧缁翠慨鐢宠,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
+ public static ToMessage MaintainScanDeviceApplyQrCodeData(string eqpcode)
{
- return AppDeviceManageDAL.MaintainScanDeviceQrCodeData(eqpcode);
+ return AppDeviceManageDAL.MaintainScanDeviceApplyQrCodeData(eqpcode);
+ }
+ #endregion
+
+ #region[璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨]
+ public static ToMessage MaintainScanDeviceApplySave(string username, string eqpcode, string wkshpcode, string faultsourcecode, string faultdescr, HttpFileCollection files)
+ {
+ return AppDeviceManageDAL.MaintainScanDeviceApplySave(username,eqpcode, wkshpcode, faultsourcecode, faultdescr, files);
}
#endregion
@@ -67,11 +74,27 @@
- #region[娴嬭瘯瀹夌伅鍛煎彨]
- public static ToMessage AppDeviceAnDengCallSave(string eqpcode)
+ #region[瀹夌伅鍛煎彨鎵弿宸ヤ綅]
+ public static ToMessage AppDeviceAnDengCallScanSearch(string eqpcode)
{
- return AppDeviceManageDAL.AppDeviceAnDengCallSave(eqpcode);
+ return AppDeviceManageDAL.AppDeviceAnDengCallScanSearch(eqpcode);
}
#endregion
+
+ #region[瀹夌伅鍛煎彨,閫夋嫨鎵弿宸ヤ綅甯﹀嚭鍛煎彨绫诲瀷閫夐」鍙婂搴斾汉鍛樻暟鎹甝
+ public static ToMessage AppDeviceAnDengCallItemSearch(string eqpcode,string wkshpcode)
+ {
+ return AppDeviceManageDAL.AppDeviceAnDengCallItemSearch(eqpcode, wkshpcode);
+ }
+ #endregion
+
+ #region[瀹夌伅鍛煎彨鎻愪氦]
+ public static ToMessage AppDeviceAnDengCallSave(string username, string eqpcode, string wkshpcode, List<AnDnDate> json)
+ {
+ return AppDeviceManageDAL.AppDeviceAnDengCallSave(username,eqpcode,wkshpcode,json);
+ }
+ #endregion
+
+
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index 7f77c18..9af4163 100644
--- a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
+++ b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -6,6 +6,7 @@
using System.Data.SqlClient;
using System.Linq;
using System.Web;
+using VueWebApi.Hubs;
using VueWebApi.Models;
using VueWebApi.Tools;
@@ -104,12 +105,12 @@
public static ToMessage AppDeviceCheckSave(string username, AppDevicecCheck json)
{
var sql = "";
- string djwo = "",numvalue="";
+ string djwo = "", numvalue = "";
List<object> list = new List<object>();
try
{
list.Clear();
- mes = SeachEncode.EncodingSeach("1027"); //鐢熸垚鍗曞彿
+ mes = SeachEncode.EncodingSeach("2040"); //鐢熸垚鍗曞彿
if (mes.code == "300")
{
return mes;
@@ -118,7 +119,7 @@
{
List<string> wo = (List<string>)mes.data;
djwo = wo[0].ToString(); //鑾峰彇鍗曞彿
- numvalue= wo[1].ToString(); //鑾峰彇娴佹按鍙�
+ numvalue = wo[1].ToString(); //鑾峰彇娴佹按鍙�
}
if (json == null || json.children.Count <= 0)
{
@@ -139,10 +140,10 @@
{
djwo = djwo,
eqp_code = json.code,
- eqpchkmain_code=json.standcode,
+ eqpchkmain_code = json.standcode,
lm_user = username,
lm_date = DateTime.Now.ToString(),
- chk_result=json.result
+ chk_result = json.result
}
});
//寰幆鍐欏叆鐐规璁板綍瀛愯〃
@@ -157,7 +158,7 @@
{
seq = json.children[i].seq,
djwo = djwo,
- eqpchkdeta_code =json.children[i].itemcode,
+ eqpchkdeta_code = json.children[i].itemcode,
chk_cyc = json.children[i].cycle,
result = json.children[i].result,
chk_value = json.children[i].value
@@ -279,7 +280,7 @@
#endregion
#region[鏃ュ父淇濆吇,鎻愪氦淇濆瓨]
- public static ToMessage AppDeviceRepairSave(string username,string maintcyc, AppDevicecCheck json)
+ public static ToMessage AppDeviceRepairSave(string username, string maintcyc, AppDevicecCheck json)
{
var sql = "";
string bywo = "", numvalue = "";
@@ -287,7 +288,7 @@
try
{
list.Clear();
- mes = SeachEncode.EncodingSeach("1028"); //鐢熸垚鍗曞彿
+ mes = SeachEncode.EncodingSeach("2041"); //鐢熸垚鍗曞彿
if (mes.code == "300")
{
return mes;
@@ -318,7 +319,7 @@
bywo = bywo,
eqp_code = json.code,
eqpmaint_code = json.standcode,
- maintcyc= maintcyc,
+ maintcyc = maintcyc,
lm_user = username,
lm_date = DateTime.Now.ToString(),
maint_result = json.result
@@ -328,7 +329,7 @@
for (int i = 0; i < json.children.Count; i++)
{
sql = @"insert into TEqpmaint_Proc_Deta(seq,bywo,eqpmaideta_code,result,maint_cyc,maint_value)
- values(@seq,@bywo,@eqpmaideta_code,@maint_cyc,@result,@maint_value)";
+ values(@seq,@bywo,@eqpmaideta_code,@result,@maint_cyc,@maint_value)";
list.Add(new
{
str = sql,
@@ -375,8 +376,167 @@
- #region[璁惧缁翠慨,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
- public static ToMessage MaintainScanDeviceQrCodeData(string eqpcode)
+ #region[璁惧缁翠慨鐢宠,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
+ public static ToMessage MaintainScanDeviceApplyQrCodeData(string eqpcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇褰撳墠鎵爜璁惧鏄惁鐢宠缁翠慨璁板綍
+ sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status='REPA' or status='COMP'";
+ dynamicParams.Add("@eqpcode", eqpcode);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
+ {
+ //鏌ョ湅缁翠慨璁板綍閲岄潰鏄惁鏈夊凡鐢宠鏈淮淇強缁翠慨纭鐨勬暟鎹�
+ var rows = data0.AsEnumerable().Where(item => item["STATUS"].ToString().Equals("REPA")).ToArray();
+ if (rows.Length > 0)
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠璁惧/宸ヤ綅宸茬敵璇�,寰呯淮淇�!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠璁惧/宸ヤ綅宸茬淮淇�,寰呯‘璁ら獙璇�!";
+ mes.data = null;
+ }
+ }
+ else
+ {
+ //鑾峰彇瀵瑰簲璁惧鍙婃墍灞炶溅闂�
+ sql = @"select A.code,A.name,T.org_code as wksp_code,T.org_name as wksp_name,E.eqpchkmain_code
+ from TEqpInfo A
+ left join TOrganization T on A.wksp_code=T.org_code
+ left join TEqpchk_Eqp E on A.code=E.eqp_code
+ where A.code=@eqpcode and A.enable='Y' and T.description='W'";
+ dynamicParams.Add("@eqpcode", eqpcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠璁惧/宸ヤ綅涓嶅瓨鍦ㄦ垨寮傚父!";
+ mes.data = data;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨]
+ public static ToMessage MaintainScanDeviceApplySave(string username, string eqpcode, string wkshpcode, string faultsourcecode, string faultdescr, HttpFileCollection files)
+ {
+ var sql = "";
+ string wxwo = "", numvalue = "";
+ List<object> list = new List<object>();
+ try
+ {
+ list.Clear();
+ mes = SeachEncode.EncodingSeach("2042"); //鐢熸垚鍗曞彿
+ if (mes.code == "300")
+ {
+ mes.Message = "鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�2042銆戠殑缂栫爜瑙勫垯";
+ return mes;
+ }
+ else
+ {
+ List<string> wo = (List<string>)mes.data;
+ wxwo = wo[0].ToString(); //鑾峰彇鍗曞彿
+ numvalue = wo[1].ToString(); //鑾峰彇娴佹按鍙�
+ }
+ //楠岃瘉涓婁紶鍥剧墖
+ if (files != null && files.Count > 0)
+ {
+ for (int i = 0; i < files.Count; i++)
+ {
+ HttpPostedFile file = files[i];
+ string imgName = DateTime.Now.ToString("yyyyMMddhhmmss");
+ string imgPath = "/DeviceImage/image1/" + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕
+ string AbsolutePath = System.Web.HttpContext.Current.Server.MapPath(imgPath);
+ file.SaveAs(AbsolutePath); //灏嗕笂浼犵殑涓滆タ淇濆瓨
+ //寰幆鍐欑淮淇褰曞搴斿浘鐗囪〃
+ sql = @"insert into TEqp_RepairImage(source_wo,wo_type,img1_url)
+ values(@source_wo,@wo_type,@img1_url)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ source_wo = wxwo,
+ wo_type = "REPA",
+ img1_url = imgPath
+ }
+ });
+ }
+ }
+
+ //鍐欏叆缁翠慨璁板綍琛�
+ sql = @"insert into TEqp_RepairRequest(docu_code,docu_date,status,wksp_code,eqp_code,request_person,request_date,failure_descript,source)
+ values(@docu_code,@docu_date,@status,@wksp_code,@eqp_code,@request_person,@request_date,@failure_descript,@source)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ docu_code = wxwo,
+ docu_date = DateTime.Now.ToString(),
+ status = "REPA",
+ wksp_code = wkshpcode,
+ eqp_code = eqpcode,
+ request_person = username,
+ request_date = DateTime.Now.ToString(),
+ failure_descript= faultdescr,
+ source=faultsourcecode
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "缁翠慨鐢宠鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "缁翠慨鐢宠澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+
+
+ #region[瀹夌伅鍛煎彨鎵弿宸ヤ綅]
+ public static ToMessage AppDeviceAnDengCallScanSearch(string eqpcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -414,17 +574,168 @@
}
#endregion
-
-
-
-
-
-
- #region[娴嬭瘯瀹夌伅鍛煎彨]
- public static ToMessage AppDeviceAnDengCallSave(string eqpcode)
+ #region[瀹夌伅鍛煎彨,閫夋嫨鎵弿宸ヤ綅甯﹀嚭鍛煎彨绫诲瀷閫夐」鍙婂搴斾汉鍛樻暟鎹甝
+ public static ToMessage AppDeviceAnDengCallItemSearch(string eqpcode, string wkshpcode)
{
- throw new NotImplementedException();
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<AnDnDate> list = new List<AnDnDate>();
+ try
+ {
+ //鏍规嵁杞﹂棿浠ｇ爜鏌ユ壘鍛煎彨绫诲瀷鏁版嵁
+ sql = @"select A.id,B.code,B.name from TAnDon_Roul_ConFig A
+ inner join TAnDonType B on A.andotype_code=B.code
+ where A.wkshp_code=@wkshpcode and A.enable='N'";
+ dynamicParams.Add("@wkshpcode", wkshpcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ for (int i = 0; i < data.Rows.Count; i++)
+ {
+ AnDnDate mn = new AnDnDate();
+ mn.code = data.Rows[i]["CODE"].ToString();
+ mn.name = data.Rows[i]["NAME"].ToString();
+ mn.children = new List<AnDnDateSub>();
+ //鏍规嵁鍛煎彨绫诲瀷id鏌ユ壘缁戝畾浜哄憳
+ sql = @"select U.usercode,U.username
+ from TAnDon_Roul_ConFigUser A
+ inner join TUser U on A.usercode=U.usercode
+ where A.ando_cogfigid=@id";
+ dynamicParams.Add("@id", data.Rows[i]["ID"].ToString());
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
+ {
+ for (int j = 0; j < data0.Rows.Count; j++)
+ {
+ AnDnDateSub sn = new AnDnDateSub();
+ sn.usercode = data0.Rows[j]["USERCODE"].ToString();
+ sn.username = data0.Rows[j]["USERNAME"].ToString();
+ mn.children.Add(sn);
+ }
+ }
+ list.Add(mn);
+ }
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = list;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠璁惧鏈缃畨鐏懠鍙被鍨嬫垨鑰呭懠鍙被鍨嬪凡鍏抽棴!";
+ mes.data = data;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
}
#endregion
+
+ #region[瀹夌伅鍛煎彨鎻愪氦]
+ public static ToMessage AppDeviceAnDengCallSave(string username, string eqpcode, string wkshpcode, List<AnDnDate> json)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ ChatHub chthub = new ChatHub();
+ try
+ {
+ list.Clear();
+ //鎵ц娑堟伅鎺ㄩ��
+ chthub.SendByGroupList(username, wkshpcode, eqpcode, json);
+ for (int i = 1; i <= json.Count; i++)
+ {
+ string code = json[i].code.ToString();
+ string name = json[i].name.ToString();
+ sql = @"select * from TAnDon_Task_Info where wkshp_code=@wkshpcode and eqp_code=@eqpcode and type=@typecode and status='START'";
+ dynamicParams.Add("@wkshpcode", wkshpcode);
+ dynamicParams.Add("@eqpcode", eqpcode);
+ dynamicParams.Add("@typecode", code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠璁惧宸茬粡鍛煎彨銆�" + name + "銆�,璇峰厛鍝嶅簲!";
+ mes.data = null;
+ return mes;
+ }
+ else
+ {
+ //鑾峰彇涓昏〃鏈�澶D
+ sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_Record')+@num,1) as id";
+ dynamicParams.Add("@num", i);
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ //鍐欏叆瀹夌伅鍛煎彨琛�
+ sql = @"insert into TAnDon_Task_Info(wkshp_code,eqp_code,type,start_date,start_user,status)
+ values(@wkshp_code,@eqp_code,@type,@start_date,@start_user,@status)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wkshp_code = wkshpcode,
+ eqp_code = eqpcode,
+ type = code,
+ start_date = DateTime.Now.ToString(),
+ start_user = username,
+ status = "START"
+ }
+ });
+ for (int j = 0; j < json[i].children.Count; j++)
+ {
+ //鍐欏叆瀹夌伅璁板綍鎺ㄩ�佷汉鍛樿〃
+ sql = @"insert into TAnDnMessagePush(m_id,wkshp_code,eqp_code,type,resp_user,status)
+ values(@m_id,@wkshp_code,@eqp_code,@type,@start_date,@start_user,@status)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
+ wkshp_code = wkshpcode,
+ eqp_code = eqpcode,
+ type = code,
+ resp_user = json[i].children[i].usercode,
+ status = "N"
+ }
+ });
+ }
+ }
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍛煎彨鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍛煎彨澶辫触!";
+ mes.data = null;
+ }
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index dc7d500..fff7512 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -2251,7 +2251,7 @@
{
search = "and 1=1 ";
}
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select
diff --git a/VueWebApi/HtmlPage1.html b/VueWebApi/HtmlPage1.html
deleted file mode 100644
index 72213e9..0000000
--- a/VueWebApi/HtmlPage1.html
+++ /dev/null
@@ -1,58 +0,0 @@
-锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
- <title></title>
- <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-1.11.3.min.js"></script>
- <script>
- var ws;
- $().ready(function () {
- $('#conn').click(function () {
- ws = new WebSocket('wss://121.196.36.24:8001' + '/api/Send?clientName=' + '456');
- $('#msg').append('<p>姝ｅ湪杩炴帴</p>');
-
- ws.onopen = function () {
- $('#msg').append('<p>宸茬粡杩炴帴</p>');
- }
- ws.onmessage = function (evt) {
- $('#msg').append('<p>' + evt.data + '</p>');
- }
- ws.onerror = function (evt) {
- $('#msg').append('<p>' + JSON.stringify(evt) + '</p>');
- }
- ws.onclose = function () {
- $('#msg').append('<p>宸茬粡鍏抽棴</p>');
- }
- });
-
- $('#close').click(function () {
- ws.close();
- });
-
- $('#send').click(function () {
- if (ws.readyState == WebSocket.OPEN) {
- ws.send($("#to").val() + "|" + $('#content').val());
- }
- else {
- $('#tips').text('杩炴帴宸茬粡鍏抽棴');
- }
- });
-
- });
- </script>
-</head>
-<body>
- <div>
- <input id="user" type="text" />
- <input id="conn" type="button" value="杩炴帴" />
- <input id="close" type="button" value="鍏抽棴" /><br />
- <span id="tips"></span>
- <input id="content" type="text" />
- <input id="send" type="button" value="鍙戦��" /><br />
- <input id="to" type="text" />鐩殑鐢ㄦ埛
- <div id="msg">
- </div>
- </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/VueWebApi/Hubs/ChatHub.cs b/VueWebApi/Hubs/ChatHub.cs
index c271caa..759cd8e 100644
--- a/VueWebApi/Hubs/ChatHub.cs
+++ b/VueWebApi/Hubs/ChatHub.cs
@@ -5,6 +5,7 @@
using System.Data;
using System.Linq;
using System.Web;
+using VueWebApi.Models;
using VueWebApi.Tools;
namespace VueWebApi.Hubs
@@ -42,6 +43,25 @@
Clients.Clients(FindPublicBaseDic).SendMessage("鏉ヨ嚜鐢ㄦ埛:" + name1 + " 鍐呭锛�" + cont + "" + DateTime.Now.ToString("yyyy/MM/ddhh:mm:ss") + "鐨勬秷鎭帹閫侊紒");
}
+ /// <summary>
+ /// 瀹夌伅鍛煎彨鎻愪氦鏃惰皟鐢�
+ /// </summary>
+ /// <param name="username">鍙戣捣浜�</param>
+ /// <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="json"></param>
+ public void SendByGroupList(string username,string wkshpcode, string eqpcode, List<AnDnDate> json)
+ {
+ for (int i = 0; i < json.Count; i++)
+ {
+ string cont = wkshpcode + "瀵瑰簲璁惧" + eqpcode + json[i].name.ToString();
+ var departmentIDs = json[i].children.ToList().Select(x => x.username).ToList();//鑾峰彇鎺ㄩ�佷汉鍛�
+ var FindPublicBaseDic = _connections.Where(d => departmentIDs.Contains(d.Key)).Select(x => x.Value).ToList(); //鍖归厤宸茬粡鐧诲綍鐨勬帹閫佷汉鍛樺敮涓�鐮�
+ var FindPublicBaseDicName = _connections.Where(d => FindPublicBaseDic.Contains(d.Value)).Select(x => x.Key).ToList(); //鏍规嵁鍞竴鐮佸尮閰嶅凡缁忕櫥褰曠殑鎺ㄩ�佷汉鍛樺悕绉�
+ Clients.Clients(FindPublicBaseDic).SendMessage("鏉ヨ嚜鐢ㄦ埛:" + username +" 鍐呭锛�" + cont + "鏃堕棿" + DateTime.Now.ToString("yyyy/MM/ddhh:mm:ss") + "鐨勬秷鎭�氱煡锛�");
+ }
+ }
+
/// <summary>
/// 鐢ㄦ埛涓婄嚎鍑芥暟(鍗曠敤鎴�)
@@ -49,7 +69,7 @@
/// <param name="name">鐢ㄦ埛鍚�</param>
public void SendLogin(string name)
{
- LogHelper.WriteLogData("鐧诲綍浜哄憳:" + name);
+ //LogHelper.WriteLogData("鐧诲綍浜哄憳:" + name);
if (!userList.Contains(name))
{
userList.Add(name);
diff --git a/VueWebApi/Hubs/HubsMessage1.html b/VueWebApi/Hubs/HubsMessage1.html
index 23937e7..2778c71 100644
--- a/VueWebApi/Hubs/HubsMessage1.html
+++ b/VueWebApi/Hubs/HubsMessage1.html
@@ -24,7 +24,7 @@
//鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
var work = $.connection.chatHub;
/*$('#displayname').val(prompt('璇疯緭鍏ユ樀绉�:', ''));*/
- $('#displayname').val("1");
+ $('#displayname').val("钁ｄ箞濡�");
$('#thisname').text('褰撳墠鐢ㄦ埛锛�' + $('#displayname').val());
diff --git a/VueWebApi/Hubs/HubsMessage2.html b/VueWebApi/Hubs/HubsMessage2.html
index 4bac89e..7dcabde 100644
--- a/VueWebApi/Hubs/HubsMessage2.html
+++ b/VueWebApi/Hubs/HubsMessage2.html
@@ -11,8 +11,7 @@
<h1>娴佺▼婕旂ず</h1>
<input type="hidden" id="displayname" />
<h2 id="thisname"></h2><br />
- <select id="username" style="width:153px;">
- </select>
+ <input type="hidden" id="username" value="1" />
<input id="cont" type="text" style="width:300px;">
<input id="send" type="button" value="鍙戦��" />
<div>
@@ -24,7 +23,7 @@
//鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
var work = $.connection.chatHub;
/*$('#displayname').val(prompt('璇疯緭鍏ユ樀绉�:', ''));*/
- $('#displayname').val("2");
+ $('#displayname').val("寮犱笁");
$('#thisname').text('褰撳墠鐢ㄦ埛锛�' + $('#displayname').val());
@@ -35,28 +34,45 @@
};
+
+ //鍚庣SendLogin璋冪敤鍚庯紝浜х敓鐨刲oginUser鍥炶皟
+ //work.client.loginUser = function (userlist) {
+ // reloadUser(userlist);
+ //};
+
+
+
//hub杩炴帴寮�鍚�
$.connection.hub.start().done(function () {
var username = $('#displayname').val();
//鍙戦�佷笂绾夸俊鎭�
work.server.sendLogin(username);
+ //鐐瑰嚮鎸夐挳锛屽彂閫佹秷鎭�
+ $('#send').click(function () {
+ /*var friend = $('#username').val();*/
+ var wkshpname = "绮惧伐杞﹂棿";
+ var eqpname = "璁惧01";
+ var json = [{ "code": "Q", "name": "鍛煎彨璐ㄩ噺", "children": [{ "usercode": "009", "username": "钁ｄ箞濡�" }, { "usercode": "008", "username": "濡傝姳" }] }];
+ //璋冪敤鍚庣鍑芥暟锛屽彂閫佹寚瀹氭秷鎭�
+ work.server.sendByGroupList(username, wkshpname, eqpname, json);
+ });
});
});
- //閲嶆柊鍔犺浇鐢ㄦ埛鍒楄〃
- //var reloadUser = function () {
- // $("#username").empty();
- // for (i = 0; i < 5; i++) {
- // $("#username").append("<option value=" + i + ">" +i + "</option>");
- // }
- //}
- //var reloadUser = function (userlist) {
- // $("#username").empty();
- // for (i = 0; i < userlist.length; i++) {
- // $("#username").append("<option value=" + userlist[i] + ">" + userlist[i] + "</option>");
- // }
- //}
+ //閲嶆柊鍔犺浇鐢ㄦ埛鍒楄〃
+ //var reloadUser = function () {
+ // $("#username").empty();
+ // for (i = 0; i < 5; i++) {
+ // $("#username").append("<option value=" + i + ">" + i + "</option>");
+ // }
+ //}
+ //var reloadUser = function (userlist) {
+ // $("#username").empty();
+ // for (i = 0; i < userlist.length; i++) {
+ // $("#username").append("<option value=" + userlist[i] + ">" + userlist[i] + "</option>");
+ // }
+ //}
</script>
</body>
</html>
\ No newline at end of file
diff --git a/VueWebApi/Image/app_4_5.png b/VueWebApi/Image/app_4_5.png
new file mode 100644
index 0000000..c639232
--- /dev/null
+++ b/VueWebApi/Image/app_4_5.png
Binary files differ
diff --git a/VueWebApi/Logs/2022-09-23.TXT b/VueWebApi/Logs/2022-09-23.TXT
new file mode 100644
index 0000000..b6d5070
--- /dev/null
+++ b/VueWebApi/Logs/2022-09-23.TXT
@@ -0,0 +1,54 @@
+ 【时间】:2022-09-23 12:26:48,827
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 11
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第36行
+ 【日志内容】:登录人员:张三
+时间：2022-09-23 12:26:48
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
+ 【时间】:2022-09-23 12:28:46,556
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 11
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第36行
+ 【日志内容】:登录人员:张三
+时间：2022-09-23 12:28:46
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
+ 【时间】:2022-09-23 12:29:30,361
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 9
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第36行
+ 【日志内容】:登录人员:1
+时间：2022-09-23 12:29:28
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
+ 【时间】:2022-09-23 12:32:02,227
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 15
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第36行
+ 【日志内容】:登录人员:张三
+时间：2022-09-23 12:32:02
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
+ 【时间】:2022-09-23 12:32:25,943
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 9
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第36行
+ 【日志内容】:登录人员:1
+时间：2022-09-23 12:32:25
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
+ 【时间】:2022-09-23 13:44:09,487
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 8
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第36行
+ 【日志内容】:登录人员:董么妹发送人:0发送内容:222
+时间：2022-09-23 13:44:09
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
diff --git a/VueWebApi/Logs/2022-09-24.TXT b/VueWebApi/Logs/2022-09-24.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-09-24.TXT
diff --git a/VueWebApi/Logs/2022-09-26.TXT b/VueWebApi/Logs/2022-09-26.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-09-26.TXT
diff --git a/VueWebApi/Models/AnDnDate.cs b/VueWebApi/Models/AnDnDate.cs
new file mode 100644
index 0000000..919361c
--- /dev/null
+++ b/VueWebApi/Models/AnDnDate.cs
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Models
+{
+ public class AnDnDate
+ {
+ public string code { get; set; }
+ public string name { get; set; }
+ public List<AnDnDateSub> children { get; set; }//瀛愯妭鐐�
+ }
+ public class AnDnDateSub
+ {
+ public string usercode { get; set; }
+ public string username { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 0490c3c..35bb146 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\XKDMesApi</_PublishTargetUrl>
- <History>True|2022-09-22T09:31:41.3605592Z;True|2022-09-22T17:25:44.2386416+08:00;True|2022-09-22T09:47:22.9767826+08:00;True|2022-09-16T14:31:58.5334673+08:00;True|2022-09-16T09:04:53.3449040+08:00;True|2022-09-15T15:15:18.3159768+08:00;True|2022-09-14T17:46:23.0171281+08:00;True|2022-09-14T17:43:44.4370239+08:00;True|2022-09-14T17:34:30.3167863+08:00;True|2022-09-14T17:33:00.5148855+08:00;True|2022-09-14T17:06:32.0879029+08:00;True|2022-09-14T16:50:12.7189783+08:00;True|2022-09-14T16:47:48.3868826+08:00;True|2022-09-14T16:42:35.3830356+08:00;True|2022-09-14T16:41:37.8545801+08:00;True|2022-09-14T16:36:47.0944090+08:00;True|2022-09-14T16:26:00.8638173+08:00;True|2022-09-14T16:13:43.6329252+08:00;True|2022-09-14T16:04:16.8093275+08:00;True|2022-09-14T16:02:54.4702614+08:00;True|2022-09-14T15:57:15.9623104+08:00;True|2022-09-14T15:54:23.8745601+08:00;True|2022-09-14T15:49:40.1730864+08:00;True|2022-09-14T15:42:08.2811334+08:00;True|2022-09-14T15:26:40.0417771+08:00;True|2022-09-14T15:24:30.2187269+08:00;True|2022-09-14T15:16:30.3856771+08:00;True|2022-09-14T15:09:22.4313367+08:00;True|2022-09-14T14:59:14.3795036+08:00;True|2022-09-14T14:53:26.8923244+08:00;True|2022-09-14T14:44:00.6688344+08:00;True|2022-09-14T14:41:53.3908108+08:00;True|2022-09-14T14:40:40.3787118+08:00;True|2022-09-14T14:28:39.2273279+08:00;True|2022-09-14T14:27:13.3566861+08:00;True|2022-09-14T14:25:25.4360688+08:00;True|2022-09-14T14:20:42.9734032+08:00;True|2022-09-14T13:51:39.1303401+08:00;True|2022-09-14T13:25:34.8906041+08:00;True|2022-09-14T13:19:28.9172079+08:00;True|2022-09-14T13:18:09.5900815+08:00;True|2022-09-14T10:58:58.0910068+08:00;True|2022-09-14T10:57:11.4834444+08:00;True|2022-09-14T10:45:39.8943674+08:00;True|2022-09-14T10:38:15.2282286+08:00;True|2022-09-14T10:36:54.8259640+08:00;True|2022-09-14T10:14:12.1218790+08:00;True|2022-09-14T10:13:20.0625618+08:00;True|2022-09-14T10:10:15.3538379+08:00;True|2022-09-14T10:07:09.4796434+08:00;True|2022-09-14T10:06:02.0382235+08:00;True|2022-09-14T09:57:12.0082796+08:00;True|2022-09-14T09:52:29.4689029+08:00;True|2022-09-14T09:47:26.7205193+08:00;True|2022-09-14T09:38:56.4089520+08:00;True|2022-09-14T09:32:34.9863473+08:00;True|2022-09-12T13:07:40.5119225+08:00;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
+ <History>True|2022-09-23T08:12:28.0271396Z;True|2022-09-23T13:50:16.4039745+08:00;True|2022-09-23T13:49:02.0464589+08:00;True|2022-09-23T13:47:12.4458913+08:00;True|2022-09-23T13:42:58.0795715+08:00;True|2022-09-23T13:32:34.2909297+08:00;True|2022-09-23T13:31:14.5573692+08:00;True|2022-09-23T13:27:32.1842906+08:00;True|2022-09-23T12:50:51.2811202+08:00;True|2022-09-22T17:31:41.3605592+08:00;True|2022-09-22T17:25:44.2386416+08:00;True|2022-09-22T09:47:22.9767826+08:00;True|2022-09-16T14:31:58.5334673+08:00;True|2022-09-16T09:04:53.3449040+08:00;True|2022-09-15T15:15:18.3159768+08:00;True|2022-09-14T17:46:23.0171281+08:00;True|2022-09-14T17:43:44.4370239+08:00;True|2022-09-14T17:34:30.3167863+08:00;True|2022-09-14T17:33:00.5148855+08:00;True|2022-09-14T17:06:32.0879029+08:00;True|2022-09-14T16:50:12.7189783+08:00;True|2022-09-14T16:47:48.3868826+08:00;True|2022-09-14T16:42:35.3830356+08:00;True|2022-09-14T16:41:37.8545801+08:00;True|2022-09-14T16:36:47.0944090+08:00;True|2022-09-14T16:26:00.8638173+08:00;True|2022-09-14T16:13:43.6329252+08:00;True|2022-09-14T16:04:16.8093275+08:00;True|2022-09-14T16:02:54.4702614+08:00;True|2022-09-14T15:57:15.9623104+08:00;True|2022-09-14T15:54:23.8745601+08:00;True|2022-09-14T15:49:40.1730864+08:00;True|2022-09-14T15:42:08.2811334+08:00;True|2022-09-14T15:26:40.0417771+08:00;True|2022-09-14T15:24:30.2187269+08:00;True|2022-09-14T15:16:30.3856771+08:00;True|2022-09-14T15:09:22.4313367+08:00;True|2022-09-14T14:59:14.3795036+08:00;True|2022-09-14T14:53:26.8923244+08:00;True|2022-09-14T14:44:00.6688344+08:00;True|2022-09-14T14:41:53.3908108+08:00;True|2022-09-14T14:40:40.3787118+08:00;True|2022-09-14T14:28:39.2273279+08:00;True|2022-09-14T14:27:13.3566861+08:00;True|2022-09-14T14:25:25.4360688+08:00;True|2022-09-14T14:20:42.9734032+08:00;True|2022-09-14T13:51:39.1303401+08:00;True|2022-09-14T13:25:34.8906041+08:00;True|2022-09-14T13:19:28.9172079+08:00;True|2022-09-14T13:18:09.5900815+08:00;True|2022-09-14T10:58:58.0910068+08:00;True|2022-09-14T10:57:11.4834444+08:00;True|2022-09-14T10:45:39.8943674+08:00;True|2022-09-14T10:38:15.2282286+08:00;True|2022-09-14T10:36:54.8259640+08:00;True|2022-09-14T10:14:12.1218790+08:00;True|2022-09-14T10:13:20.0625618+08:00;True|2022-09-14T10:10:15.3538379+08:00;True|2022-09-14T10:07:09.4796434+08:00;True|2022-09-14T10:06:02.0382235+08:00;True|2022-09-14T09:57:12.0082796+08:00;True|2022-09-14T09:52:29.4689029+08:00;True|2022-09-14T09:47:26.7205193+08:00;True|2022-09-14T09:38:56.4089520+08:00;True|2022-09-14T09:32:34.9863473+08:00;True|2022-09-12T13:07:40.5119225+08:00;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -720,16 +720,16 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>09/22/2022 17:31:35</publishTime>
+ <publishTime>09/23/2022 16:12:20</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>09/22/2022 17:31:35</publishTime>
+ <publishTime>09/23/2022 16:12:20</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>09/22/2022 17:31:35</publishTime>
+ <publishTime>09/23/2022 16:12:20</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -738,10 +738,10 @@
<publishTime>01/23/2014 13:57:34</publishTime>
</File>
<File Include="bin/zh-Hans/Microsoft.AspNet.SignalR.Core.resources.dll">
- <publishTime>05/04/2017 02:34:10</publishTime>
+ <publishTime>05/04/2017 10:34:10</publishTime>
</File>
<File Include="bin/zh-Hans/Microsoft.AspNet.SignalR.SystemWeb.resources.dll">
- <publishTime>05/04/2017 02:34:16</publishTime>
+ <publishTime>05/04/2017 10:34:16</publishTime>
</File>
<File Include="bin/zh-Hans/Microsoft.Owin.Host.SystemWeb.resources.dll">
<publishTime>01/18/2019 12:59:56</publishTime>
@@ -1284,13 +1284,13 @@
<publishTime>09/14/2022 17:56:08</publishTime>
</File>
<File Include="Hubs/HubsMessage.html">
- <publishTime>09/08/2022 17:51:08</publishTime>
+ <publishTime>09/23/2022 12:47:04</publishTime>
</File>
<File Include="Hubs/HubsMessage1.html">
- <publishTime>09/08/2022 17:47:19</publishTime>
+ <publishTime>09/23/2022 12:40:14</publishTime>
</File>
<File Include="Hubs/HubsMessage2.html">
- <publishTime>09/08/2022 17:47:18</publishTime>
+ <publishTime>09/23/2022 13:52:12</publishTime>
</File>
<File Include="Image/1.png">
<publishTime>08/11/2022 08:20:52</publishTime>
@@ -1521,7 +1521,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/22/2022 17:31:40</publishTime>
+ <publishTime>09/23/2022 16:12:27</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/TestSocket.cs b/VueWebApi/Tools/TestSocket.cs
deleted file mode 100644
index 501eba6..0000000
--- a/VueWebApi/Tools/TestSocket.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-锘縰sing Fleck;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace VueWebApi.Tools
-{
- public class TestSocket
- {
- #region 鍗曚緥妯″紡
- private static readonly Lazy<TestSocket> lazy = new Lazy<TestSocket>(() => new TestSocket());
- public static TestSocket Instance { get { return lazy.Value; } }
- #endregion
-
- private string msg = "榛樿淇℃伅";
- Dictionary<string, IWebSocketConnection> allSockets = new Dictionary<string, IWebSocketConnection>();
-
- public void socketServer()
- {
- try
- {
- string serverIP = System.Configuration.ConfigurationManager.AppSettings["serverIP"]; //鏈嶅姟鍣↖P鍦板潃
- var server = new WebSocketServer(serverIP);
- server.Start(socket =>//鏈嶅姟寮�濮�
- {
- var userid = socket.ConnectionInfo.Path.Split('?')[1].Split('=')[1];
-
- socket.OnOpen = () =>
- {
- Console.WriteLine("Open!");
- allSockets.Add(userid, socket);
- };
- socket.OnClose = () =>
- {
- Console.WriteLine("Close!");
- allSockets.Remove(userid);
- };
- socket.OnMessage = message =>
- {
- //瀹㈡埛绔氦浜掔殑娑堟伅
- //System.Timers.Timer t = new System.Timers.Timer(10000);//瀹炰緥鍖朤imer绫伙紝璁剧疆闂撮殧鏃堕棿涓�10000姣锛�
- //t.Elapsed += new System.Timers.ElapsedEventHandler(theout);//鍒拌揪鏃堕棿鐨勬椂鍊欐墽琛屼簨浠讹紱
- //t.AutoReset = true;//璁剧疆鏄墽琛屼竴娆★紙false锛夎繕鏄竴鐩存墽琛�(true)锛�
- //t.Enabled = true;//鏄惁鎵цSystem.Timers.Timer.Elapsed浜嬩欢锛�
- allSockets.ToList().ForEach(s => s.Value.Send("Echo: " + msg));
- };
- });
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
-
- }
-
- /// <summary>
- /// 鍙戦�佹秷鎭�
- /// </summary>
- /// <param name="userid"></param>
- /// <param name="msg"></param>
- /// <returns></returns>
- public string Send(string userid, string msg)
- {
- var _msg = $"{DateTime.Now.ToString("HH:mm:ss")}:{msg}";
- allSockets[userid].Send(_msg);
- return _msg;
- }
- }
-}
\ No newline at end of file
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index e30278a..2f26d87 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -360,6 +360,7 @@
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="Hubs\ChatHub2.cs" />
+ <Compile Include="Models\AnDnDate.cs" />
<Compile Include="Models\AppDevicecCheck.cs" />
<Compile Include="Models\EqpRepair.cs" />
<Compile Include="Models\ExcelErro.cs" />
@@ -402,7 +403,6 @@
<Compile Include="Tools\SeachEncode.cs" />
<Compile Include="Tools\SessionControllerRouteHandler.cs" />
<Compile Include="Tools\SessionRouteHandler.cs" />
- <Compile Include="Tools\TestSocket.cs" />
<Compile Include="Tools\TJson.cs" />
<Compile Include="Tools\ToMessage.cs" />
<Compile Include="Util\EntityHelper.cs" />
@@ -418,7 +418,6 @@
<Content Include="Global.asax" />
<Content Include="Grid\grwebapp.js" />
<Content Include="Grid\webapp-ws-tutorial.htm" />
- <Content Include="HtmlPage1.html" />
<Content Include="Hubs\HubsMessage2.html" />
<Content Include="Hubs\HubsMessage1.html" />
<Content Include="Hubs\HubsMessage.html" />
@@ -443,6 +442,7 @@
<Content Include="Image\app_4_2.png" />
<Content Include="Image\app_4_3.png" />
<Content Include="Image\app_4_4.png" />
+ <Content Include="Image\app_4_5.png" />
<Content Include="Image\app_5.png" />
<Content Include="Image\app_5_1.png" />
<Content Include="Image\app_5_2.png" />
@@ -535,6 +535,8 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="DeviceImage\image1\" />
+ <Folder Include="DeviceImage\image2\" />
<Folder Include="File\excel\" />
<Folder Include="File\newxls\" />
<Folder Include="InExcel\" />
diff --git a/VueWebApi/Web.config b/VueWebApi/Web.config
index 6fa534a..e0e8320 100644
--- a/VueWebApi/Web.config
+++ b/VueWebApi/Web.config
@@ -25,7 +25,6 @@
<!--key澶辨晥鏃堕棿30绉�-->
<add key="RedisKeyTimeCont" value="120" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
- <add key="serverIP" value="wss://121.196.36.24:8001" />
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
diff --git a/VueWebApi/bin/VueWebApi.dll.config b/VueWebApi/bin/VueWebApi.dll.config
index 6fa534a..e0e8320 100644
--- a/VueWebApi/bin/VueWebApi.dll.config
+++ b/VueWebApi/bin/VueWebApi.dll.config
@@ -25,7 +25,6 @@
<!--key澶辨晥鏃堕棿30绉�-->
<add key="RedisKeyTimeCont" value="120" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
- <add key="serverIP" value="wss://121.196.36.24:8001" />
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index f93f753..9c952b0 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index 761e01e..d305862 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -741,11 +741,36 @@
<param name="json">鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.AppDeviceManageController.MaintainScanDeviceQrCodeData(System.String)">
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.MaintainScanDeviceApplyQrCodeData(System.String)">
<summary>
- 璁惧缁翠慨,鎵弿宸ヤ綅/璁惧浜岀淮鐮�
+ 璁惧缁翠慨鐢宠,鎵弿宸ヤ綅/璁惧浜岀淮鐮�
</summary>
<param name="eqpcode">璁惧缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.AppDeviceAnDengCallScanSearch(System.String)">
+ <summary>
+ 瀹夌伅鍛煎彨鎵弿宸ヤ綅
+ </summary>
+ <param name="eqpcode">璁惧鐮�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.AppDeviceAnDengCallItemSearch(System.String,System.String)">
+ <summary>
+ 瀹夌伅鍛煎彨,閫夋嫨鎵弿宸ヤ綅甯﹀嚭鍛煎彨绫诲瀷閫夐」鍙婂搴斾汉鍛樻暟鎹�
+ </summary>
+ <param name="eqpcode">璁惧缂栫爜</param>
+ <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.AppDeviceAnDengCallSave(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.AnDnDate})">
+ <summary>
+ 瀹夌伅鍛煎彨鎻愪氦
+ </summary>
+ <param name="username">鐧诲綍浜哄憳</param>
+ <param name="eqpcode">璁惧缂栫爜</param>
+ <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ <param name="json">鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.BasicSettingController.OrganizationSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
@@ -1361,7 +1386,7 @@
</member>
<member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceCheckSubTakeSearch(System.String)">
<summary>
- 璁惧淇濆吇璁板綍鏄庣粏鏌ヨ
+ 璁惧鐐规璁板綍鏄庣粏鏌ヨ
</summary>
<param name="djwo">璁惧鐐规鍗曞彿</param>
<returns></returns>
@@ -2529,6 +2554,15 @@
<param name="name2">娑堟伅鎺ユ敹鑰�</param>
<param name="cont">娑堟伅鍐呭</param>
</member>
+ <member name="M:VueWebApi.Hubs.ChatHub.SendByGroupList(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.AnDnDate})">
+ <summary>
+ 瀹夌伅鍛煎彨鎻愪氦鏃惰皟鐢�
+ </summary>
+ <param name="username">鍙戣捣浜�</param>
+ <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栫爜</param>
+ <param name="json"></param>
+ </member>
<member name="M:VueWebApi.Hubs.ChatHub.SendLogin(System.String)">
<summary>
鐢ㄦ埛涓婄嚎鍑芥暟(鍗曠敤鎴�)
@@ -3147,14 +3181,6 @@
</summary>
<param name="rolecode"></param>
<param name="type"></param>
- <returns></returns>
- </member>
- <member name="M:VueWebApi.Tools.TestSocket.Send(System.String,System.String)">
- <summary>
- 鍙戦�佹秷鎭�
- </summary>
- <param name="userid"></param>
- <param name="msg"></param>
<returns></returns>
</member>
<member name="T:VueWebApi.Util.ObjectValueParser`1">
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index a781365..2106ae9 100644
--- a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/HtmlPage1.html b/VueWebApi/obj/Release/Package/PackageTmp/HtmlPage1.html
deleted file mode 100644
index 72213e9..0000000
--- a/VueWebApi/obj/Release/Package/PackageTmp/HtmlPage1.html
+++ /dev/null
@@ -1,58 +0,0 @@
-锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
- <title></title>
- <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-1.11.3.min.js"></script>
- <script>
- var ws;
- $().ready(function () {
- $('#conn').click(function () {
- ws = new WebSocket('wss://121.196.36.24:8001' + '/api/Send?clientName=' + '456');
- $('#msg').append('<p>姝ｅ湪杩炴帴</p>');
-
- ws.onopen = function () {
- $('#msg').append('<p>宸茬粡杩炴帴</p>');
- }
- ws.onmessage = function (evt) {
- $('#msg').append('<p>' + evt.data + '</p>');
- }
- ws.onerror = function (evt) {
- $('#msg').append('<p>' + JSON.stringify(evt) + '</p>');
- }
- ws.onclose = function () {
- $('#msg').append('<p>宸茬粡鍏抽棴</p>');
- }
- });
-
- $('#close').click(function () {
- ws.close();
- });
-
- $('#send').click(function () {
- if (ws.readyState == WebSocket.OPEN) {
- ws.send($("#to").val() + "|" + $('#content').val());
- }
- else {
- $('#tips').text('杩炴帴宸茬粡鍏抽棴');
- }
- });
-
- });
- </script>
-</head>
-<body>
- <div>
- <input id="user" type="text" />
- <input id="conn" type="button" value="杩炴帴" />
- <input id="close" type="button" value="鍏抽棴" /><br />
- <span id="tips"></span>
- <input id="content" type="text" />
- <input id="send" type="button" value="鍙戦��" /><br />
- <input id="to" type="text" />鐩殑鐢ㄦ埛
- <div id="msg">
- </div>
- </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Hubs/HubsMessage1.html b/VueWebApi/obj/Release/Package/PackageTmp/Hubs/HubsMessage1.html
index 23937e7..2778c71 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/Hubs/HubsMessage1.html
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Hubs/HubsMessage1.html
@@ -24,7 +24,7 @@
//鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
var work = $.connection.chatHub;
/*$('#displayname').val(prompt('璇疯緭鍏ユ樀绉�:', ''));*/
- $('#displayname').val("1");
+ $('#displayname').val("钁ｄ箞濡�");
$('#thisname').text('褰撳墠鐢ㄦ埛锛�' + $('#displayname').val());
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Hubs/HubsMessage2.html b/VueWebApi/obj/Release/Package/PackageTmp/Hubs/HubsMessage2.html
index 4bac89e..7dcabde 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/Hubs/HubsMessage2.html
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Hubs/HubsMessage2.html
@@ -11,8 +11,7 @@
<h1>娴佺▼婕旂ず</h1>
<input type="hidden" id="displayname" />
<h2 id="thisname"></h2><br />
- <select id="username" style="width:153px;">
- </select>
+ <input type="hidden" id="username" value="1" />
<input id="cont" type="text" style="width:300px;">
<input id="send" type="button" value="鍙戦��" />
<div>
@@ -24,7 +23,7 @@
//鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
var work = $.connection.chatHub;
/*$('#displayname').val(prompt('璇疯緭鍏ユ樀绉�:', ''));*/
- $('#displayname').val("2");
+ $('#displayname').val("寮犱笁");
$('#thisname').text('褰撳墠鐢ㄦ埛锛�' + $('#displayname').val());
@@ -35,28 +34,45 @@
};
+
+ //鍚庣SendLogin璋冪敤鍚庯紝浜х敓鐨刲oginUser鍥炶皟
+ //work.client.loginUser = function (userlist) {
+ // reloadUser(userlist);
+ //};
+
+
+
//hub杩炴帴寮�鍚�
$.connection.hub.start().done(function () {
var username = $('#displayname').val();
//鍙戦�佷笂绾夸俊鎭�
work.server.sendLogin(username);
+ //鐐瑰嚮鎸夐挳锛屽彂閫佹秷鎭�
+ $('#send').click(function () {
+ /*var friend = $('#username').val();*/
+ var wkshpname = "绮惧伐杞﹂棿";
+ var eqpname = "璁惧01";
+ var json = [{ "code": "Q", "name": "鍛煎彨璐ㄩ噺", "children": [{ "usercode": "009", "username": "钁ｄ箞濡�" }, { "usercode": "008", "username": "濡傝姳" }] }];
+ //璋冪敤鍚庣鍑芥暟锛屽彂閫佹寚瀹氭秷鎭�
+ work.server.sendByGroupList(username, wkshpname, eqpname, json);
+ });
});
});
- //閲嶆柊鍔犺浇鐢ㄦ埛鍒楄〃
- //var reloadUser = function () {
- // $("#username").empty();
- // for (i = 0; i < 5; i++) {
- // $("#username").append("<option value=" + i + ">" +i + "</option>");
- // }
- //}
- //var reloadUser = function (userlist) {
- // $("#username").empty();
- // for (i = 0; i < userlist.length; i++) {
- // $("#username").append("<option value=" + userlist[i] + ">" + userlist[i] + "</option>");
- // }
- //}
+ //閲嶆柊鍔犺浇鐢ㄦ埛鍒楄〃
+ //var reloadUser = function () {
+ // $("#username").empty();
+ // for (i = 0; i < 5; i++) {
+ // $("#username").append("<option value=" + i + ">" + i + "</option>");
+ // }
+ //}
+ //var reloadUser = function (userlist) {
+ // $("#username").empty();
+ // for (i = 0; i < userlist.length; i++) {
+ // $("#username").append("<option value=" + userlist[i] + ">" + userlist[i] + "</option>");
+ // }
+ //}
</script>
</body>
</html>
\ No newline at end of file
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Web.config b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
index 0ce3b69..695b8b9 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/Web.config
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
@@ -25,7 +25,6 @@
<!--key澶辨晥鏃堕棿30绉�-->
<add key="RedisKeyTimeCont" value="120" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
- <add key="serverIP" value="wss://121.196.36.24:8001" />
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index f93f753..31a8bd0 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index 761e01e..1518d2b 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -748,6 +748,31 @@
<param name="eqpcode">璁惧缂栫爜</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.AppDeviceAnDengCallScanSearch(System.String)">
+ <summary>
+ 瀹夌伅鍛煎彨鎵弿宸ヤ綅
+ </summary>
+ <param name="eqpcode">璁惧鐮�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.AppDeviceAnDengCallItemSearch(System.String,System.String)">
+ <summary>
+ 瀹夌伅鍛煎彨,閫夋嫨鎵弿宸ヤ綅甯﹀嚭鍛煎彨绫诲瀷閫夐」鍙婂搴斾汉鍛樻暟鎹�
+ </summary>
+ <param name="eqpcode">璁惧缂栫爜</param>
+ <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.AppDeviceAnDengCallSave(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.AnDnDate})">
+ <summary>
+ 瀹夌伅鍛煎彨鎻愪氦
+ </summary>
+ <param name="username">鐧诲綍浜哄憳</param>
+ <param name="eqpcode">璁惧缂栫爜</param>
+ <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ <param name="json">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.BasicSettingController.OrganizationSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
缁勭粐鏋舵瀯鏌ヨ
@@ -1361,7 +1386,7 @@
</member>
<member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceCheckSubTakeSearch(System.String)">
<summary>
- 璁惧淇濆吇璁板綍鏄庣粏鏌ヨ
+ 璁惧鐐规璁板綍鏄庣粏鏌ヨ
</summary>
<param name="djwo">璁惧鐐规鍗曞彿</param>
<returns></returns>
@@ -2529,6 +2554,15 @@
<param name="name2">娑堟伅鎺ユ敹鑰�</param>
<param name="cont">娑堟伅鍐呭</param>
</member>
+ <member name="M:VueWebApi.Hubs.ChatHub.SendByGroupList(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.AnDnDate})">
+ <summary>
+ 瀹夌伅鍛煎彨鎻愪氦鏃惰皟鐢�
+ </summary>
+ <param name="username">鍙戣捣浜�</param>
+ <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栫爜</param>
+ <param name="json"></param>
+ </member>
<member name="M:VueWebApi.Hubs.ChatHub.SendLogin(System.String)">
<summary>
鐢ㄦ埛涓婄嚎鍑芥暟(鍗曠敤鎴�)
@@ -3147,14 +3181,6 @@
</summary>
<param name="rolecode"></param>
<param name="type"></param>
- <returns></returns>
- </member>
- <member name="M:VueWebApi.Tools.TestSocket.Send(System.String,System.String)">
- <summary>
- 鍙戦�佹秷鎭�
- </summary>
- <param name="userid"></param>
- <param name="msg"></param>
<returns></returns>
</member>
<member name="T:VueWebApi.Util.ObjectValueParser`1">
diff --git a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
index 6fa534a..e0e8320 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
@@ -25,7 +25,6 @@
<!--key澶辨晥鏃堕棿30绉�-->
<add key="RedisKeyTimeCont" value="120" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
- <add key="serverIP" value="wss://121.196.36.24:8001" />
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
diff --git a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
index 0ce3b69..695b8b9 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
@@ -25,7 +25,6 @@
<!--key澶辨晥鏃堕棿30绉�-->
<add key="RedisKeyTimeCont" value="120" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
- <add key="serverIP" value="wss://121.196.36.24:8001" />
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
--- /dev/null
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index 99631d6..8686fbd 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-b8cd0f8acb858c5d84c40903a64913c5cbad3758
+d0fa6e5450730e3a6c9afa3aaa38f785c470472a
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index 8cfbe6a..2d4bf1d 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -281,6 +281,7 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index f93f753..9c952b0 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3