Skip to content

R
rs-cloud-platform
Commit ddbdd2f7 authored by 周健威's avatar 周健威
Browse files
Options

修改代码

parent 77012366
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 19 deletions
rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/pojo/imagedata/InsertCoverDTO.java
View file @ ddbdd2f7
...@@ -10,4 +10,5 @@ import java.util.List; ...@@ -10,4 +10,5 @@ import java.util.List;
@Data @Data
public class InsertCoverDTO extends RscpImageCover { public class InsertCoverDTO extends RscpImageCover {
List<Long> dataIds; List<Long> dataIds;
Integer oldId;
} }
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageCoverBiz.java
View file @ ddbdd2f7
...@@ -9,7 +9,6 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO; ...@@ -9,7 +9,6 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageParam; import com.github.wxiaoqi.security.common.vo.PageParam;
import com.upyuns.platform.rs.datacenter.entity.*; import com.upyuns.platform.rs.datacenter.entity.*;
import com.upyuns.platform.rs.datacenter.mapper.RscpImageCoverMapper; import com.upyuns.platform.rs.datacenter.mapper.RscpImageCoverMapper;
import com.upyuns.platform.rs.datacenter.mapper.RscpImageStatisticsMapper;
import com.upyuns.platform.rs.datacenter.pojo.BgImageCoverQueryDTO; import com.upyuns.platform.rs.datacenter.pojo.BgImageCoverQueryDTO;
import com.upyuns.platform.rs.datacenter.pojo.imagedata.InsertCoverDTO; import com.upyuns.platform.rs.datacenter.pojo.imagedata.InsertCoverDTO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -23,6 +22,7 @@ import java.util.stream.Collectors; ...@@ -23,6 +22,7 @@ import java.util.stream.Collectors;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE; import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE; import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
import static com.upyuns.platform.rs.datacenter.entity.RscpImageCover.TYPE_MONTH;
@Service @Service
public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCover> { public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCover> {
...@@ -46,10 +46,6 @@ public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCo ...@@ -46,10 +46,6 @@ public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCo
return mapper.bgQueryDataList(dto); return mapper.bgQueryDataList(dto);
} }
public int coverInserver(InsertCoverDTO dto){
return mapper.coverInserver(dto);
}
public void coverTask() { public void coverTask() {
Date now = new Date(); Date now = new Date();
Long count= rscpImageDataTotalBiz.selectCount(new RscpImageDataTotal(){{ Long count= rscpImageDataTotalBiz.selectCount(new RscpImageDataTotal(){{
...@@ -60,6 +56,10 @@ public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCo ...@@ -60,6 +56,10 @@ public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCo
if(count > 500L) { if(count > 500L) {
cirle = (count/500L) + 1; cirle = (count/500L) + 1;
if(count%500L > 0) {
cirle += 1;
}
} }
for (int i = 0; i < cirle; i++) { for (int i = 0; i < cirle; i++) {
...@@ -116,25 +116,27 @@ public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCo ...@@ -116,25 +116,27 @@ public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCo
List<Long> dataIds = mv.parallelStream().map(RscpAreaImageTotal::getDataId).collect(Collectors.toList()); List<Long> dataIds = mv.parallelStream().map(RscpAreaImageTotal::getDataId).collect(Collectors.toList());
InsertCoverDTO insertCoverDTO = new InsertCoverDTO();
if(CollUtil.isNotEmpty(list)) { if(CollUtil.isNotEmpty(list)) {
Integer oldId = list.get(0).getId(); Integer oldId = list.get(0).getId();
updateById(new RscpImageCover(){{ updateById(new RscpImageCover(){{
setId(oldId); setId(oldId);
setIsDel(SYS_TRUE); setIsDel(SYS_TRUE);
}}); }});
}else { insertCoverDTO.setOldId(oldId);
int hasSucc = coverInserver(new InsertCoverDTO(){{
setDataIds(dataIds);
setAreaCode(areaCode);
setAreaName(rscpAreaInfo.getName());
setCrtTime(now.getTime());
setUpdTime(now.getTime());
setDateMonth(monthMk);
setDateYear(yearMk);
setType(TYPE_MONTH);
}});
} }
insertCoverDTO.setName(mk+""+rscpAreaInfo.getName());
insertCoverDTO.setDataIds(dataIds);
insertCoverDTO.setAreaCode(areaCode);
insertCoverDTO.setAreaName(rscpAreaInfo.getName());
insertCoverDTO.setCrtTime(now.getTime());
insertCoverDTO.setUpdTime(now.getTime());
insertCoverDTO.setDateMonth(monthMk);
insertCoverDTO.setDateYear(yearMk);
insertCoverDTO.setType(TYPE_MONTH);
}); });
}); });
......
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/mapper/RscpImageCoverMapper.java
View file @ ddbdd2f7
...@@ -9,5 +9,6 @@ import java.util.List; ...@@ -9,5 +9,6 @@ import java.util.List;
public interface RscpImageCoverMapper extends Mapper<RscpImageCover> { public interface RscpImageCoverMapper extends Mapper<RscpImageCover> {
public List<RscpImageCover> bgQueryDataList(BgImageCoverQueryDTO dto); public List<RscpImageCover> bgQueryDataList(BgImageCoverQueryDTO dto);
public int coverInserver(InsertCoverDTO dto); public int coverInsert(InsertCoverDTO dto);
// public int coverSecondInsert(InsertCoverDTO dto);
} }
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/resources/mapper/rscpImageCoverMapper.xml
View file @ ddbdd2f7
...@@ -35,7 +35,63 @@ ...@@ -35,7 +35,63 @@
<!-- This code was generated by TableGo tools, mark 2 end. --> <!-- This code was generated by TableGo tools, mark 2 end. -->
<insert id="coverInserver"> <!-- <insert id="coverSecondInsert">-->
<!-- INSERT INTO-->
<!-- rscp_image_cover-->
<!-- (-->
<!-- range, type, name, ratio, date_year, date_month, crt_time, upd_time, area_code, area_name, cover_acreage, region_acreage-->
<!-- )-->
<!-- (-->
<!-- select temp.unrange, #{type}, #{name}, cover_acreage/region_acreage, #{dateYear}, #{dateMonth}, #{crtTime}, #{updTime}, #{areaCode}, #{areaName},-->
<!-- cover_acreage, region_acreage-->
<!-- from-->
<!-- ( select ridt_temp.unrange, cast(st_area(ST_Intersection(-->
<!-- <if test="oldId != null">-->
<!-- ST_Intersection(ridt_temp.unrange, oric_temp.range)-->
<!-- </if>-->
<!-- <if test="oldId == null">-->
<!-- ridt_temp.unrange-->
<!-- </if>-->
<!-- , area_temp.geom),true)/1000/1000 as numeric(10,3)) as cover_acreage, cast(st_area(area_temp.geom,true)/1000/1000 as numeric(10,3)) as region_acreage-->
<!-- from-->
<!-- (-->
<!-- select st_union(ridt.range) as unrange-->
<!-- from rscp_image_data_total ridt-->
<!-- <where>-->
<!-- <if test="dataIds !=null and dataIds.size()>0">-->
<!-- and ( ridt.id in-->
<!-- <foreach collection="dataIds" item="dataIdsVal" open="(" close=")" separator=",">-->
<!-- #{dataIdsVal}-->
<!-- </foreach>-->
<!-- )-->
<!-- </if>-->
<!-- </where>-->
<!-- ) ridt_temp-->
<!-- , (-->
<!-- select geom from rscp_area_info rai-->
<!-- <where>-->
<!-- <if test="areaCode != null">-->
<!-- and rai.admincode = ''||#{areaCode}-->
<!-- </if>-->
<!-- </where>-->
<!-- ) area_temp-->
<!-- <if test="oldId != null">-->
<!-- , (-->
<!-- select range from rscp_image_cover oric-->
<!-- <where>-->
<!-- and oric.id = #{oldId}-->
<!-- </where>-->
<!-- ) oric_temp-->
<!-- </if>-->
<!-- ) temp-->
<!-- )-->
<!-- </insert>-->
<insert id="coverInsert">
INSERT INTO INSERT INTO
rscp_image_cover rscp_image_cover
...@@ -49,7 +105,14 @@ ...@@ -49,7 +105,14 @@
from from
( select ridt_temp.unrange, cast(st_area(ST_Intersection(ridt_temp.unrange, area_temp.geom),true)/1000/1000 as numeric(10,3)) as cover_acreage, cast(st_area(area_temp.geom,true)/1000/1000 as numeric(10,3)) as region_acreage ( select ridt_temp.unrange, cast(st_area(ST_Intersection(
<if test="oldId != null">
ST_Intersection(ridt_temp.unrange, oric_temp.range)
</if>
<if test="oldId == null">
ridt_temp.unrange
</if>
, area_temp.geom),true)/1000/1000 as numeric(10,3)) as cover_acreage, cast(st_area(area_temp.geom,true)/1000/1000 as numeric(10,3)) as region_acreage
from from
( (
select st_union(ridt.range) as unrange select st_union(ridt.range) as unrange
...@@ -72,6 +135,14 @@ ...@@ -72,6 +135,14 @@
</if> </if>
</where> </where>
) area_temp ) area_temp
<if test="oldId != null">
, (
select range from rscp_image_cover oric
<where>
and oric.id = #{oldId}
</where>
) oric_temp
</if>
) temp ) temp
) )
</insert> </insert>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment