求解器版本升级到2.2

dcb

2025-06-18 4c4d0f591f94428ed7e5d2f4ae5df5c5087d8c26

 src/main/java/com/se/nsl/controller/SimuController.java

@@ -5,11 +5,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.se.nsl.domain.po.Simu;
import com.se.nsl.domain.po.SimuData;
import com.se.nsl.domain.vo.R;
import com.se.nsl.domain.vo.SimuVo;
import com.se.nsl.domain.vo.*;
import com.se.nsl.service.RealTimeSimulationService;
import com.se.nsl.service.ResolveService;
import com.se.nsl.service.SimuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.gdal.ogr.Geometry;
@@ -18,6 +20,10 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;

@Api(tags = "03－推演模拟")
@@ -31,6 +37,9 @@

    @Resource
    ResolveService resolveService;

    @Resource
    RealTimeSimulationService rts;

    /**
     * 分页查询推演模拟
@@ -163,20 +172,68 @@

    @ApiOperation(value = "position")
    @GetMapping("/position")
    public R<Object> queryByPosition(double lon, double lat, String time, String serviceName) {
    public R<Object> queryByPosition(double lon, double lat, Long time, String serviceName) {
        if (lon > 180 || lon < -180) {
            return fail("经度范围应该在-180到180");
            return clientError("经度范围应该在-180到180");
        }
        if (lat > 90 || lat < -90) {
            return fail("纬度范围应该在-90到90");
            return clientError("纬度范围应该在-90到90");
        }
        if (time == null || time.trim().isEmpty()) {
            return fail("时间戳不能为空");
        if (time == null) {
            return clientError("时间戳不能为空");
        }
        if (serviceName == null || serviceName.trim().isEmpty()) {
            return fail("服务名不能为空");
            return clientError("服务名不能为空");
        }
        SimuResult result = simuService.queryByPosition(lon, lat, time, serviceName);
        if (result == null) {
            return notFound("未查找到相关数据");
        }
        return success(result);
    }

        return null;
    @ApiOperation(value = "realTime")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "date1", value = "5分钟前的时间，格式为2025-05-31 14:15:20"),
            @ApiImplicitParam(name = "rainfall1", value = "5分钟前的降雨强度"),
            @ApiImplicitParam(name = "date2", value = "当前时间，格式为2025-05-31 14:20:20"),
            @ApiImplicitParam(name = "rainfall2", value = "当前的降雨强度"),
            @ApiImplicitParam(name = "serviceName", value = "服务名")
    })
    @GetMapping("/realTime")
    public R<Object> realTimeSimulate(String date1, double rainfall1,
                                      String date2, double rainfall2, String serviceName) {
        RealTimeInput input = new RealTimeInput();
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        LocalDateTime t1 = LocalDateTime.parse(date1, formatter);
        LocalDateTime t2 = LocalDateTime.parse(date2, formatter);
        RealTimeInput.RealTimeData d1 = new RealTimeInput.RealTimeData();
        d1.setDateTime(t1);
        d1.setIntensity(rainfall1);
        RealTimeInput.RealTimeData d2 = new RealTimeInput.RealTimeData();
        d2.setDateTime(t2);
        d2.setIntensity(rainfall2);
        input.setData(Arrays.asList(d1, d2));
        input.setServiceName(serviceName);

        try {
            String layerJsonName = resolveService.realTimeSimulate(input);
            return success(layerJsonName);
        } catch (IOException e) {
            log.error("real-time simulate exception:", e);
            return fail("实时模拟异常");
        }
    }

    @ApiOperation(value = "realTime")
    @PostMapping("/realTime2")
    public R<Object> realTimeSimulate(@RequestBody RealTimeSimuParam param) {
        try {
            String layerJsonName = rts.realTimeSimulate(param);
            return success(layerJsonName);
        } catch (IOException e) {
            log.error("real-time simulate exception:", e);
            return fail("实时模拟异常");
        }
    }
}