Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rs-cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周健威
rs-cloud-platform
Commits
0ffaacb5
Commit
0ffaacb5
authored
Jan 17, 2022
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
26d2c15a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
RscpImageDataTotalController.java
...form/rs/datacenter/rest/RscpImageDataTotalController.java
+2
-1
RscpImageDataTotalMapper.xml
...er/src/main/resources/mapper/RscpImageDataTotalMapper.xml
+12
-0
No files found.
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java
View file @
0ffaacb5
...
@@ -121,7 +121,7 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
...
@@ -121,7 +121,7 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
String
redisStr
=
redisTemplate
.
opsForValue
().
get
(
dto
.
getShpKey
()).
toString
();
String
redisStr
=
redisTemplate
.
opsForValue
().
get
(
dto
.
getShpKey
()).
toString
();
ShpDTO
shpDTO
=
JSONUtil
.
toBean
(
redisStr
,
ShpDTO
.
class
);
ShpDTO
shpDTO
=
JSONUtil
.
toBean
(
redisStr
,
ShpDTO
.
class
);
if
(
CollUtil
.
isNotEmpty
(
shpDTO
.
getFeatures
()))
{
if
(
CollUtil
.
isNotEmpty
(
shpDTO
.
getFeatures
()))
{
dto
.
setGeom
(
shpDTO
.
getFeatures
().
get
(
0
));
dto
.
setGeom
s
(
shpDTO
.
getFeatures
(
));
// dto.setGeom(redisTemplate.opsForValue().get(dto.getShpKey()).toString());
// dto.setGeom(redisTemplate.opsForValue().get(dto.getShpKey()).toString());
}
}
return
ObjectRestResponse
.
succ
(
baseBiz
.
queryDataAreaList
(
dto
));
return
ObjectRestResponse
.
succ
(
baseBiz
.
queryDataAreaList
(
dto
));
...
@@ -192,6 +192,7 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
...
@@ -192,6 +192,7 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
String
startDateTime
;
String
startDateTime
;
String
endDateTime
;
String
endDateTime
;
String
geom
;
String
geom
;
List
<
String
>
geoms
;
String
areaNo
;
String
areaNo
;
String
provinceNo
;
String
provinceNo
;
List
<
satelliteDTO
>
saSensor
;
List
<
satelliteDTO
>
saSensor
;
...
...
rs-datacenter/rs-datacenter-server/src/main/resources/mapper/RscpImageDataTotalMapper.xml
View file @
0ffaacb5
...
@@ -132,6 +132,15 @@
...
@@ -132,6 +132,15 @@
<if
test=
"geom != null"
>
<if
test=
"geom != null"
>
, (select geojsontowkt(#{geom}, 'true') geom_input) temp
, (select geojsontowkt(#{geom}, 'true') geom_input) temp
</if>
</if>
<if
test=
"geoms != null"
>
, ( select st_asgeojson(st_union(item_geom)
from
<foreach
collection=
"geoms"
index=
"geomsIndex"
item=
"geomsItem"
open=
"("
close=
")"
separator=
" UNION ALL "
>
select geojsontowkt(#{geomsItem}, 'true') item_geom
</foreach>
as item_temp
) geoms_input ) temp
</if>
<where>
<where>
<if
test=
"saSensor != null"
>
<if
test=
"saSensor != null"
>
and
and
...
@@ -160,6 +169,9 @@
...
@@ -160,6 +169,9 @@
<if
test=
"geom != null"
>
<if
test=
"geom != null"
>
and ST_Intersects(temp.geom_input,range)
and ST_Intersects(temp.geom_input,range)
</if>
</if>
<if
test=
"geoms != null"
>
and ST_Intersects(temp.geoms_input,range)
</if>
</where>
</where>
</sql>
</sql>
</mapper>
</mapper>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment