Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Application.Contracts/Suggestions/CreateSuggestionManyDto.cs

@@ -15,7 +15,7 @@ namespace Shentun.Peis.Suggestions
         public Guid DiagnosisId { get; set; }
 
         /// <summary>
-        /// 建议类型(0-代表医学解释，1-代表健康指导)
+        /// 建议类型(0-代表医学解释，1-代表常见原因，2-代表健康指导)
         /// </summary>
         public char SuggestionType { get; set; }
 

src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs

@@ -32,7 +32,8 @@ namespace Shentun.Peis.DataMigrations
     /// <summary>
     /// 基础数据处理
     /// </summary>
-    //[Authorize]
+    [Authorize]
+    [RemoteService(false)]
     public class BaseDataHandleAppService : ApplicationService
     {
 
@@ -43,6 +44,13 @@ namespace Shentun.Peis.DataMigrations
             IsAutoCloseConnection = true
         });
 
+        private readonly SqlSugarClient PgDb = new SqlSugarClient(new ConnectionConfig()
+        {
+            ConnectionString = "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123;",
+            DbType = SqlSugar.DbType.PostgreSQL,
+            IsAutoCloseConnection = true
+        });
+
 
         //默认指引类别ID
         private readonly Guid defaultGuidTypeId = Guid.Parse("3a120284-df18-7b36-4b12-0423a7d5c1c6");
@@ -70,6 +78,7 @@ namespace Shentun.Peis.DataMigrations
         private readonly IRepository<ItemResultTemplate, Guid> _itemResultTemplateRepository;
         private readonly IRepository<ItemResultMatch, Guid> _ItemResultMatchRepository;
         private readonly MyUserAppService _myUserAppService;
+        private readonly IRepository<MenuInfo, Guid> _menuInfoRepository;
 
         public BaseDataHandleAppService(
             IRepository<DeviceType, Guid> deviceTypeRepository,
@@ -91,7 +100,8 @@ namespace Shentun.Peis.DataMigrations
             IRepository<ItemResultMatch, Guid> itemResultMatchRepository,
             IRepository<Diagnosis, Guid> diagnosisRepository,
             IRepository<Suggestion, Guid> suggestionRepository,
-            MyUserAppService myUserAppService)
+            MyUserAppService myUserAppService,
+            IRepository<MenuInfo, Guid> menuInfoRepository)
         {
             _deviceTypeRepository = deviceTypeRepository;
             _itemTypeRepository = itemTypeRepository;
@@ -113,6 +123,7 @@ namespace Shentun.Peis.DataMigrations
             _diagnosisRepository = diagnosisRepository;
             _suggestionRepository = suggestionRepository;
             _myUserAppService = myUserAppService;
+            _menuInfoRepository = menuInfoRepository;
         }
 
         /// <summary>
@@ -1187,6 +1198,47 @@ namespace Shentun.Peis.DataMigrations
 
         }
 
+        /// <summary>
+        /// 迁移菜单
+        /// </summary>
+        /// <returns></returns>
+        public async Task TransferMenuInfoData()
+        {
+            var oldMenuInfoList = await PgDb.Ado.GetDataTableAsync("select * from menu_info");
+            if (oldMenuInfoList.Rows.Count > 0)
+            {
+
+                List<MenuInfo> dataList = new List<MenuInfo>();
+
+                foreach (DataRow menuInfo in oldMenuInfoList.Rows)
+                {
+                    var data = new MenuInfo(Guid.Parse(menuInfo["id"].ToString()))
+                    {
+                        DisplayName = menuInfo["display_name"].ToString(),
+                        DisplayOrder = Convert.ToInt32(menuInfo["display_order"].ToString()),
+                        IconName = menuInfo["icon_name"].ToString(),
+                        IsActive = Convert.ToChar(menuInfo["is_active"].ToString()),
+                        MenuType = Convert.ToChar(menuInfo["menu_type"].ToString()),
+                        ParentId = !string.IsNullOrWhiteSpace(menuInfo["parent_id"].ToString()) ? Guid.Parse(menuInfo["parent_id"].ToString()) : null,
+                        RouteUrl = menuInfo["route_url"].ToString(),
+                        SimpleCode = menuInfo["simple_code"].ToString()
+                    };
+
+                    dataList.Add(data);
+
+                }
+
+                if (dataList.Any())
+                    await _menuInfoRepository.InsertManyAsync(dataList);
+
+
+
+
+
+            }
+        }
+
+
         private void LoadDLL()
         {
             // 定义dll文件夹路径

src/Shentun.Peis.Domain.Shared/Enums/SuggestionTypeFlag.cs

@@ -21,7 +21,7 @@ namespace Shentun.Peis.Enums
         public const char CommonReasons = '1';
 
         /// <summary>
-        /// 常见原因
+        /// 健康指导
         /// </summary>
         [Description("健康指导")]
         public const char HealthGuidance = '2';

src/Shentun.Peis.Domain/MenuInfos/MenuInfo.cs

@@ -15,7 +15,17 @@ namespace Shentun.Peis.Models
     [Index(nameof(DisplayName), nameof(ParentId), Name = "ix_menu_info", IsUnique = true)]
     public class MenuInfo : AuditedEntity<Guid>, IDisplayOrder, IDisplayName, IHasConcurrencyStamp
     {
- 
+
+        protected MenuInfo()
+        {
+
+        }
+
+        public MenuInfo(Guid id) : base(id)
+        {
+
+        }
+
         /// <summary>
         /// 名称
         /// </summary>
@@ -44,7 +54,7 @@ namespace Shentun.Peis.Models
         /// </summary>
         [Column("simple_code")]
         [StringLength(20)]
-        public string SimpleCode { get; set; }  
+        public string SimpleCode { get; set; }
 
         /// <summary>
         /// 父id

src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs

@@ -116,7 +116,7 @@ public class PeisHttpApiHostModule : AbpModule
             opt.Password.RequireLowercase = false;
             opt.Password.RequireUppercase = false;
             opt.Password.RequireNonAlphanumeric = false;
-            opt.Password.RequiredLength = 6;
+            opt.Password.RequiredLength = 1;
         });
 
         //防伪令牌