2024-11-08 11:54:40 +08:00
parent 7c1ab8ce69
commit 2219cae500
15 changed files with 83 additions and 137 deletions
--- a/Epost.TestToolsWeb/Controllers/HomeController.cs
+++ b/Epost.TestToolsWeb/Controllers/HomeController.cs
@ -46,92 +46,6 @@ namespace Epost.TestToolsWeb.Controllers
            ViewBag.isWork = isWork;
            return View();
        } 
-       
- 
-        #region 初始化
-        public ActionResult ClearALL()
-        {
-
-            bool result = false;
-            isShow = true;
-            try
-            {
-
-                ResultModel resultModel = contrbll.ClearALL();
-                return Json(new { Success = resultModel.result, Message = resultModel.msg });
-            }
-            catch (Exception)
-            {
-
-                return Json(new { Success = result, Message = "失败" });
-            }
-
-
-        }
-        #endregion
-
-        #region 开始作业  
-
-        public ActionResult StartWork()
-        {
-            isShow = true;
-
-            contrbll.StartWork();
-            isWork = 1;
-            return Json(new { Success = true, Message = "成功" });
-        }
-        #endregion 
-
-        #region 设备检测
-        public ActionResult TestStart()
-        {
-
-            ResultModel result = contrbll.TestStart();
-            if (result.result == "1")
-            {
-                return Json(new { Success = result, Message = result.msg });
-            }
-            else
-            {
-                return Json(new { Success = result, Message = result.msg });
-            }
-
-        }
-        #endregion
-
-        #region 停止检测
-        public ActionResult TestEnd()
-        {
-            contrbll.TestEnd();
-            return Json(new { Success = true, Message = "成功" });
-
-
-        }
-        #endregion
-
-        #region 结束作业  
-        public ActionResult EndWork()
-        {
-            try
-            {
-
-                isShow = false;
-                isWork = 0;
-                isClear = 0;
-                contrbll.EndWork();
-                return Json(new { Success = true, Message = "成功" });
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogInfo("结束作业异常" + ex.Message);
-                return Json(new { Success = false, Message = "失败" });
-            }
-
-
-        }
-        #endregion
-
-  

    }
 }
--- a/Epost.TestToolsWeb/Controllers/ServerController.cs
+++ b/Epost.TestToolsWeb/Controllers/ServerController.cs
@ -104,21 +104,21 @@ namespace Epost.DPS.Controllers
        #region 设备检测
        [Route("TestStart")]
        [HttpPost]
-        public ResultModel TestStart()
+        public ResultModel TestStart(BatchModel model)
        {
            lock (lockinit)
            {
                ResultModel res = new ResultModel();
                try
                {
-                    ResultModel result = contrbll.TestStart();
+                    ResultModel result = contrbll.TestStart(model.batchno);

                    return result;

                }
                catch (Exception ex)
                {
-                    LogHelper.WriteLogInfo("GetDataList异常：" + ex.Message);
+                    LogHelper.WriteLogInfo("TestStart异常：" + ex.Message);
                    res.msg = "请求异常！";
                    res.result = "-1";
                    return res;
--- a/Epost.TestToolsWeb/Epost.DPS.csproj.user
+++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user
@ -11,7 +11,7 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
    <NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
    <IISExpressAnonymousAuthentication />
--- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml
+++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml
@ -9,13 +9,13 @@
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>D:\驿传\T系列</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
-    <PrecompileBeforePublish>True</PrecompileBeforePublish>
-    <EnableUpdateable>True</EnableUpdateable>
-    <DebugSymbols>False</DebugSymbols>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <publishUrl>D:\驿传\Wuxidingshi_DAS</publishUrl>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
+    <PrecompileBeforePublish>true</PrecompileBeforePublish>
+    <EnableUpdateable>true</EnableUpdateable>
+    <DebugSymbols>false</DebugSymbols>
    <WDPMergeOption>DonotMerge</WDPMergeOption>
  </PropertyGroup>
 </Project>
--- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
+++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
@ -6,8 +6,8 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <TimeStampOfAssociatedLegacyPublishXmlFile />
-    <_PublishTargetUrl>D:\驿传\T系列</_PublishTargetUrl>
-    <History>True|2024-09-01T02:13:37.1598955Z;True|2024-08-31T17:27:57.5375469+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
+    <_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS</_PublishTargetUrl>
+    <History>False|2024-11-04T09:48:25.2781696Z;True|2024-11-01T16:04:56.3535724+08:00;True|2024-09-01T10:13:37.1598955+08:00;True|2024-08-31T17:27:57.5375469+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
  <ItemGroup>
@ -33,19 +33,19 @@
      <publishTime>04/04/2018 15:45:12</publishTime>
    </File>
    <File Include="bin/App_global.asax.compiled">
-      <publishTime>09/01/2024 13:28:03</publishTime>
+      <publishTime>11/08/2024 11:47:18</publishTime>
    </File>
    <File Include="bin/App_global.asax.dll">
-      <publishTime>09/01/2024 13:28:02</publishTime>
+      <publishTime>11/08/2024 11:47:17</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>02/24/2020 15:29:24</publishTime>
    </File>
    <File Include="bin/Common.dll">
-      <publishTime>09/01/2024 10:13:03</publishTime>
+      <publishTime>11/06/2024 10:26:56</publishTime>
    </File>
    <File Include="bin/Common.pdb">
-      <publishTime>09/01/2024 10:13:03</publishTime>
+      <publishTime>11/06/2024 10:26:56</publishTime>
    </File>
    <File Include="bin/ComposerSDK.dll">
      <publishTime>04/29/2020 16:50:14</publishTime>
@ -63,31 +63,31 @@
      <publishTime>10/23/2017 13:15:20</publishTime>
    </File>
    <File Include="bin/Epost.BLL.dll">
-      <publishTime>09/01/2024 13:27:54</publishTime>
+      <publishTime>11/08/2024 11:47:07</publishTime>
    </File>
    <File Include="bin/Epost.BLL.pdb">
-      <publishTime>09/01/2024 13:27:54</publishTime>
+      <publishTime>11/08/2024 11:47:07</publishTime>
    </File>
    <File Include="bin/Epost.BLL.XmlSerializers.dll">
      <publishTime>08/26/2020 18:09:48</publishTime>
    </File>
    <File Include="bin/Epost.DAL.dll">
-      <publishTime>09/01/2024 11:27:24</publishTime>
+      <publishTime>11/08/2024 11:47:06</publishTime>
    </File>
    <File Include="bin/Epost.DAL.pdb">
-      <publishTime>09/01/2024 11:27:24</publishTime>
+      <publishTime>11/08/2024 11:47:06</publishTime>
    </File>
    <File Include="bin/Epost.DPS.dll">
-      <publishTime>09/01/2024 13:27:56</publishTime>
+      <publishTime>11/08/2024 11:47:09</publishTime>
    </File>
    <File Include="bin/Epost.DPS.pdb">
-      <publishTime>09/01/2024 13:27:56</publishTime>
+      <publishTime>11/08/2024 11:47:09</publishTime>
    </File>
    <File Include="bin/Epost.Model.dll">
-      <publishTime>08/31/2024 17:27:44</publishTime>
+      <publishTime>11/06/2024 10:26:56</publishTime>
    </File>
    <File Include="bin/Epost.Model.pdb">
-      <publishTime>08/31/2024 17:27:44</publishTime>
+      <publishTime>11/06/2024 10:26:56</publishTime>
    </File>
    <File Include="bin/Epost.TestToolsWeb.dll">
      <publishTime>09/06/2018 11:57:11</publishTime>
@ -5652,7 +5652,7 @@
      <publishTime>05/30/2022 16:58:47</publishTime>
    </File>
    <File Include="PrecompiledApp.config">
-      <publishTime>09/01/2024 13:27:58</publishTime>
+      <publishTime>11/08/2024 11:47:11</publishTime>
    </File>
    <File Include="Scripts/ai.0.22.9-build00167.js">
      <publishTime>04/04/2018 15:45:12</publishTime>
@ -7572,7 +7572,7 @@
      <publishTime>07/04/2022 14:22:38</publishTime>
    </File>
    <File Include="Web.config">
-      <publishTime>08/31/2024 19:13:15</publishTime>
+      <publishTime>11/01/2024 16:24:56</publishTime>
    </File>
  </ItemGroup>
 </Project>
--- a/Epost.TestToolsWeb/Web.config
+++ b/Epost.TestToolsWeb/Web.config
@ -11,7 +11,7 @@
  </configSections>
  <connectionStrings>
    <add name="weijie_dpsEntities" connectionString="metadata=res://*/WJDB.csdl|res://*/WJDB.ssdl|res://*/WJDB.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=weijie_dps;user id=sa;password=123456;min pool size=4;max pool size=4;packet size=3072;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-    <add name="SqlLocDPSConnection" connectionString="server=139.196.36.200;user id=EpostTest;password=antion;database=BJ_ZhongLiang_DAS;min pool size=512;max pool size=512;packet size=3072" providerName="System.Data.SqlClient" />
+    <add name="SqlLocDPSConnection" connectionString="server=139.196.36.200;user id=EpostTest;password=antion;database=WuXi_DingShi_DAS;min pool size=512;max pool size=512;packet size=3072" providerName="System.Data.SqlClient" />
    <add name="MysqlLocDPSConnection" connectionString="Server=localhost;Port=3306;Database=world;User=root; Password=antion;SslMode=None;Pooling=true;Allow User Variables=True;" />

    <add name="WMSConnection" connectionString="data source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=139.196.36.200)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=EpostDB)));user id=C##Test;password=test" />
@ -27,11 +27,11 @@
    <add key="ControlXML" value="/App_Data/EpostController.xml" />
    <add key="LabelXML" value="/App_Data/AddressStorage.xml" />
    <add key="ResultsXML" value="/App_Data/Results.xml" />
-    <add key="WebAPIUrl" value="http://192.168.3.65:8051/api/WebAPI/ProcessingResult"/>
+    <add key="WebAPIUrl" value="http://192.168.0.20:8045/api/WebAPI/ProcessingResult"/>
    <add key="ShowMode" value="1" />
    <add key="SetupMode" value="\Epost_P\Epost.TestToolsWeb\App_Data\SetupMode.txt" />
    <add key="CARID" value="HT01" />
-    <add key="ServerAPIURL" value="http://192.168.3.65:8051/api/WebAPI" />
+    <add key="ServerAPIURL" value="http://192.168.0.20:8045/api/WebAPI" />
    <add key="SleepTime" value="1" />
  </appSettings>
  <!--