@ -482,7 +482,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
c = > c . identification_time > DateTime . Now . AddDays ( - 30 ) & &
c . identification_time < DateTime . Now . AddDays ( - 7 ) ) //30天内
. WhereIF ( req . out_time_flag = = 5 , c = > c . identification_time < DateTime . Now . AddDays ( - 30 ) ) //30天以上
//是否处理
//是否处理
. WhereIF ( req . is_deal = = 1 , c = > c . handle_status_id ! = 0 | | ( c . handle_status_id = = 0 & & c . is_jieshou = = 1 ) )
//是否整改完成
. WhereIF ( req . is_complete = = 0 , c = > c . handle_status_id ! = 2 )
@ -1389,22 +1389,22 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
dataList = ( from item in queryList
join task in verifytaskList on item . areaid equals task . countyid into temp
from data in temp . DefaultIfEmpty ( )
orderby item . sortno
select new
{
item . areaid ,
item . totaltask ,
item . receivetask ,
item . nonfoodcase ,
item . legalcase ,
item . ilegalcase ,
item . areaname ,
item . sortno ,
verifytask = data = = null ? 0 : data . verifytask ,
level = 1
} as dynamic ) . ToList ( ) ;
join task in verifytaskList on item . areaid equals task . countyid into temp
from data in temp . DefaultIfEmpty ( )
orderby item . sortno
select new
{
item . areaid ,
item . totaltask ,
item . receivetask ,
item . nonfoodcase ,
item . legalcase ,
item . ilegalcase ,
item . areaname ,
item . sortno ,
verifytask = data = = null ? 0 : data . verifytask ,
level = 1
} as dynamic ) . ToList ( ) ;
}
else
{
@ -2775,14 +2775,14 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
string sql = "" ;
string sqlcount = "" ;
int allCount = 0 ;
sqlcount =
$"select count(a.*) from wf_task a LEFT JOIN wf_process " +
$"b on a.\" ProcessId \ "=b.\"Id\" \r\nLEFT JOIN drone_ssnyd c on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\" where 1=1 and a.\"ProcessCode\"='004' " ;
string sqlcount1 =
$"select count(a.*) from wf_task a LEFT JOIN wf_process " +
$"b on a.\" ProcessId \ "=b.\"Id\" \r\nLEFT JOIN drone_ssnyd_rcjg c on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\" RIGHT JOIN drone_ssnyd d on d.\"Id\"=c.ssnyd_id where 1=1 and a.\"ProcessCode\"='005'" ;
sqlcount =
$"select count(a.*) from wf_task a LEFT JOIN wf_process " +
$"b on a.\" ProcessId \ "=b.\"Id\" \r\nLEFT JOIN drone_ssnyd c on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\" where 1=1 and a.\"ProcessCode\"='004' " ;
string sqlcount1 =
$"select count(a.*) from wf_task a LEFT JOIN wf_process " +
$"b on a.\" ProcessId \ "=b.\"Id\" \r\nLEFT JOIN drone_ssnyd_rcjg c on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\" RIGHT JOIN drone_ssnyd d on d.\"Id\"=c.ssnyd_id where 1=1 and a.\"ProcessCode\"='005'" ;
// $"a.\"ProcessCode\"='" +
// schemeCode + "' ";
@ -2795,11 +2795,11 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
$"\r\n a.\" ProcessCode \ " as processcode,a.\"ProcessId\" as processid,c.gengdi_area as gengdiArea,yongjiujibennongtian_area as yongjiujibennongtianArea ,nongyongdi_area as nongyongdiArea,c.geomid,c.\"Id\" as caseid\r\n" +
$" from wf_task a LEFT JOIN wf_process b on a.\" ProcessId \ "=b.\"Id\"\r\nLEFT JOIN drone_ssnyd_rcjg d on b.\"InstanceInfo\"->>'pkeyValue'=d.\"Id\" RIGHT JOIN drone_ssnyd c on c.\"Id\"=d.ssnyd_id where 1=1 " +
$" and a.\" ProcessCode \ "='005' and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工 问题整改','日常监管','监管问题整改','现场复核','监管接收') and a.\"State\"=1 )) e where 1=1 " ;
string sqlpart1 = sqlpart + $" and a.\" UnitName \ " in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收') and a.\"State\"=1 " ;
allCount = await client . Ado . GetIntAsync ( sqlcount + sqlpart1 ) ;
var allCount1 = await client . Ado . GetIntAsync ( sqlcount1 + sqlpart1 ) ;
string sqlpart2 = sqlpart1 + $" and a.\" UnitName \ " in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收') and a.\"State\"=1 " ;
allCount = await client . Ado . GetIntAsync ( sqlcount + sqlpart2 ) ;
var allCount1 = await client . Ado . GetIntAsync ( sqlcount1 + sqlpart2 ) ;
allCount = allCount + allCount1 ;
if ( ! string . IsNullOrEmpty ( req . caseNo ) )
@ -2807,7 +2807,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
sqlpart = sqlpart + $" and e.xiangmu_no like '%" + req . caseNo + "%'" ;
}
if ( ! string . IsNullOrEmpty ( req . tubanArea1 ) & & ! string . IsNullOrEmpty ( req . tubanArea2 ) )
@ -2882,9 +2882,9 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
double . Parse ( req . jibenArea2 ) ;
}
sqlpart + = $" ORDER BY e.createdate desc" ;
sqlpart + = $" ORDER BY e.createdate desc" ;
Console . WriteLine ( sql + sqlpart ) ;
var info = await client . SqlQueryable < dynamic > ( sql + sqlpart ) . ToPageListAsync ( req . page , req . limit , totalcount ) ;
@ -2907,10 +2907,10 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
{
Dictionary < string , object > dic = new Dictionary < string , object > ( ) ;
string sql = $"select a.\" Id \ " as taskId,d.*\r\n from wf_task a LEFT JOIN wf_process b on a.\"ProcessId\"=b.\"Id\"\r\nLEFT JOIN drone_ssnyd_rcjg d " +
$" on b.\" InstanceInfo \ "->>'pkeyValue'=d.\"Id\" where d.ssnyd_id='" + caseid + "' and is_lishi=1" ;
$" on b.\" InstanceInfo \ "->>'pkeyValue'=d.\"Id\" where d.ssnyd_id='" + caseid + "' and is_lishi=1" ;
var list = client . Ado . SqlQuery < dynamic > ( sql ) ;
dic . Add ( "list" , list ) ;
return new Response < Dictionary < string , object > >
@ -2918,7 +2918,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
Result = dic
} ;
}
public Response < List < dynamic > > loadStreet ( )
public Response < List < dynamic > > loadStreet ( )
{
var authStrategyContext = _auth . GetCurrentUser ( ) ;
var user = authStrategyContext . User ;
@ -3570,7 +3570,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
{
sqlpart = sqlpart + $" and typename='" + req . typename + "'" ;
}
if ( ! string . IsNullOrEmpty ( req . tubanlaiyuan ) )
{
var tubanlaiyuanList = req . tubanlaiyuan . Split ( "," ) . ToList ( ) ;
@ -4927,9 +4927,9 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
c = > c . identification_time > DateTime . Now . AddDays ( - 30 ) & &
c . identification_time < DateTime . Now . AddDays ( - 7 ) ) //30天内
. WhereIF ( req . out_time_flag = = 5 , c = > c . identification_time < DateTime . Now . AddDays ( - 30 ) ) //30天以上
//是否处理
//.WhereIF(req.is_deal == 1, c => c.handle_status_id != 0 || (c.handle_status_id == 0 && c.is_examine == 1))
//是否整改完成
//是否处理
//.WhereIF(req.is_deal == 1, c => c.handle_status_id != 0 || (c.handle_status_id == 0 && c.is_examine == 1))
//是否整改完成
. WhereIF ( req . is_complete = = 0 , c = > c . handle_status_id ! = 2 )
//24小时未核查
// .WhereIF(req.is_not_deal_hour24 == 1, c => c.handle_status_id == 0 && (c.is_examine == null || c.is_examine == 0) && c.identification_time < DateTime.Now.AddDays(-1))
@ -5679,15 +5679,16 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
} ;
}
public TubanSplit CalTubanArea ( TubanSplit split ) {
public TubanSplit CalTubanArea ( TubanSplit split )
{
TubanSplit tubanSplit = new TubanSplit ( ) ;
string geomwkt = split . wktgeom ;
string mianjisql = $"select sum(c.have_intersection) from (SELECT ST_Area(ST_Transform(st_setsrid(ST_Intersection(st_setsrid(ST_Force2D(a.geometry)\r\n , 4326)," +
$"st_setsrid(ST_Force2D(b.geometry), 4326)),4326),4527)) AS have_intersection from geoserver_gengdi\r\n a ," +
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
Console . Write ( mianjisql ) ;
double gengdimianji = client . Ado . GetDouble ( mianjisql ) ;
tubanSplit . gengdi = Math . Round ( gengdimianji * 0.0015 , 2 ) ;
tubanSplit . gengdi = Math . Round ( gengdimianji * 0.0015 , 2 ) ;
string jibensql = $"select sum(c.have_intersection) from (SELECT ST_Area(ST_Transform(st_setsrid(ST_Intersection(st_setsrid(ST_Force2D(a.geometry)\r\n , 4326)," +
$"st_setsrid(ST_Force2D(b.geometry), 4326)),4326),4527)) AS have_intersection from geoserver_jibennongtian\r\n a ," +
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
@ -5703,8 +5704,8 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
double shengtaimianji = client . Ado . GetDouble ( shengtaisql ) ;
tubanSplit . shengtaihongxian = Math . Round ( shengtaimianji * 0.0015 , 2 ) ;
string zongmianji = $"select sum(c.have_intersection) from (SELECT ST_Area(ST_Transform(st_setsrid(b.geometry, 4326), 4527)) AS have_intersection " +
$" from (select ST_Force2D('" + geomwkt + $"') as geometry) b) c" ;
string zongmianji = $"select sum(c.have_intersection) from (SELECT ST_Area(ST_Transform(st_setsrid(b.geometry, 4326), 4527)) AS have_intersection " +
$" from (select ST_Force2D('" + geomwkt + $"') as geometry) b) c" ;
double totalmianji = client . Ado . GetDouble ( zongmianji ) ;
tubanSplit . totalmianji = Math . Round ( totalmianji * 0.0015 , 2 ) ;
return tubanSplit ;
@ -5721,11 +5722,11 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
$"where a.intersection != '010300000000000000') b where b.geomstr like '%POLYGON%') c" ;
var gengdigeom = client . Ado . GetString ( splitgengdi ) ;
tubanSplit . gengdituban = gengdigeom ;
/ * string splitjiben = $"select st_astext(st_union(c.geomstr)) from(select ST_Force2D(b.geomstr) as geomstr from(select st_astext(a.intersection) as geomstr from( " +
$"SELECT ST_Intersection('" + geomwkt + $"', st_astext(geometry)) AS intersection FROM geoserver_jibennongtian) a " +
$"where a.intersection != '010300000000000000') b where b.geomstr like '%POLYGON%') c" ;
var jibengeom = client . Ado . GetString ( splitjiben ) ;
tubanSplit . jibennongtiantuban = jibengeom ; * /
/ * string splitjiben = $"select st_astext(st_union(c.geomstr)) from(select ST_Force2D(b.geomstr) as geomstr from(select st_astext(a.intersection) as geomstr from( " +
$"SELECT ST_Intersection('" + geomwkt + $"', st_astext(geometry)) AS intersection FROM geoserver_jibennongtian) a " +
$"where a.intersection != '010300000000000000') b where b.geomstr like '%POLYGON%') c" ;
var jibengeom = client . Ado . GetString ( splitjiben ) ;
tubanSplit . jibennongtiantuban = jibengeom ; * /
string splitnongyong = $"select st_astext(st_union(c.geomstr)) from(select ST_Force2D(b.geomstr) as geomstr from(select st_astext(a.intersection) as geomstr from( " +
$"SELECT ST_Intersection('" + geomwkt + $"', st_astext(geometry)) AS intersection FROM geoserver_nongyongdi) a " +
$"where a.intersection != '010300000000000000') b where b.geomstr like '%POLYGON%') c" ;
@ -5738,36 +5739,37 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
tubanSplit . shengtaihongxiantuban = shengtaigeom ;
string difsql = $"select st_astext(st_union(c.geom)) from ( " ;
bool flag = false ;
if ( ! string . IsNullOrEmpty ( gengdigeom ) & & ! string . IsNullOrEmpty ( nongyonggeom ) ) {
if ( ! string . IsNullOrEmpty ( gengdigeom ) & & ! string . IsNullOrEmpty ( nongyonggeom ) )
{
string diff1 = $"select st_astext(st_union(a.intersection)) as dif from(SELECT ST_Difference('" + nongyonggeom + $"','" + gengdigeom + $"') AS intersection ) a " ;
var diffgeom1 = client . Ado . GetString ( diff1 ) ;
tubanSplit . nongyongdituban = diffgeom1 ;
flag = true ;
}
/ * if ( ! string . IsNullOrEmpty ( tubanSplit . gengdituban ) )
{
string sqlgeng = $"\r\nWITH test_abc AS (Select 1 as id,'" + tubanSplit . gengdituban + $"' as geom )," +
$" original_points AS (\r\n\r\n SELECT \r\n id, \r\n (ST_DumpPoints(geom)).path[1] AS ring_index, \r\n (ST_DumpPoints(geom)).path[2] AS point_index, " +
$" ST_X((ST_DumpPoints(geom)).geom) AS lon,\r\n ST_Y((ST_DumpPoints(geom)).geom) AS lat\r\n FROM test_abc\r\n),\r\nrounded_points AS ( " +
$" SELECT \r\n id, ring_index,\r\n point_index,\r\n round(lon::numeric, 8) AS lon,\r\n round(lat::numeric, 8) AS lat\r\n FROM original_points\r\n)\r\n\r\nSELECT \r\n t.id,\r\n st_astext(ST_SetSRID(ST_MakePolygon(" +
$" ST_MakeLine(\r\n ARRAY(\r\n SELECT ST_MakePoint(p.lon, p.lat)\r\n FROM rounded_points p\r\n WHERE p.id = t.id AND p.ring_index = 1" +
$" ORDER BY p.point_index\r\n )\r\n )\r\n ), 4326)) AS geomrounded \r\nFROM test_abc t\r\nGROUP BY t.id;" ;
var geng8 = client . Ado . SqlQuerySingle < dynamic > ( sqlgeng ) ;
tubanSplit . gengdituban = geng8 . geomrounded ;
}
if ( ! string . IsNullOrEmpty ( tubanSplit . nongyongdituban ) )
{
string sqlgeng = $"\r\nWITH test_abc AS (Select 1 as id,'" + tubanSplit . nongyongdituban + $"' as geom )," +
$" original_points AS (\r\n\r\n SELECT \r\n id, \r\n (ST_DumpPoints(geom)).path[1] AS ring_index, \r\n (ST_DumpPoints(geom)).path[2] AS point_index, " +
$" ST_X((ST_DumpPoints(geom)).geom) AS lon,\r\n ST_Y((ST_DumpPoints(geom)).geom) AS lat\r\n FROM test_abc\r\n),\r\nrounded_points AS ( " +
$" SELECT \r\n id, ring_index,\r\n point_index,\r\n round(lon::numeric, 8) AS lon,\r\n round(lat::numeric, 8) AS lat\r\n FROM original_points\r\n)\r\n\r\nSELECT \r\n t.id,\r\n st_astext(ST_SetSRID(ST_MakePolygon(" +
$" ST_MakeLine(\r\n ARRAY(\r\n SELECT ST_MakePoint(p.lon, p.lat)\r\n FROM rounded_points p\r\n WHERE p.id = t.id AND p.ring_index = 1" +
$" ORDER BY p.point_index\r\n )\r\n )\r\n ), 4326)) AS geomrounded \r\nFROM test_abc t\r\nGROUP BY t.id;" ;
var geng8 = client . Ado . SqlQuerySingle < dynamic > ( sqlgeng ) ;
tubanSplit . nongyongdituban = geng8 . geomrounded ;
} * /
/ * if ( ! string . IsNullOrEmpty ( tubanSplit . gengdituban ) )
{
string sqlgeng = $"\r\nWITH test_abc AS (Select 1 as id,'" + tubanSplit . gengdituban + $"' as geom )," +
$" original_points AS (\r\n\r\n SELECT \r\n id, \r\n (ST_DumpPoints(geom)).path[1] AS ring_index, \r\n (ST_DumpPoints(geom)).path[2] AS point_index, " +
$" ST_X((ST_DumpPoints(geom)).geom) AS lon,\r\n ST_Y((ST_DumpPoints(geom)).geom) AS lat\r\n FROM test_abc\r\n),\r\nrounded_points AS ( " +
$" SELECT \r\n id, ring_index,\r\n point_index,\r\n round(lon::numeric, 8) AS lon,\r\n round(lat::numeric, 8) AS lat\r\n FROM original_points\r\n)\r\n\r\nSELECT \r\n t.id,\r\n st_astext(ST_SetSRID(ST_MakePolygon(" +
$" ST_MakeLine(\r\n ARRAY(\r\n SELECT ST_MakePoint(p.lon, p.lat)\r\n FROM rounded_points p\r\n WHERE p.id = t.id AND p.ring_index = 1" +
$" ORDER BY p.point_index\r\n )\r\n )\r\n ), 4326)) AS geomrounded \r\nFROM test_abc t\r\nGROUP BY t.id;" ;
var geng8 = client . Ado . SqlQuerySingle < dynamic > ( sqlgeng ) ;
tubanSplit . gengdituban = geng8 . geomrounded ;
}
if ( ! string . IsNullOrEmpty ( tubanSplit . nongyongdituban ) )
{
string sqlgeng = $"\r\nWITH test_abc AS (Select 1 as id,'" + tubanSplit . nongyongdituban + $"' as geom )," +
$" original_points AS (\r\n\r\n SELECT \r\n id, \r\n (ST_DumpPoints(geom)).path[1] AS ring_index, \r\n (ST_DumpPoints(geom)).path[2] AS point_index, " +
$" ST_X((ST_DumpPoints(geom)).geom) AS lon,\r\n ST_Y((ST_DumpPoints(geom)).geom) AS lat\r\n FROM test_abc\r\n),\r\nrounded_points AS ( " +
$" SELECT \r\n id, ring_index,\r\n point_index,\r\n round(lon::numeric, 8) AS lon,\r\n round(lat::numeric, 8) AS lat\r\n FROM original_points\r\n)\r\n\r\nSELECT \r\n t.id,\r\n st_astext(ST_SetSRID(ST_MakePolygon(" +
$" ST_MakeLine(\r\n ARRAY(\r\n SELECT ST_MakePoint(p.lon, p.lat)\r\n FROM rounded_points p\r\n WHERE p.id = t.id AND p.ring_index = 1" +
$" ORDER BY p.point_index\r\n )\r\n )\r\n ), 4326)) AS geomrounded \r\nFROM test_abc t\r\nGROUP BY t.id;" ;
var geng8 = client . Ado . SqlQuerySingle < dynamic > ( sqlgeng ) ;
tubanSplit . nongyongdituban = geng8 . geomrounded ;
} * /
if ( ! string . IsNullOrEmpty ( gengdigeom ) )
{
difsql = difsql + $"(select ST_Force2D('" + gengdigeom + $"') as geom ) UNION" ;
@ -5790,18 +5792,18 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
var difgeom = client . Ado . GetString ( difsql ) ;
string diff = $"select st_astext(st_union(a.intersection)) as dif from(SELECT ST_Difference('" + geomwkt + $"','" + difgeom + $"') AS intersection ) a " ;
var diffgeom = client . Ado . GetString ( diff ) ;
tubanSplit . remaintuban = diffgeom ;
tubanSplit . remaintuban = diffgeom ;
string mianjisql = $"select sum(c.have_intersection) from (SELECT ST_Area(ST_Transform(st_setsrid(ST_Intersection(st_setsrid(ST_Force2D(a.geometry)\r\n , 4326)," +
$"st_setsrid(ST_Force2D(b.geometry), 4326)),4326),4527)) AS have_intersection from geoserver_gengdi\r\n a ," +
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
Console . Write ( mianjisql ) ;
double gengdimianji = client . Ado . GetDouble ( mianjisql ) ;
tubanSplit . gengdi = Math . Round ( gengdimianji * 0.0015 , 2 ) ;
/ * string jibensql = $"select sum(c.have_intersection) from (SELECT ST_Area(ST_Transform(st_setsrid(ST_Intersection(st_setsrid(ST_Force2D(a.geometry)\r\n , 4326)," +
$"st_setsrid(ST_Force2D(b.geometry), 4326)),4326),4527)) AS have_intersection from geoserver_jibennongtian\r\n a ," +
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
double jibenminaji = client . Ado . GetDouble ( jibensql ) ;
tubanSplit . jibennongtian = Math . Round ( jibenminaji * 0.0015 , 2 ) ; * /
/ * string jibensql = $"select sum(c.have_intersection) from (SELECT ST_Area(ST_Transform(st_setsrid(ST_Intersection(st_setsrid(ST_Force2D(a.geometry)\r\n , 4326)," +
$"st_setsrid(ST_Force2D(b.geometry), 4326)),4326),4527)) AS have_intersection from geoserver_jibennongtian\r\n a ," +
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
double jibenminaji = client . Ado . GetDouble ( jibensql ) ;
tubanSplit . jibennongtian = Math . Round ( jibenminaji * 0.0015 , 2 ) ; * /
string nongyongsql = $"select sum(c.have_intersection) from (SELECT ST_Area(ST_Transform(st_setsrid(ST_Intersection(st_setsrid(ST_Force2D(a.geometry)\r\n , 4326)," +
$"st_setsrid(ST_Force2D(b.geometry), 4326)),4326),4527)) AS have_intersection from geoserver_nongyongdi\r\n a ," +
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
@ -5811,7 +5813,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
{
tubanSplit . nongyongdi = Math . Round ( ( nongyongmianji - gengdimianji ) * 0.0015 , 2 ) ;
}
string shengtaisql = $"select sum(c.have_intersection) from (SELECT ST_Area(ST_Transform(st_setsrid(ST_Intersection(st_setsrid(ST_Force2D(a.geometry)\r\n , 4326)," +
$"st_setsrid(ST_Force2D(b.geometry), 4326)),4326),4527)) AS have_intersection from geoserver_shengtaihongxian\r\n a ," +
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
@ -5820,7 +5822,8 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
return tubanSplit ;
}
public TubanSplit SplitTubanBackYuan ( TubanSplit split ) {
public TubanSplit SplitTubanBackYuan ( TubanSplit split )
{
TubanSplit tubanSplit = new TubanSplit ( ) ;
string geomwkt = split . wktgeom ;
string mianjisql = $"select st_astext(c.geometry) as geom from (SELECT a.geometry,ST_Area(ST_Transform(st_setsrid(ST_Intersection(st_setsrid(ST_Force2D(a.geometry)\r\n , 4326)," +
@ -5838,22 +5841,23 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
string nongyongsql = $"select st_astext(c.geometry) from (SELECT a.geometry, ST_Area(ST_Transform(st_setsrid(ST_Intersection(st_setsrid(ST_Force2D(a.geometry)\r\n , 4326)," +
$"st_setsrid(ST_Force2D(b.geometry), 4326)),4326),4527)) AS have_intersection from geoserver_nongyongdi\r\n a ," +
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
List < string > nongyongmianji = client . Ado . SqlQuery < string > ( nongyongsql ) ;
tubanSplit . nongyongdituban = string . Join ( "," , nongyongmianji ) ;
string shengtaisql = $"select st_astext(c.geometry) from (SELECT a.geometry,ST_Area(ST_Transform(st_setsrid(ST_Intersection(st_setsrid(ST_Force2D(a.geometry)\r\n , 4326)," +
$"st_setsrid(ST_Force2D(b.geometry), 4326)),4326),4527)) AS have_intersection from geoserver_shengtaihongxian\r\n a ," +
$"(select '" + geomwkt + $"' as geometry ) b) c where c.have_intersection>0;" ;
List < string > shengtaimianji = client . Ado . SqlQuery < string > ( shengtaisql ) ;
tubanSplit . shengtaihongxiantuban = string . Join ( "," , shengtaimianji ) ;
return tubanSplit ;
}
public List < Dictionary < string , object > > rebackzhuantipic ( string zhunti , string caseid ) {
List < Dictionary < string , object > > listobj = new List < Dictionary < string , object > > ( ) ;
Zhuanti zhuanti = new Zhuanti ( zhunti ) ;
List < Dictionary < string , object > > list = zhuanti . Names ;
public List < Dictionary < string , object > > rebackzhuantipic ( string zhunti , string caseid )
{
List < Dictionary < string , object > > listobj = new List < Dictionary < string , object > > ( ) ;
Zhuanti zhuanti = new Zhuanti ( zhunti ) ;
List < Dictionary < string , object > > list = zhuanti . Names ;
string daicha = zhuanti . daicha ;
string sql = $"select original_case_no from " + daicha + $" where \" Id \ "='" + caseid + $"'" ;
string originalcaseno = client . Ado . GetString ( sql ) ;
@ -5870,8 +5874,10 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
{
continue ;
}
else {
for ( int j = 0 ; j < listdy . Count ; j + + ) {
else
{
for ( int j = 0 ; j < listdy . Count ; j + + )
{
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
@ -5889,10 +5895,10 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
result = result + listdy [ j ] . zhaopianhou + "," ;
}
}
}
}
}
else if ( "drone_caseinfo_gdflh" . Equals ( dic [ "name" ] ) )
{
@ -5955,7 +5961,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
}
}
}
}
else if ( "drone_caseinfo_single" . Equals ( dic [ "name" ] ) )
{
@ -5981,8 +5987,8 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
{
result = result + listdy [ j ] . fujianreform + "," ;
}
}
}
}
@ -6040,16 +6046,16 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
}
}
}
/ * else if ( "drone_caseinfo_stxf" . Equals ( dic [ "name" ] ) )
{
string zhuantisql = $"select fujian chufafujian from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"'" ;
dynamic listdy = client . Ado . SqlQuerySingle < dynamic > ( zhuantisql ) ;
if ( ! string . IsNullOrEmpty ( listdy . chufafujian ) )
{
result = result + listdy . chufafujian + "," ;
}
} * /
/ * else if ( "drone_caseinfo_stxf" . Equals ( dic [ "name" ] ) )
{
string zhuantisql = $"select fujian chufafujian from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"'" ;
dynamic listdy = client . Ado . SqlQuerySingle < dynamic > ( zhuantisql ) ;
if ( ! string . IsNullOrEmpty ( listdy . chufafujian ) )
{
result = result + listdy . chufafujian + "," ;
}
} * /
else if ( "drone_caseinfo_sthx" . Equals ( dic [ "name" ] ) )
{
string zhuantisql = $"select anjianzhaopian as chufafujian from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0" ;
@ -6068,7 +6074,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
}
}
}
}
if ( ! string . IsNullOrEmpty ( result ) )
{
@ -6077,26 +6083,27 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
List < dynamic > listobj1 = new List < dynamic > ( ) ;
for ( int j = 0 ; j < listdys . Length ; j + + )
{
string path = listdys [ j ] ;
string sql2 = $"select * from drone_image_ref where \" FilePath \ "='" + path + $"'" ;
dynamic listdy = client . Ado . SqlQuerySingle < dynamic > ( sql2 ) ;
if ( listdy ! = null )
{
listobj1 . Add ( listdy ) ;
}
else {
else
{
if ( ! string . IsNullOrEmpty ( path ) )
{
dynamic dy = new ExpandoObject ( ) ;
dy . FilePath = path ;
listobj1 . Add ( dy ) ;
}
}
}
dic . Add ( "val" , listobj1 ) ;
listobj . Add ( dic ) ;
@ -6111,9 +6118,9 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
/// </summary>
/// <param name="path"></param>
/// <returns></returns>
public async Task < Response < List < string > > > CopyImg ( CopyImageReq req )
public async Task < Response < List < string > > > CopyImg ( CopyImageReq req )
{
using var httpClient = new HttpClient ( ) ;
using var httpClient = new HttpClient ( ) ;
var config = ConfigHelper . GetConfigRoot ( ) ;
var baseUrl = config [ "ImgServer" ] ;
var url = baseUrl + "/api/Platform/NewCopyImg" ;
@ -6138,9 +6145,9 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
var originalPath = sysUploadFileNew . OriginalPath ;
var newFilePath = sysUploadFileNew . FilePath ;
strings . Add ( newFilePath ) ;
string sql = $"select * from drone_image_ref where \" FilePath \ "='" + originalPath + $"'" ;
DroneImageRef droneref = client . SqlQueryable < DroneImageRef > ( sql ) . First ( ) ;
string sql = $"select * from drone_image_ref where \" FilePath \ "='" + originalPath + $"'" ;
DroneImageRef droneref = client . SqlQueryable < DroneImageRef > ( sql ) . First ( ) ;
if ( droneref ! = null )
{
DroneImageRef droneImageRef = new DroneImageRef ( )
@ -6156,9 +6163,9 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
await client . Insertable < DroneImageRef > ( droneImageRef ) . ExecuteCommandAsync ( ) ;
}
}
}
return new Response < List < string > >
{
Result = strings
@ -6230,17 +6237,17 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
for ( int j = 0 ; j < listdy . Count ; j + + )
{
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
}
}
}
}
}
}
else if ( "drone_caseinfo_zdwt2" . Equals ( dic [ "name" ] ) )
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
@ -6254,19 +6261,19 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
for ( int j = 0 ; j < listdy . Count ; j + + )
{
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
}
}
}
}
}
else if ( "drone_caseinfo_zdwt1" . Equals ( dic [ "name" ] ) )
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile,qitafujian fujianreform from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile,qitafujian fujianreform from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
List < dynamic > listdy = client . Ado . SqlQuery < dynamic > ( zhuantisql ) ;
if ( listdy = = null | | listdy . Count = = 0 )
{
@ -6276,24 +6283,24 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
{
for ( int j = 0 ; j < listdy . Count ; j + + )
{
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . fujianreform ) )
{
result = result + listdy [ j ] . fujianreform + "," ;
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . fujianreform ) )
{
result = result + listdy [ j ] . fujianreform + "," ;
}
}
}
}
}
}
else if ( "drone_caseinfo_single" . Equals ( dic [ "name" ] ) )
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile,qitafujian fujianreform,zhenggaifujian,yanshoubiao from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile,qitafujian fujianreform,zhenggaifujian,yanshoubiao from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
List < dynamic > listdy = client . Ado . SqlQuery < dynamic > ( zhuantisql ) ;
if ( listdy = = null | | listdy . Count = = 0 )
{
@ -6303,33 +6310,33 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
{
for ( int j = 0 ; j < listdy . Count ; j + + )
{
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . fujianreform ) )
{
result = result + listdy [ j ] . fujianreform + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . zhenggaifujian ) )
{
result = result + listdy [ j ] . zhenggaifujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . fujianreform ) )
{
result = result + listdy [ j ] . fujianreform + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . zhenggaifujian ) )
{
result = result + listdy [ j ] . zhenggaifujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . yanshoubiao ) )
{
result = result + listdy [ j ] . yanshoubiao + "," ;
}
}
}
}
}
else if ( "drone_caseinfo_wpxf" . Equals ( dic [ "name" ] ) )
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile,qitafujian fujianreform,zhenggaifujian,yanshoubiao from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile,qitafujian fujianreform,zhenggaifujian,yanshoubiao from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
List < dynamic > listdy = client . Ado . SqlQuery < dynamic > ( zhuantisql ) ;
if ( listdy = = null | | listdy . Count = = 0 )
{
@ -6340,32 +6347,32 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
for ( int j = 0 ; j < listdy . Count ; j + + )
{
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . fujianreform ) )
{
result = result + listdy [ j ] . fujianreform + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . zhenggaifujian ) )
{
result = result + listdy [ j ] . zhenggaifujian + "," ;
}
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . fujianreform ) )
{
result = result + listdy [ j ] . fujianreform + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . zhenggaifujian ) )
{
result = result + listdy [ j ] . zhenggaifujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . yanshoubiao ) )
{
result = result + listdy [ j ] . yanshoubiao + "," ;
}
}
}
}
}
else if ( "drone_caseinfo_xcsj" . Equals ( dic [ "name" ] ) )
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile,qitafujian fujianreform,zhenggaifujian,yanshoubiao from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile,qitafujian fujianreform,zhenggaifujian,yanshoubiao from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
List < dynamic > listdy = client . Ado . SqlQuery < dynamic > ( zhuantisql ) ;
if ( listdy = = null | | listdy . Count = = 0 )
{
@ -6376,31 +6383,31 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
for ( int j = 0 ; j < listdy . Count ; j + + )
{
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . fujianreform ) )
{
result = result + listdy [ j ] . fujianreform + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . zhenggaifujian ) )
{
result = result + listdy [ j ] . zhenggaifujian + "," ;
}
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . fujianreform ) )
{
result = result + listdy [ j ] . fujianreform + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . zhenggaifujian ) )
{
result = result + listdy [ j ] . zhenggaifujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . yanshoubiao ) )
{
result = result + listdy [ j ] . yanshoubiao + "," ;
}
}
}
}
}
else if ( "drone_caseinfo_stxf" . Equals ( dic [ "name" ] ) )
{
string zhuantisql = $"select fujian chufafujian from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
{
string zhuantisql = $"select fujian chufafujian from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
List < dynamic > listdy = client . Ado . SqlQuery < dynamic > ( zhuantisql ) ;
if ( listdy = = null | | listdy . Count = = 0 )
{
@ -6411,16 +6418,16 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
for ( int j = 0 ; j < listdy . Count ; j + + )
{
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
}
}
}
{
result = result + listdy [ j ] . chufafujian + "," ;
}
}
}
}
else if ( "drone_caseinfo_sthx" . Equals ( dic [ "name" ] ) )
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile,qitafujian fujianreform,zhenggaifujian from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
{
string zhuantisql = $"select hefafujian as chufafujian,fujian luoshifile,qitafujian fujianreform,zhenggaifujian from " + dic [ "name" ] + $" where original_case_no='" + originalcaseno + $"' and is_closed = 0 and \" Id \ "!='" + caseid + $"'" ;
List < dynamic > listdy = client . Ado . SqlQuery < dynamic > ( zhuantisql ) ;
if ( listdy = = null | | listdy . Count = = 0 )
{
@ -6431,27 +6438,27 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
for ( int j = 0 ; j < listdy . Count ; j + + )
{
if ( ! string . IsNullOrEmpty ( listdy [ j ] . chufafujian ) )
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . fujianreform ) )
{
result = result + listdy [ j ] . fujianreform + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . zhenggaifujian ) )
{
result = result + listdy [ j ] . zhenggaifujian + "," ;
{
result = result + listdy [ j ] . chufafujian + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . luoshifile ) )
{
result = result + listdy [ j ] . luoshifile + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . fujianreform ) )
{
result = result + listdy [ j ] . fujianreform + "," ;
}
if ( ! string . IsNullOrEmpty ( listdy [ j ] . zhenggaifujian ) )
{
result = result + listdy [ j ] . zhenggaifujian + "," ;
}
}
}
}
}
if ( ! string . IsNullOrEmpty ( result ) )
{
string sub = result . Substring ( 0 , result . Length - 1 ) ;
string sub = result . Substring ( 0 , result . Length - 1 ) ;
string [ ] listdys = sub . Split ( ',' ) ;
List < Dictionary < string , object > > listobj1 = new List < Dictionary < string , object > > ( ) ;
for ( int j = 0 ; j < listdys . Length ; j + + )
@ -6463,7 +6470,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
dic1 . Add ( "path" , path ) ;
listobj1 . Add ( dic1 ) ;
}
}
dic . Add ( "val" , listobj1 ) ;
listobj . Add ( dic ) ;