From 7de64b71919b37221cfca5dd11fab5b40bfd449c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 11 12月 2024 14:01:46 +0800
Subject: [PATCH] 2
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs | 1
LA24030_LuLiPackageLine_Pda/api/login.js | 2
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/App.json | 2
LA24030_LuLiPackageLine_Pda/manifest.json | 4
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystem/PDAUpdate/PdaUpdateService.cs | 127 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 132 insertions(+), 4 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Pda/api/login.js b/LA24030_LuLiPackageLine_Pda/api/login.js
index a7ac033..6d9381c 100644
--- a/LA24030_LuLiPackageLine_Pda/api/login.js
+++ b/LA24030_LuLiPackageLine_Pda/api/login.js
@@ -22,7 +22,7 @@
export function getWgt() { //PDA绋嬪簭鏇存柊wgt
return request({
// url: "/pdaupdate/get",
- url: "/api/wmsGroupDisk/PDAUpdate",
+ url: "/api/pdaUpdate/GetUpdate",
method: 'get',
contentType: 'application/json'
})
diff --git a/LA24030_LuLiPackageLine_Pda/manifest.json b/LA24030_LuLiPackageLine_Pda/manifest.json
index ccedeb5..aa96538 100644
--- a/LA24030_LuLiPackageLine_Pda/manifest.json
+++ b/LA24030_LuLiPackageLine_Pda/manifest.json
@@ -1,8 +1,8 @@
{
"name" : "LuLiMuYe_Package_Pda",
"appid" : "__UNI__28D87EB",
- "description" : "2024.07.29",
- "versionName" : "1.0.0",
+ "description" : "2024.12.1",
+ "versionName" : "1.0.2",
"versionCode" : "100",
"transformPx" : false,
"app-plus" : {
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/App.json b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/App.json
index 5a295b1..10116b5 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/App.json
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/App.json
@@ -7,7 +7,7 @@
"AllowedHosts": "*",
"AppSettings": {
- "FilePreviewUrl": "http://10.10.14.91:8077/", //ly-0805鏂囦欢棰勮鍓嶇紑鍜宎pp鏇存柊涓嬭浇
+ "FilePreviewUrl": "http://172.17.1.111:5005/", //ly-0805鏂囦欢棰勮鍓嶇紑鍜宎pp鏇存柊涓嬭浇
"InjectSpecificationDocument": true, // 鐢熶骇鐜鏄惁寮�鍚疭wagger
"ExternalAssemblies": [ "plugins" ] // 鎻掍欢鐩綍
},
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
index df9ad37..ea83e1a 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
@@ -47,6 +47,7 @@
public const string WmsOperationsGroupName = "浠撳簱浣滀笟";
public const string WmsQCGroupName = "鎶ユ鍗�";
public const string PdaOperationsGroup = "PDA浣滀笟";
+ public const string PdaUpdateGroup = "PDA鏇存柊";
public const string ReportCenterGroupName = "鎶ヨ〃涓績";
public const string WmsTaskGroupName = "浠诲姟绠＄悊";
public const string WmsSystemConfigGroupName = "绯荤粺閰嶇疆";
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystem/PDAUpdate/PdaUpdateService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystem/PDAUpdate/PdaUpdateService.cs
new file mode 100644
index 0000000..84c1717
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystem/PDAUpdate/PdaUpdateService.cs
@@ -0,0 +1,127 @@
+锘縰sing Admin.NET.Application.CommonHelper;
+using Admin.NET.Application.Entity;
+using Furion.DatabaseAccessor;
+
+namespace Admin.NET.Application;
+/// <summary>
+/// pda鏈嶅姟
+/// </summary>
+[ApiDescriptionSettings(ApplicationConst.PdaUpdateGroup, Order = 100)]
+public class PdaUpdateService : IDynamicApiController, ITransient
+{
+
+ public PdaUpdateService(
+ )
+ {
+ }
+
+ /// <summary>
+ /// PDA绋嬪簭鏇存柊鏂囦欢鍦板潃
+ /// </summary>
+ /// <returns></returns>
+ /// string
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "GetUpdate")]
+ [Description("PdaUpdate/GetUpdate")]
+ [AllowAnonymous]
+ public async Task<string> GetUpdate()
+ {
+ /** ly-0729*/
+ var savePath = Path.Combine(App.HostEnvironment.ContentRootPath + "wwwroot\\", "PDAUpdate");
+ if (!Directory.Exists(savePath))
+ {
+ throw Oops.Oh("鏂囦欢澶逛笉瀛樺湪");
+ }
+ List<FileInfo> lstfiles = await GetFile(savePath, ".wgt");
+ //Regex rxNonDigits = new Regex(@"[^\d]+");
+ //long i = 0;
+ FileInfo fileInfo = null;
+
+ foreach (var item in lstfiles)
+ {
+ //string str = rxNonDigits.Replace(item.Name, "");
+ //long j = Convert.ToInt64(rxNonDigits.Replace(item.Name, ""));
+ //if (i < j)
+ //{
+ // fileInfo = item;
+ // i = j;
+ //}
+ if (fileInfo == null)
+ {
+ fileInfo = item;
+ }
+ else
+ {
+ //姣旇緝涓や釜鏂囦欢鐨勭敓鎴愭椂闂达紝鍙栫敓鎴愭瘮杈冩櫄鐨�
+ if (item.CreationTimeUtc.Subtract(fileInfo.CreationTimeUtc).TotalSeconds > 0)
+ {
+ fileInfo = item;
+ }
+ }
+ }
+ if (fileInfo == null)
+ {
+ throw Oops.Oh("娌℃湁瑕佹洿鏂扮殑鏂囦欢");
+ }
+ return GetFilePreviewURL() + "PDAUpdate/" + fileInfo.Name;
+
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏂囦欢棰勮鍦板潃
+ /// </summary>
+ /// <returns></returns>
+ private static string GetFilePreviewURL()
+ {
+ try
+ {
+ //App.Configuration.GetSection("IpRateLimiting")
+ return App.Configuration["AppSettings:FilePreviewUrl"].ToString();
+ }
+ catch
+ {
+ return string.Empty;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏂囦欢澶逛笅鐨勬寚瀹氬悗缂�鐨勬墍鏈夋枃浠�
+ /// </summary>
+ /// <param name="path">鏂囦欢璺緞</param>
+ /// <param name="ExtName">鏂囦欢鍚庣紑</param>
+ /// <returns></returns>
+ [NonAction]
+ public async Task<List<FileInfo>> GetFile(string path, string ExtName)
+ {
+
+ try
+ {
+ List<FileInfo> lst = new List<FileInfo>();
+ string[] dir = Directory.GetDirectories(path);// 鏂囦欢澶瑰垪琛�
+ DirectoryInfo directoryInfo = new DirectoryInfo(path);
+ FileInfo[] files = directoryInfo.GetFiles();
+ if (files.Length != 0 || dir.Length != 0) // 褰撳墠鐩綍鏂囦欢鎴栨枃浠跺す涓嶈兘涓虹┖
+ {
+ foreach (FileInfo f in files)
+ {
+ if (ExtName.ToLower().IndexOf(f.Extension.ToLower()) >= 0)
+ {
+ lst.Add(f);
+ }
+ }
+ foreach (string d in dir)
+ {
+ await GetFile(d, ExtName);
+ }
+ }
+ return lst;
+ }
+ catch (Exception ex)
+ {
+ throw Oops.Oh(ex.Message);
+ }
+ }
+
+
+}
+
--
Gitblit v1.9.3