From 57ee3976fb480922030bfd145baba7f38bf7103f Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期六, 28 十二月 2024 14:19:31 +0800
Subject: [PATCH] 添加PDA上传及下载接口
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs | 2
/dev/null | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_LogController.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 67 +++++++++++++++++++++++++++++++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/47049b24-30e9-4e73-be80-cc5abf5cfefd.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs | 2
8 files changed, 72 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/47049b24-30e9-4e73-be80-cc5abf5cfefd.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/47049b24-30e9-4e73-be80-cc5abf5cfefd.vsidx"
new file mode 100644
index 0000000..8951428
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/47049b24-30e9-4e73-be80-cc5abf5cfefd.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a2fa64ef-bfbd-465a-bb17-e67f300690d9.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a2fa64ef-bfbd-465a-bb17-e67f300690d9.vsidx"
deleted file mode 100644
index d427b37..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a2fa64ef-bfbd-465a-bb17-e67f300690d9.vsidx"
+++ /dev/null
Binary files differ
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 43931d1..3747638 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"
@@ -29,5 +29,72 @@
_taskService = taskService;
}
+ [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))
+ {
+ byte[] fileBytes = System.IO.File.ReadAllBytes(path);
+ return File(
+ fileBytes,
+ System.Net.Mime.MediaTypeNames.Application.Octet,
+ System.IO.Path.GetFileName(path)
+ );
+ }
+ else
+ {
+ return Json(WebResponseContent.Instance.Error($"鏈壘鍒板畨瑁呭寘"));
+ }
+
+ }
+
+ [HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
+ [Consumes("multipart/form-data")]
+ public WebResponseContent UploadApp(IEnumerable<IFormFile> fileInput)
+ {
+ try
+ {
+ List<IFormFile> files = fileInput.ToList();
+ if (files == null || files.Count() == 0)
+ return new WebResponseContent { Status = true, Message = "璇烽�夋嫨涓婁紶鐨勬枃浠�" };
+ IFormFile formFile = files[0];
+ string dicPath = $"{AppDomain.CurrentDomain.BaseDirectory}Upload/App/";
+ 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);
+
+ using (var stream = new FileStream(dicPath, FileMode.Create))
+ {
+ formFile.CopyTo(stream);
+ }
+ return new WebResponseContent { Status = true, Message = "鏂囦欢涓婁紶鎴愬姛" };
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ //[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);
+ // }
+
+ //}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
index 5673650..76b8535 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
@@ -7,7 +7,7 @@
using WIDESEA_Model.Models;
using WIDESEA_DTO.System;
-namespace WIDESEA_WMSServer.Controllers.System
+namespace WIDESEA_WMSServer.Controllers
{
[Route("api/Sys_Dictionary")]
[ApiController]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs"
index cafe2b3..29e40a2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs"
@@ -3,7 +3,7 @@
using WIDESEA_ISystemService;
using WIDESEA_Model.Models;
-namespace WIDESEA_WMSServer.Controllers.System
+namespace WIDESEA_WMSServer.Controllers
{
[Route("api/Sys_DictionaryList")]
[ApiController]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_LogController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_LogController.cs"
index 175bb74..9c1a931 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_LogController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_LogController.cs"
@@ -4,7 +4,7 @@
using WIDESEA_ISystemService;
using WIDESEA_Model.Models;
-namespace WIDESEA_WMSServer.Controllers.System
+namespace WIDESEA_WMSServer.Controllers
{
[Route("api/[controller]")]
[ApiController]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs"
index ef53e67..561db83 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs"
@@ -4,7 +4,7 @@
using WIDESEA_ISystemService;
using WIDESEA_Model.Models;
-namespace WIDESEA_WMSServer.Controllers.System
+namespace WIDESEA_WMSServer.Controllers
{
[Route("api/Sys_RoleAuth")]
[ApiController]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs"
index 62ef3d0..1671985 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs"
@@ -9,7 +9,7 @@
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.System;
-namespace WIDESEA_WMSServer.Controllers.System
+namespace WIDESEA_WMSServer.Controllers
{
[Route("api/Sys_Role")]
[ApiController]
--
Gitblit v1.9.3