aix
2024-06-23 d6a89b1e7c683ad26f9bd492ce70dd793c24e49d
Merge remote-tracking branch 'origin/jtdev' into jtdev
3 files modified
16 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/StResRainfall.java 8 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java 6 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/StResRainfall.java
@@ -1,12 +1,15 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName("\"st_res_rainfall\"")
@@ -19,8 +22,9 @@
     * id
     */
    @ApiModelProperty(value = "id")
    @TableField("\"id\"")
    @TableId(value = "\"id\"",type = IdType.NONE)
    private String id;
    /**
     * 水库编码
@@ -41,7 +45,7 @@
     */
    @ApiModelProperty(value = "入库时间")
    @TableField("\"create_time\"")
    private Long createTime;
    private Date createTime;
    /**
     * 预报的时段
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -177,6 +177,10 @@
        List<AttResWithRainfall> attResWithRainfallList = new ArrayList<>();
        for (AttResBase attResBase : attResBases) {
            if (null == attResBase.getCenterLat() || attResBase.getCenterLong() == null) {
                log.warn("过滤掉经度或者纬度为空的水库,水库名称:{}", attResBase.getName());
                continue;
            }
            // 横向索引(lonIndex):(站点的经度 - 网格最小经度) / 每个网格单元的经度跨度
            int lonIndex = (int) ((Double.parseDouble(attResBase.getCenterLong()) - lonMin) / lonSpan);
            //  纵向索引(latIndex):(站点的纬度 - 网格最小纬度) / 每个网格单元的纬度跨度
@@ -197,7 +201,7 @@
                attResWithRainfall.setFileName(fileName);
                attResWithRainfallList.add(attResWithRainfall);
            } else {
                log.warn("AttRes {} is out of the grid range. centerLong: {}, centerLat: {}", attResBase.getName(),
                log.warn("水库 {} 超出栅格范围. 中心点经度: {}, 中心点纬度: {}", attResBase.getName(),
                        attResBase.getCenterLong(), attResBase.getCenterLat());
            }
        }
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
@@ -630,7 +630,7 @@
                stResRainfall.setDrp(attResWithRainfall.getRainfall());
                stResRainfall.setFileName(attResWithRainfall.getFileName());
                stResRainfall.setDayIndex(dayIndex);
                stResRainfall.setCreateTime(System.currentTimeMillis());
                stResRainfall.setCreateTime(new Date());
                stResRainfalls.add(stResRainfall);
            }
        }