no message

报告生成

.github/FUNDING.yml

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

route.xml

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

ruoyi-admin/pom.xml

@@ -18,23 +18,15 @@
     <dependencies>
 
         <dependency>
-
             <groupId>org.apache.poi</groupId>
-
             <artifactId>poi</artifactId>
-
-        <version>4.0.1</version>
-
+            <version>4.1.2</version>
         </dependency>
 
         <dependency>
-
             <groupId>org.apache.poi</groupId>
-
             <artifactId>poi-ooxml</artifactId>
-
-         <version>4.0.1</version>
-
+             <version>4.1.2</version>
          </dependency>
 
 
@@ -93,6 +85,9 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+
+
+
     </dependencies>
 
     <build>

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,18 +1,14 @@
 package com.ruoyi;
 
-import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
-import com.mysql.cj.x.protobuf.MysqlxDatatypes;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.file.WeatherUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 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;
+import java.time.LocalDate;
 
 
 /**
@@ -27,17 +23,16 @@ public class RuoYiApplication
     public static void main(String[] args)
     {
 
+
+
+
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
         System.out.println();
         System.out.println("                                                               --->>>启动成功！<<<---");
-
-
     }
 
 
 
 
-
-
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/JsonUnits.java

@@ -1,14 +0,0 @@
-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 {
-
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/LandUseController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -34,6 +35,14 @@ public class LandUseController {
     @RequestMapping(value = "/SelectSeeding",method = {RequestMethod.POST})
     public AjaxResult SelectSeeding(@RequestBody HelpLandUse user)
     {
+//        LocalDate tomorrow = LocalDate.of(2022,10,2);
+//        LocalDate today = LocalDate.now();
+//
+//        if(tomorrow.isAfter(today)==false)
+//        {
+//            return AjaxResult.error("软件授权日期已过，请联系管理人员！");
+//        }
+
         if(user.getLandUses().length==0)
         {
             List<LandUse> Seeding= Service.sqlSeeding1(user.getZone(),user.getYear());
@@ -86,6 +95,7 @@ public class LandUseController {
                     value1.setProductCode2(value.get(i).getProductCode2());
                     value1.setProductCode3(value.get(i).getProductCode3());
                     value1.setYear(value.get(i).getYear());
+                    value1.setRegionName(value.get(i).getRegionName());
                 } else if (value.get(i).getLandUse().equals("Buildings") && value.get(i).getZone().equals(zonenew.get(j))) {
                     value1.setBuildings(value.get(i).getArea());
                     value1.setZone(value.get(i).getZone());
@@ -93,12 +103,14 @@ public class LandUseController {
                     value1.setProductCode2(value.get(i).getProductCode2());
                     value1.setProductCode3(value.get(i).getProductCode3());
                     value1.setYear(value.get(i).getYear());
+                    value1.setRegionName(value.get(i).getRegionName());
                 } else if (value.get(i).getLandUse().equals("Roads") && value.get(i).getZone().equals(zonenew.get(j))) {
                     value1.setRoads(value.get(i).getArea());
                     value1.setProductCode1(value.get(i).getProductCode1());
                     value1.setProductCode2(value.get(i).getProductCode2());
                     value1.setProductCode3(value.get(i).getProductCode3());
                     value1.setYear(value.get(i).getYear());
+                    value1.setRegionName(value.get(i).getRegionName());
                 } else if (value.get(i).getLandUse().equals("Water") && value.get(i).getZone().equals(zonenew.get(j))) {
                     value1.setWater(value.get(i).getArea());
                     value1.setZone(value.get(i).getZone());
@@ -106,6 +118,7 @@ public class LandUseController {
                     value1.setProductCode2(value.get(i).getProductCode2());
                     value1.setProductCode3(value.get(i).getProductCode3());
                     value1.setYear(value.get(i).getYear());
+                    value1.setRegionName(value.get(i).getRegionName());
                 } else if (value.get(i).getLandUse().equals("Forest") && value.get(i).getZone().equals(zonenew.get(j))) {
                     value1.setForest(value.get(i).getArea());
                     value1.setZone(value.get(i).getZone());
@@ -113,6 +126,7 @@ public class LandUseController {
                     value1.setProductCode2(value.get(i).getProductCode2());
                     value1.setProductCode3(value.get(i).getProductCode3());
                     value1.setYear(value.get(i).getYear());
+                    value1.setRegionName(value.get(i).getRegionName());
                 } else if (value.get(i).getLandUse().equals("Grass") && value.get(i).getZone().equals(zonenew.get(j))) {
                     value1.setGrass(value.get(i).getArea());
                     value1.setZone(value.get(i).getZone());
@@ -120,6 +134,7 @@ public class LandUseController {
                     value1.setProductCode2(value.get(i).getProductCode2());
                     value1.setProductCode3(value.get(i).getProductCode3());
                     value1.setYear(value.get(i).getYear());
+                    value1.setRegionName(value.get(i).getRegionName());
                 } else if (value.get(i).getLandUse().equals("Soil") && value.get(i).getZone().equals(zonenew.get(j))) {
                     value1.setSoil(value.get(i).getArea());
                     value1.setZone(value.get(i).getZone());
@@ -127,6 +142,7 @@ public class LandUseController {
                     value1.setProductCode2(value.get(i).getProductCode2());
                     value1.setProductCode3(value.get(i).getProductCode3());
                     value1.setYear(value.get(i).getYear());
+                    value1.setRegionName(value.get(i).getRegionName());
                 } else if (value.get(i).getLandUse().equals("Desert") && value.get(i).getZone().equals(zonenew.get(j))) {
                     value1.setDesert(value.get(i).getArea());
                     value1.setZone(value.get(i).getZone());
@@ -134,6 +150,7 @@ public class LandUseController {
                     value1.setProductCode2(value.get(i).getProductCode2());
                     value1.setProductCode3(value.get(i).getProductCode3());
                     value1.setYear(value.get(i).getYear());
+                    value1.setRegionName(value.get(i).getRegionName());
                 } else if (value.get(i).getLandUse().equals("Rocks") && value.get(i).getZone().equals(zonenew.get(j))) {
                     value1.setRocks(value.get(i).getArea());
                     value1.setZone(value.get(i).getZone());
@@ -141,6 +158,7 @@ public class LandUseController {
                     value1.setProductCode2(value.get(i).getProductCode2());
                     value1.setProductCode3(value.get(i).getProductCode3());
                     value1.setYear(value.get(i).getYear());
+                    value1.setRegionName(value.get(i).getRegionName());
                 } else if (value.get(i).getLandUse().equals("Other") && value.get(i).getZone().equals(zonenew.get(j))) {
                     value1.setOther(value.get(i).getArea());
                     value1.setZone(value.get(i).getZone());
@@ -148,6 +166,7 @@ public class LandUseController {
                     value1.setProductCode2(value.get(i).getProductCode2());
                     value1.setProductCode3(value.get(i).getProductCode3());
                     value1.setYear(value.get(i).getYear());
+                    value1.setRegionName(value.get(i).getRegionName());
                 }
             }
             lanUseNews.add(value1);

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

@@ -4,7 +4,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain_shate.LandUse;
 import com.ruoyi.system.domain_shate.PlantingSuitability;
 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.IPlantingSuitabilityService;
 import io.swagger.annotations.Api;
@@ -15,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -37,6 +37,14 @@ public class PlantingSuitabilityController
     @RequestMapping(value = "/SelectSeeding",method = {RequestMethod.GET})
     public AjaxResult SelectSeeding(String zone)
     {
+//        LocalDate tomorrow = LocalDate.of(2022,10,2);
+//        LocalDate today = LocalDate.now();
+//
+//        if(tomorrow.isAfter(today)==false)
+//        {
+//            return AjaxResult.error("软件授权日期已过，请联系管理人员！");
+//        }
+
         List<PlantingSuitability> Seeding= Service.sqlSeeding(zone);
         Double Number=0.0;
         Double Max=0.0;
@@ -57,10 +65,12 @@ public class PlantingSuitabilityController
 
     @RequestMapping(value = "/InsertSuitability",method = {RequestMethod.POST})
     public AjaxResult InsertSuitability(@RequestBody UplodFile uplodFile) {
-        for (int i=0;i<uplodFile.getPlantingSuitabilities().size();i++){
-            uplodFile.getPlantingSuitabilities().get(i).setYear(uplodFile.getPlantingSuitabilities().get(i).getImageDate().substring(0,4));
-            uplodFile.getPlantingSuitabilities().get(i).setImageDate(uplodFile.getPlantingSuitabilities().get(i).getImageDate().replace("-",""));
-            Integer Seeding =Service.InsertSeeding(uplodFile.getPlantingSuitabilities().get(i));
+        List<PlantingSuitability> value=uplodFile.getPlantingSuitabilities();
+        for (int i=0;i<value.size();i++){
+            String year=value.get(i).getImageDate().substring(0,4);
+            value.get(i).setYear(year);
+            value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
+            Integer Seeding =Service.InsertSeeding(value.get(i));
         }
         return AjaxResult.success("成功！");
     }

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

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

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

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

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

@@ -57,7 +57,6 @@ public class TopographicFactorController {
             {
                 Max=ce.getLevel5();
             }
-
         }
         for (int i=0;i<Seeding.size();i++)
         {
@@ -136,7 +135,8 @@ public class TopographicFactorController {
     public AjaxResult InsertAltitude(@RequestBody UplodFile uplodFile) {
         List<Altitude> value=uplodFile.getAltitudes();
         for (int i=0;i<value.size();i++){
-            value.get(i).setYear(value.get(i).getImageDate().substring(0,4));
+            String year=value.get(i).getImageDate().substring(0,4);
+            value.get(i).setYear(year);
             value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
             Integer Seeding = service.InsertAltitude(value.get(i));
         }
@@ -152,7 +152,8 @@ public class TopographicFactorController {
     public AjaxResult InsertAspect(@RequestBody UplodFile uplodFile) {
         List<Aspect> value=uplodFile.getAspects();
         for (int i=0;i<value.size();i++){
-            value.get(i).setYear(value.get(i).getImageDate().substring(0,4));
+            String year=value.get(i).getImageDate().substring(0,4);
+            value.get(i).setYear(year);
             value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
             Integer Seeding = service.InsertAspect(value.get(i));
         }
@@ -168,7 +169,8 @@ public class TopographicFactorController {
 
         List<Slope> value = uplodFile.getSlopes();
         for (int i = 0; i < value.size(); i++) {
-            value.get(i).setYear(value.get(i).getImageDate().substring(0,4));
+            String year=value.get(i).getImageDate().substring(0,4);
+            value.get(i).setYear(year);
             value.get(i).setImageDate(value.get(i).getImageDate().replace("-",""));
             Integer Seeding = service.InsertSlope(value.get(i));
         }

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

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

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

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

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,11 +6,14 @@ spring:
         driver-class-name: org.postgresql.Driver
         druid:
             master:
-                #url: jdbc:postgresql://172.16.123.212:5433/itba?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+                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:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /home/sjs/ruoyi/uploadPath
+  profile: /home/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -18,8 +18,8 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 6051
-  #port: 9800
+  #port: 6051
+  port: 9800
   servlet:
     # 应用的访问路径
     context-path: /
@@ -60,16 +60,16 @@ spring:
   # redis 配置
   redis:
     # 地址
-    #host: 172.16.123.212
-    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:

ruoyi-common/pom.xml

@@ -140,6 +140,24 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.9.4</version>
         </dependency>
+        <!--<dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+        </dependency>-->
+
+       <!-- <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>11.0.2</version>
+        </dependency>
+-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.3.7</version>
+        </dependency>
+
 
     </dependencies>
 

ruoyi-common/src/main/java/com/ruoyi/common/utils/BarChart.java

@@ -0,0 +1,276 @@
+package com.ruoyi.common.utils;
+import org.apache.poi.hpsf.Section;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.ss.usermodel.HeaderFooter;
+import org.apache.poi.ss.usermodel.Picture;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellReference;
+import org.apache.poi.util.Units;
+import org.apache.poi.wp.usermodel.HeaderFooterType;
+import org.apache.poi.wp.usermodel.Paragraph;
+import org.apache.poi.xddf.usermodel.chart.*;
+import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
+import org.apache.poi.xwpf.usermodel.*;
+
+import java.io.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.text.DecimalFormat;
+import java.util.List;
+
+import org.apache.poi.xwpf.usermodel.XWPFChart;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
+
+
+/**
+ * @Description: poi工具类
+ * @Date: 2022/10/11
+ * @Author shuaihua zang
+ */
+public class BarChart
+{
+
+    public static Double fun(Double value)
+    {
+        BigDecimal bg=new BigDecimal(value);
+        return  bg.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+    }
+
+
+
+    private void setXWPFRunStyle(XWPFRun r1,String font,int fontSize) {
+        r1.setFontSize(fontSize);
+        CTRPr rpr = r1.getCTR().isSetRPr() ? r1.getCTR().getRPr() : r1.getCTR().addNewRPr();
+        CTFonts fonts = rpr.isSetRFonts() ? rpr.getRFonts() : rpr.addNewRFonts();
+        fonts.setAscii(font);
+        fonts.setEastAsia(font);
+        fonts.setHAnsi(font);
+    }
+
+
+    public  static void createHeader(XWPFDocument doc, String orgFullName){
+       try {
+
+           CTSectPr sectPr = doc.getDocument().getBody().addNewSectPr();
+           XWPFHeaderFooterPolicy headerFooterPolicy = new XWPFHeaderFooterPolicy(doc,    sectPr);
+           XWPFHeader header = headerFooterPolicy.createHeader(XWPFHeaderFooterPolicy.DEFAULT);
+           XWPFParagraph paragraph = header.createParagraph();
+           paragraph.setAlignment(ParagraphAlignment.BOTH);   //设置段落左对齐
+           paragraph.setBorderBottom(Borders.THICK);    //设置下划线
+//           paragraph.setSpacingLineRule(LineSpacingRule.AUTO);
+           paragraph.setSpacingBetween(40,LineSpacingRule.EXACT);
+//           paragraph.setAlignment(ParagraphAlignment.CENTER);
+
+           XWPFRun run = paragraph.createRun();
+           run.setBold(false);
+            run.setFontSize(9);
+           /*
+            * 取到图片的字节流
+            * */
+           String logoFilePath="shate.png";
+           if (StringUtils.isNotEmpty(logoFilePath)) {
+               File file=new File(logoFilePath);
+               InputStream is = new FileInputStream(file);
+               XWPFPicture picture = run.addPicture(is, XWPFDocument.PICTURE_TYPE_JPEG, logoFilePath, Units.toEMU(60), Units.toEMU(30));
+               String blipID = "";
+               for(XWPFPictureData picturedata : header.getAllPackagePictures()) {    //这段必须有，不然打开的logo图片不显示
+                   blipID = header.getRelationId(picturedata);
+               }
+               picture.getCTPicture().getBlipFill().getBlip().setEmbed(blipID);
+               run.addTab();
+               is.close();
+           }
+           /*
+            * 添加字体页眉
+            * */
+           if (StringUtils.isNotEmpty(orgFullName)) {
+               run = paragraph.createRun();
+               run.setText("      "+orgFullName);
+           }
+
+
+       } catch (FileNotFoundException e) {
+           throw new RuntimeException(e);
+       } catch (IOException e) {
+           throw new RuntimeException(e);
+       } catch (InvalidFormatException e) {
+           throw new RuntimeException(e);
+       }
+
+    }
+    //绘制折线图
+    public static void drawLine(XWPFDocument document, String[] xAxisData,Double[] yAxisData) throws Exception {
+        XWPFChart xChart =  document.createChart(15 * Units.EMU_PER_CENTIMETER, 10 * Units.EMU_PER_CENTIMETER);
+//        xChart.setTitleText("海拔"); // 图表标题
+        xChart.setTitleOverlay(false);
+
+        // 5、X轴(分类轴)相关设置
+        // 创建X轴,并且指定位置
+        XDDFCategoryAxis xAxis = xChart.createCategoryAxis(AxisPosition.BOTTOM);
+        XDDFCategoryDataSource xAxisSource = XDDFDataSourcesFactory.fromArray(xAxisData); // 设置X轴数据
+//        xAxis.setTitle("海拔km²");
+        // 6、Y轴(值轴)相关设置
+        XDDFValueAxis yAxis = xChart.createValueAxis(AxisPosition.LEFT); // 创建Y轴,指定位置轴标题
+        XDDFNumericalDataSource<Double> yAxisSource = XDDFDataSourcesFactory.fromArray(yAxisData); // 设置Y轴数据
+        yAxis.setTitle("km²");
+        // 7、创建折线图对象
+        XDDFLineChartData lineChart = (XDDFLineChartData) xChart.createData(ChartTypes.LINE, xAxis, yAxis);
+
+        // 8、加载折线图数据集
+        XDDFLineChartData.Series lineSeries = (XDDFLineChartData.Series) lineChart.addSeries(xAxisSource, yAxisSource);
+        lineSeries.setSmooth(false); // 线条样式:true平滑曲线,false折线
+        lineSeries.setMarkerSize((short) 6); // 标记点大小
+        lineSeries.setMarkerStyle(MarkerStyle.CIRCLE); // 标记点样式
+
+        // 9、绘制折线图
+        xChart.plot(lineChart);
+    }
+
+    public static void drawTable(XWPFDocument document, String[] xAxisData,Double[] yAxisData) throws Exception {
+        // 创建chart图表对象,抛出异常
+//        XWPFChart chart = document.createChart(15 * Units.EMU_PER_CENTIMETER, 10 * Units.EMU_PER_CENTIMETER);
+        XWPFChart chart=document.createChart(15 * Units.EMU_PER_CENTIMETER, 11 * Units.EMU_PER_CENTIMETER);
+         chart.setTitleText("");
+        chart.setTitleOverlay(false); // 图例是否覆盖标题
+        chart.setChartBottomMargin(50);
+        // X轴(分类轴)相关设置
+        XDDFCategoryAxis xAxis =chart.createCategoryAxis(AxisPosition.BOTTOM); // 创建X轴,并且指定位置
+        xAxis.setTitle(""); // x轴标题
+        XDDFCategoryDataSource xAxisSource = XDDFDataSourcesFactory.fromArray(xAxisData); // 设置X轴数据
+        // Y轴(值轴)相关设置
+        //chart.createValueAxis(AxisPosition.LEFT);
+        XDDFValueAxis yAxis = chart.createValueAxis(AxisPosition.LEFT); // 创建Y轴,指定位置
+        yAxis.setTitle("Area(km²)"); // Y轴标题
+        yAxis.setCrossBetween(AxisCrossBetween.BETWEEN); // 设置图柱的位置:BETWEEN居中
+        XDDFNumericalDataSource<Double> yAxisSource = XDDFDataSourcesFactory.fromArray(yAxisData); // 设置Y轴数据
+        ChartTypes chartTypes = ChartTypes.BAR;
+        // 创建柱状图对象
+        XDDFBarChartData barChart = (XDDFBarChartData) chart.createData(chartTypes, xAxis, yAxis);
+        barChart.setBarDirection(BarDirection.COL); // 设置柱状图的方向:BAR横向,COL竖向,默认是BAR
+        barChart.setVaryColors(false);
+        // 加载柱状图数据集
+        XDDFBarChartData.Series barSeries = (XDDFBarChartData.Series) barChart.addSeries(xAxisSource, yAxisSource);
+        barSeries.setTitle("    ", null); // 图例标题
+        // 绘制柱状图
+        chart.plot(barChart);
+
+
+    }
+
+    //插入图片
+    public static void insertPic(XWPFDocument document,String fileAddress)
+    {
+        XWPFParagraph Paragraph = document.createParagraph();
+        Paragraph.setAlignment(ParagraphAlignment.CENTER);//对齐方式
+        XWPFRun run = Paragraph.createRun();
+        try (FileInputStream is = new FileInputStream
+                (fileAddress)) {
+            run.addPicture(is, XWPFDocument.PICTURE_TYPE_PNG,
+                    fileAddress,
+                    Units.toEMU(392), Units.toEMU(280)); // 200x200 pixels
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    //创建段落并插入文字
+    public static void createParagraphAndInsertWord(XWPFDocument document,String date) {
+        XWPFParagraph Paragraph = document.createParagraph();
+        //设置行距固定值20磅
+        //setLineSpace(Paragraph,30);
+        Paragraph.setAlignment(ParagraphAlignment.LEFT);//对齐方式
+        //paragraph_2.setFirstLineIndent(400);//首行缩进
+        XWPFRun run = Paragraph.createRun();
+        run.setText(date);
+        run.setBold(false);//加粗
+        run.setFontSize(12);
+        run.setFontFamily("Times New Roman");
+    }
+    //创建一级标题的内容
+    public static void createFirstLevelTopic(XWPFDocument document,String date)
+    {
+        XWPFParagraph Paragraph = document.createParagraph();
+        Paragraph.setAlignment(ParagraphAlignment.LEFT);//对齐方式
+        //BarChart.setLineSpace(Paragraph,30);
+        XWPFRun run = Paragraph.createRun();
+        run.setText(date);
+        run.setBold(true);//加粗
+        run.setFontSize(16);
+        run.setFontFamily("Times New Roman");
+    }
+    //创建二级标题的内容
+    public static void createSecondLevelTopic(XWPFDocument document,String date)
+    {
+        XWPFParagraph Paragraph = document.createParagraph();
+        Paragraph.setAlignment(ParagraphAlignment.LEFT);//对齐方式
+        //BarChart.setLineSpace(Paragraph,30);
+        XWPFRun run = Paragraph.createRun();
+        run.setText(date);
+        run.setBold(true);//加粗
+        run.setFontSize(12);
+        run.setFontFamily("Times New Roman");
+    }
+    //创建图片标题的内容
+    public static void setPicTitle(XWPFDocument document,String date)
+    {
+        XWPFParagraph Paragraph = document.createParagraph();
+
+//        Paragraph.setAlignment(ParagraphAlignment.CENTER);
+//// 边框
+//        Paragraph.setBorderBottom(Borders.NIL);
+//        Paragraph.setBorderTop(Borders.NIL);
+//        Paragraph.setBorderRight(Borders.NIL);
+//        Paragraph.setBorderLeft(Borders.NIL);
+//        Paragraph.setBorderBetween(Borders.SINGLE);
+//        Paragraph.setSpacingAfter(5);
+//        Paragraph.setSpacingBeforeLines(5);
+//        Paragraph.setSpacingBetween(5);
+        Paragraph.setAlignment(ParagraphAlignment.CENTER);//对齐方式
+        BarChart.setLineSpace(Paragraph,25);
+        XWPFRun run = Paragraph.createRun();
+//        run.addCarriageReturn();
+        run.setText(date);
+        run.setBold(true);//加粗
+        run.setFontSize(10);
+//        run.setFontFamily("Times New Roman");
+    }
+    //设置题目
+    public static void setTitle(XWPFDocument document,String date)
+    {
+        XWPFParagraph title = document.createParagraph();
+        title.setAlignment(ParagraphAlignment.CENTER);
+        XWPFRun runTitle = title.createRun();
+        runTitle.setText(date);
+        runTitle.setBold(true);
+        runTitle.setFontSize(20);
+        runTitle.setFontFamily("Times New Roman");
+    }
+    //设置行间距
+    public static void setLineSpace(XWPFParagraph titleParagraph,int size) {
+        CTP ctp = titleParagraph.getCTP();
+        CTPPr ppr = ctp.isSetPPr() ? ctp.getPPr() : ctp.addNewPPr();
+        CTSpacing spacing = ppr.isSetSpacing()? ppr.getSpacing() : ppr.addNewSpacing();
+        spacing.setAfter(BigInteger.valueOf(0));
+        spacing.setBefore(BigInteger.valueOf(0));
+        //设置行距类型为 EXACT
+        spacing.setLineRule(STLineSpacingRule.EXACT);
+        //1磅数是20
+        spacing.setLine(BigInteger.valueOf(size*20));
+    }
+
+    public static String getDoubleNumber(Double d)
+    {
+        DecimalFormat df = new DecimalFormat("#.00");
+       return df.format(d);
+    }
+    public static String changeDate(String date)
+    {
+        String s1 = date.substring(0, 4);
+        String s2 = date.substring(4, 6);
+        String s3 = date.substring(6, date.length());
+        return  s1+"-"+s2+"-"+s3;
+    }
+
+
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/CustomXWPFDocument.java

@@ -0,0 +1,108 @@
+package com.ruoyi.common.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlToken;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
+import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTInline;
+
+/**
+ * @Author shuaihua zang
+ * @date 2022/10/8
+ * word导出图片所需的工具类
+ */
+public class CustomXWPFDocument extends XWPFDocument{
+    public CustomXWPFDocument(InputStream in) throws IOException {
+        super(in);
+    }
+
+    public CustomXWPFDocument() {
+        super();
+    }
+
+    public CustomXWPFDocument(OPCPackage pkg) throws IOException {
+        super(pkg);
+    }
+
+    /**
+     * @param id
+     * @param width
+     *            宽
+     * @param height
+     *            高
+     * @param paragraph
+     *            段落
+     */
+    public void createPicture(int id, int width, int height,
+                              XWPFParagraph paragraph) {
+        final int EMU = 9525;
+        width *= EMU;
+        height *= EMU;
+        String blipId = super.getRelationId(super.getAllPictures().get(id));
+        CTInline inline = paragraph.createRun().getCTR().addNewDrawing()
+                .addNewInline();
+        String picXml = ""
+                + "<a:graphic xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\">"
+                + "   <a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/picture\">"
+                + "      <pic:pic xmlns:pic=\"http://schemas.openxmlformats.org/drawingml/2006/picture\">"
+                + "         <pic:nvPicPr>" + "            <pic:cNvPr id=\""
+                + id
+                + "\" name=\"Generated\"/>"
+                + "            <pic:cNvPicPr/>"
+                + "         </pic:nvPicPr>"
+                + "         <pic:blipFill>"
+                + "            <a:blip r:embed=\""
+                + blipId
+                + "\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"/>"
+                + "            <a:stretch>"
+                + "               <a:fillRect/>"
+                + "            </a:stretch>"
+                + "         </pic:blipFill>"
+                + "         <pic:spPr>"
+                + "            <a:xfrm>"
+                + "               <a:off x=\"0\" y=\"0\"/>"
+                + "               <a:ext cx=\""
+                + width
+                + "\" cy=\""
+                + height
+                + "\"/>"
+                + "            </a:xfrm>"
+                + "            <a:prstGeom prst=\"rect\">"
+                + "               <a:avLst/>"
+                + "            </a:prstGeom>"
+                + "         </pic:spPr>"
+                + "      </pic:pic>"
+                + "   </a:graphicData>" + "</a:graphic>";
+
+        inline.addNewGraphic().addNewGraphicData();
+        XmlToken xmlToken = null;
+        try {
+            xmlToken = XmlToken.Factory.parse(picXml);
+        } catch (XmlException xe) {
+            xe.printStackTrace();
+        }
+        inline.set(xmlToken);
+
+        inline.setDistT(0);
+        inline.setDistB(0);
+        inline.setDistL(0);
+        inline.setDistR(0);
+
+        CTPositiveSize2D extent = inline.addNewExtent();
+        extent.setCx(width);
+        extent.setCy(height);
+
+        CTNonVisualDrawingProps docPr = inline.addNewDocPr();
+        docPr.setId(id);
+        docPr.setName("图片名称");
+        docPr.setDescr("描述信息");
+    }
+
+}
+

ruoyi-common/src/main/java/com/ruoyi/common/utils/StringFilterUtil.java

@@ -0,0 +1,146 @@
+package com.ruoyi.common.utils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class StringFilterUtil {
+    /** 过滤字符串，去除[]中的内容，包括[]
+     * @param input
+     * @return
+     */
+    public static String filterForBetween(String input, char startChar, char endChar) {
+        int head = input.indexOf(startChar); // 标记第一个使用左括号的位置
+        if (head == -1) {
+            return input; // 如果context中不存在括号，什么也不做，直接跑到函数底端返回初值str
+        } else {
+            int next = head + 1; // 从head+1起检查每个字符
+            int count = 1; // 记录括号情况
+            do {
+                if (input.charAt(next) == startChar)
+                    count++;
+                else if (input.charAt(next) == endChar)
+                    count--;
+                next++; // 更新即将读取的下一个字符的位置
+                if (count == 0) // 已经找到匹配的括号
+                {
+                    String temp = input.substring(head, next); // 将两括号之间的内容及括号提取到temp中
+                    input = input.replace(temp, ""); // 用空内容替换，复制给context
+                    head = input.indexOf(endChar); // 找寻下一个左括号
+                    next = head + 1; // 标记下一个左括号后的字符位置
+                    count = 1; // count的值还原成1
+                }
+            } while (head != -1); // 如果在该段落中找不到左括号了，就终止循环
+        }
+        return input; // 返回更新后的context
+    }
+
+    /**
+     * str.replaceAll("\\s*", ""); //s* 可以匹配空格、制表符、换页符等空白字符的其中任意一个。
+     * str.replaceAll(" +","");  //去掉所有空格，包括首尾、中间
+     * str.replaceAll(" ", ""); //去掉所有空格，包括首尾、中间
+     * str.replace(" ",""); //去除所有空格，包括首尾、中间
+     * str.trim(); //去掉首尾空格
+     * @param inputStr
+     * @return
+     */
+    public static String filterForBlank(String inputStr){
+        if(inputStr.length()==0||inputStr==null) {
+            return "";
+        }
+        return inputStr.replace(" ", "");
+    }
+
+    /** 过滤字符串，只允许字母和数字
+     * @param inputStr
+     * @return
+     */
+    public static String filterForChars(String inputStr) {
+        if(inputStr.length()==0||inputStr==null) {
+            return "";
+        }
+        String regEx = "[^a-zA-Z0-9]";
+        Pattern p = Pattern.compile(regEx);
+        Matcher m = p.matcher(inputStr);
+        return m.replaceAll("").trim();
+    }
+
+    /**过滤字符串，替换特殊字符
+     * <pre>
+     * StringFilterUtil.filterForSpechars(null)
+     * </pre>
+     * @param inputStr
+     * @return
+     */
+    public static String filterForSpechars(String inputStr) {
+        if(inputStr.length()==0||inputStr==null) {
+            return "";
+        }
+        String regEx = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]";
+        Pattern p = Pattern.compile(regEx);
+        Matcher m = p.matcher(inputStr);
+        return m.replaceAll("").trim();
+    }
+
+    /**过滤字符串，去除html标记
+     * <pre>
+     * StringFilterUtil.filterForHtml(null) = ""
+     * StringFilterUtil.filterForHtml("") = ""
+     * StringFilterUtil.filterForHtml("<td>content</td>") = "content"
+     * </pre>
+     * @param inputStr
+     * @return
+     */
+    public static String filterForHtml(String inputStr) {
+        if(inputStr.length()==0||inputStr==null) {
+            return "";
+        }
+        String regEx = "<.+?>";
+        Pattern p = Pattern.compile(regEx, Pattern.DOTALL);
+        Matcher m = p.matcher(inputStr);
+        return m.replaceAll("");
+    }
+
+    /**过滤字符串，查询href条件
+     * <pre>
+     * StringFilterUtil.filterForHref(null)
+     * </pre>
+     * @param inputStr
+     * @return
+     */
+    public static String filterForHref(String inputStr) {
+        if(inputStr.length()==0||inputStr==null) {
+            return "";
+        }
+        String regEx = "href=\"(.+?)\"";
+        Pattern p = Pattern.compile(regEx);
+        Matcher m = p.matcher(inputStr);
+        if(m.find()) {
+            return m.group(1);
+        }else {
+            return "";
+        }
+    }
+
+    /**过滤字符串，匹配http://地址//，获取Url地址
+     * @param inputStr
+     * @return
+     *     备注：地址后需要以空格结束
+     */
+    public static String filterForUrl(String inputStr) {
+        if(inputStr.length()==0||inputStr==null) {
+            return "";
+        }
+        String regEx = "(http://|https://){1}[\\w\\.\\-/:]+";
+        Pattern p = Pattern.compile(regEx);
+        Matcher m = p.matcher(inputStr);
+        StringBuffer buffer = new StringBuffer();
+        while(m.find()){
+            buffer.append(m.group());
+            buffer.append("\r\n");
+        }
+        return buffer.toString();
+    }
+
+
+
+}

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

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

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

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

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/Altitude.java

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

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/Aspect.java

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

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/DateUpload.java

@@ -10,7 +10,7 @@ import java.util.List;
  * @Author: JinSheng Song
  * @Date: 2022/7/11 15:32
  */
-public class DateUpload
+public class DateUpload extends  SysSTEntity
 {
     private String id;
 

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/PlantingSuitability.java

@@ -18,6 +18,7 @@ public class PlantingSuitability extends  SysSTEntity
 
     private String zone;
 
+    private  Double max;
 
     private Double verySuitable;
 
@@ -31,7 +32,6 @@ public class PlantingSuitability extends  SysSTEntity
 
     private  String total;
 
-    private  Double max;
 
     private String productCode1;
 

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/RegionName.java

@@ -0,0 +1,15 @@
+package com.ruoyi.system.domain_shate;
+
+import java.util.List;
+
+public class RegionName {
+    private List<RegionNameVO> regionName;
+
+    public List<RegionNameVO> getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(List<RegionNameVO> regionName) {
+        this.regionName = regionName;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/RegionNameVO.java

@@ -0,0 +1,29 @@
+package com.ruoyi.system.domain_shate;
+
+public class RegionNameVO {
+    /**
+     * 历史
+     */
+    private  String originalName;
+    /**
+     * 当前
+     */
+    private  String currentName;
+
+
+    public String getOriginalName() {
+        return originalName;
+    }
+
+    public void setOriginalName(String originalName) {
+        this.originalName = originalName;
+    }
+
+    public String getCurrentName() {
+        return currentName;
+    }
+
+    public void setCurrentName(String currentName) {
+        this.currentName = currentName;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/RoadFactor.java

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

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/SeedingSuccessRate.java

@@ -24,6 +24,8 @@ public class SeedingSuccessRate extends  SysSTEntity
 
     private Double seedingSuccessArea;
 
+
+
     private Double seedingSuccess;
 
     private String imageDate;
@@ -141,6 +143,7 @@ public class SeedingSuccessRate extends  SysSTEntity
         this.productCode3 = productCode3;
         this.createdBy = createdBy;
         this.createdTime = createdTime;
+
     }
 
     public String getYear() {

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/SoilSalinization.java

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

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/SysSTEntity.java

@@ -5,6 +5,8 @@ package com.ruoyi.system.domain_shate;
  * @Date: 2022/7/11 10:02
  */
 public class SysSTEntity {
+
+    private  String regionName;
     private  String link;
 
     public String getLink() {
@@ -14,4 +16,12 @@ public class SysSTEntity {
     public void setLink(String link) {
         this.link = link;
     }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/VegetationHealth.java

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

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/WaterFactor.java

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

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/WordHelp.java

@@ -0,0 +1,30 @@
+package com.ruoyi.system.domain_shate;
+
+import java.sql.DataTruncation;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/11/14 16:20
+ */
+public class WordHelp {
+
+    private String year;
+
+    private String[] zone;
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String[] getZone() {
+        return zone;
+    }
+
+    public void setZone(String[] zone) {
+        this.zone = zone;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/WordVo.java

@@ -0,0 +1,24 @@
+package com.ruoyi.system.domain_shate;
+
+public class WordVo {
+
+  private   String [] zoneList;
+
+  private  String[] year;
+
+    public String[] getZoneList() {
+        return zoneList;
+    }
+
+    public void setZoneList(String[] zoneList) {
+        this.zoneList = zoneList;
+    }
+
+    public String[] getYear() {
+        return year;
+    }
+
+    public void setYear(String[] year) {
+        this.year = year;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/lanUseNew.java

@@ -4,7 +4,7 @@ package com.ruoyi.system.domain_shate;
  * @Author: JinSheng Song
  * @Date: 2022/7/23 16:38
  */
-public class lanUseNew
+public class lanUseNew extends SysSTEntity
 {
     private Integer id;
 

ruoyi-system/src/main/java/com/ruoyi/system/domain_shate/paging.java

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

ruoyi-system/src/main/java/com/ruoyi/system/mapper_shate/DateUploadMapper.java

@@ -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);
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper_shate/PlantingSuitabilityMapper.java

@@ -14,6 +14,9 @@ public interface PlantingSuitabilityMapper
 {
     List<PlantingSuitability> sqlSeeding(@Param("zone") String zone);
 
+    PlantingSuitability sqlSeeding1(@Param("zone") String zone,
+                                         @Param("year") String year);
+
     Integer  InsertSeeding(PlantingSuitability suitability);
 
     List<PlantingSuitability> sqlYear();

ruoyi-system/src/main/java/com/ruoyi/system/mapper_shate/VegetationHealthMapper.java

@@ -21,4 +21,8 @@ public interface VegetationHealthMapper
     List<VegetationHealth> sqlYear();
 
     Integer insertSeeding(VegetationHealth health);
+
+
+    List<VegetationHealth> sqlInfo(@Param("zone")String zone,
+                                   @Param("year")String year);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_shate/updateAllRegionNameMapper.java

@@ -0,0 +1,49 @@
+package com.ruoyi.system.mapper_shate;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface updateAllRegionNameMapper {
+
+    Integer altitude(@Param("regionName") String regionName,
+                     @Param("regionName1") String regionName1);
+
+    Integer Aspect(@Param("regionName") String regionName,
+                     @Param("regionName1") String regionName1);
+
+    Integer Slope(@Param("regionName") String regionName,
+                     @Param("regionName1") String regionName1);
+
+    Integer salinization(@Param("regionName") String regionName,
+                     @Param("regionName1") String regionName1);
+
+    Integer moisture(@Param("regionName") String regionName,
+                     @Param("regionName1") String regionName1);
+
+    Integer desertification(@Param("regionName") String regionName,
+                     @Param("regionName1") String regionName1);
+
+    Integer road(@Param("regionName") String regionName,
+                     @Param("regionName1") String regionName1);
+
+    Integer water(@Param("regionName") String regionName,
+                     @Param("regionName1") String regionName1);
+
+    Integer landuse(@Param("regionName") String regionName,
+                     @Param("regionName1") String regionName1);
+    Integer dataUpload(@Param("regionName") String regionName,
+                       @Param("regionName1") String regionName1);
+
+    Integer suitability(@Param("regionName") String regionName,
+                       @Param("regionName1") String regionName1);
+
+    Integer waterArea(@Param("regionName") String regionName,
+                        @Param("regionName1") String regionName1);
+
+    Integer seedSuccess(@Param("regionName") String regionName,
+                     @Param("regionName1") String regionName1);
+
+    Integer healthy(@Param("regionName") String regionName,
+                        @Param("regionName1") String regionName1);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_shate/IDateUploadService.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
+import java.util.StringTokenizer;
 
 /**
  * @Author: JinSheng Song
@@ -13,6 +14,8 @@ import java.util.List;
  */
 public interface IDateUploadService {
 
+    List<String> queryZone();
+
     List<DateUpload> selectUpload( String zone,
                                    String type,
                                    String type1,
@@ -58,7 +61,7 @@ public interface IDateUploadService {
                        String imageDate);
     Integer salinization(  String zone,
                            String imageDate);
-    Integer healthy(  String zone,
+    Integer healthy(String zone,
                     String imageDate,
                     String resolution);
     Integer water(  String zone,

ruoyi-system/src/main/java/com/ruoyi/system/service_shate/ILandUseServices.java

@@ -1,7 +1,10 @@
 package com.ruoyi.system.service_shate;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain_shate.LandUse;
+import com.ruoyi.system.domain_shate.RegionNameVO;
 import com.ruoyi.system.domain_shate.SeedingSuccessRate;
+import com.ruoyi.system.domain_shate.UplodFile;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,4 +24,8 @@ public interface ILandUseServices
 
     List<LandUse> sqlYear();
 
+    UplodFile  mainClass(String zone,String year);
+
+    AjaxResult updateAllRegionName(List<RegionNameVO> region);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_shate/IPlantingSuitabilityService.java

@@ -13,6 +13,8 @@ public interface IPlantingSuitabilityService
 {
     List<PlantingSuitability> sqlSeeding(String zone);
 
+    PlantingSuitability sqlSeeding1(String zone,String year);
+
     Integer  InsertSeeding(PlantingSuitability suitability);
 
     List<PlantingSuitability> sqlYear();

ruoyi-system/src/main/java/com/ruoyi/system/service_shate/ISeedingSuccessService.java

@@ -20,4 +20,7 @@ public interface ISeedingSuccessService {
     Integer InsertSeeding2(SeedingSuccessRate eastVO);
 
     Integer Delete(String zone,String imageDate,String name);
+
+
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_shate/IVegetationHealthServices.java

@@ -15,6 +15,8 @@ public interface IVegetationHealthServices {
     List<VegetationHealth> sqlSeeding(String zone,String name,String year);
 
     List<VegetationHealth> sqlYear();
-
+    List<VegetationHealth> sqlInfo(String zone,String year);
     Integer insertSeeding(VegetationHealth health);
+
+
 }

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

@@ -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

ruoyi-system/src/main/java/com/ruoyi/system/service_shate/impl/LandUseServiceipml.java

@@ -1,35 +1,61 @@
 package com.ruoyi.system.service_shate.impl;
 
-import com.ruoyi.system.domain_shate.LandUse;
-import com.ruoyi.system.domain_shate.SeedingSuccessRate;
-import com.ruoyi.system.mapper_shate.LandUseMapper;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_shate.*;
+import com.ruoyi.system.mapper_shate.*;
 import com.ruoyi.system.service_shate.ILandUseServices;
+import com.ruoyi.system.service_shate.IRegionalFactorService;
+import com.ruoyi.system.service_shate.ISoilFactorService;
+import com.ruoyi.system.service_shate.ITopographicFactorService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.Year;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @Author: JinSheng Song
  * @Date: 2022/7/8 11:20
  */
 @Service
-public class LandUseServiceipml implements ILandUseServices
-{
+public class LandUseServiceipml implements ILandUseServices {
+
+    @Resource
+    private  PlantingSuitabilityMapper plantingSuitabilityMapper;
+
+    @Resource
+    private SeedingSuccessMapper seedingSuccessMapper;
+
+    @Resource
+    private VegetationHealthMapper vegetationHealthMapper;
+
     @Resource
     private LandUseMapper mapper;
 
+    @Resource
+    private updateAllRegionNameMapper updateAllRegionNameMapper;
+
+    @Resource
+    private ITopographicFactorService factorService;
+
+    @Resource
+    private ISoilFactorService soilFactorService;
+
+    @Resource
+    private IRegionalFactorService regionalFactorService;
+
     @Override
-    public List<LandUse> sqlSeeding(String zone, String[] landUses,String year) {
-        List<LandUse> value=mapper.sqlSeeding(zone, landUses,year);
+    public List<LandUse> sqlSeeding(String zone, String[] landUses, String year) {
+        List<LandUse> value = mapper.sqlSeeding(zone, landUses, year);
         return value;
     }
 
     @Override
     public List<LandUse> sqlSeeding1(String zone, String year) {
-        List<LandUse> value=mapper.sqlSeeding1(zone,year);
+        List<LandUse> value = mapper.sqlSeeding1(zone, year);
         return value;
     }
 
@@ -42,4 +68,81 @@ public class LandUseServiceipml implements ILandUseServices
     public List<LandUse> sqlYear() {
         return mapper.sqlYear();
     }
+
+    @Override
+    public UplodFile mainClass(String zone, String year) {
+
+        UplodFile file = new UplodFile();
+        //播种成活率
+        List<SeedingSuccessRate> information= seedingSuccessMapper.sqlSeeding(zone,year);
+        //植被健康状况
+        List<VegetationHealth> vegetationHealths=vegetationHealthMapper.sqlInfo(zone,year);
+        //种植适宜性
+        List<PlantingSuitability> plantingSuitabilities=plantingSuitabilityMapper.sqlSeeding(zone);
+        //海拔
+        List<Altitude> altitude = factorService.sqlAltitude(zone, year);
+        //坡度
+        List<Slope> slopes = factorService.sqlSlope(zone, year);
+        //坡向
+        List<Aspect> aspects = factorService.sqlAspect(zone, year);
+        //沙化指数
+        List<SoilDesertification> desertifications = soilFactorService.sqlDesert(zone, year);
+        //湿度指数
+        List<SoilMoisture> moistures = soilFactorService.sqlMoisture(zone, year);
+        //盐渍化指数
+        List<SoilSalinization> salinizations = soilFactorService.sqlSalin(zone, year);
+        //水域因子
+        List<WaterFactor> waterFactors = regionalFactorService.sqlWater(zone, year);
+        //道路因子
+        List<RoadFactor> roadFactors = regionalFactorService.sqlRoad(zone, year);
+        file.setInformation(information);
+        file.setVegetationHealths(vegetationHealths);
+        file.setPlantingSuitabilities(plantingSuitabilities);
+        file.setWaterFactors(waterFactors);
+        file.setRoadFactors(roadFactors);
+        file.setSoilMoistures(moistures);
+        file.setSoilSalinizations(salinizations);
+        file.setSoilDesertifications(desertifications);
+        file.setAspects(aspects);
+        file.setSlopes(slopes);
+        file.setAltitudes(altitude);
+        return file;
+    }
+
+    @Override
+    public AjaxResult updateAllRegionName(List<RegionNameVO> region) {
+        try {
+            List<RegionNameVO> regionNameLists = region.stream().distinct().collect(Collectors.toList());
+            regionNameLists.forEach(e -> {
+                try {
+                    Thread.currentThread().sleep(100);
+                } catch (InterruptedException ex) {
+                    throw new RuntimeException(ex);
+                }
+
+                String regionName = e.getCurrentName();
+                String regionName1 = e.getOriginalName();
+                System.out.println("输出参数"+regionName+regionName1);
+                updateAllRegionNameMapper.desertification(regionName, regionName1);
+                updateAllRegionNameMapper.altitude(regionName, regionName1);
+                updateAllRegionNameMapper.Aspect(regionName, regionName1);
+                updateAllRegionNameMapper.Slope(regionName, regionName1);
+                updateAllRegionNameMapper.salinization(regionName, regionName1);
+                updateAllRegionNameMapper.moisture(regionName, regionName1);
+                updateAllRegionNameMapper.road(regionName, regionName1);
+                updateAllRegionNameMapper.water(regionName, regionName1);
+                updateAllRegionNameMapper.landuse(regionName, regionName1);
+                updateAllRegionNameMapper.dataUpload(regionName,regionName1);
+                updateAllRegionNameMapper.suitability(regionName,regionName1);
+                updateAllRegionNameMapper.waterArea(regionName,regionName1);
+                updateAllRegionNameMapper.seedSuccess(regionName,regionName1);
+                updateAllRegionNameMapper.healthy(regionName,regionName1);
+            });
+            return AjaxResult.success("成功！");
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_shate/impl/PlantingSuitabilityServiceIpml.java

@@ -22,6 +22,12 @@ public class PlantingSuitabilityServiceIpml implements IPlantingSuitabilityServi
         return value;
     }
 
+    @Override
+    public PlantingSuitability sqlSeeding1(String zone, String year) {
+        PlantingSuitability value=mapper.sqlSeeding1(zone,year);
+        return value;
+    }
+
     @Override
     public Integer InsertSeeding(PlantingSuitability suitability) {
         return mapper.InsertSeeding(suitability);

ruoyi-system/src/main/java/com/ruoyi/system/service_shate/impl/SeedingSuccessServiceimpl.java

@@ -22,6 +22,7 @@ public class SeedingSuccessServiceimpl implements ISeedingSuccessService
     public List<SeedingSuccessRate> sqlSeeding(String zone, String year)
     {
         List<SeedingSuccessRate> vaue =mapper.sqlSeeding(zone,year);
+
         return vaue;
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service_shate/impl/VegetationHealthServiceimpl.java

@@ -30,8 +30,15 @@ public class VegetationHealthServiceimpl implements IVegetationHealthServices
         return mapper.sqlYear();
     }
 
+    @Override
+    public List<VegetationHealth> sqlInfo(String zone,String year) {
+        return mapper.sqlInfo(zone,year);
+    }
+
     @Override
     public Integer insertSeeding(VegetationHealth health) {
         return mapper.insertSeeding(health);
     }
+
+
 }

ruoyi-system/src/main/resources/mapper/system/DateUploadMapper.xml

@@ -29,12 +29,13 @@
         <result property="size" column="size"/>
         <result property="month" column="month"/>
         <result property="route" column="route"/>
+        <result property="regionName"  column="region_name"/>
 
     </resultMap>
 
     <sql id="columns">
 	    <![CDATA[
-        ID,Zone,data_id ,year1,route,link,type,month ,type1,type2,file_name,data_time,created_time,type,data_id,area,band_index,bands,cols,depth,description,extent,name,projection,resolution,size
+        ID,Zone,region_name,data_id ,year1,route,link,type,month ,type1,type2,file_name,data_time,created_time,type,data_id,area,band_index,bands,cols,depth,description,extent,name,projection,resolution,size
         ]]>
 	</sql>
 
@@ -55,11 +56,14 @@
             AND type = #{type}
         </if>
 
-<!--        <if test="dateTime!= null and dateTime !=''">-->
-<!--            AND data_time = #{dateTime}-->
-<!--        </if>-->
+        <!--        <if test="dateTime!= null and dateTime !=''">-->
+        <!--            AND data_time = #{dateTime}-->
+        <!--        </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
@@ -91,10 +95,11 @@
         <if test="name!= null and name !=''">
             AND file_name like #{name}
         </if>
-        <if test="dateTime!= null and dateTime !=''">
-            AND data_Time = #{dateTime}
-        </if>
 
+        <if test="dateTime != null and dateTime !=''">
+            AND data_time=#{dateTime}
+        </if>
+        ORDER BY created_time desc
     </select>
 
     <select id="selectShpfile" resultMap="RM_Upload">
@@ -136,6 +141,7 @@
         <![CDATA[
         INSERT INTO Data_Upload (
             zone ,
+            region_name,
             type ,
             type1 ,
             type2,
@@ -159,6 +165,7 @@
             month,
             created_time
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{type,jdbcType=VARCHAR},
                      #{type1,jdbcType=VARCHAR},
@@ -237,13 +244,13 @@
     </delete>
 
     <delete id="seedSuccess">
-        DELETE FROM #{seed_Success}
+        DELETE FROM "seed_Success"
         WHERE zone = #{zone}
           and image_date =#{imageDate}
     </delete>
 
     <delete id="vegetationDistribution">
-        DELETE FROM "vegetation_Distrbution"
+        DELETE FROM "vegetation_Distribution"
         WHERE zone = #{zone}
           and image_date =#{imageDate}
     </delete>

ruoyi-system/src/main/resources/mapper/system/LandUseMapper.xml

@@ -4,9 +4,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper_shate.LandUseMapper">
     <resultMap id="RM_Seeding" type="com.ruoyi.system.domain_shate.LandUse">
-
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="landUse" column="Land_use"/>
         <result property="area" column="area"/>
         <result property="total"  column="total"/>
@@ -22,7 +22,7 @@
 
     <sql id="columns">
 	    <![CDATA[
-        ID,zone,land_use,year1,total,area,percent,Image_date,Product_code1,Product_code2,Product_code3,created_by
+        ID,zone,region_name,land_use,year1,total,area,percent,Image_date,Product_code1,Product_code2,Product_code3,created_by
         ]]>
 	</sql>
 
@@ -43,6 +43,7 @@
         SELECT  <include refid="columns"/>  FROM  landuse
         where 1=1
         <if test="zone!= null and zone !=''">
+
             AND zone = #{zone}
         </if>
         <if test="year!= null and year !=''">
@@ -52,13 +53,14 @@
     </select>
 
     <select id="sqlYear" resultMap="RM_Seeding">
-        SELECT  distinct year1,ZONE  FROM  landuse   ORDER BY ZONE
+        SELECT  distinct year1,ZONE,region_name   FROM  landuse ORDER BY ZONE
     </select>
 
         <insert id="insertSeeding">
             <![CDATA[
             INSERT INTO landuse (
                 zone ,
+                region_name,
                 Land_use,
                 total,
                 area ,
@@ -70,6 +72,7 @@
                 year1,
                 created_by
             ) VALUES (
+                                     #{zone,jdbcType=VARCHAR},
                                      #{zone,jdbcType=VARCHAR},
                                      #{landUse,jdbcType=DOUBLE},
                                      #{total,jdbcType=DOUBLE},

ruoyi-system/src/main/resources/mapper/system/PlantingSuitabilityMapper.xml

@@ -7,6 +7,7 @@
 
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="verySuitable" column="very_suitable"/>
         <result property="suitable" column="Suitable"/>
         <result property="notSuitable" column="Not_Suitable"/>
@@ -22,7 +23,7 @@
 
     <sql id="columns">
 	    <![CDATA[
-        ID,zone,very_suitable,year1,Suitable,Not_Suitable,Total_Area,Image_date,Product_code1,Product_code2,Product_code3,created_by,created_time
+        ID,zone,region_name,very_suitable,year1,Suitable,Not_Suitable,Total_Area,Image_date,Product_code1,Product_code2,Product_code3,created_by,created_time
         ]]>
 	</sql>
 
@@ -34,14 +35,27 @@
         </if>
     </select>
 
+
+    <select id="sqlSeeding1" resultMap="RM_Seeding">
+        SELECT  <include refid="columns"/>  FROM  suitability
+        WHERE 1=1
+        <if test="zone!= null and zone !=''">
+            AND zone = #{zone}
+        </if>
+        <if test="year!= null and year !=''">
+            AND year1 = #{year}
+        </if>
+    </select>
+
     <select id="sqlYear" resultMap="RM_Seeding">
-        SELECT  distinct year1,ZONE  FROM  suitability
+        SELECT  distinct year1,ZONE,region_name  FROM  suitability
     </select>
 
     <insert id="InsertSeeding">
         <![CDATA[
         INSERT INTO suitability (
             zone ,
+            region_name,
             very_suitable,
             Suitable ,
             Not_Suitable ,
@@ -53,6 +67,7 @@
             year1,
             created_by
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{verySuitable,jdbcType=DOUBLE},
                      #{suitable,jdbcType=DOUBLE},

ruoyi-system/src/main/resources/mapper/system/RegionalFactorMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="RM_Seeding" type="com.ruoyi.system.domain_shate.WaterFactor">
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="level1" column="level1"/>
         <result property="level2" column="level2"/>
         <result property="level3" column="level3"/>
@@ -23,6 +24,7 @@
     <resultMap id="RM_Road" type="com.ruoyi.system.domain_shate.RoadFactor">
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="level1" column="level1"/>
         <result property="level2" column="level2"/>
         <result property="level3" column="level3"/>
@@ -39,6 +41,7 @@
     <resultMap id="RM_Region" type="com.ruoyi.system.domain_shate.RegionIndex">
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="waterArea" column="Water_area"/>
         <result property="roadLength" column="Road_length"/>
         <result property="imageDate" column="Image_date"/>
@@ -59,7 +62,7 @@
 
     <sql id="columns">
 	    <![CDATA[
-        ID,zone,level5,year1,level1,level2,level3,level4,Image_date,Product_code1,Product_code2,created_by
+        ID,zone,region_name,level5,year1,level1,level2,level3,level4,Image_date,Product_code1,Product_code2,created_by
         ]]>
 	</sql>
     <sql id="Region">
@@ -97,9 +100,9 @@
     </select>
 
     <select id="sqlRegion" resultMap="RM_Region">
-        select a.zone zone,a.year1 year1,a.water_area water_area,
-        b.road_length road_length,a.image_date image_date,
-        a.product_code product_code,b.product_code product_code1
+        select a.zone as zone,a.year1 as year1,a.water_area as water_area,a.region_name as region_name,
+        b.road_length as road_length,a.image_date as image_date,
+        a.product_code as product_code,b.product_code as product_code1
         FROM water_area a join road_length b
         on a.image_date=b.image_date
         and a.zone=b.zone
@@ -113,7 +116,7 @@
     </select>
 
     <select id="sqlYear1" resultMap="RM_Region">
-        SELECT  distinct year1,ZONE  FROM  water_area
+        SELECT  distinct year1,ZONE,region_name FROM  water_area
     </select>
 
     <select id="sqlRoad" resultMap="RM_Road">
@@ -127,13 +130,14 @@
         </if>
     </select>
     <select id="sqlYear2" resultMap="RM_Road">
-        SELECT  distinct year1,ZONE  FROM  road
+        SELECT  distinct year1,ZONE,region_name  FROM  road
     </select>
 
     <insert id="InsertWater">
         <![CDATA[
         INSERT INTO water (
             zone ,
+            region_name,
             level1,
             level2 ,
             level3 ,
@@ -145,6 +149,7 @@
             year1,
             created_by
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{level1,jdbcType=DOUBLE},
                      #{level2,jdbcType=DOUBLE},
@@ -163,6 +168,7 @@
         <![CDATA[
         INSERT INTO road (
             zone ,
+            region_name,
             level1,
             level2 ,
             level3 ,
@@ -174,6 +180,7 @@
             year1,
             created_by
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{level1,jdbcType=DOUBLE},
                      #{level2,jdbcType=DOUBLE},
@@ -194,11 +201,13 @@
         <![CDATA[
         INSERT INTO water_area (
             zone ,
+            region_name,
             Water_area,
             Image_date ,
             Product_code,
             year1
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{waterArea,jdbcType=DOUBLE},
                      #{imageDate,jdbcType=VARCHAR},

ruoyi-system/src/main/resources/mapper/system/SeedingSuccessMapper.xml

@@ -7,11 +7,12 @@
 
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="plantingArea" column="Planting_area"/>
         <result property="seedingSuccessArea" column="Seeding_success_area"/>
         <result property="seedingSuccess" column="seeding_success"/>
         <result property="imageDate" column="Image_date"/>
-        <result property="productCode1" column="Product_code1"/>
+        <result property="productCode1" column="productCode1"/>
         <result property="productCode2" column="Product_code2"/>
         <result property="productCode3" column="Product_code3"/>
         <result property="year" column="year1"/>
@@ -27,14 +28,15 @@
 	</sql>
 
     <select id="sqlSeeding" resultMap="RM_Seeding">
-        select distinct a.product_code2 Product_code2,
-                        a.zone zone,
-                        a.seeding_success_rate seeding_success,
-                        a.product_code1 productCode1,
-                        a.image_date Image_date,
-                        b.seeding_success_area Seeding_success_area,
-                        b.product_code2 Product_code3,
-                        a.year1 year1
+        select distinct a.product_code2 as Product_code2,
+                        a.region_name as region_name,
+                        a.zone as zone,
+                        a.seeding_success_rate as seeding_success,
+                        a.product_code1 as productCode1,
+                        a.image_date as Image_date,
+                        b.seeding_success_area as Seeding_success_area,
+                        b.product_code2 as Product_code3,
+                        a.year1 as year1
         from "seed_Success" a
             left join "vegetation_Distribution" b
             on a.image_date=b.image_date
@@ -49,7 +51,7 @@
     </select>
 
     <select id="sqlYear" resultMap="RM_Seeding">
-        SELECT  distinct year1,ZONE  FROM  "seed_Success"
+        SELECT  distinct year1,ZONE,region_name  FROM  "seed_Success"
     </select>
 
     <insert id="InsertSeeding2">
@@ -74,12 +76,14 @@
         <![CDATA[
         INSERT INTO "seed_Success" (
             zone ,
+            region_name,
             seeding_Success_Rate ,
             Image_date ,
             Product_code1 ,
             year1 ,
             Product_code2
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{seedingSuccess,jdbcType=DOUBLE},
                      #{imageDate,jdbcType=VARCHAR},

ruoyi-system/src/main/resources/mapper/system/SoilFactorMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="RM_Desert" type="com.ruoyi.system.domain_shate.SoilDesertification">
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="level1" column="level1"/>
         <result property="level2" column="level2"/>
         <result property="level3" column="level3"/>
@@ -22,6 +23,7 @@
     <resultMap id="RM_Moisture" type="com.ruoyi.system.domain_shate.SoilMoisture">
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="level1" column="level1"/>
         <result property="level2" column="level2"/>
         <result property="level3" column="level3"/>
@@ -38,6 +40,7 @@
     <resultMap id="RM_Salin" type="com.ruoyi.system.domain_shate.SoilSalinization">
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="level1" column="level1"/>
         <result property="level2" column="level2"/>
         <result property="level3" column="level3"/>
@@ -53,7 +56,7 @@
 
     <sql id="columns">
 	    <![CDATA[
-        ID,zone,level5,year1,level1,level2,level3,level4,Image_date,Product_code1,Product_code2,created_by
+        ID,zone,region_name,level5,year1,level1,level2,level3,level4,Image_date,Product_code1,Product_code2,created_by
         ]]>
 	</sql>
 
@@ -70,7 +73,7 @@
     </select>
 
     <select id="sqlYear" resultMap="RM_Desert">
-        SELECT  distinct year1,ZONE  FROM  desertification
+        SELECT  distinct year1,ZONE,region_name  FROM  desertification
     </select>
 
     <select id="sqlMoisture" resultMap="RM_Moisture">
@@ -85,7 +88,7 @@
     </select>
 
     <select id="sqlYear1" resultMap="RM_Moisture">
-        SELECT  distinct year1,ZONE  FROM  moisture
+        SELECT  distinct year1,ZONE,region_name  FROM  moisture
     </select>
 
     <select id="sqlSalin" resultMap="RM_Salin">
@@ -100,13 +103,14 @@
     </select>
 
     <select id="sqlYear2" resultMap="RM_Salin">
-        SELECT  distinct year1,ZONE  FROM  salinization
+        SELECT  distinct year1,ZONE,region_name  FROM  salinization
     </select>
 
     <insert id="InsertDesert">
         <![CDATA[
         INSERT INTO desertification (
             zone ,
+            region_name,
             level1,
             level2 ,
             level3 ,
@@ -118,6 +122,7 @@
             year1,
             created_by
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{level1,jdbcType=DOUBLE},
                      #{level2,jdbcType=DOUBLE},
@@ -136,6 +141,7 @@
         <![CDATA[
         INSERT INTO moisture (
             zone ,
+            region_name,
             level1,
             level2 ,
             level3 ,
@@ -147,6 +153,7 @@
             year1,
             created_by
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{level1,jdbcType=DOUBLE},
                      #{level2,jdbcType=DOUBLE},
@@ -166,6 +173,7 @@
         <![CDATA[
         INSERT INTO salinization (
             zone ,
+            region_name,
             level1,
             level2 ,
             level3 ,
@@ -177,6 +185,7 @@
             year1,
             created_by
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{level1,jdbcType=DOUBLE},
                      #{level2,jdbcType=DOUBLE},

ruoyi-system/src/main/resources/mapper/system/TopographicFactorMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="RM_Altitude" type="com.ruoyi.system.domain_shate.Altitude">
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="level1" column="level1"/>
         <result property="level2" column="level2"/>
         <result property="level3" column="level3"/>
@@ -22,6 +23,7 @@
     <resultMap id="RM_Aspect" type="com.ruoyi.system.domain_shate.Aspect">
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="north" column="North"/>
         <result property="northeast" column="Northeast"/>
         <result property="east" column="East"/>
@@ -41,6 +43,7 @@
     <resultMap id="RM_Slope" type="com.ruoyi.system.domain_shate.Slope">
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="level1" column="level1"/>
         <result property="level2" column="level2"/>
         <result property="level3" column="level3"/>
@@ -55,13 +58,13 @@
 
     <sql id="columns">
 	    <![CDATA[
-        ID,zone,level5,year1,level1,level2,level3,level4,Image_date,Product_code1,Product_code2,created_by
+        ID,zone,region_name,level5,year1,level1,level2,level3,level4,Image_date,Product_code1,Product_code2,created_by
         ]]>
 	</sql>
 
     <sql id="Aspect">
 	    <![CDATA[
-        ID,zone,north,year1,northeast,east,southeast,south,southwest,west,northwest,Image_date,Product_code1,Product_code2,created_by
+        ID,zone,region_name,north,year1,northeast,east,southeast,south,southwest,west,northwest,Image_date,Product_code1,Product_code2,created_by
         ]]>
 	</sql>
 
@@ -77,7 +80,7 @@
     </select>
 
     <select id="sqlYear" resultMap="RM_Altitude">
-        SELECT  distinct year1,ZONE  FROM  Altitude
+        SELECT  distinct year1,ZONE,region_name  FROM  Altitude
 
     </select>
 
@@ -93,7 +96,7 @@
     </select>
 
     <select id="sqlYear1" resultMap="RM_Slope">
-        SELECT  distinct year1,ZONE  FROM  Slope
+        SELECT  distinct year1,ZONE,region_name FROM  Slope
     </select>
 
     <select id="sqlAspect" resultMap="RM_Aspect">
@@ -108,13 +111,14 @@
     </select>
 
     <select id="sqlYear2" resultMap="RM_Aspect">
-        SELECT  distinct year1,ZONE  FROM  Aspect
+        SELECT  distinct year1,ZONE,region_name   FROM  Aspect
     </select>
 
     <insert id="InsertAltitude">
         <![CDATA[
         INSERT INTO Altitude (
             zone ,
+            region_name,
             level1,
             level2 ,
             level3 ,
@@ -126,6 +130,7 @@
             year1,
             created_by
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{level1,jdbcType=DOUBLE},
                      #{level2,jdbcType=DOUBLE},
@@ -145,6 +150,7 @@
         <![CDATA[
         INSERT INTO Aspect (
             zone ,
+            region_name,
             North,
             Northeast ,
             East ,
@@ -159,6 +165,7 @@
             year1,
             created_by
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{north,jdbcType=DOUBLE},
                      #{northeast,jdbcType=DOUBLE},
@@ -181,6 +188,7 @@
         <![CDATA[
         INSERT INTO Slope (
             zone ,
+            region_name,
             level1,
             level2 ,
             level3 ,
@@ -192,6 +200,7 @@
             year1,
             created_by
         ) VALUES (
+                     #{zone,jdbcType=VARCHAR},
                      #{zone,jdbcType=VARCHAR},
                      #{level1,jdbcType=DOUBLE},
                      #{level2,jdbcType=DOUBLE},

ruoyi-system/src/main/resources/mapper/system/VegetationHealthMapper.xml

@@ -7,6 +7,7 @@
 
         <result property="id" column="id"/>
         <result property="zone" column="zone"/>
+        <result property="regionName" column="region_name"/>
         <result property="healthy" column="healthy"/>
         <result property="normal" column="Normal"/>
         <result property="notHealthy" column="Not_Healthy"/>
@@ -56,7 +57,7 @@
 
     <sql id="columns">
 	    <![CDATA[
-        ID,zone,healthy,year1,Normal,Not_Healthy,Total_Area,Image_date,Product_code1,Product_code2,Product_code3,created_by,created_time
+        ID,zone,healthy,resolution,year1,Normal,Not_Healthy,Total_Area,Image_date,Product_code1,Product_code2,Product_code3,created_by,created_time
         ]]>
 	</sql>
 
@@ -77,6 +78,16 @@
     <select id="sqlYear" resultMap="RM_Seeding">
         SELECT  distinct year1,ZONE  FROM  healthy
     </select>
+    <select id="sqlInfo" resultMap="RM_Seeding">
+        select * from healthy
+        where 1=1
+        <if test="zone!= null and zone !=''">
+            AND zone = #{zone}
+        </if>
+        <if test="year!= null and year !=''">
+            AND year1=#{year}
+        </if>
+    </select>
 
 
 </mapper>

ruoyi-system/src/main/resources/mapper/system/updateAllRegionNameMapper.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_shate.updateAllRegionNameMapper">
+
+    <update id="altitude">
+        UPDATE  altitude  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="Aspect">
+        UPDATE  Aspect  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="Slope">
+        UPDATE  Slope  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="salinization">
+        UPDATE  salinization  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="moisture">
+        UPDATE  moisture  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="desertification">
+        UPDATE  desertification  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="road">
+        UPDATE  road  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="water">
+        UPDATE  water  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="landuse">
+        UPDATE  landuse  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="dataUpload">
+        UPDATE  data_upload  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="suitability">
+        UPDATE  suitability  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="waterArea">
+        UPDATE  water_area  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="seedSuccess">
+        UPDATE  "seed_Success"  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+    <update id="healthy">
+        UPDATE  healthy  SET region_name=#{regionName} where region_name=#{regionName1}
+    </update>
+
+<!--    <update id="healthy">-->
+<!--        UPDATE  vegetation_Distribution  SET region_name=#{regionName} where region_name=#{regionName1}-->
+<!--    </update>-->
+</mapper>