2

schangxiang@126.com

2024-12-11 7de64b71919b37221cfca5dd11fab5b40bfd449c

2

 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'
    })

 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" : {

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/App.json

@@ -7,7 +7,7 @@
  "AllowedHosts": "*",

  "AppSettings": {
    "FilePreviewUrl": "http://10.10.14.91:8077/", //ly-0805文件预览前缀和app更新下载
    "FilePreviewUrl": "http://172.17.1.111:5005/", //ly-0805文件预览前缀和app更新下载
    "InjectSpecificationDocument": true, // ç”Ÿäº§çŽ¯å¢ƒæ˜¯å¦å¼€å¯Swagger
    "ExternalAssemblies": [ "plugins" ] // æ’件目录
  },

 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 = "系统配置";

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystem/PDAUpdate/PdaUpdateService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,127 @@
using 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);
        }
    }


}