1

13693261870

2024-09-18 14e8093d5c4ef75bd6cd3b5d929d71aa9fa417f5

1

 src/main/java/com/se/simu/controller/BaseController.java

@@ -1,6 +1,6 @@
package com.se.simu.controller;

import com.se.simu.domain.R;
import com.se.simu.domain.vo.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;


 src/main/java/com/se/simu/controller/TaskController.java

@@ -1,7 +1,7 @@
package com.se.simu.controller;

import com.se.simu.domain.R;
import com.se.simu.service.SedbService;
import com.se.simu.domain.vo.R;
import com.se.simu.service.GedbService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@
@SuppressWarnings("ALL")
public class TaskController extends BaseController {
    @Resource
    SedbService sedbService;
    GedbService gedbService;

    @ApiOperation(value = "创建任务")
    @PostMapping(value = "/createTask", produces = "application/json; charset=UTF-8")
@@ -31,7 +31,7 @@
            // 469538.6536261877,4416744.922022615,469853.14714664617,4417049.378602433
            String bbox = "116.64388473935195,39.884315914604464,116.64754729082588,39.887069143903496";
            String taskName = "20240913";
            Object rs = sedbService.test(bbox, taskName);
            Object rs = gedbService.test(bbox, taskName);

            return success(rs);
        } catch (Exception ex) {

 src/main/java/com/se/simu/domain/vo/Duration.java

ÎļþÃû´Ó src/main/java/com/se/simu/domain/Duration.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.se.simu.domain;
package com.se.simu.domain.vo;

/**
 * æŒç»­æ—¶é—´å®žä½“ç±»

 src/main/java/com/se/simu/domain/vo/Extension.java

ÎļþÃû´Ó src/main/java/com/se/simu/domain/Extension.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.se.simu.domain;
package com.se.simu.domain.vo;

/**
 * æŒç»­æ—¶é—´å®žä½“ç±»

 src/main/java/com/se/simu/domain/vo/Layer.java

ÎļþÃû´Ó src/main/java/com/se/simu/domain/Layer.java ÐÞ¸Ä
@@ -1,4 +1,9 @@
package com.se.simu.domain;
package com.se.simu.domain.vo;

import com.se.simu.domain.vo.Duration;
import com.se.simu.domain.vo.Extension;
import com.se.simu.domain.vo.Terrain;
import com.se.simu.domain.vo.Water;

/**
 * å›¾å±‚实体类

 src/main/java/com/se/simu/domain/vo/R.java

ÎļþÃû´Ó src/main/java/com/se/simu/domain/R.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.se.simu.domain;
package com.se.simu.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import org.springframework.http.HttpStatus;

 src/main/java/com/se/simu/domain/vo/Terrain.java

ÎļþÃû´Ó src/main/java/com/se/simu/domain/Terrain.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.se.simu.domain;
package com.se.simu.domain.vo;

import java.util.List;


 src/main/java/com/se/simu/domain/vo/Water.java

ÎļþÃû´Ó src/main/java/com/se/simu/domain/Water.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.se.simu.domain;
package com.se.simu.domain.vo;

import java.util.List;


 src/main/java/com/se/simu/service/GedbService.java

ÎļþÃû´Ó src/main/java/com/se/simu/service/SedbService.java ÐÞ¸Ä
@@ -31,7 +31,7 @@
import java.util.stream.Collectors;

/**
 * SDDB服务类
 * GEDB服务类
 *
 * @author WWW
 * @date   2024-09-12
@@ -39,41 +39,41 @@
@Slf4j
@Service
@SuppressWarnings("ALL")
public class SedbService {
public class GedbService {
    @Value("${sys.path.in}")
    String inPath;

    @Value("${sedb.host}")
    @Value("${gedb.host}")
    String host;

    @Value("${sedb.user}")
    @Value("${gedb.user}")
    String user;

    @Value("${sedb.pwd}")
    @Value("${gedb.pwd}")
    String pwd;

    @Value("${sedb.dbName}")
    @Value("${gedb.dbName}")
    String dbName;

    @Value("${sedb.pageSize}")
    @Value("${gedb.pageSize}")
    Integer pageSize;

    @Value("#{'${sedb.layerNames}'}")
    @Value("#{'${gedb.layerNames}'}")
    List<String> layerNames;

    @Value("#{'${sedb.shpNames}'}")
    @Value("#{'${gedb.shpNames}'}")
    List<String> shpNames;

    @Value("#{'${sedb.sysFields}'}")
    @Value("#{'${gedb.sysFields}'}")
    List<String> sysFields;

    @Value("${sedb.demFile}")
    @Value("${gedb.demFile}")
    String demFile;

    @Value("${sedb.demType}")
    @Value("${gedb.demType}")
    String demType;

    @Value("${sedb.demName}")
    @Value("${gedb.demName}")
    String demName;

    String password;

 src/main/java/com/se/simu/service/WaterService.java

@@ -1,6 +1,6 @@
package com.se.simu.service;

import com.se.simu.domain.*;
import com.se.simu.domain.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

 src/main/resources/application.yml

@@ -42,7 +42,7 @@
    in: D:\simu\in
    out: D:\simu\out

sedb:
gedb:
  host: http://106.120.22.26:8013/
  user: WUWEIWEI
  pwd: WUWEIWEI