增加模板版本号筛选

Controllers/Client/AppController.cs

@@ -93,7 +93,7 @@ namespace Controllers
             AppSettings.Bind("OssConfigs", ossConfigs);
             string modulePath = parm.modulePath + ".html";
             var response = _PageUpdateInfoService.Queryable()
-                .First(x => x.modulePath == modulePath)
+                .First(x => x.modulePath == modulePath && x.appVersion == parm.appVersion)
                 .Adapt<AppPageInfoVo>() ?? new AppPageInfoVo();
             response.dataId = Function.MD5_16(response.id.ToString() + "123890");
             if (parm.moduleVersion < response.moduleVersion)

Controllers/PageUpdateInfoController.cs

@@ -162,9 +162,9 @@ namespace Controllers
         [Route("/noauth/SystemSet/makeAppInitData")]
         public string makeAppInitData([FromQuery] MakeAppInitDataDto parm)
         {
-            string AppInfoList = _AppBottomNavsService.makeAppInitData(parm.kind);
-            string FileInfoList = _FileUpdateInfoService.makeAppInitData(parm.kind);
-            string PageInfoList = _PageUpdateInfoService.makeAppInitData(parm.kind);
+            string AppInfoList = _AppBottomNavsService.makeAppInitData(parm.kind, parm.appVersion);
+            string FileInfoList = _FileUpdateInfoService.makeAppInitData(parm.kind, parm.appVersion);
+            string PageInfoList = _PageUpdateInfoService.makeAppInitData(parm.kind, parm.appVersion);
             return AppInfoList + "#cut#" + FileInfoList + "#cut#" + PageInfoList;
         }
 

Model/Database/AppBottomNavs.cs

@@ -178,6 +178,13 @@ namespace Model
         public bool pagFlag { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "模板版本号", Length = 50, ColumnName = "app_version")]
+        public string appVersion { get; set; }
+
+
 
     }
 }

Model/Database/AppVersion.cs

@@ -108,6 +108,13 @@ namespace Model
         public string kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "模板版本号", Length = 50, ColumnName = "app_version")]
+        public string appVersion { get; set; }
+
+
 
     }
 }

Model/Database/FileUpdateInfo.cs

@@ -80,6 +80,13 @@ namespace Model
         public string kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "模板版本号", Length = 50, ColumnName = "app_version")]
+        public string appVersion { get; set; }
+
+
 
     }
 }

Model/Database/PageUpdateInfo.cs

@@ -199,6 +199,13 @@ namespace Model
         public bool webTitle { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "模板版本号", Length = 50, ColumnName = "app_version")]
+        public string appVersion { get; set; }
+
+
 
     }
 }

Model/Dto/AppBottomNavsListDto.cs

@@ -15,6 +15,12 @@ namespace Dto
         public string? kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        public string? appVersion { get; set; }
+
+
 
     }
 }

Model/Dto/AppVersionListDto.cs

@@ -15,6 +15,12 @@ namespace Dto
         public string? kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        public string? appVersion { get; set; }
+
+
 
     }
 }

Model/Dto/Client/AppAppBottomNavsDto.cs

@@ -16,6 +16,12 @@ namespace Dto
         public string? kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        public string? appVersion { get; set; }
+
+
 
     }
 }

Model/Dto/Client/AppPageInfoDto.cs

@@ -31,6 +31,12 @@ namespace Dto
         public string? kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        public string? appVersion { get; set; }
+
+
 
     }
 }

Model/Dto/Client/AppStaticFilesDto.cs

@@ -16,6 +16,12 @@ namespace Dto
         public string? kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        public string? appVersion { get; set; }
+
+
 
     }
 }

Model/Dto/FileUpdateInfoListDto.cs

@@ -15,6 +15,12 @@ namespace Dto
         public string? kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        public string? appVersion { get; set; }
+
+
 
     }
 }

Model/Dto/MakeAppInitDataDto.cs

@@ -15,5 +15,11 @@ namespace Dto
         public string kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        public string? appVersion { get; set; }
+
+
     }
 }

Model/Dto/PageUpdateInfoListDto.cs

@@ -27,6 +27,12 @@ namespace Dto
         public string? kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        public string? appVersion { get; set; }
+
+
 
     }
 }

Services/AppBottomNavsService.cs

@@ -26,6 +26,7 @@ namespace Services
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<AppBottomNavs>();
+            predicate = predicate.And(m => m.appVersion.Contains(parm.appVersion));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             var response = Queryable()
                 .Where(predicate.ToExpression())
@@ -43,9 +44,9 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind)
+        public string makeAppInitData(string kind, string appVersion = "")
         {
-            var obj = GetList(m => m.kind == kind);
+            var obj = GetList(m => m.kind == kind && m.appVersion == appVersion);
             string str = Newtonsoft.Json.JsonConvert.SerializeObject(obj);
             return Dbconn.Encrypt3DES(str, "*ga34|^7");
         }

Services/AppVersionService.cs

@@ -25,6 +25,7 @@ namespace Services
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<AppVersion>();
+            predicate = predicate.And(m => m.appVersion.Contains(parm.appVersion));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             var response = Queryable()
                 .Where(predicate.ToExpression())

Services/Client/AppBottomNavsService.cs

@@ -25,6 +25,7 @@ namespace Services.Client
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<AppBottomNavs>();
+            predicate = predicate.And(m => m.appVersion.Contains(parm.appVersion));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             var response = Queryable()
                 .Where(predicate.ToExpression())

Services/Client/FileUpdateInfoService.cs

@@ -27,6 +27,7 @@ namespace Services.Client
             page.pageSize = 100000;
             //开始拼装查询条件
             var predicate = Expressionable.Create<FileUpdateInfo>();
+            predicate = predicate.And(m => m.appVersion.Contains(parm.appVersion));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             var response = Queryable()
                 .Where(predicate.ToExpression())

Services/FileUpdateInfoService.cs

@@ -29,6 +29,7 @@ namespace Services
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<FileUpdateInfo>();
+            predicate = predicate.And(m => m.appVersion.Contains(parm.appVersion));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             var response = Queryable()
                 .Where(predicate.ToExpression())
@@ -97,10 +98,11 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind)
+        public string makeAppInitData(string kind, string appVersion = "")
         {
             FileUpdateInfoListDto parm = new FileUpdateInfoListDto();
             parm.kind = kind;
+            parm.appVersion = appVersion;
             PagerInfo page = new PagerInfo();
             page.pageSize = 100000;
             var obj = List(parm, page);

Services/IService/IAppBottomNavsService.cs

@@ -24,7 +24,7 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind);
+        public string makeAppInitData(string kind, string appVersion = "");
 
 
 

Services/IService/IFileUpdateInfoService.cs

@@ -34,6 +34,6 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind);
+        public string makeAppInitData(string kind, string appVersion = "");
     }
 }

Services/IService/IPageUpdateInfoService.cs

@@ -33,7 +33,7 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind);
+        public string makeAppInitData(string kind, string appVersion = "");
 
 
     }

Services/PageUpdateInfoService.cs

@@ -31,6 +31,7 @@ namespace Services
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<PageUpdateInfo>();
+            predicate = predicate.And(m => m.appVersion.Contains(parm.appVersion));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.title), m => m.title.Contains(parm.title));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.modulePath), m => m.modulePath.Contains(parm.modulePath));
@@ -133,14 +134,14 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind)
+        public string makeAppInitData(string kind, string appVersion = "")
         {
             OssConfigs ossConfigs = new();
             AppSettings.Bind("OssConfigs", ossConfigs);
             string GotoPages = "{";
             string PageInfoList = "{";
             string LibFile = "{";
-            List<PageUpdateInfo> newpages = GetList(m => m.kind == kind);
+            List<PageUpdateInfo> newpages = GetList(m => m.kind == kind && m.appVersion == appVersion);
             foreach (PageUpdateInfo page in newpages)
             {
                 string FileName = page.modulePath.Split('.')[0];