Skip to content

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

修改代码

parent b8ef023d
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 1 deletion
ace-modules/ace-generator/src/main/resources/application.yml
View file @ 627c4d50
......@@ -19,7 +19,7 @@ spring:
username: root
password: sslcloud123*()
# driverClassName: org.postgresql.Driver
# url: jdbc:postgresql://10.5.52.6:5432/rscloudmart
# url: jdbc:postgresql://10.5.52.6:5432/rsclouds_platform
# username: postgres
# password: root
jackson:
......
rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpImageCover.java 0 → 100644
View file @ 627c4d50
package com.upyuns.platform.rs.datacenter.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Id;
import javax.persistence.Table;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import tk.mybatis.mapper.annotation.KeySql;
import java.math.BigDecimal;
@Data
@Table(name = "rscp_image_cover")
@ApiModel(description = "")
public class RscpImageCover implements java.io.Serializable {
/** 版本号 */
private static final long serialVersionUID = -2790155170329491146L;
/* This code was generated by TableGo tools, mark 1 begin. */
/** id标识 */
@Id
@KeySql(useGeneratedKeys = true)
@Column(name = "id",insertable = false)
@ApiModelProperty(value = "id标识")
private String id;
/** 统计类型 2--月份；3--年份 */
@ApiModelProperty(value = "统计类型 2--月份；3--年份")
private Integer type;
/** 名称 */
@ApiModelProperty(value = "名称")
private String name;
/** 覆盖率 */
@ApiModelProperty(value = "覆盖率")
private BigDecimal ratio;
/** 合并后的几何范围 */
@ApiModelProperty(value = "合并后的几何范围")
private String range;
/** 年份 */
@ApiModelProperty(value = "年份")
private String dateYear;
/** 月份 */
@ApiModelProperty(value = "月份")
private String dateMonth;
/** 删除 */
@ApiModelProperty(value = "删除")
private Integer isDel;
/** 创建时间 */
@ApiModelProperty(value = "创建时间")
private Long crtTime;
/** 更新时间 */
@ApiModelProperty(value = "更新时间")
private Long updTime;
/** 省份编码 */
@ApiModelProperty(value = "省份编码")
private Integer areaCode;
/** 省份名称 */
@ApiModelProperty(value = "省份名称")
private String areaName;
/* This code was generated by TableGo tools, mark 1 end. */
/* This code was generated by TableGo tools, mark 2 begin. */
}
\ No newline at end of file
rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/pojo/BgImageCoverQueryDTO.java 0 → 100644
View file @ 627c4d50
package com.upyuns.platform.rs.datacenter.pojo;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class BgImageCoverQueryDTO extends PageParam {
Integer type;
String dateYear;
String dateMonth;
String areaCode;
}
\ No newline at end of file
rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/vo/MaxMinVO.java 0 → 100644
View file @ 627c4d50
package com.upyuns.platform.rs.datacenter.vo;
import lombok.Data;
@Data
public class MaxMinVO {
String maxTime;
String minTime;
}
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageCoverBiz.java 0 → 100644
View file @ 627c4d50
package com.upyuns.platform.rs.datacenter.biz;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.upyuns.platform.rs.datacenter.entity.RscpImageCover;
import com.upyuns.platform.rs.datacenter.entity.RscpImageStatistics;
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 org.springframework.stereotype.Service;
import java.util.List;
@Service
public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCover> {
public List<RscpImageCover> bgQueryDataList(BgImageCoverQueryDTO dto) {
return mapper.bgQueryDataList(dto);
}
}
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageDataTotalBiz.java
View file @ 627c4d50
......@@ -17,6 +17,7 @@ import com.upyuns.platform.rs.datacenter.pojo.ImageTotalInputDTO;
import com.upyuns.platform.rs.datacenter.pojo.imagedata.BgImageQueryDTO;
import com.upyuns.platform.rs.datacenter.rest.RscpImageDataTotalController;
import com.upyuns.platform.rs.datacenter.vo.ImageInputVO;
import com.upyuns.platform.rs.datacenter.vo.MaxMinVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.support.AmqpHeaders;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -154,6 +155,10 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
return mapper.updateGeom(dto.getLeftTopLon(), dto.getLeftTopLat(), dto.getLeftBottomLon(), dto.getLeftBottomLat(), dto.getRightBottomLon(), dto.getRightBottomLat(), dto.getRightTopLon(), dto.getRightTopLat(), dto.getId());
}
public MaxMinVO coverStatisticsMaxMin() {
return mapper.coverStatisticsMaxMin();
}
public String geoJsonByRange(String rangeMeta){
return mapper.geoJsonByRange(rangeMeta);
}
......
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/job/CoverScheduleTask.java
View file @ 627c4d50
......@@ -8,6 +8,7 @@ import com.upyuns.platform.rs.datacenter.biz.RscpImageStatisticsBiz;
import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
import com.upyuns.platform.rs.datacenter.entity.RscpImageStatistics;
import com.upyuns.platform.rs.datacenter.vo.MaxMinVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
......@@ -39,6 +40,21 @@ public class CoverScheduleTask {
//或直接指定时间间隔，例如：5秒
//@Scheduled(fixedRate=5000)
public void configureTasks() {
//定时统计覆盖率数据
//查询未处理覆盖率影像最早时间和最晚时间
// MaxMinVO vo = rscpImageDataTotalBiz.coverStatisticsMaxMin();
// if(null == vo.getMaxTime()) {
// log.info("无需更新");
// return;
// }
//
// //生成月份循环
// DateUtil.
// for(String satelliteType : satelliteTypes){
//
// }
//生成年循环
}
......
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/mapper/RscpImageCoverMapper.java 0 → 100644
View file @ 627c4d50
package com.upyuns.platform.rs.datacenter.mapper;
import com.upyuns.platform.rs.datacenter.entity.RscpImageCover;
import com.upyuns.platform.rs.datacenter.pojo.BgImageCoverQueryDTO;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
public interface RscpImageCoverMapper extends Mapper<RscpImageCover> {
public List<RscpImageCover> bgQueryDataList(BgImageCoverQueryDTO dto);
}
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/mapper/RscpImageDataTotalMapper.java
View file @ 627c4d50
......@@ -4,6 +4,8 @@ import com.upyuns.platform.rs.datacenter.entity.RscpAreaInfo;
import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
import com.upyuns.platform.rs.datacenter.pojo.imagedata.BgImageQueryDTO;
import com.upyuns.platform.rs.datacenter.rest.RscpImageDataTotalController;
import com.upyuns.platform.rs.datacenter.vo.MaxMinVO;
import lombok.Data;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.springframework.data.repository.query.Param;
......@@ -50,4 +52,7 @@ public interface RscpImageDataTotalMapper extends Mapper<RscpImageDataTotal> {
@Update("update rscp_image_data_total set range = st_GeomFromText('MULTIPOLYGON(((${leftTopLon} ${leftTopLat} ,${leftBottomLon} ${leftBottomLat} , ${rightBottomLon} ${rightBottomLat} ,${rightTopLon} ${rightTopLat}, ${leftTopLon} ${leftTopLat})))',4326) where id = #{id}")
Integer updateGeom(BigDecimal leftTopLon, BigDecimal leftTopLat, BigDecimal leftBottomLon, BigDecimal leftBottomLat, BigDecimal rightBottomLon, BigDecimal rightBottomLat, BigDecimal rightTopLon, BigDecimal rightTopLat, Long id);
@Select("SELECT Max(image_take_time) as max_time, min(image_take_time) as min_time where cover_statistics = 0")
MaxMinVO coverStatisticsMaxMin();
}
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/backstage/BgRscpImageCoverController.java 0 → 100644
View file @ 627c4d50
package com.upyuns.platform.rs.datacenter.rest.backstage;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.upyuns.platform.rs.datacenter.biz.RscpImageCoverBiz;
import com.upyuns.platform.rs.datacenter.biz.RscpImageStatisticsBiz;
import com.upyuns.platform.rs.datacenter.entity.RscpImageCover;
import com.upyuns.platform.rs.datacenter.entity.RscpImageStatistics;
import com.upyuns.platform.rs.datacenter.pojo.BgImageCoverQueryDTO;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
@RestController
@RequestMapping("/bg/cover")
public class BgRscpImageCoverController extends BaseController<RscpImageCoverBiz, RscpImageCover> {
@ApiOperation("查询分页")
@RequestMapping(value = "/bgPages",method = RequestMethod.GET)
@ResponseBody
public ObjectRestResponse<PageDataVO<RscpImageCover>> bgPages(BgImageCoverQueryDTO dto) {
return ObjectRestResponse.succ(PageDataVO.pageInfo(dto.initQuery(), () -> baseBiz.bgQueryDataList(dto)));
}
}
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/resources/mapper/rscpImageCoverMapper.xml 0 → 100644
View file @ 627c4d50
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!-- rscp_image_cover -->
<mapper namespace="com.upyuns.platform.rs.datacenter.mapper.RscpImageCoverMapper">
<!-- This code was generated by TableGo tools, mark 1 begin. -->
<!-- 字段映射 -->
<resultMap id="rscpImageCoverMap" type="com.upyuns.platform.rs.datacenter.entity.RscpImageCover">
<id column="id" property="id" jdbcType="VARCHAR" />
<result column="type" property="type" jdbcType="INTEGER" />
<result column="name" property="name" jdbcType="VARCHAR" />
<result column="ratio" property="ratio" jdbcType="INTEGER" />
<result column="range" property="range" jdbcType="VARCHAR" />
<result column="date_year" property="dateYear" jdbcType="VARCHAR" />
<result column="date_month" property="dateMonth" jdbcType="VARCHAR" />
<result column="is_del" property="isDel" jdbcType="INTEGER" />
<result column="crt_time" property="crtTime" jdbcType="INTEGER" />
<result column="upd_time" property="updTime" jdbcType="INTEGER" />
<result column="area_code" property="areaCode" jdbcType="INTEGER" />
<result column="area_name" property="areaName" jdbcType="VARCHAR" />
</resultMap>
<!-- This code was generated by TableGo tools, mark 1 end. -->
<!-- This code was generated by TableGo tools, mark 2 begin. -->
<!-- 表查询字段 -->
<sql id="allColumns">
ric.id, ric.type, ric.name, ric.ratio, ric.range, ric.date_year, ric.date_month,
ric.is_del, ric.crt_time, ric.upd_time, ric.area_code, ric.area_name
</sql>
<sql id="allColumns2">
ric.id, ric.type, ric.name, ric.ratio, ric.date_year, ric.date_month,
ric.is_del, ric.crt_time, ric.upd_time, ric.area_code, ric.area_name
</sql>
<!-- This code was generated by TableGo tools, mark 2 end. -->
<select id="bgQueryDataList" resultMap="rscpImageCoverMap">
select
<include refid="allColumns2"></include>
from rscp_image_cover ric
<where>
and ric.is_del = 0
<if test="type != null">
and ric.type like '%' || #{type} || '%'
</if>
<if test="dateYear != null">
and ric.date_year like '%' || #{dateYear} || '%'
</if>
<if test="dateMonth != null">
and ric.date_month like '%' || #{dateMonth} || '%'
</if>
<if test="areaCode != null">
and ric.area_code like '%' || #{areaCode} || '%'
</if>
<!-- <if test="imageSatelliteType != null">-->
<!-- and image_satellite_type like '%' || #{imageSatelliteType} || '%'-->
<!-- </if>-->
<!-- <if test="resolution != null">-->
<!-- and #{resolution} = any(image_resolution)-->
<!-- </if>-->
<!-- <if test="startDateTime != null">-->
<!-- and image_take_time &gt;= #{startDateTime}-->
<!-- </if>-->
<!-- <if test="endDateTime != null">-->
<!-- and image_take_time &lt;= #{endDateTime}-->
<!-- </if>-->
<!-- <if test="imageSatelliteType != null">-->
<!-- image_satellite_type = #{imageSatelliteType}-->
<!-- </if>-->
</where>
</select>
</mapper>
\ No newline at end of file
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