From 06407e013aeb7cf346352542dfbd4cc207622d92 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期一, 18 十一月 2024 10:30:55 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 75 insertions(+), 10 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 ef4b831..6e4397e 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"
@@ -1,34 +1,44 @@
-锘縰sing Microsoft.AspNetCore.Http;
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO.Inbound;
using WIDESEA_IInboundService;
+using WIDESEA_IOutboundService;
using WIDESEA_ITaskInfoService;
+using System.IO;
using WIDESEA_Model.Models;
+using System;
namespace WIDESEA_WMSServer.Controllers
{
[Route("api/PDA")]
- [ApiController]
- public class PDAController : ApiBaseController<ITaskService, Dt_Task>
+ [Authorize, ApiController]
+ public class PDAController : Controller
{
private readonly IInboundService _inboundService;
- public PDAController(ITaskService service, IInboundService inboundService) : base(service)
+ private readonly IOutboundService _outboundService;
+ private readonly ITaskService _taskService;
+
+ public PDAController(ITaskService taskService, IInboundService inboundService, IOutboundService outboundService)
{
_inboundService = inboundService;
+ _outboundService = outboundService;
+ _taskService = taskService;
}
- [HttpPost, Route("CallMateriel")]
- public WebResponseContent CallMateriel(string endPoint)
+ [HttpPost, Route("CallMateriel"), AllowAnonymous]
+ public WebResponseContent CallMateriel([FromBody] string endPoint)
{
- return Service.CallMateriel(endPoint);
+ return _taskService.CallMateriel(endPoint);
}
- [HttpPost, Route("MaterielCarry")]
- public WebResponseContent MaterielCarry(string startPoint)
+ [HttpPost, Route("MaterielCarry"), AllowAnonymous]
+ public WebResponseContent MaterielCarry([FromBody] string startPoint)
{
- return Service.MaterielCarry(startPoint);
+ return _taskService.MaterielCarry(startPoint);
}
[HttpPost, Route("MaterielGroup")]
@@ -42,5 +52,60 @@
{
return _inboundService.InbounOrderService.QueryOrderInfo(pageNo, orderNo);
}
+
+ [HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
+ public async Task<WebResponseContent> UploadApk(IEnumerable<IFormFile> fileInput)
+ {
+ // 妫�鏌ユ槸鍚︽湁鏂囦欢涓婁紶
+ if (fileInput == null || !fileInput.Any())
+ {
+ return WebResponseContent.Instance.Error("鏂囦欢鏈笂浼�");
+ }
+
+ var formFile = fileInput.First();
+ var uploadFolder = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "Upload");
+ Directory.CreateDirectory(uploadFolder);
+
+ var fileName = $"WMS-PDA.apk";
+ var filePath = Path.Combine(uploadFolder, fileName);
+
+ using (var stream = new FileStream(filePath, FileMode.Create))
+ {
+ await formFile.CopyToAsync(stream);
+ }
+ return WebResponseContent.Instance.OK("鏂囦欢涓婁紶鎴愬姛"); ;
+ }
+
+ [HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous]
+ public WebResponseContent GetPDAVersion(string version)
+ {
+ try
+ {
+ string versionPDA = AppSettings.Configuration["PDAVersion"];
+ if (Convert.ToInt32(versionPDA) > 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("DownLoadApp"), AllowAnonymous]
+ public virtual ActionResult DownLoadApp()
+ {
+ var filename = "WMS-PDA.apk";
+ var filePath = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot/Upload", filename);
+
+ var memory = new MemoryStream();
+ using (var stream = new FileStream(filePath, FileMode.Open))
+ {
+ stream.CopyTo(memory);
+ }
+ memory.Position = 0;
+ var ext = Path.GetExtension(filePath).ToLowerInvariant();
+ return File(memory, new Dictionary<string, string>{{ ".apk", "application/vnd.android.package-archive" }}[ext], Path.GetFileName(filePath));
+ }
}
}
--
Gitblit v1.9.3