add 房屋相关单位信息维护

Api/Ewide.Application/Entity/BsHouseCompany.cs

@@ -0,0 +1,36 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    [Table("bs_house_company")]
+    [Comment("房屋相关单位表")]
+    public class BsHouseCompany : Core.DEntityBase
+    {
+        /// <summary>
+        /// 单位类型，多选
+        /// </summary>
+        [Comment("单位类型，多选")]
+        [MaxLength(20)]
+        public string Type { get; set; }
+
+        /// <summary>
+        /// 单位名称
+        /// </summary>
+        [Comment("单位名称")]
+        [MaxLength(200)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 信息
+        /// </summary>
+        [Comment("信息")]
+        public string Info { get; set; }
+    }
+}

Api/Ewide.Application/Entity/BsHouseUnitInfo.cs

@@ -1,55 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Ewide.Application.Entity
-{
-    public class BsHouseCompany : Core.DEntityBase
-    {
-        /// <summary>
-        /// 单位类型，多选
-        /// </summary>
-        [Comment("单位类型，多选")]
-        [MaxLength(20)]
-        public string Type { get; set; }
-
-        /// <summary>
-        /// 单位名称
-        /// </summary>
-        [Comment("单位名称")]
-        [MaxLength(200)]
-        public string CompanyName { get; set; }
-
-        /// <summary>
-        /// 单位负责人
-        /// </summary>
-        [Comment("单位负责人")]
-        [MaxLength(100)]
-        public string ChargePerson { get; set; }
-
-        /// <summary>
-        /// 单位负责人电话
-        /// </summary>
-        [Comment("单位负责人电话")]
-        [MaxLength(50)]
-        public string ChargePersonTel { get; set; }
-
-        /// <summary>
-        /// 单位联系人
-        /// </summary>
-        [Comment("单位联系人")]
-        [MaxLength(100)]
-        public string ContactPerson { get; set; }
-
-        /// <summary>
-        /// 单位联系人电话
-        /// </summary>
-        [Comment("单位联系人电话")]
-        [MaxLength(50)]
-        public string ContactPersonTel { get; set; }
-    }
-}

Api/Ewide.Application/Ewide.Application.xml

@@ -4,6 +4,21 @@
         <name>Ewide.Application</name>
     </assembly>
     <members>
+        <member name="P:Ewide.Application.BsHouseCompany.Type">
+            <summary>
+            单位类型，多选
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseCompany.Name">
+            <summary>
+            单位名称
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseCompany.Info">
+            <summary>
+            信息
+            </summary>
+        </member>
         <member name="P:Ewide.Application.BsHouseInfo.HouseCodeId">
             <summary>
             HouseCode主键ID
@@ -329,36 +344,6 @@
             主管部门
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseCompany.Type">
-            <summary>
-            单位类型，多选
-            </summary>
-        </member>
-        <member name="P:Ewide.Application.Entity.BsHouseCompany.CompanyName">
-            <summary>
-            单位名称
-            </summary>
-        </member>
-        <member name="P:Ewide.Application.Entity.BsHouseCompany.ChargePerson">
-            <summary>
-            单位负责人
-            </summary>
-        </member>
-        <member name="P:Ewide.Application.Entity.BsHouseCompany.ChargePersonTel">
-            <summary>
-            单位负责人电话
-            </summary>
-        </member>
-        <member name="P:Ewide.Application.Entity.BsHouseCompany.ContactPerson">
-            <summary>
-            单位联系人
-            </summary>
-        </member>
-        <member name="P:Ewide.Application.Entity.BsHouseCompany.ContactPersonTel">
-            <summary>
-            单位联系人电话
-            </summary>
-        </member>
         <member name="P:Ewide.Application.BsHouseTask.HouseCodeId">
             <summary>
             bs_house_code主键Id

Api/Ewide.Application/Service/HouseSafety/HouseCompany/Dto/HouseCompanyInput.cs

@@ -0,0 +1,61 @@
+using Ewide.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseCompanyInput
+    {
+        [Required(ErrorMessage = "Id不能为空")]
+        public string Id { get; set; }
+    }
+
+    public class HouseCompanyInfoInput
+    {
+        [Required(ErrorMessage = "信息名称不能为空")]
+        public string Name { get; set; }
+        [Required(ErrorMessage = "信息内容不能为空")]
+        public string Value { get; set; }
+    }
+
+    public class HouseCompanyPageInput : PageInputBase {}
+
+    public class HouseCompanyAddInput
+    {
+        [Required(ErrorMessage = "名称不能为空")]
+        public virtual string Name { get; set; }
+
+        private string _Type { get; set; }
+
+        [Required(ErrorMessage = "类型不能为空")]
+        public virtual string Type
+        {
+            get
+            {
+                return _Type;
+            }
+            set
+            {
+                _Type = String.Join(",", value.Split(',').Select(p => $"[{p}]"));
+            }
+        }
+
+        public virtual List<HouseCompanyInfoInput> Info { get; set; }
+    }
+
+    public class HouseCompanyEditInput : HouseCompanyAddInput
+    {
+        [Required(ErrorMessage = "Id不能为空")]
+        public string Id { get; set; }
+    }
+
+    public class HouseCompanyListInput
+    {
+        [Required(ErrorMessage = "类型不能为空")]
+        public string Type { get; set; }
+    }
+}

Api/Ewide.Application/Service/HouseSafety/HouseCompany/Dto/HouseCompanyOutput.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseCompanyInfoOutput
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+    }
+
+    public class HouseCompanyDetailOutput
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        private string _Type { get; set; }
+        public string Type
+        {
+            get
+            {
+                return _Type;
+            }
+            set
+            {
+                _Type = String.Join(",", value.Split(',').Select(p => p.Replace("[", "").Replace("]", "")));
+            }
+        }
+        public List<HouseCompanyInfoOutput> Info { get; set; }
+    }
+}

Api/Ewide.Application/Service/HouseSafety/HouseCompany/HouseCompanyService.cs

@@ -0,0 +1,101 @@
+using Ewide.Core.Extension;
+using Furion.DatabaseAccessor;
+using Furion.DatabaseAccessor.Extensions;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    [ApiDescriptionSettings(Name = "HouseCompany")]
+    public class HouseCompanyService : IHouseCompanyService, IDynamicApiController, ITransient
+    {
+        private readonly IRepository<BsHouseCompany> _bsHouseCompanyRep;
+
+        public HouseCompanyService(IRepository<BsHouseCompany> bsHouseCompanyRep)
+        {
+            _bsHouseCompanyRep = bsHouseCompanyRep;
+        }
+
+        [HttpPost("/houseCompany/page")]
+        public async Task<dynamic> Page([FromBody] HouseCompanyPageInput input)
+        {
+            var config = new TypeAdapterConfig().ForType<BsHouseCompany, HouseCompanyDetailOutput>()
+                .Map(target => target.Info, src => JsonConvert.DeserializeObject<List<HouseCompanyInfoOutput>>(src.Info))
+                .Config;
+            return await _bsHouseCompanyRep.DetachedEntities.ToPageData<BsHouseCompany, HouseCompanyDetailOutput>(input, config);
+        }
+
+        [HttpPost("/houseCompany/add")]
+        public async Task Add([FromBody] HouseCompanyAddInput input)
+        {
+            var info = JsonConvert.SerializeObject(input.Info);
+            var config = new TypeAdapterConfig().ForType<HouseCompanyAddInput, BsHouseCompany>()
+                .Map(target => target.Info, src => JsonConvert.SerializeObject(src.Info))
+                .Config;
+            var company = input.Adapt<BsHouseCompany>(config);
+            await company.InsertAsync();
+        }
+
+        [HttpPost("/houseCompany/edit")]
+        public async Task Edit([FromBody] HouseCompanyEditInput input)
+        {
+            var config = new TypeAdapterConfig().ForType<HouseCompanyEditInput, BsHouseCompany>()
+                .Map(target => target.Info, src => JsonConvert.SerializeObject(src.Info))
+                .Config;
+            var company = input.Adapt<BsHouseCompany>(config);
+            await company.UpdateAsync();
+        }
+
+        [HttpPost("/houseCompany/delete")]
+        public async Task Delete([FromBody] HouseCompanyInput input)
+        {
+            var company = await _bsHouseCompanyRep.FirstOrDefaultAsync(p => p.Id.Equals(input.Id));
+            await company.DeleteAsync();
+        }
+
+        [HttpGet("/houseCompany/detail")]
+        public async Task<HouseCompanyDetailOutput> Detail([FromQuery] HouseCompanyInput input)
+        {
+            var company = await _bsHouseCompanyRep.FirstOrDefaultAsync(p => p.Id.Equals(input.Id));
+            var config = new TypeAdapterConfig().ForType<BsHouseCompany, HouseCompanyDetailOutput>()
+                .Map(target => target.Info, src => JsonConvert.DeserializeObject<List<HouseCompanyInfoOutput>>(src.Info))
+                .Config;
+            var output = company.Adapt<HouseCompanyDetailOutput>(config);
+            return output;
+        }
+
+        [HttpGet("/houseCompany/list")]
+        public async Task<dynamic> List([FromQuery] HouseCompanyListInput input)
+        {
+            var types = input.Type.Split(',');
+            var result = new List<HouseCompanyDetailOutput>();
+            var config = new TypeAdapterConfig().ForType<BsHouseCompany, HouseCompanyDetailOutput>()
+                .Map(target => target.Info, src => JsonConvert.DeserializeObject<List<HouseCompanyInfoOutput>>(src.Info))
+                .Config;
+            foreach (var type in types)
+            {
+                var list = (await _bsHouseCompanyRep.DetachedEntities
+                    .Where(p => EF.Functions.Like(p.Type, $"%[{type.Trim()}]%"))
+                    .OrderBy(p => p.Name)
+                    .ToListAsync())
+                    .Select(p =>
+                    {
+                        var output = p.Adapt<HouseCompanyDetailOutput>(config);
+                        return output;
+                    });
+                result.AddRange(list);
+            }
+
+            return result.Distinct();
+        }
+    }
+}

Api/Ewide.Application/Service/HouseSafety/HouseCompany/IHouseCompanyService.cs

@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    public interface IHouseCompanyService
+    {
+        Task<dynamic> Page([FromBody] HouseCompanyPageInput input);
+        Task Add([FromBody] HouseCompanyAddInput input);
+        Task Edit([FromBody] HouseCompanyEditInput input);
+        Task Delete([FromBody] HouseCompanyInput input);
+        Task<HouseCompanyDetailOutput> Detail([FromQuery] HouseCompanyInput input);
+        Task<dynamic> List([FromQuery] HouseCompanyListInput input);
+    }
+}