diff --git a/ARW.Model/Dto/Api/Custom/Regions/RegionApiDto.cs b/ARW.Model/Dto/Api/Custom/Regions/RegionApiDto.cs
index d95c386..610ca86 100644
--- a/ARW.Model/Dto/Api/Custom/Regions/RegionApiDto.cs
+++ b/ARW.Model/Dto/Api/Custom/Regions/RegionApiDto.cs
@@ -27,7 +27,7 @@ namespace ARW.Model.Dto.Api.Custom.Regions
public class RegionDtoApi
{
[Required(ErrorMessage = "RegionGuid不能为空")]
- public long RegionGuid { get; set; }
+ public int RegionId { get; set; }
}
}
diff --git a/ARW.Model/Vo/Api/Custom/Regions/RegionApiVo.cs b/ARW.Model/Vo/Api/Custom/Regions/RegionApiVo.cs
index bfc8ad4..2d07cf3 100644
--- a/ARW.Model/Vo/Api/Custom/Regions/RegionApiVo.cs
+++ b/ARW.Model/Vo/Api/Custom/Regions/RegionApiVo.cs
@@ -20,41 +20,32 @@ namespace ARW.Model.Vo.Api.Custom.Regions
///
/// 描述 :区划信息ID
///
- [EpplusIgnore]
+ [SugarColumn(IsTreeKey = true)]
public int RegionId { get; set; }
///
/// 描述 :区划名称
///
- [EpplusTableColumn(Header = "区划名称")]
- public string RegionName { get; set; }
+ public string Label { get; set; }
///
/// 描述 :父级ID
///
- [EpplusTableColumn(Header = "父级ID")]
public int RegionPid { get; set; }
///
/// 描述 :区划编码
///
- [EpplusTableColumn(Header = "区划编码")]
- public string RegionCode { get; set; }
+ public string Value { get; set; }
///
- /// 描述 :层级(1省级 2市级 3区/县级)
+ /// 子级
///
- [EpplusTableColumn(Header = "层级(1省级 2市级 3区/县级)")]
- public int RegionLevel { get; set; }
-
- public string ParentName { get; set; }
-
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
- [SugarColumn(IsIgnore = true)]
public List Children { get; set; }
}
diff --git a/ARW.Service/Api/BusinessService/Custom/Regions/RegionServiceApi.cs b/ARW.Service/Api/BusinessService/Custom/Regions/RegionServiceApi.cs
index 2d53cdd..86bdd2e 100644
--- a/ARW.Service/Api/BusinessService/Custom/Regions/RegionServiceApi.cs
+++ b/ARW.Service/Api/BusinessService/Custom/Regions/RegionServiceApi.cs
@@ -32,64 +32,36 @@ namespace ARW.Service.Api.BusinessService.Custom.Regions
this._RegionRepository = RegionRepository;
}
- #region Api接口代码
-
-
- ///
+ #region Api接口代码
+
+
+ ///
/// 查询省市区数据表树形列表(Api)
///
///
///
- public async Task> GetRegionTreeListApi(RegionQueryDtoApi parm)
- {
+ public async Task> GetRegionTreeListApi(RegionQueryDtoApi parm)
+ {
//开始拼装查询条件d
var predicate = Expressionable.Create();
- predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.RegionName), it => it.RegionName.Contains(parm.RegionName));
var query = _RegionRepository
.Queryable()
.Where(predicate.ToExpression())
- .LeftJoin((s, c) => s.RegionPid == c.RegionGuid)
- .OrderBy(s => s.RegionId,OrderByType.Asc)
- .Select((s,c) => new RegionVoApi
+ .OrderBy(s => s.RegionId, OrderByType.Asc)
+ .Select(s => new RegionVoApi
{
- RegionId = s.RegionId,
- RegionName = s.RegionName,
- RegionPid = s.RegionPid,
- RegionCode = s.RegionCode,
- RegionLevel = s.RegionLevel,
- ParentName = c.RegionName,
-});
+ RegionId = s.RegionId,
+ RegionPid = s.RegionPid,
+ Label = s.RegionName,
+ Value = s.RegionCode,
+ });
- return await query.ToTreeAsync(it => it.Children, it => it.RegionPid, 0);
+ return await query.ToTreeAsync(it => it.Children, it => it.RegionPid, 0);
}
- ///
- /// 查询省市区数据表详情(Api)
- ///
- ///
- ///
- public Task GetRegionDetails(RegionDtoApi parm)
- {
- var query = _RegionRepository
- .Queryable()
- .Where(s => s.RegionGuid == parm.RegionGuid)
- .Select(s => new RegionApiDetailsVo
- {
- RegionId = s.RegionId,
- RegionName = s.RegionName,
- RegionPid = s.RegionPid,
- RegionCode = s.RegionCode,
- RegionLevel = s.RegionLevel,
- }).Take(1);
-
-
- return query.ToJsonAsync();
- }
-
-
-#endregion
+ #endregion
}
}
diff --git a/ARW.Service/Api/IBusinessService/Custom/Regions/IRegionServiceApi.cs b/ARW.Service/Api/IBusinessService/Custom/Regions/IRegionServiceApi.cs
index debc641..d1f9dd6 100644
--- a/ARW.Service/Api/IBusinessService/Custom/Regions/IRegionServiceApi.cs
+++ b/ARW.Service/Api/IBusinessService/Custom/Regions/IRegionServiceApi.cs
@@ -25,12 +25,5 @@ namespace ARW.Service.Api.IBusinessService.Custom.Regions
///
Task> GetRegionTreeListApi(RegionQueryDtoApi parm);
- ///
- /// 获取省市区数据表详情(Api)
- ///
- ///
- ///
- Task GetRegionDetails(RegionDtoApi parm);
-
}
}
diff --git a/ARW.WebApi/Controllers/Api/Custom/Regions/RegionApiController.cs b/ARW.WebApi/Controllers/Api/Custom/Regions/RegionApiController.cs
index bf0bdaf..d8da062 100644
--- a/ARW.WebApi/Controllers/Api/Custom/Regions/RegionApiController.cs
+++ b/ARW.WebApi/Controllers/Api/Custom/Regions/RegionApiController.cs
@@ -24,7 +24,7 @@ namespace ARW.WebApi.Controllers.Api.Custom.Regions
/// @author admin
/// @date 2023-06-09
///
- [Verify]
+ //[Verify]
[Route("api/[controller]")]
public class RegionApiController : BaseController
{
@@ -49,36 +49,12 @@ namespace ARW.WebApi.Controllers.Api.Custom.Regions
public async Task GetRegionTreeListApi([FromQuery] RegionQueryDtoApi parm)
{
var res = await _RegionServiceApi.GetRegionTreeListApi(parm);
- if (res == null)
- res = new List();
-
+ //if (res == null)
+ // res = new List();
+
return SUCCESS(res);
}
- ///
- /// 获取Region详情(Api)
- ///
- /// 查询参数
- ///
- [HttpGet("getRegionDetails")]
- public async Task GetRegionDetails([FromQuery] RegionDtoApi parm)
- {
- //if (parm == null) throw new CustomException("参数错误!");
-
- var res = await _RegionServiceApi.GetRegionDetails(parm);
-
- if (res != "[]")
- {
- res = res.Remove(0, 1);
- res = res.Substring(0, res.Length - 1);
- var data = res.FromJSON();
- return SUCCESS(data);
- }
- else
- {
- return SUCCESS(res);
- }
- }
}
}