Эх сурвалжийг харах

Merge branch 'feature/snapshot' into dev

qinchaoyue 4 сар өмнө
parent
commit
ff378cf427

+ 20 - 2
src/Hotline.Api/Controllers/Snapshot/IndustryController.cs

@@ -1,4 +1,6 @@
-using Hotline.Application.Snapshot;
+using Amazon.Runtime.Internal.Transform;
+using Hotline.Application.Snapshot;
+using Hotline.Caching.Interfaces;
 using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Snapshot;
@@ -14,14 +16,30 @@ namespace Hotline.Api.Controllers.Snapshot;
 public class IndustryController : BaseController
 {
     private readonly IIndustryRepository _industryRepository;
+    private readonly ISystemDicDataCacheManager _systemDicDataCacheManager;
     private readonly IIndustryApplication _industryApplication;
 
-    public IndustryController(IIndustryRepository industryRepository, IIndustryApplication industryApplication)
+    public IndustryController(IIndustryRepository industryRepository, IIndustryApplication industryApplication, ISystemDicDataCacheManager systemDicDataCacheManager)
     {
         _industryRepository = industryRepository;
         _industryApplication = industryApplication;
+        _systemDicDataCacheManager = systemDicDataCacheManager;
     }
 
+    /// <summary>
+    /// 添加行业页面基础数据
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("basedata")]
+    public Dictionary<string, object> GetBaseData()
+    { 
+        return new Dictionary<string, object>
+        {
+            { "department", _systemDicDataCacheManager.SnapshotDepartment },
+            { "acceptType", _systemDicDataCacheManager.AcceptType},
+            { "bulletinType", _systemDicDataCacheManager.SnapshotBulletinType}
+        };
+    }
     /// <summary>
     /// 新增行业
     /// </summary>

+ 5 - 0
src/Hotline/Caching/Interfaces/ISysDicDataCacheManager.cs

@@ -50,5 +50,10 @@ namespace Hotline.Caching.Interfaces
         public IReadOnlyList<SystemDicDataOutDto> WorkArea { get; }
         public IReadOnlyList<SystemDicData> VisitMananer { get; }
         public IReadOnlyList<SystemDicData> SourceChannel { get; }
+
+        /// <summary>
+        /// 自贡随手拍行业审批部门
+        /// </summary>
+        public IReadOnlyCollection<SystemDicDataOutDto> SnapshotDepartment { get; }
     }
 }

+ 5 - 0
src/Hotline/Caching/Services/SysDicDataCacheManager.cs

@@ -112,6 +112,11 @@ namespace Hotline.Caching.Services
         public IReadOnlyList<SystemDicData> VisitMananer => GetSysDicDataCache(SysDicTypeConsts.VisitManner);
         public IReadOnlyList<SystemDicData> SourceChannel => GetSysDicDataCache(SysDicTypeConsts.SourceChannel);
 
+        /// <summary>
+        /// 自贡随手拍行业审批部门
+        /// </summary>
+        public IReadOnlyCollection<SystemDicDataOutDto> SnapshotDepartment => GetOrAdd(SysDicTypeConsts.SnapshotDepartment);
+
 
         public void RemoveSysDicDataCache(string code)
         {

+ 30 - 0
src/Hotline/SeedData/SystemDicDataSeedData.cs

@@ -17,6 +17,31 @@ public class SystemDicDataSeedData : ISeedData<SystemDicData>
 
     public IEnumerable<SystemDicData> GetData(string dicTypeCode)
     {
+        if (dicTypeCode == SysDicTypeConsts.SnapshotDepartment)
+        {
+            return [
+                    new() { Id = "08dd1fd9-ec8b-455b-8a45-e7b449b760c6", DicDataValue = "1", DicDataName = "政务服务热线系统", Sort = 1 },
+                    new() { Id = "08dd1fd9-d8e4-4715-8605-de7c11d25ebf", DicDataValue = "2" , DicDataName = "热线中心" , Sort = 2},
+                    new() { Id = "08dd1fd9-d79d-4dc8-80fe-90d211edd1a9", DicDataValue = "2661", DicDataName = "自贡建工建设工程有限公司" , Sort = 3},
+                    new() { Id = "08dd1fd5-298b-49c4-813b-5a1ff2edcd29", DicDataValue = "2039", DicDataName = "自流井区人民政府" , Sort = 4},
+                    new() { Id = "08dd1fd5-0a4d-4e22-87bf-337653f883c1", DicDataValue = "2040", DicDataName = "贡井区人民政府" , Sort = 5},
+                    new() { Id = "08dd1fd5-0841-4119-89d6-cb923dfe3998", DicDataValue = "2041", DicDataName = "大安区人民政府" , Sort = 6},
+                    new() { Id = "08dd1fd5-0660-44a5-8104-4f6e4d0714e5", DicDataValue = "2042", DicDataName = "沿滩区人民政府" , Sort = 7},
+                    new() { Id = "08dd1f9f-e706-4cf9-8ee6-3c3cd7602c21", DicDataValue = "2043", DicDataName = "富顺县人民政府" , Sort = 8},
+                    new() { Id = "08dd1f67-0797-47f5-8da2-5742a98a53c4", DicDataValue = "2044", DicDataName = "荣县人民政府" , Sort = 9},
+                    new() { Id = "08dd1f66-441e-4eff-81fc-8b0afd78ca8f", DicDataValue = "2045", DicDataName = "高新区管委会" , Sort = 10},
+                    new() { Id = "08dd1f63-5682-456f-8596-8d99868334f6", DicDataValue = "2074", DicDataName = "荣县行政审批和营商环境局" , Sort = 11},
+                    new() { Id = "08dd1f62-ae99-474b-8a18-6351f9456bd9", DicDataValue = "2075", DicDataName = "荣县经开区管委会" , Sort = 12},
+                    new() { Id = "08dd1f61-3ec6-49c9-85d8-be35ddd9859b", DicDataValue = "2076", DicDataName = "荣县发展和改革局" , Sort = 13},
+                    new() { Id = "08dd1f5f-b885-4dae-86dc-4464660908ac", DicDataValue = "2077", DicDataName = "荣县科技和经信局" , Sort = 14},
+                    new() { Id = "08dd1f5f-b856-4e8c-8b33-0565dea6b56d", DicDataValue = "2078", DicDataName = "荣县教育和体育局" , Sort = 15},
+                    new() { Id = "08dd1f5f-af91-48c2-8b03-69f2c07ccefd", DicDataValue = "2079", DicDataName = "荣县公安局" , Sort = 16},
+                    new() { Id = "08dd1f5f-af5a-4fc7-85f5-034ba952d7fd", DicDataValue = "2834", DicDataName = "中国联通自贡分公司" , Sort = 17},
+                    new() { Id = "08dd1f5f-af18-42e6-8b8e-51923a92cf67", DicDataValue = "2081", DicDataName = "荣县民政局" , Sort = 18},
+                    new() { Id = "08dd1f5f-595d-4913-83be-ee71bebf3c30", DicDataValue = "2082", DicDataName = "荣县财政局" , Sort = 19},
+                    new() { Id = "08dd1f5e-d913-48cf-86f7-4bd3842669f4", DicDataValue = "2083", DicDataName = "荣县人力资源社会保障局" , Sort = 20}
+                ];
+        }
         if (dicTypeCode == SysDicTypeConsts.Workplace)
         {
             return
@@ -147,6 +172,11 @@ public class SystemDicDataSeedData : ISeedData<SystemDicData>
         {
             dicType = ["08dc0681-a6e1-473d-8b1d-1b0b67e0ec13", "随手拍公告类型"];
         }
+        if (dicTypeCode == SysDicTypeConsts.SnapshotDepartment)
+        {
+            dicType = ["08dd1f5d-ebd8-4dc1-861c-d3190ad4c528", "随手拍审核部门"];
+        }
+
         return new SystemDicType
         {
             Id = dicType[0],

+ 5 - 0
src/Hotline/Settings/SysDicTypeConsts.cs

@@ -291,4 +291,9 @@ public class SysDicTypeConsts
     /// 作业区域
     /// </summary>
     public const string WorkArea = "WorkArea";
+
+    /// <summary>
+    /// 自贡随手拍行业审批部门
+    /// </summary>
+    public const string SnapshotDepartment = "SnapshotDepartment";
 }