From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
index 3747638..33d6641 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
@@ -14,6 +14,9 @@
namespace WIDESEA_WMSServer.Controllers
{
+ /// <summary>
+ /// PDA
+ /// </summary>
[Route("api/PDA")]
[Authorize, ApiController]
public class PDAController : Controller
@@ -29,14 +32,18 @@
_taskService = taskService;
}
+ /// <summary>
+ /// 涓嬭浇PDA
+ /// </summary>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("DownLoadApp"), AllowAnonymous]
public virtual ActionResult DownLoadApp()
{
string path = $"{AppDomain.CurrentDomain.BaseDirectory}Upload/App/";
if (!Directory.Exists(path)) Directory.CreateDirectory(path);
path += "WMS-PDA.apk";
-
- if(System.IO.File.Exists(path))
+
+ if (System.IO.File.Exists(path))
{
byte[] fileBytes = System.IO.File.ReadAllBytes(path);
return File(
@@ -49,9 +56,14 @@
{
return Json(WebResponseContent.Instance.Error($"鏈壘鍒板畨瑁呭寘"));
}
-
+
}
+ /// <summary>
+ /// 涓婁紶PDA
+ /// </summary>
+ /// <param name="fileInput"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
[Consumes("multipart/form-data")]
public WebResponseContent UploadApp(IEnumerable<IFormFile> fileInput)
@@ -66,7 +78,8 @@
if (!Directory.Exists(dicPath)) Directory.CreateDirectory(dicPath);
string path = $"{dicPath}WMS-PDA{DateTime.Now:yyyyMMddhhmmss}.apk";
dicPath = $"{dicPath}WMS-PDA.apk";
- System.IO.File.Move(dicPath, path);
+ if (System.IO.File.Exists(dicPath))
+ System.IO.File.Move(dicPath, path);
using (var stream = new FileStream(dicPath, FileMode.Create))
{
@@ -80,21 +93,21 @@
}
}
- //[HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous]
- //public WebResponseContent GetPDAVersion(string version)
- //{
- // try
- // {
- // string versionP = ConfigUtil.GetConfiguration["PDAVersion"];
- // if (Convert.ToInt32(versionP) > Convert.ToInt32(version))
- // return WebResponseContent.Instance.OK(data: true);
- // else return WebResponseContent.Instance.OK(data: false);
- // }
- // catch (Exception ex)
- // {
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
+ [HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous]
+ public WebResponseContent GetPDAVersion(string version)
+ {
+ try
+ {
+ string versionP = AppSettings.Get("PDAVersion");
+ if (Convert.ToInt32(versionP) > Convert.ToInt32(version))
+ return WebResponseContent.Instance.OK(data: true);
+ else return WebResponseContent.Instance.OK(data: false);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
- //}
+ }
}
}
--
Gitblit v1.9.3