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

线下版本维护

Browse Source
This commit is contained in:
songjinsheng 2022-08-23 15:39:06 +08:00
parent 873c24cae8
commit 45fbc8a501
31 changed files with 268 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1 @@
custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html

9
route.xml
View File

@ -2,28 +2,27 @@
<Rodel> <Rodel>
<path> <path>
<exepath> <exepath>
E:\沙特\EXE\exe\shate.exe /home/sjs/ruoyi/shate/main
</exepath> </exepath>
</path> </path>
<path> <path>
<exepath> <exepath>
E:\沙特\EXE\temp /home/sjs/ruoyi/shate
</exepath> </exepath>
</path> </path>
<path> <path>
<exepath> <exepath>
/rs-warehouse/temporary/images/ /home/sjs/ruoyi/shate
</exepath> </exepath>
</path> </path>
<path> <path>
<exepath> <exepath>
/rs-warehouse/temporary/vectors/ /home/sjs/ruoyi/shate
</exepath> </exepath>
</path> </path>

14
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -1,14 +1,18 @@
package com.ruoyi; package com.ruoyi;
import com.ruoyi.common.core.domain.AjaxResult; import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
import com.ruoyi.common.utils.file.WeatherUtils; import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.ResourceUtils;
import java.io.File;
import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.List;
/** /**
@ -27,9 +31,13 @@ public class RuoYiApplication
SpringApplication.run(RuoYiApplication.class, args); SpringApplication.run(RuoYiApplication.class, args);
System.out.println(); System.out.println();
System.out.println(" --->>>启动成功！<<<---"); System.out.println(" --->>>启动成功！<<<---");
} }
} }

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

@ -56,8 +56,6 @@ public class DateUploadController
private String FilePaths; private String FilePaths;
private String ShpPaths;
@RequestMapping(value = "/SelectUpload",method = {RequestMethod.POST}) @RequestMapping(value = "/SelectUpload",method = {RequestMethod.POST})
public AjaxResult SelectUpload(@RequestBody paging paging) public AjaxResult SelectUpload(@RequestBody paging paging)
@ -70,19 +68,19 @@ public class DateUploadController
type2= paging.getType2().toUpperCase(); type2= paging.getType2().toUpperCase();
} }
String date=paging.getUploadTime(); String date=paging.getUploadTime();
String dateTime=paging.getDateTime();
String name=paging.getType3(); String name=paging.getType3();
String dateTime =paging.getDateTime();
if ( name!=null && name!="") if ( name!=null && name!="")
{ {
if (name.equals("1")) if (name.equals("1"))
{ {
name="M_Heal"; name="Medium%";
} }
else if(name.equals("2")) else if(name.equals("2"))
{ {
name="H_Heal%"; name="High%";
} }
} }
@ -103,6 +101,7 @@ public class DateUploadController
@RequestMapping(value = "/delUpload",method = {RequestMethod.POST}) @RequestMapping(value = "/delUpload",method = {RequestMethod.POST})
public AjaxResult DelUpload(@RequestBody UplodFile uplodFile) public AjaxResult DelUpload(@RequestBody UplodFile uplodFile)
{ {
return delUploadFile(uplodFile.getId()); return delUploadFile(uplodFile.getId());
// List<Integer> ids=uplodFile.getId(); // List<Integer> ids=uplodFile.getId();
// Integer Seeding=0; // Integer Seeding=0;
@ -123,7 +122,11 @@ public class DateUploadController
} }
/**
* 删除
* @param id
* @return
*/
@RequestMapping(value = "/delUpload1",method = {RequestMethod.DELETE}) @RequestMapping(value = "/delUpload1",method = {RequestMethod.DELETE})
public AjaxResult DelUpload1(@RequestParam("id") List<Integer> id) public AjaxResult DelUpload1(@RequestParam("id") List<Integer> id)
{ {
@ -139,20 +142,11 @@ public class DateUploadController
} }
@RequestMapping(value = "/InitShp",method = {RequestMethod.POST}) /**
public AjaxResult InitShp(@RequestBody UplodFile uplodFile) * 添加
{ * @param uplodFile
List<DateUpload> dateUploads=infr(uplodFile.getDateUploads()); * @return
*/
for (int i=0; i<dateUploads.size();i++)
{
Integer Seeding= service.IntoShp(dateUploads.get(i));
}
return AjaxResult.success("成功");
}
@RequestMapping(value = "/InitUpload",method = {RequestMethod.POST}) @RequestMapping(value = "/InitUpload",method = {RequestMethod.POST})
public AjaxResult InitUpload(@RequestBody UplodFile uplodFile) public AjaxResult InitUpload(@RequestBody UplodFile uplodFile)
{ {
@ -170,6 +164,11 @@ public class DateUploadController
return AjaxResult.success("成功"); return AjaxResult.success("成功");
} }
/**
* 解析添加实体类
* @param dateUpload
* @return
*/
private List<DateUpload> infr(List<DateUpload> dateUpload) private List<DateUpload> infr(List<DateUpload> dateUpload)
{ {
for (int i=0;i<dateUpload.size();i++) for (int i=0;i<dateUpload.size();i++)
@ -221,12 +220,12 @@ public class DateUploadController
DateUpload uploadValue=service.selectShp(name1,type,""); DateUpload uploadValue=service.selectShp(name1,type,"");
MyThread1 demo=new MyThread1(name.replace(".tif",""), MyThread1 demo=new MyThread1(name.replace(".tif",""),
FilePaths+dateUpload.get(i).getData_id(), dateUpload.get(i).getRoute(),
ShpPaths+uploadValue.getData_id()); uploadValue.getRoute());
demo.run(); demo.run();
} }
else if(type1.equals("BOUNDARIES"))//Boundaries else if(type1.equals("LANDUSE"))
{ {
String[] strs = dateUpload.get(i).getFileName().split("\\."); String[] strs = dateUpload.get(i).getFileName().split("\\.");
@ -234,60 +233,37 @@ public class DateUploadController
String[] strs2=name.split("\\_"); String[] strs2=name.split("\\_");
String[] typeValue=name.split("2");
String type2=typeValue[0];
String name1=strs2[strs2.length-1]; String name1=strs2[strs2.length-1];
String name2=strs2[strs2.length-2];
dateUpload.get(i).setDataTime(name2);
dateUpload.get(i).setZone(name1); dateUpload.get(i).setZone(name1);
dateUpload.get(i).setCreatedTime(dateNowStr); dateUpload.get(i).setCreatedTime(dateNowStr);
dateUpload.get(i).setYear(dateNowStr.substring(0,4));
dateUpload.get(i).setType(type); dateUpload.get(i).setType(type);
dateUpload.get(i).setType1(type1); dateUpload.get(i).setType1(type1);
dateUpload.get(i).setYear(name2.substring(0,4));
dateUpload.get(i).setType2(type2.substring(0,type2.length()-1).toUpperCase());
dateUpload.get(i).setExtent1(dateUpload.get(i).getExtent().toString()); dateUpload.get(i).setExtent1(dateUpload.get(i).getExtent().toString());
DateUpload uploadValue=service.selectShp(name1,type,"");
MyThread1 demo=new MyThread1(name.replace(".tif",""),
dateUpload.get(i).getRoute(),
uploadValue.getRoute());
demo.run();
} }
else if(type1.equals("LANDUSE"))
{
String[] strs = dateUpload.get(i).getFileName().split("\\.");
String name=strs[0];
String[] strs2=name.split("\\_");
String[] typeValue=name.split("2");
String type2=typeValue[0];
String name1=strs2[strs2.length-1];
String name2=strs2[strs2.length-2];
dateUpload.get(i).setDataTime(name2);
dateUpload.get(i).setZone(name1);
dateUpload.get(i).setCreatedTime(dateNowStr);
dateUpload.get(i).setType(type);
dateUpload.get(i).setType1(type1);
dateUpload.get(i).setYear(name2.substring(0,4));
dateUpload.get(i).setType2(type2.substring(0,type2.length()-1).toUpperCase());
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("SUITABILITY")) else if(type1.equals("SUITABILITY"))
{ {
String[] strs = dateUpload.get(i).getFileName().split("\\."); String[] strs = dateUpload.get(i).getFileName().split("\\.");
@ -323,10 +299,34 @@ public class DateUploadController
DateUpload uploadValue=service.selectShp(name1,type,""); DateUpload uploadValue=service.selectShp(name1,type,"");
MyThread1 demo=new MyThread1(name.replace(".tif",""), MyThread1 demo=new MyThread1(name.replace(".tif",""),
FilePaths+dateUpload.get(i).getData_id(), dateUpload.get(i).getRoute(),
ShpPaths+uploadValue.getData_id()); uploadValue.getRoute());
demo.run(); demo.run();
} }
else if(type1.equals("BOUNDARIES"))//Boundaries
{
String[] strs = dateUpload.get(i).getFileName().split("\\.");
String name=strs[0];
String[] strs2=name.split("\\_");
String name1=strs2[strs2.length-1];
dateUpload.get(i).setZone(name1);
dateUpload.get(i).setCreatedTime(dateNowStr);
dateUpload.get(i).setYear(dateNowStr.substring(0,4));
dateUpload.get(i).setType(type);
dateUpload.get(i).setType1(type1);
dateUpload.get(i).setExtent1(dateUpload.get(i).getExtent().toString());
}
else else
{ {
String[] strs = dateUpload.get(i).getFileName().split("\\."); String[] strs = dateUpload.get(i).getFileName().split("\\.");
@ -360,8 +360,8 @@ public class DateUploadController
DateUpload uploadValue=service.selectShp(name1,type,""); DateUpload uploadValue=service.selectShp(name1,type,"");
MyThread1 demo=new MyThread1(name.replace(".tif",""), MyThread1 demo=new MyThread1(name.replace(".tif",""),
FilePaths+dateUpload.get(i).getData_id(), dateUpload.get(i).getRoute(),
ShpPaths+uploadValue.getData_id()); uploadValue.getRoute());
demo.run(); demo.run();
} }
@ -383,34 +383,39 @@ public class DateUploadController
Process proc=null; Process proc=null;
try { try {
// String til = UrlFileUpload.fileUpload(filePath,FilePathName); String til = UrlFileUpload.fileUpload(filePath,FilePathName);
//
// String shp = UrlFileUpload.fileUpload(shpPath,FilePathName); String shp = UrlFileUpload.fileUpload(shpPath,FilePathName);
String[] cmd = {ExePathName, String[] cmd = {ExePathName,
fileName, fileName,
filePath+".tif", til.replace("\\","/"),
shpPath+".zip"}; shp.replace("\\","/")};
System.out.println("调用exe执行算法");
ProcessBuilder pb = new ProcessBuilder(); ProcessBuilder pb = new ProcessBuilder();
pb.command(cmd); pb.command(cmd);
proc=pb.start(); proc=pb.start();
System.out.println("Start calling algorithm");
bufferedReader =new BufferedReader(new InputStreamReader(proc.getErrorStream())); bufferedReader =new BufferedReader(new InputStreamReader(proc.getErrorStream()));
String aa=null; String aa=null;
String line=null; String line=null;
while ((line=bufferedReader.readLine())!=null){ while ((line=bufferedReader.readLine())!=null){
aa=aa+line; aa=aa+line;
} }
// 打印错误日志
System.out.println(aa); System.out.println(aa);
// Process process=Runtime.getRuntime().exec("cmd /c start"+" E:\\沙特\\~\\exe\\后台统计分析.exe \"Seed_Success_20220604_01\" \"E:\\沙特\\~\\temp\\Seed_Success_20220604_01.tif\" \"E:\\沙特\\~\\temp\\Seed_01.zip\"");
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
System.out.println(e.getMessage());; } catch (InterruptedException e) {
e.printStackTrace();
} }
} }
/**
* 执行地图数据解析
*/
public class MyThread1 extends Thread{ public class MyThread1 extends Thread{
private String FileName; private String FileName;
@ -470,7 +475,7 @@ public class DateUploadController
{ {
String[] typeValue = value.getFileName().split("_"); String[] typeValue = value.getFileName().split("_");
String resolution=typeValue[0]; String resolution=typeValue[0];
String type2 = "Heal"; String type2 = "Healthy";
file.UploadFile1(type2, value.getZone(), value.getDataTime(),service,resolution); file.UploadFile1(type2, value.getZone(), value.getDataTime(),service,resolution);
Seeding= service.DelUpload(ids.get(i)); Seeding= service.DelUpload(ids.get(i));
if (Seeding==0){return AjaxResult.error("没有此id单据！"+ids.get(i));} if (Seeding==0){return AjaxResult.error("没有此id单据！"+ids.get(i));}
@ -490,22 +495,20 @@ public class DateUploadController
return AjaxResult.success("成功！"); return AjaxResult.success("成功！");
} }
public void readXml() { public void readXml() {
try { try {
// 创建解析器工厂 // 创建解析器工厂
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder db = factory.newDocumentBuilder(); DocumentBuilder db = factory.newDocumentBuilder();
// 创建一个Document对象 // 创建一个Document对象
String parent = new File(ResourceUtils.getURL("classpath:").getPath()).getParentFile().getParentFile().getParent(); String parent = new File(ResourceUtils.getURL("classpath:").getPath()).getParentFile().getParentFile().getParent();
File file = new File("route.xml"); File file = new File("route.xml");
Document doc =db.parse(file); Document doc =db.parse(file);
NodeList routeList = doc.getElementsByTagName("Rodel"); NodeList routeList = doc.getElementsByTagName("Rodel");
// 遍历每个book节点 // 遍历每个book节点
for (int i = 0; i < routeList.getLength(); i++) { for (int i = 0; i < routeList.getLength(); i++) {
System.out.println("*******************************");
// 索引从零开始 // 索引从零开始
org.w3c.dom.Node book = routeList.item(i); org.w3c.dom.Node book = routeList.item(i);
// 获取book节点所有属性集合 // 获取book节点所有属性集合
@ -523,11 +526,12 @@ public class DateUploadController
this.FilePathName=childNodes.item(3).getTextContent().trim(); this.FilePathName=childNodes.item(3).getTextContent().trim();
this.FilePaths=childNodes.item(5).getTextContent().trim(); this.FilePaths=childNodes.item(5).getTextContent().trim();
this.ShpPaths=childNodes.item(7).getTextContent().trim();
} }
} }
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/JsonUnits.java Normal file
View File

@ -0,0 +1,14 @@
package com.ruoyi.web.controller.shate;
import com.alibaba.fastjson.JSON;
import java.util.Dictionary;
/**
* @Author: JinSheng Song
* @Date: 2022/8/5 15:21
*/
public class JsonUnits {
}

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/PlantingSuitabilityController.java
View File

@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain_shate.LandUse; import com.ruoyi.system.domain_shate.LandUse;
import com.ruoyi.system.domain_shate.PlantingSuitability; import com.ruoyi.system.domain_shate.PlantingSuitability;
import com.ruoyi.system.domain_shate.UplodFile; import com.ruoyi.system.domain_shate.UplodFile;
import com.ruoyi.system.domain_shate.VegetationHealth;
import com.ruoyi.system.service_shate.ILandUseServices; import com.ruoyi.system.service_shate.ILandUseServices;
import com.ruoyi.system.service_shate.IPlantingSuitabilityService; import com.ruoyi.system.service_shate.IPlantingSuitabilityService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -56,12 +57,10 @@ public class PlantingSuitabilityController
@RequestMapping(value = "/InsertSuitability",method = {RequestMethod.POST}) @RequestMapping(value = "/InsertSuitability",method = {RequestMethod.POST})
public AjaxResult InsertSuitability(@RequestBody UplodFile uplodFile) { public AjaxResult InsertSuitability(@RequestBody UplodFile uplodFile) {
List<PlantingSuitability> value=uplodFile.getPlantingSuitabilities(); for (int i=0;i<uplodFile.getPlantingSuitabilities().size();i++){
for (int i=0;i<value.size();i++){ uplodFile.getPlantingSuitabilities().get(i).setYear(uplodFile.getPlantingSuitabilities().get(i).getImageDate().substring(0,4));
String year=value.get(i).getImageDate().substring(0,4); uplodFile.getPlantingSuitabilities().get(i).setImageDate(uplodFile.getPlantingSuitabilities().get(i).getImageDate().replace("-",""));
value.get(i).setYear(year); Integer Seeding =Service.InsertSeeding(uplodFile.getPlantingSuitabilities().get(i));
value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
Integer Seeding =Service.InsertSeeding(value.get(i));
} }
return AjaxResult.success("成功！"); return AjaxResult.success("成功！");
} }

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/RegionalFactorController.java
View File

@ -104,7 +104,6 @@ public class RegionalFactorController
/** /**
* 道路指数查询 * 道路指数查询
* @return 实体类 * @return 实体类
@ -153,8 +152,7 @@ public class RegionalFactorController
public AjaxResult InsertWater(@RequestBody UplodFile uplodFile) { public AjaxResult InsertWater(@RequestBody UplodFile uplodFile) {
List<WaterFactor> value=uplodFile.getWaterFactors(); List<WaterFactor> value=uplodFile.getWaterFactors();
for (int i=0;i<value.size();i++){ for (int i=0;i<value.size();i++){
String year=value.get(i).getImageDate().substring(0,4); value.get(i).setYear(value.get(i).getImageDate().substring(0,4));
value.get(i).setYear(year);
value.get(i).setImageDate(value.get(i).getImageDate().replace("-","")); value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
Integer Seeding = service.InsertWater(value.get(i)); Integer Seeding = service.InsertWater(value.get(i));
} }
@ -171,8 +169,7 @@ public class RegionalFactorController
List<RegionIndex> indices=uplodFile.getRegionIndexs(); List<RegionIndex> indices=uplodFile.getRegionIndexs();
for (int i=0;i<indices.size();i++){ for (int i=0;i<indices.size();i++){
String year=indices.get(i).getImageDate().substring(0,4); indices.get(i).setYear(indices.get(i).getImageDate().substring(0,4));
indices.get(i).setYear(year);
indices.get(i).setImageDate(indices.get(i).getImageDate().replace("-","")); indices.get(i).setImageDate(indices.get(i).getImageDate().replace("-",""));
Integer Seeding = service.InsertWaterArea(indices.get(i)); Integer Seeding = service.InsertWaterArea(indices.get(i));
} }
@ -188,8 +185,7 @@ public class RegionalFactorController
List<RegionIndex> indices=uplodFile.getRegionIndexs(); List<RegionIndex> indices=uplodFile.getRegionIndexs();
for (int i=0;i<indices.size();i++){ for (int i=0;i<indices.size();i++){
String year=indices.get(i).getImageDate().substring(0,4); indices.get(i).setYear(indices.get(i).getImageDate().substring(0,4));
indices.get(i).setYear(year);
indices.get(i).setImageDate(indices.get(i).getImageDate().replace("-","")); indices.get(i).setImageDate(indices.get(i).getImageDate().replace("-",""));
Integer Seeding = service.InsertRoadLength(indices.get(i)); Integer Seeding = service.InsertRoadLength(indices.get(i));
} }
@ -204,8 +200,6 @@ public class RegionalFactorController
public AjaxResult InsertRoad(@RequestBody UplodFile uplodFile) { public AjaxResult InsertRoad(@RequestBody UplodFile uplodFile) {
for (int i=0;i<uplodFile.getRoadFactors().size();i++){ for (int i=0;i<uplodFile.getRoadFactors().size();i++){
String year=uplodFile.getRoadFactors().get(i).getImageDate().substring(0,4);
uplodFile.getRoadFactors().get(i).setYear(year);
uplodFile.getRoadFactors().get(i).setImageDate(uplodFile.getRoadFactors().get(i).getImageDate().replace("-","")); uplodFile.getRoadFactors().get(i).setImageDate(uplodFile.getRoadFactors().get(i).getImageDate().replace("-",""));
Integer Seeding = service.InsertRoad(uplodFile.getRoadFactors().get(i)); Integer Seeding = service.InsertRoad(uplodFile.getRoadFactors().get(i));

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/SoilFactorController.java
View File

@ -65,8 +65,7 @@ public class SoilFactorController
public AjaxResult InsertDesert(@RequestBody UplodFile uplodFile) { public AjaxResult InsertDesert(@RequestBody UplodFile uplodFile) {
List<SoilDesertification> value=uplodFile.getSoilDesertifications(); List<SoilDesertification> value=uplodFile.getSoilDesertifications();
for (int i=0;i<value.size();i++){ for (int i=0;i<value.size();i++){
String year=value.get(i).getImageDate().substring(0,4); value.get(i).setYear(value.get(i).getImageDate().substring(0,4));
value.get(i).setYear(year);
value.get(i).setImageDate(value.get(i).getImageDate().replace("-","")); value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
Integer Seeding = service.InsertDesert(value.get(i)); Integer Seeding = service.InsertDesert(value.get(i));
} }
@ -82,8 +81,7 @@ public class SoilFactorController
public AjaxResult InsertSalin(@RequestBody UplodFile uplodFile) { public AjaxResult InsertSalin(@RequestBody UplodFile uplodFile) {
List<SoilSalinization> value=uplodFile.getSoilSalinizations(); List<SoilSalinization> value=uplodFile.getSoilSalinizations();
for (int i=0;i<value.size();i++){ for (int i=0;i<value.size();i++){
String year=value.get(i).getImageDate().substring(0,4); value.get(i).setYear(value.get(i).getImageDate().substring(0,4));
value.get(i).setYear(year);
value.get(i).setImageDate(value.get(i).getImageDate().replace("-","")); value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
Integer Seeding = service.InsertSalin(value.get(i)); Integer Seeding = service.InsertSalin(value.get(i));
} }
@ -99,8 +97,7 @@ public class SoilFactorController
List<SoilMoisture> value=uplodFile.getSoilMoistures(); List<SoilMoisture> value=uplodFile.getSoilMoistures();
for (int i=0;i<value.size();i++){ for (int i=0;i<value.size();i++){
String year=value.get(i).getImageDate().substring(0,4); value.get(i).setYear(value.get(i).getImageDate().substring(0,4));
value.get(i).setYear(year);
value.get(i).setImageDate(value.get(i).getImageDate().replace("-","")); value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
Integer Seeding = service.InsertMoisture(value.get(i)); Integer Seeding = service.InsertMoisture(value.get(i));
} }

45
ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/TopographicFactorController.java
View File

@ -37,26 +37,26 @@ public class TopographicFactorController {
Double Max=0.0; Double Max=0.0;
for (Altitude ce : Seeding) for (Altitude ce : Seeding)
{ {
if (Max<ce.getLevel1()) if (Max<ce.getLevel1())
{ {
Max= ce.getLevel1(); Max= ce.getLevel1();
} }
if (Max<ce.getLevel2()) if (Max<ce.getLevel2())
{ {
Max=ce.getLevel2(); Max=ce.getLevel2();
} }
if (Max<ce.getLevel3()) if (Max<ce.getLevel3())
{ {
Max=ce.getLevel3(); Max=ce.getLevel3();
} }
if (Max<ce.getLevel4()) if (Max<ce.getLevel4())
{ {
Max=ce.getLevel4(); Max=ce.getLevel4();
} }
if (Max<ce.getLevel5()) if (Max<ce.getLevel5())
{ {
Max=ce.getLevel5(); Max=ce.getLevel5();
} }
} }
for (int i=0;i<Seeding.size();i++) for (int i=0;i<Seeding.size();i++)
@ -136,8 +136,7 @@ public class TopographicFactorController {
public AjaxResult InsertAltitude(@RequestBody UplodFile uplodFile) { public AjaxResult InsertAltitude(@RequestBody UplodFile uplodFile) {
List<Altitude> value=uplodFile.getAltitudes(); List<Altitude> value=uplodFile.getAltitudes();
for (int i=0;i<value.size();i++){ for (int i=0;i<value.size();i++){
String year=value.get(i).getImageDate().substring(0,4); value.get(i).setYear(value.get(i).getImageDate().substring(0,4));
value.get(i).setYear(year);
value.get(i).setImageDate(value.get(i).getImageDate().replace("-","")); value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
Integer Seeding = service.InsertAltitude(value.get(i)); Integer Seeding = service.InsertAltitude(value.get(i));
} }
@ -153,8 +152,7 @@ public class TopographicFactorController {
public AjaxResult InsertAspect(@RequestBody UplodFile uplodFile) { public AjaxResult InsertAspect(@RequestBody UplodFile uplodFile) {
List<Aspect> value=uplodFile.getAspects(); List<Aspect> value=uplodFile.getAspects();
for (int i=0;i<value.size();i++){ for (int i=0;i<value.size();i++){
String year=value.get(i).getImageDate().substring(0,4); value.get(i).setYear(value.get(i).getImageDate().substring(0,4));
value.get(i).setYear(year);
value.get(i).setImageDate(value.get(i).getImageDate().replace("-","")); value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
Integer Seeding = service.InsertAspect(value.get(i)); Integer Seeding = service.InsertAspect(value.get(i));
} }
@ -170,8 +168,7 @@ public class TopographicFactorController {
List<Slope> value = uplodFile.getSlopes(); List<Slope> value = uplodFile.getSlopes();
for (int i = 0; i < value.size(); i++) { for (int i = 0; i < value.size(); i++) {
String year=value.get(i).getImageDate().substring(0,4); value.get(i).setYear(value.get(i).getImageDate().substring(0,4));
value.get(i).setYear(year);
value.get(i).setImageDate(value.get(i).getImageDate().replace("-","")); value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
Integer Seeding = service.InsertSlope(value.get(i)); Integer Seeding = service.InsertSlope(value.get(i));
} }

23
ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/UploadFile.java
View File

@ -33,23 +33,23 @@ public class UploadFile
Integer num=0; Integer num=0;
switch (Uplod) switch (Uplod)
{ {
case "Alt": case "Altitude":
//海拔 //海拔
num=seedingService.altitude(zone,imageDate); num=seedingService.altitude(zone,imageDate);
break; break;
case "Asp": case "Aspect":
//坡向 //坡向
num=seedingService.aspect(zone,imageDate); num=seedingService.aspect(zone,imageDate);
break; break;
case "Land": case "Landuse":
//土地利用类型1 //土地利用类型1
num=seedingService.landuse(zone,imageDate); num=seedingService.landuse(zone,imageDate);
break; break;
case "Land_Plant": case "Landuse_Planting":
//土地利用类型2 //土地利用类型2
num=seedingService.landuse(zone,imageDate); num=seedingService.landuse(zone,imageDate);
break; break;
case "Suit": case "Suitability":
//种植适宜性 //种植适宜性
num=seedingService.suitability(zone,imageDate); num=seedingService.suitability(zone,imageDate);
break; break;
@ -57,11 +57,11 @@ public class UploadFile
//道路指数 //道路指数
num=seedingService.road(zone,imageDate); num=seedingService.road(zone,imageDate);
break; break;
case "Seed": case "Seed_Success":
//种植适应性1 //种植适应性1
num=seedingService.seedSuccess(zone,imageDate); num=seedingService.seedSuccess(zone,imageDate);
break; break;
case "Veg": case "Vegetation_Distribution":
//种植适宜性 //种植适宜性
num=seedingService.vegetationDistribution(zone,imageDate); num=seedingService.vegetationDistribution(zone,imageDate);
break; break;
@ -69,7 +69,7 @@ public class UploadFile
//坡度 //坡度
num=seedingService.slope(zone,imageDate); num=seedingService.slope(zone,imageDate);
break; break;
case "Desert": case "Desertification":
//土壤沙化指数 //土壤沙化指数
num=seedingService.desertification(zone,imageDate); num=seedingService.desertification(zone,imageDate);
break; break;
@ -77,11 +77,11 @@ public class UploadFile
//土壤湿度指数 //土壤湿度指数
num=seedingService.moisture(zone,imageDate); num=seedingService.moisture(zone,imageDate);
break; break;
case "Salt": case "Salinization":
//土壤盐渍化指数 //土壤盐渍化指数
num=seedingService.salinization(zone,imageDate); num=seedingService.salinization(zone,imageDate);
break; break;
case "Heal": case "Healthy":
//植被健康状况 //植被健康状况
num=seedingService.healthy(zone,imageDate,resolution); num=seedingService.healthy(zone,imageDate,resolution);
break; break;
@ -94,9 +94,8 @@ public class UploadFile
//土壤盐渍化指数 //土壤盐渍化指数
num=seedingService.waterArea(zone,imageDate); num=seedingService.waterArea(zone,imageDate);
break; break;
case "Road_len": case "Road_length":
//植被健康状况 //植被健康状况
num=seedingService.roadLength(zone,imageDate);
break; break;
case "Climate_index": case "Climate_index":
//水分因素 //水分因素

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/VegetationHealthController.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.web.controller.shate; package com.ruoyi.web.controller.shate;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain_shate.SeedingSuccessRate; import com.ruoyi.system.domain_shate.SeedingSuccessRate;
import com.ruoyi.system.domain_shate.UplodFile; import com.ruoyi.system.domain_shate.UplodFile;
@ -38,13 +39,11 @@ public class VegetationHealthController {
{ {
String name=""; String name="";
if (type!=null && type !=""){ if (type!=null && type !=""){
if (name.equals("1")) if (type.equals("1")){
{ name="Medium%";
name="M_Heal%";
} }
else if(name.equals("2")) else if(type.equals("2")){
{ name="High%";
name="H_Heal%";
} }
} }
List<VegetationHealth> Seeding= VegetationService.sqlSeeding(zone,name,year); List<VegetationHealth> Seeding= VegetationService.sqlSeeding(zone,name,year);
@ -68,7 +67,6 @@ public class VegetationHealthController {
@RequestMapping(value = "/InsertVegetation",method = {RequestMethod.POST}) @RequestMapping(value = "/InsertVegetation",method = {RequestMethod.POST})
public AjaxResult InsertVegetation(@RequestBody UplodFile uplodFile) { public AjaxResult InsertVegetation(@RequestBody UplodFile uplodFile) {
List<VegetationHealth> value=uplodFile.getVegetationHealths(); List<VegetationHealth> value=uplodFile.getVegetationHealths();
for (int i=0;i<value.size();i++){ for (int i=0;i<value.size();i++){
String year=value.get(i).getImageDate().substring(0,4); String year=value.get(i).getImageDate().substring(0,4);

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

@ -6,15 +6,11 @@ spring:
driver-class-name: org.postgresql.Driver driver-class-name: org.postgresql.Driver
druid: druid:
master: master:
url: jdbc:postgresql://rs-middleware-postgres:5432/itba?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai #url: jdbc:postgresql://172.16.123.212:5433/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://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 url: jdbc:postgresql://121.36.229.60:5432/saudiArabia?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: sjs
#username: sjs password: song5325
#password: song5325
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

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

@ -9,7 +9,7 @@ ruoyi:
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /home/ruoyi/uploadPath profile: /home/sjs/ruoyi/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证 # 验证码类型 math 数组计算 char 字符验证
@ -18,8 +18,8 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为8080 # 服务器的HTTP端口，默认为8080
#port: 6051 port: 6051
port: 9800 #port: 9800
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
@ -60,16 +60,16 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: rs-middleware-redis #host: 172.16.123.212
#host: localhost host: localhost
# 端口，默认为6379 # 端口，默认为6379
#port: 14096 #port: 14096
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
password: SenseTime@2019 #password: SenseTime@2019
#password: sdust2020 password: sdust2020
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/UrlFileUpload.java
View File

@ -17,7 +17,7 @@ public class UrlFileUpload {
public static String fileUpload(String FileUrl,String FileNamePath) throws IOException, InterruptedException { public static String fileUpload(String FileUrl,String FileNamePath) throws IOException, InterruptedException {
System.out.println("下载文件！");
// 创建一个URL链接 // 创建一个URL链接
URL url = new URL(FileUrl); URL url = new URL(FileUrl);

3
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/WeatherUtils.java
View File

@ -74,10 +74,9 @@ public class WeatherUtils {
String strRead = null; String strRead = null;
URL url = new URL(serverURL); URL url = new URL(serverURL);
HttpURLConnection connection = (HttpURLConnection)url.openConnection(); HttpURLConnection connection = (HttpURLConnection)url.openConnection();
connection.setRequestMethod("POST");//请求post方式 connection.setRequestMethod("POST");
connection.setDoInput(true); connection.setDoInput(true);
connection.setDoOutput(true); connection.setDoOutput(true);
//header内的的参数在这里set。||connection.setRequestProperty("健, "值");
connection.setRequestProperty("Content-Type", "application/json"); connection.setRequestProperty("Content-Type", "application/json");
connection.connect(); connection.connect();
OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream(),"UTF-8"); OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream(),"UTF-8");

3
ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/Altitude.java
View File

@ -23,12 +23,11 @@ public class Altitude extends SysSTEntity
private Double Level2; private Double Level2;
private Double Level3; private Double Level3;
private Double Level4; private Double Level4;
private Double Level5; private Double Level5;
private Double max; private Double max;
private String imageDate; private String imageDate;

4
ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/Aspect.java
View File

@ -26,12 +26,12 @@ public class Aspect extends SysSTEntity{
private Double southeast; private Double southeast;
private Double max;
private Double south; private Double south;
private Double southwest; private Double southwest;
private Double max;
private Double west; private Double west;
private Double northwest; private Double northwest;

4
ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/PlantingSuitability.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.domain_shate; package com.ruoyi.system.domain_shate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
@ -18,7 +18,6 @@ public class PlantingSuitability extends SysSTEntity
private String zone; private String zone;
private Double max;
private Double verySuitable; private Double verySuitable;
@ -32,6 +31,7 @@ public class PlantingSuitability extends SysSTEntity
private String total; private String total;
private Double max;
private String productCode1; private String productCode1;

4
ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/RoadFactor.java
View File

@ -19,8 +19,6 @@ public class RoadFactor extends SysSTEntity
private String zone; private String zone;
private Double max;
private Double Level1; private Double Level1;
private Double Level2; private Double Level2;
@ -31,6 +29,8 @@ public class RoadFactor extends SysSTEntity
private Double Level5; private Double Level5;
private Double max;
private String imageDate; private String imageDate;

3
ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/SoilSalinization.java
View File

@ -31,7 +31,7 @@ public class SoilSalinization extends SysSTEntity
private String imageDate; private String imageDate;
private String year1;
private String productCode1; private String productCode1;
@ -165,5 +165,4 @@ public class SoilSalinization extends SysSTEntity
public void setYear(String year) { public void setYear(String year) {
this.year = year; this.year = year;
} }
} }

6
ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/VegetationHealth.java
View File

@ -10,6 +10,9 @@ public class VegetationHealth extends SysSTEntity
{ {
private Integer id; private Integer id;
private Double max;
private String zone; private String zone;
private Double healthy; private Double healthy;
@ -22,8 +25,6 @@ public class VegetationHealth extends SysSTEntity
private String resolution; private String resolution;
private Double max;
private String imageDate; private String imageDate;
private String productCode1; private String productCode1;
@ -160,6 +161,7 @@ public class VegetationHealth extends SysSTEntity
this.year = year; this.year = year;
} }
public String getResolution() { public String getResolution() {
return resolution; return resolution;
} }

3
ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/WaterFactor.java
View File

@ -19,8 +19,6 @@ public class WaterFactor extends SysSTEntity
private String zone; private String zone;
private Double max;
private Double level1; private Double level1;
private Double level2; private Double level2;
@ -31,6 +29,7 @@ public class WaterFactor extends SysSTEntity
private Double level5; private Double level5;
private Double max;
private String imageDate; private String imageDate;

4
ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/paging.java
View File

@ -15,8 +15,11 @@ public class paging {
private Integer pageSize; private Integer pageSize;
private String zone;//区域 private String zone;//区域
private String type;//类型1 private String type;//类型1
private String type1;//类型2 private String type1;//类型2
private String type2; private String type2;
private String type3; private String type3;
@ -27,7 +30,6 @@ public class paging {
private String dateTime; private String dateTime;
private List<Integer> ids; private List<Integer> ids;
public String getZone() { public String getZone() {

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

@ -13,53 +13,53 @@ import java.util.List;
public interface DateUploadMapper { public interface DateUploadMapper {
Integer altitude(@Param("zone") String zone, Integer altitude(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer aspect(@Param("zone") String zone, Integer aspect(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer landuse(@Param("zone") String zone, Integer landuse(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer suitability(@Param("zone") String zone, Integer suitability(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer road(@Param("zone") String zone, Integer road(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer seedSuccess(@Param("zone") String zone, Integer seedSuccess(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer vegetationDistribution(@Param("zone") String zone, Integer vegetationDistribution(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer slope(@Param("zone") String zone, Integer slope(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer desertification(@Param("zone") String zone, Integer desertification(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer moisture(@Param("zone") String zone, Integer moisture(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer salinization(@Param("zone") String zone, Integer salinization(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer healthy(@Param("zone") String zone, Integer healthy(@Param("zone") String zone,
@Param("imageDate") String imageDate, @Param("imageDate") String imageDate,
@Param("resolution") String resolution); @Param("resolution") String resolution);
Integer water(@Param("zone") String zone, Integer water(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer waterArea(@Param("zone") String zone, Integer waterArea(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer roadLength(@Param("zone") String zone, Integer roadLength(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
Integer climateIndex(@Param("zone") String zone, Integer climateIndex(@Param("zone") String zone,
@Param("imageDate") String imageDate); @Param("imageDate") String imageDate);
List<DateUpload> selectUpload(@Param("zone") String zone, List<DateUpload> selectUpload(@Param("zone") String zone,
@Param("type") String type, @Param("type") String type,
@ -71,13 +71,13 @@ public interface DateUploadMapper {
@Param("dateTime") String dateTime); @Param("dateTime") String dateTime);
DateUpload selectShpfile(@Param("zone") String zone, DateUpload selectShpfile(@Param("zone") String zone,
@Param("type") String type, @Param("type") String type,
@Param("dateTime") String dateTime, @Param("dateTime") String dateTime,
@Param("year") String year); @Param("year") String year);
DateUpload selectShp(@Param("zone") String zone, DateUpload selectShp(@Param("zone") String zone,
@Param("type") String type, @Param("type") String type,
@Param("dateTime") String dateTime); @Param("dateTime") String dateTime);
Integer DelUpload(@Param("id") Integer id); Integer DelUpload(@Param("id") Integer id);

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

@ -6,7 +6,6 @@ import org.apache.ibatis.annotations.Param;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.StringTokenizer;
/** /**
* @Author: JinSheng Song * @Author: JinSheng Song
@ -38,36 +37,36 @@ public interface IDateUploadService {
DateUpload selectDel(Integer id); DateUpload selectDel(Integer id);
Integer altitude( String zone, Integer altitude( String zone,
String imageDate);
Integer aspect( String zone,
String imageDate);
Integer landuse( String zone,
String imageDate);
Integer suitability( String zone,
String imageDate);
Integer road( String zone,
String imageDate);
Integer seedSuccess( String zone,
String imageDate);
Integer vegetationDistribution( String zone,
String imageDate);
Integer slope( String zone,
String imageDate);
Integer desertification( String zone,
String imageDate);
Integer moisture( String zone,
String imageDate);
Integer salinization( String zone,
String imageDate);
Integer healthy(String zone,
String imageDate,
String resolution);
Integer water( String zone,
String imageDate);
Integer waterArea( String zone,
String imageDate); String imageDate);
Integer roadLength( String zone, Integer aspect( String zone,
String imageDate); String imageDate);
Integer climateIndex( String zone, Integer landuse( String zone,
String imageDate);
Integer suitability( String zone,
String imageDate); String imageDate);
Integer road( String zone,
String imageDate);
Integer seedSuccess( String zone,
String imageDate);
Integer vegetationDistribution( String zone,
String imageDate);
Integer slope( String zone,
String imageDate);
Integer desertification( String zone,
String imageDate);
Integer moisture( String zone,
String imageDate);
Integer salinization( String zone,
String imageDate);
Integer healthy( String zone,
String imageDate,
String resolution);
Integer water( String zone,
String imageDate);
Integer waterArea( String zone,
String imageDate);
Integer roadLength( String zone,
String imageDate);
Integer climateIndex( String zone,
String imageDate);
} }

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

@ -55,9 +55,9 @@
AND type = #{type} AND type = #{type}
</if> </if>
<!-- <if test="dateTime!= null and dateTime !=''">--> <!-- <if test="dateTime!= null and dateTime !=''">-->
<!-- AND data_time = #{dateTime}--> <!-- AND data_time = #{dateTime}-->
<!-- </if>--> <!-- </if>-->
</select> </select>
@ -91,11 +91,10 @@
<if test="name!= null and name !=''"> <if test="name!= null and name !=''">
AND file_name like #{name} AND file_name like #{name}
</if> </if>
<if test="dateTime!= null and dateTime !=''">
<if test="dateTime != null and dateTime !=''"> AND data_Time = #{dateTime}
AND data_time=#{dateTime}
</if> </if>
ORDER BY created_time desc
</select> </select>
<select id="selectShpfile" resultMap="RM_Upload"> <select id="selectShpfile" resultMap="RM_Upload">
@ -244,7 +243,7 @@
</delete> </delete>
<delete id="vegetationDistribution"> <delete id="vegetationDistribution">
DELETE FROM "vegetation_Distribution" DELETE FROM "vegetation_Distrbution"
WHERE zone = #{zone} WHERE zone = #{zone}
and image_date =#{imageDate} and image_date =#{imageDate}
</delete> </delete>
@ -276,8 +275,8 @@
<delete id="healthy"> <delete id="healthy">
DELETE FROM healthy DELETE FROM healthy
WHERE zone = #{zone} WHERE zone = #{zone}
and image_date =#{imageDate} and image_date =#{imageDate}
and resolution=#{resolution} and resolution=#{resolution}
</delete> </delete>
<delete id="water"> <delete id="water">

2
ruoyi-system/src/main/resources/mapper/system/LandUseMapper.xml
View File

@ -52,7 +52,7 @@
</select> </select>
<select id="sqlYear" resultMap="RM_Seeding"> <select id="sqlYear" resultMap="RM_Seeding">
SELECT distinct year1,ZONE FROM landuse ORDER BY ZONE SELECT distinct year1,ZONE FROM landuse ORDER BY ZONE
</select> </select>
<insert id="insertSeeding"> <insert id="insertSeeding">

2
ruoyi-system/src/main/resources/mapper/system/PlantingSuitabilityMapper.xml
View File

@ -57,7 +57,7 @@
#{verySuitable,jdbcType=DOUBLE}, #{verySuitable,jdbcType=DOUBLE},
#{suitable,jdbcType=DOUBLE}, #{suitable,jdbcType=DOUBLE},
#{notSuitable,jdbcType=DOUBLE}, #{notSuitable,jdbcType=DOUBLE},
#{totalArea,jdbcType=DOUBLE}, #{totalArea,jdbcType=DOUBLE},
#{imageDate,jdbcType=VARCHAR}, #{imageDate,jdbcType=VARCHAR},
#{productCode1,jdbcType=VARCHAR}, #{productCode1,jdbcType=VARCHAR},
#{productCode2,jdbcType=VARCHAR}, #{productCode2,jdbcType=VARCHAR},

6
ruoyi-system/src/main/resources/mapper/system/RegionalFactorMapper.xml
View File

@ -97,9 +97,9 @@
</select> </select>
<select id="sqlRegion" resultMap="RM_Region"> <select id="sqlRegion" resultMap="RM_Region">
select a.zone as zone,a.year1 as year1,a.water_area as water_area, select a.zone zone,a.year1 year1,a.water_area water_area,
b.road_length as road_length,a.image_date as image_date, b.road_length road_length,a.image_date image_date,
a.product_code as product_code,b.product_code as product_code1 a.product_code product_code,b.product_code product_code1
FROM water_area a join road_length b FROM water_area a join road_length b
on a.image_date=b.image_date on a.image_date=b.image_date
and a.zone=b.zone and a.zone=b.zone

16
ruoyi-system/src/main/resources/mapper/system/SeedingSuccessMapper.xml
View File

@ -27,14 +27,14 @@
</sql> </sql>
<select id="sqlSeeding" resultMap="RM_Seeding"> <select id="sqlSeeding" resultMap="RM_Seeding">
select distinct a.product_code2 as Product_code2, select distinct a.product_code2 Product_code2,
a.zone as zone, a.zone zone,
a.seeding_success_rate as seeding_success, a.seeding_success_rate seeding_success,
a.product_code1 as productCode1, a.product_code1 productCode1,
a.image_date as Image_date, a.image_date Image_date,
b.seeding_success_area as Seeding_success_area, b.seeding_success_area Seeding_success_area,
b.product_code2 as Product_code3, b.product_code2 Product_code3,
a.year1 as year1 a.year1 year1
from "seed_Success" a from "seed_Success" a
left join "vegetation_Distribution" b left join "vegetation_Distribution" b
on a.image_date=b.image_date on a.image_date=b.image_date

2
ruoyi-system/src/main/resources/mapper/system/VegetationHealthMapper.xml
View File

@ -56,7 +56,7 @@
<sql id="columns"> <sql id="columns">
<![CDATA[ <![CDATA[
ID,zone,healthy,resolution,year1,Normal,Not_Healthy,Total_Area,Image_date,Product_code1,Product_code2,Product_code3,created_by,created_time ID,zone,healthy,year1,Normal,Not_Healthy,Total_Area,Image_date,Product_code1,Product_code2,Product_code3,created_by,created_time
]]> ]]>
</sql> </sql>