Song/xkrs_shate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
song 2023-03-15 09:08:14 +08:00
parent 32cca20d3a
commit 2da5ba5137
7 changed files with 72 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/DateUploadController.java
View File

@ -73,6 +73,13 @@ public class DateUploadController {
private String MapExePath;
@RequestMapping(value = "/queryZone" ,method = {RequestMethod.GET})
public AjaxResult queryZone()
{
List<String> zone= service.queryZone();
return AjaxResult.success(zone);
}
@RequestMapping(value = "/SelectUpload", method = {RequestMethod.POST})
public AjaxResult SelectUpload(@RequestBody paging paging) {
// LocalDate tomorrow = LocalDate.of(2022,10,2);
@ -151,14 +158,11 @@ public class DateUploadController {
public AjaxResult InitUpload(@RequestBody UplodFile uplodFile) {
readXml();
List<DateUpload> dateUploads = infr(uplodFile.getDateUploads());
for (int i = 0; i < dateUploads.size(); i++) {
Integer Seeding = service.IntoUpload(dateUploads.get(i));
}
return AjaxResult.success("成功");
}
@ -209,12 +213,19 @@ public class DateUploadController {
dateUpload.get(i).setExtent1(dateUpload.get(i).getExtent().toString());
DateUpload uploadValue = service.selectShp(name1, type, "");
MyThread1 demo = new MyThread1(name.replace(".tif", ""),
FilePaths + dateUpload.get(i).getData_id(),
ShpPaths + uploadValue.getData_id());
demo.run();
} else if (type1.equals("BOUNDARIES"))//Boundaries
// callExe1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id());
// callExe(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id(),
// ShpPaths + uploadValue.getData_id());
//
// MyThread1 demo = new MyThread1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id(),
// ShpPaths + uploadValue.getData_id());
// demo.run();
} else if (type1.equals("BOUNDARIES") || type1.equals("RSIMAGES"))//Boundaries
{
String[] strs = dateUpload.get(i).getFileName().split("\\.");
@ -267,11 +278,17 @@ public class DateUploadController {
dateUpload.get(i).setExtent1(dateUpload.get(i).getExtent().toString());
DateUpload uploadValue = service.selectShp(name1, type, "");
MyThread1 demo = new MyThread1(name.replace(".tif", ""),
FilePaths + dateUpload.get(i).getData_id(),
ShpPaths + uploadValue.getData_id());
demo.run();
// DateUpload uploadValue = service.selectShp(name1, type, "");
// callExe1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id());
// callExe(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id(),
// ShpPaths + uploadValue.getData_id());
// MyThread1 demo = new MyThread1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id(),
// ShpPaths + uploadValue.getData_id());
// demo.run();
} else if (type1.equals("SUITABILITY")) {
String[] strs = dateUpload.get(i).getFileName().split("\\.");
@ -306,10 +323,15 @@ public class DateUploadController {
DateUpload uploadValue = service.selectShp(name1, type, "");
MyThread1 demo = new MyThread1(name.replace(".tif", ""),
FilePaths + dateUpload.get(i).getData_id(),
ShpPaths + uploadValue.getData_id());
demo.run();
// callExe1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id());
// callExe(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id(),
// ShpPaths + uploadValue.getData_id());
// MyThread1 demo = new MyThread1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id(),
// ShpPaths + uploadValue.getData_id());
// demo.run();
} else {
String[] strs = dateUpload.get(i).getFileName().split("\\.");
@ -341,11 +363,15 @@ public class DateUploadController {
DateUpload uploadValue = service.selectShp(name1, type, "");
MyThread1 demo = new MyThread1(name.replace(".tif", ""),
FilePaths + dateUpload.get(i).getData_id(),
ShpPaths + uploadValue.getData_id());
demo.run();
// callExe1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id());
// callExe(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id(),
// ShpPaths + uploadValue.getData_id());
// MyThread1 demo = new MyThread1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id(),
// ShpPaths + uploadValue.getData_id());
// demo.run();
}
}

12
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -6,14 +6,14 @@ spring:
driver-class-name: org.postgresql.Driver
druid:
master:
url: jdbc:postgresql://rs-middleware-postgres:5432/itba?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: gis
password: AQBSdU5bT27AKxAAvKoWQdGpSuNRCHjC4B8DVA
# url: jdbc:postgresql://rs-middleware-postgres:5432/itba?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
# username: gis
# password: AQBSdU5bT27AKxAAvKoWQdGpSuNRCHjC4B8DVA
#url: jdbc:postgresql://192.168.2.9:5432/saudiArabia?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
# url: jdbc:postgresql://121.36.229.60:5432/saudiArabia?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
# username: sjs
# password: song5325
url: jdbc:postgresql://121.36.229.60:5432/saudiArabia?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: sjs
password: song5325
# 从库数据源
slave:
# 从数据源开关/默认关闭

8
ruoyi-admin/src/main/resources/application.yml
View File

@ -60,16 +60,16 @@ spring:
# redis 配置
redis:
# 地址
host: rs-middleware-redis
#host: localhost
#host: rs-middleware-redis
host: localhost
# 端口，默认为6379
#port: 14096
port: 6379
# 数据库索引
database: 0
# 密码
password: SenseTime@2019
# password: sdust2020
#password: SenseTime@2019
password: sdust2020
# 连接超时时间
timeout: 10s
lettuce:

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper_shate/DateUploadMapper.java
View File

@ -70,12 +70,14 @@ public interface DateUploadMapper {
@Param("name") String name,
@Param("dateTime") String dateTime);
List<String> queryZone();
DateUpload selectShpfile(@Param("zone") String zone,
@Param("type") String type,
@Param("dateTime") String dateTime,
@Param("year") String year);
DateUpload selectShp(@Param("zone") String zone,
List<DateUpload> selectShp(@Param("zone") String zone,
@Param("type") String type,
@Param("dateTime") String dateTime);

2
ruoyi-system/src/main/java/com/ruoyi/system/service_shate/IDateUploadService.java
View File

@ -14,6 +14,8 @@ import java.util.StringTokenizer;
*/
public interface IDateUploadService {
List<String> queryZone();
List<DateUpload> selectUpload( String zone,
String type,
String type1,

7
ruoyi-system/src/main/java/com/ruoyi/system/service_shate/impl/DateUploadServiceImpl.java
View File

@ -19,6 +19,11 @@ public class DateUploadServiceImpl implements IDateUploadService {
@Resource
private DateUploadMapper mapper;
@Override
public List<String> queryZone() {
return mapper.queryZone();
}
@Override
public List<DateUpload> selectUpload(String zone,String type,String type1,String type2,String year, String dateWithSway,String name,String dateTime) {
return mapper.selectUpload(zone,type,type1,type2,year,dateWithSway,name,dateTime);
@ -41,7 +46,7 @@ public class DateUploadServiceImpl implements IDateUploadService {
@Override
public DateUpload selectShp(String zone, String type, String dateTime) {
return mapper.selectShp(zone,type,dateTime);
return mapper.selectShp(zone,type,dateTime).get(0);
}
@Override

3
ruoyi-system/src/main/resources/mapper/system/DateUploadMapper.xml
View File

@ -61,6 +61,9 @@
<!-- </if>-->
</select>
<select id="queryZone" resultType="string">
SELECT DISTINCT Zone FROM data_upload
</select>
<select id="selectUpload" resultMap="RM_Upload">
SELECT <include refid="columns"/> FROM data_upload