tester
/
Remontor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Пилим поиск по cssm

This commit is contained in:
klavirshik 2024-10-23 23:37:29 +02:00
parent ca9409a95e
commit 1b05d2ed0d
31 changed files with 264 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Remontor/.vs/Remontor/FileContentIndex/04c71609-7605-4221-a27b-6699449e439d.vsidx
View File

Binary file not shown.

BIN
Remontor/.vs/Remontor/FileContentIndex/18f2b697-7b7f-460f-b5bc-b32d44e6b46b.vsidx
View File

Binary file not shown.

BIN
Remontor/.vs/Remontor/FileContentIndex/20e335d5-46e4-4814-b533-78edaa1359db.vsidx Normal file
View File

Binary file not shown.

BIN
Remontor/.vs/Remontor/FileContentIndex/4a6b48c5-aa51-494a-8803-f41aa2388634.vsidx
View File

Binary file not shown.

BIN
Remontor/.vs/Remontor/FileContentIndex/572420f5-f22c-4bfe-95bf-67bbb0912573.vsidx
View File

Binary file not shown.

BIN
Remontor/.vs/Remontor/FileContentIndex/83c16984-46f9-4650-894d-557be5ae12e9.vsidx
View File

Binary file not shown.

BIN
Remontor/.vs/Remontor/FileContentIndex/84e6eb22-43c3-4722-9b8d-e0b844fd8bad.vsidx
View File

Binary file not shown.

BIN
Remontor/.vs/Remontor/FileContentIndex/857cf4a3-e158-4597-bf0f-9907b129dd68.vsidx
View File

Binary file not shown.

BIN
Remontor/.vs/Remontor/FileContentIndex/92985faa-8945-4dd5-bcb5-30915ed1691d.vsidx Normal file
View File

Binary file not shown.

BIN
Remontor/.vs/Remontor/FileContentIndex/d9d059a6-7f60-48eb-8bdb-c696a14ce270.vsidx
View File

Binary file not shown.

BIN
Remontor/.vs/Remontor/v17/.suo
View File

Binary file not shown.

2
Remontor/Connector/DobleMonFull.cs
View File

@ -35,7 +35,7 @@ namespace Remontor.Connector
SConnector.FormMain.Width = 3840; SConnector.FormMain.Width = 3840;
SConnector.FormMain.Height = 1040; SConnector.FormMain.Height = 1040;
SConnector.FormMain.Location = new System.Drawing.Point(0, 0); SConnector.FormMain.Location = new System.Drawing.Point(0, 0);
MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y - 0, View.Bounds.Width, View.Bounds.Height, true); MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width, View.Bounds.Height - 9, true);
} }
public override IModeMon Change(IModeMon Mode) public override IModeMon Change(IModeMon Mode)

2
Remontor/Connector/DobleMonOne.cs
View File

@ -17,7 +17,7 @@ namespace Remontor.Connector
public DobleMonOne() { } public DobleMonOne() { }
public override void Resize(Process Proc, Control View) public override void Resize(Process Proc, Control View)
{ {
MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y - 4, View.Bounds.Width * 2, View.Bounds.Height, true); MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width * 2, View.Bounds.Height - 9, true);
} }
public override IModeMon Change(IModeMon Mode) public override IModeMon Change(IModeMon Mode)
{ {

2
Remontor/Connector/DobleMonTwo.cs
View File

@ -16,7 +16,7 @@ namespace Remontor.Connector
public DobleMonTwo() { } public DobleMonTwo() { }
public override void Resize(Process Proc, Control View) public override void Resize(Process Proc, Control View)
{ {
MoveWindow(Proc.MainWindowHandle, View.Bounds.X - View.Bounds.Width, View.Bounds.Y - 4, View.Bounds.Width * 2, View.Bounds.Height, true); MoveWindow(Proc.MainWindowHandle, View.Bounds.X - View.Bounds.Width, View.Bounds.Y + 9, View.Bounds.Width * 2, View.Bounds.Height - 9, true);
} }
public override IModeMon Change(IModeMon Mode) public override IModeMon Change(IModeMon Mode)
{ {

2
Remontor/Connector/OneMon.cs
View File

@ -16,7 +16,7 @@ namespace Remontor.Connector
public OneMon() { } public OneMon() { }
public override void Resize(Process Proc, Control View) public override void Resize(Process Proc, Control View)
{ {
MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width, View.Bounds.Height, true); MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width, View.Bounds.Height - 9, true);
} }
public override IModeMon Change(IModeMon Mode) public override IModeMon Change(IModeMon Mode)
{ {

112
Remontor/Finder/Finder.cs
View File

@ -24,7 +24,15 @@ namespace Remontor.Finder
private void ConnectBtn_Click(object sender, EventArgs e) private void ConnectBtn_Click(object sender, EventArgs e)
{ {
SConnector.NewConnect(new CompId(CompNameLB.Text));
if(SelectedItem != null)
{
SConnector.NewConnect(SelectedItem.seacherResult.Result());
}
else
{
SConnector.NewConnect(new CompId(CompNameLB.Text));
}
this.Close(); this.Close();
} }
@ -59,6 +67,12 @@ namespace Remontor.Finder
private void UpdateActiv(SessionItemControl sessionItem) private void UpdateActiv(SessionItemControl sessionItem)
{ {
if(SelectedItem == sessionItem)
{
SConnector.NewConnect(SelectedItem.seacherResult.Result());
this.Close();
return;
}
if(SelectedItem != null) SelectedItem.SelectActiv(null); if(SelectedItem != null) SelectedItem.SelectActiv(null);
if(PreSelected > -1)((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv(null); if(PreSelected > -1)((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv(null);
SelectedItem = sessionItem; SelectedItem = sessionItem;
@ -72,54 +86,66 @@ namespace Remontor.Finder
private void CompNameLB_KeyDown(object sender, KeyEventArgs e) private void CompNameLB_KeyDown(object sender, KeyEventArgs e)
{ {
switch (e.KeyValue) if (SeaherPanel.Controls[0] is SessionItemControl)
{ {
case 40: if (!(((SessionItemControl)SeaherPanel.Controls[0]).seacherResult is NoResult))
if (PreSelected < SeaherPanel.Controls.Count - 1) {
switch (e.KeyValue)
{ {
SelectedItem = null; case 40:
if (PreSelected > -1) ((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv(null); if (PreSelected < SeaherPanel.Controls.Count - 1)
++PreSelected; {
SeaherPanel.ScrollControlIntoView(SeaherPanel.Controls[PreSelected]); SelectedItem = null;
((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv((SessionItemControl)SeaherPanel.Controls[PreSelected]); if (PreSelected > -1) ((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv(null);
} ++PreSelected;
e.SuppressKeyPress = true; SeaherPanel.ScrollControlIntoView(SeaherPanel.Controls[PreSelected]);
break; ((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv((SessionItemControl)SeaherPanel.Controls[PreSelected]);
case 38: }
if (PreSelected > 0) e.SuppressKeyPress = true;
{ break;
SelectedItem = null; case 38:
if (PreSelected > -1) ((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv(null); if (PreSelected > 0)
--PreSelected; {
SeaherPanel.ScrollControlIntoView(SeaherPanel.Controls[PreSelected]); SelectedItem = null;
((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv((SessionItemControl)SeaherPanel.Controls[PreSelected]); if (PreSelected > -1) ((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv(null);
} --PreSelected;
SeaherPanel.ScrollControlIntoView(SeaherPanel.Controls[PreSelected]);
((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv((SessionItemControl)SeaherPanel.Controls[PreSelected]);
}
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
//ListComp.Refresh(); //ListComp.Refresh();
break; break;
case 13: case 13:
if ((SessionItemControl)SeaherPanel.Controls[PreSelected] == SelectedItem) if (PreSelected > -1)
{ {
if ((SessionItemControl)SeaherPanel.Controls[PreSelected] == SelectedItem)
//bt_reset_Click(null, null); {
break;
}
if (PreSelected >= 0)
{
if (SelectedItem != null) SelectedItem.SelectActiv(null);
SelectedItem = (SessionItemControl)SeaherPanel.Controls[PreSelected];
((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectActiv((SessionItemControl)SeaherPanel.Controls[PreSelected]);
StopRefreshSeacher = true;
CompNameLB.Focus();
CompNameLB.Text = ((SessionItemControl)SeaherPanel.Controls[PreSelected]).seacherResult.ResultString();
CompNameLB.Select(CompNameLB.Text.Length, 0);
StopRefreshSeacher = false;
e.SuppressKeyPress = true; //bt_reset_Click(null, null);
SConnector.NewConnect(SelectedItem.seacherResult.Result());
this.Close();
break;
}
if (PreSelected >= 0)
{
if (SelectedItem != null) SelectedItem.SelectActiv(null);
SelectedItem = (SessionItemControl)SeaherPanel.Controls[PreSelected];
((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectActiv((SessionItemControl)SeaherPanel.Controls[PreSelected]);
StopRefreshSeacher = true;
CompNameLB.Focus();
CompNameLB.Text = ((SessionItemControl)SeaherPanel.Controls[PreSelected]).seacherResult.ResultString();
CompNameLB.Select(CompNameLB.Text.Length, 0);
StopRefreshSeacher = false;
e.SuppressKeyPress = true;
}
}
break;
} }
break; }
} }
} }

1
Remontor/Remontor.csproj
View File

@ -116,6 +116,7 @@
<Compile Include="Seacher\ISeaherMetod.cs" /> <Compile Include="Seacher\ISeaherMetod.cs" />
<Compile Include="Seacher\HistoryResult.cs" /> <Compile Include="Seacher\HistoryResult.cs" />
<Compile Include="Seacher\NoResult.cs" /> <Compile Include="Seacher\NoResult.cs" />
<Compile Include="Seacher\SCCMResult.cs" />
<Compile Include="Seacher\SeachSCCM.cs" /> <Compile Include="Seacher\SeachSCCM.cs" />
<Compile Include="Seacher\SeahcLocal.cs" /> <Compile Include="Seacher\SeahcLocal.cs" />
<Compile Include="Seacher\SSeaher.cs" /> <Compile Include="Seacher\SSeaher.cs" />

13
Remontor/Seacher/HistoryResult.cs
View File

@ -10,6 +10,7 @@ namespace Remontor.Seacher
{ {
private IComp Comp; private IComp Comp;
private DateTime LastConnect; private DateTime LastConnect;
private string StrQuestion;
public HistoryResult() public HistoryResult()
{ {
@ -20,6 +21,13 @@ namespace Remontor.Seacher
LastConnect = lastConnect; LastConnect = lastConnect;
} }
public HistoryResult(IComp comp, string lastConnect, string strQuestion)
{
Comp = comp;
LastConnect = DateTime.Parse(lastConnect);
StrQuestion = strQuestion;
}
public IComp GetComp() { public IComp GetComp() {
return Comp; return Comp;
} }
@ -32,7 +40,10 @@ namespace Remontor.Seacher
{ {
return Comp.GetNetNameStr(); return Comp.GetNetNameStr();
} }
/// <summary>
/// //////////////////
/// </summary>
/// <returns></returns>
public IComp Result() public IComp Result()
{ {
return Comp; return Comp;

3
Remontor/Seacher/ISeaherMetod.cs
View File

@ -10,8 +10,7 @@ namespace Remontor.Seacher
internal interface ISeaherMetod internal interface ISeaherMetod
{ {
void Change(ResultUpdate sender, string seach); void Change(ResultUpdate sender, string seach);
IComp Result(int index);
string ResultString(int index);
} }
} }

58
Remontor/Seacher/SCCMResult.cs Normal file
View File

@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Remontor.Seacher
{
internal class SCCMResult : ISeacherResult
{
private IComp Comp;
private DateTime LastConnect;
private string StrQuestion;
public SCCMResult()
{
}
public SCCMResult(IComp comp, DateTime lastConnect)
{
Comp = comp;
LastConnect = lastConnect;
}
public SCCMResult(IComp comp, string lastConnect, string strQuestion)
{
Comp = comp;
LastConnect = DateTime.Parse(lastConnect);
StrQuestion = strQuestion;
}
public IComp GetComp()
{
return Comp;
}
public DateTime GetLastConnect()
{
return LastConnect;
}
public string toString()
{
return Comp.GetNetNameStr();
}
/// <summary>
/// //////////////////
/// </summary>
/// <returns></returns>
public IComp Result()
{
return Comp;
}
public string ResultString()
{
return StrQuestion;
}
}
}

115
Remontor/Seacher/SeachSCCM.cs
View File

@ -20,7 +20,7 @@ namespace Remontor.Seacher
{ {
private SqlConnection Connection; private SqlConnection Connection;
private IAuthType AuthType; private IAuthType AuthType;
private List<IComp> comps = new List<IComp>(); //private List<IComp> comps = new List<IComp>();
private ResultUpdate Update; private ResultUpdate Update;
private bool enable; private bool enable;
private string error; private string error;
@ -119,11 +119,60 @@ namespace Remontor.Seacher
} }
return result; return result;
} }
public List<string> ResultSeach(string seach) //public List<string> ResultSeach(string seach)
//{
// int y = 0;
// comps.Clear();
// List<string> result = new List<string>();
// if (Connection.State == ConnectionState.Open && Connection != null)
// {
// try
// {
// string sql = QueryBilder(seach);
// SqlCommand sqlCom = new SqlCommand(sql, Connection);
// // Connection.Open();
// sqlCom.ExecuteNonQuery();
// SqlDataAdapter dataAdapter = new SqlDataAdapter(sqlCom);
// DataTable dt = new DataTable();
// dataAdapter.Fill(dt);
// DataRow[] myData = dt.Select();
// for (int i = 0; i < myData.Length; i++)
// {
// HistoryResult itemResult = new HistoryResult(item.GetComp(), item.GetStart());
// result.Add(itemResult);
// IComp comp = new CompId(myData[i].ItemArray[0].ToString());
// comp.SetName(myData[i].ItemArray[1].ToString());
// comp.SetDescription(myData[i].ItemArray[2].ToString());
// comps.Add(comp);
// result.Add("ПК:"+ comp.GetNetNameStr() + " Логин:" + comp.GetName() + "\r\n" + comp.GetDescription() + "\r\nLastLogin:" + myData[i].ItemArray[3].ToString());
// ++y;
// }
// enable = true;
// }
// catch
// {
// y = 1;
// enable = false;
// result.Clear();
// result.Add("Ошибка выполнения запроса");
// }
// }
// if (y == 0)
// {
// enable = false;
// result.Add("Ничего не найдено");
// }
// TimerDisconnect.Change(90000, 90000);
// return result;
//}
public List<ISeacherResult> ResultSeach(string seach)
{ {
int y = 0; int y = 0;
comps.Clear(); // comps.Clear();
List<string> result = new List<string>(); List<ISeacherResult> result = new List<ISeacherResult>();
if (Connection.State == ConnectionState.Open && Connection != null) if (Connection.State == ConnectionState.Open && Connection != null)
{ {
try try
@ -139,11 +188,27 @@ namespace Remontor.Seacher
DataRow[] myData = dt.Select(); DataRow[] myData = dt.Select();
for (int i = 0; i < myData.Length; i++) for (int i = 0; i < myData.Length; i++)
{ {
// result.Add(itemResult);
IComp comp = new CompId(myData[i].ItemArray[0].ToString()); IComp comp = new CompId(myData[i].ItemArray[0].ToString());
comp.SetName(myData[i].ItemArray[1].ToString()); comp.SetName(myData[i].ItemArray[1].ToString());
comp.SetDescription(myData[i].ItemArray[2].ToString()); comp.SetDescription(myData[i].ItemArray[2].ToString());
comps.Add(comp); // comps.Add(comp);
result.Add("ПК:"+ comp.GetNetNameStr() + " Логин:" + comp.GetName() + "\r\n" + comp.GetDescription() + "\r\nLastLogin:" + myData[i].ItemArray[3].ToString()); string quest = "";
switch (mode)
{
case Mode.Login:
quest = comp.GetName();
break;
case Mode.Username:
quest = comp.GetDescription();
break;
case Mode.PCname:
quest = comp.GetNetNameStr();
break;
}
SCCMResult itemResult = new SCCMResult(comp, myData[i].ItemArray[3].ToString(), quest);
result.Add(itemResult);
++y; ++y;
} }
enable = true; enable = true;
@ -153,14 +218,14 @@ namespace Remontor.Seacher
y = 1; y = 1;
enable = false; enable = false;
result.Clear(); result.Clear();
result.Add("Ошибка выполнения запроса"); result.Add(new NoResult("Ничего не найдено"));
} }
} }
if (y == 0) if (y == 0)
{ {
enable = false; enable = false;
result.Add("Ничего не найдено"); result.Add(new NoResult("Ничего не найдено"));
} }
TimerDisconnect.Change(90000, 90000); TimerDisconnect.Change(90000, 90000);
return result; return result;
@ -199,23 +264,23 @@ namespace Remontor.Seacher
Update(result); Update(result);
} }
public IComp Result(int index) //public IComp Result(int index)
{ //{
return comps[index]; // return comps[index];
} //}
public string ResultString(int index) //public string ResultString(int index)
{ //{
switch (mode) // switch (mode)
{ // {
case Mode.Login: // case Mode.Login:
return comps[index].GetName(); // return comps[index].GetName();
case Mode.Username: // case Mode.Username:
return comps[index].GetDescription(); // return comps[index].GetDescription();
case Mode.PCname: // case Mode.PCname:
return comps[index].GetNetNameStr(); // return comps[index].GetNetNameStr();
} // }
return ""; // return "";
} //}
public string CheckConnect(string server, string basa) public string CheckConnect(string server, string basa)
{ {
if (Connection == null) if (Connection == null)

36
Remontor/Seacher/SeahcLocal.cs
View File

@ -99,25 +99,25 @@ namespace Remontor.Seacher
return result; return result;
} }
public IComp Result(int index) //public IComp Result(int index)
{ //{
return comps[index]; // return comps[index];
} //}
public string ResultString(int index) //public string ResultString(int index)
{ //{
string buf; // string buf;
if (comps[index].GetName() == null) // if (comps[index].GetName() == null)
{ // {
buf = comps[index].GetNetNameStr(); // buf = comps[index].GetNetNameStr();
} // }
else // else
{ // {
buf = comps[index].GetName(); // buf = comps[index].GetName();
if (comps[index].GetNetNameStr() != null) buf += "(" + comps[index].GetNetNameStr() + ")"; // if (comps[index].GetNetNameStr() != null) buf += "(" + comps[index].GetNetNameStr() + ")";
} // }
return buf; // return buf;
} //}
} }
} }

11
Remontor/SessionItemControl.cs
View File

@ -53,6 +53,17 @@ namespace Remontor
Index = index; Index = index;
}
else if (seacherResult is SCCMResult)
{
SCCMResult result = (SCCMResult)seacherResult;
LbName.Text = result.GetComp().GetName();
LbNetName.Text = result.GetComp().GetNetName();
LbData.Text = "last login:" + result.GetLastConnect();
Select += UpdateAct;
Index = index;
} }
} }
public void SelectPreActiv(SessionItemControl control) public void SelectPreActiv(SessionItemControl control)

BIN
Remontor/bin/Debug/Remontor.exe
View File

Binary file not shown.

BIN
Remontor/bin/Debug/Remontor.pdb
View File

Binary file not shown.

BIN
Remontor/bin/Debug/res.dat
View File

Binary file not shown.

BIN
Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Remontor/obj/Debug/Remontor.exe
View File

Binary file not shown.

BIN
Remontor/obj/Debug/Remontor.pdb
View File

Binary file not shown.