|
@@ -6,6 +6,7 @@
|
|
|
|
|
|
using System.Collections.Generic;
|
|
using System.Collections.Generic;
|
|
using System.ComponentModel;
|
|
using System.ComponentModel;
|
|
|
|
+using System.IO;
|
|
using System.Linq;
|
|
using System.Linq;
|
|
using System.Reflection;
|
|
using System.Reflection;
|
|
using Newtonsoft.Json.Linq;
|
|
using Newtonsoft.Json.Linq;
|
|
@@ -36,9 +37,11 @@ namespace SAGA.MBI.JsonConvert
|
|
List<ProvinceInfo> list = new List<ProvinceInfo>();
|
|
List<ProvinceInfo> list = new List<ProvinceInfo>();
|
|
string json = CmbDataSourceRequest.GeographyDic();
|
|
string json = CmbDataSourceRequest.GeographyDic();
|
|
if (!json.IsSuccessRequest()) return list;
|
|
if (!json.IsSuccessRequest()) return list;
|
|
-
|
|
|
|
JObject jObject = JObject.Parse(json);
|
|
JObject jObject = JObject.Parse(json);
|
|
- foreach (KeyValuePair<string, JToken> keyValuePair in (JObject)jObject["Content"])
|
|
|
|
|
|
+ JObject useObject = (JObject) jObject["Content"];
|
|
|
|
+ //测试代码
|
|
|
|
+ //useObject = JObject.Parse(File.ReadAllText(@"C: \Users\sagacloud\Desktop\Geography.json"));
|
|
|
|
+ foreach (KeyValuePair<string, JToken> keyValuePair in useObject)
|
|
{
|
|
{
|
|
foreach (JObject provinceJObject in (JArray)keyValuePair.Value)
|
|
foreach (JObject provinceJObject in (JArray)keyValuePair.Value)
|
|
{
|
|
{
|
|
@@ -51,8 +54,9 @@ namespace SAGA.MBI.JsonConvert
|
|
provinceInfo.ProvinceName = (string)provinceJObject["provinceName"];
|
|
provinceInfo.ProvinceName = (string)provinceJObject["provinceName"];
|
|
provinceInfo.Code = (string)provinceJObject["provinceInfo"][0]["code"];
|
|
provinceInfo.Code = (string)provinceJObject["provinceInfo"][0]["code"];
|
|
provinceInfo.Name = (string)provinceJObject["provinceInfo"][0]["name"];
|
|
provinceInfo.Name = (string)provinceJObject["provinceInfo"][0]["name"];
|
|
- provinceInfo.LocalCode = (string)provinceJObject["provinceInfo"][1]["code"];
|
|
|
|
- provinceInfo.LocalName = (string)provinceJObject["provinceInfo"][1]["name"];
|
|
|
|
|
|
+ //修改成0
|
|
|
|
+ provinceInfo.LocalCode = (string)provinceJObject["provinceInfo"][0]["code"];
|
|
|
|
+ provinceInfo.LocalName = (string)provinceJObject["provinceInfo"][0]["name"];
|
|
foreach (var cityJObject in provinceJObject["cities"])
|
|
foreach (var cityJObject in provinceJObject["cities"])
|
|
{
|
|
{
|
|
CityInfo cityInfo = new CityInfo();
|
|
CityInfo cityInfo = new CityInfo();
|
|
@@ -63,7 +67,8 @@ namespace SAGA.MBI.JsonConvert
|
|
cityInfo.Code = (string)cityJObject["cityInfo"][0]["code"];
|
|
cityInfo.Code = (string)cityJObject["cityInfo"][0]["code"];
|
|
cityInfo.Name = (string)cityJObject["cityInfo"][0]["name"];
|
|
cityInfo.Name = (string)cityJObject["cityInfo"][0]["name"];
|
|
cityInfo.CityInfoI = GetDistrictInfo((JObject)cityJObject["cityInfo"][0]);
|
|
cityInfo.CityInfoI = GetDistrictInfo((JObject)cityJObject["cityInfo"][0]);
|
|
- cityInfo.CityLocalInfoI = GetDistrictInfo((JObject)cityJObject["cityInfo"][1]);
|
|
|
|
|
|
+ //修改成0
|
|
|
|
+ cityInfo.CityLocalInfoI = GetDistrictInfo((JObject)cityJObject["cityInfo"][0]);
|
|
provinceInfo.Cities.Add(cityInfo);
|
|
provinceInfo.Cities.Add(cityInfo);
|
|
foreach (JObject districtJObject in cityJObject["district"])
|
|
foreach (JObject districtJObject in cityJObject["district"])
|
|
{
|
|
{
|