Merge branch 'master' into test

ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AustraliaMiddleEastController.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.controller.RemoteSensing;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.service.IAustraliaMiddleEastService;
+import com.ruoyi.system.service.IForestService;
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ *  澳大利亚中东部地区
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:08
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/orderMng", produces = "application/json;charset=UTF-8")
+public class AustraliaMiddleEastController
+{
+   // @Autowired
+    private IAustraliaMiddleEastService australiaMiddleEastService;
+
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
+    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
+             return AjaxResult.success(eastVOSList);
+    }
+
+    /**
+     * 删除方法
+     * @param ID
+     * @return
+     */
+    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
+    public AjaxResult DelAustralia(@Param("ID") String ID)
+    {
+        int NUM = australiaMiddleEastService.DelAustralia(ID);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+
+    }
+
+    /**
+     * 新增方法
+     * @param eastVOS
+     * @return
+     */
+    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
+    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
+    {
+        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/AustraliaMiddleEastMapper.java

@@ -0,0 +1,21 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import org.apache.ibatis.annotations.Param;
+
+
+import java.util.List;
+
+/**
+ * 澳大利亚中东部地区
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface AustraliaMiddleEastMapper {
+
+    List<AustraliaMiddleEastVO> selectAustralia();
+
+    Integer DelAustralia(@Param("id") String id);
+
+    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegionVGIMapper.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import com.ruoyi.system.vo.RegionVGIVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface RegionVGIMapper {
+
+    List<RegionVGIVO> selectRegion();
+
+    Integer DelRegion(@Param("id") String id);
+
+    Integer IntoRegion(RegionVGIVO regionVGIVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IAustraliaMiddleEastService.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 澳大利亚中东部地区
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:32
+ */
+public interface IAustraliaMiddleEastService
+{
+    public  List<AustraliaMiddleEastVO> selectAustralia();
+
+    public Integer DelAustralia(@Param("id") String id);
+
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IRegionVGIService.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import com.ruoyi.system.vo.RegionVGIVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:34
+ */
+public interface IRegionVGIService {
+
+    public List<RegionVGIVO> selectRegion();
+
+    public Integer DelRegion(@Param("id") String id);
+
+    public Integer IntoRegion(RegionVGIVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AustraliaMiddleEastServiceimpl.java

@@ -0,0 +1,37 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.mapper.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper.SysLogininforMapper;
+import com.ruoyi.system.service.IAustraliaMiddleEastService;
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * 亚大综合监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:43
+ */
+public class AustraliaMiddleEastServiceimpl implements IAustraliaMiddleEastService
+{
+    @Autowired
+    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
+
+    @Override
+    public List<AustraliaMiddleEastVO> selectAustralia()
+    {
+        return australiaMiddleEastMapper.selectAustralia();
+    }
+
+    @Override
+    public Integer DelAustralia(String id) {
+        return australiaMiddleEastMapper.DelAustralia(id);
+
+    }
+
+    @Override
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
+        return australiaMiddleEastMapper.IntoAustralia(eastVO);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegionVGIServiceimpl.java

@@ -0,0 +1,35 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.mapper.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper.RegionVGIMapper;
+import com.ruoyi.system.service.IRegionVGIService;
+import com.ruoyi.system.vo.RegionVGIVO;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * 大气质量监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:45
+ */
+public class RegionVGIServiceimpl implements IRegionVGIService {
+
+    @Autowired
+    private RegionVGIMapper vgiMapper;
+
+    @Override
+    public List<RegionVGIVO> selectRegion() {
+        return vgiMapper.selectRegion();
+    }
+
+    @Override
+    public Integer DelRegion(String id) {
+        return vgiMapper.DelRegion(id);
+    }
+
+    @Override
+    public Integer IntoRegion(RegionVGIVO eastVO) {
+        return vgiMapper.IntoRegion(eastVO);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/vo/AustraliaMiddleEastVO.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.vo;
+
+import javax.xml.crypto.Data;
+import java.lang.ref.PhantomReference;
+import java.time.LocalDate;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/19 14:50
+ */
+public class AustraliaMiddleEastVO
+{
+    private  String id;
+
+    private LocalDate yearMonth;
+
+    private  Double sstAnomalyIndex;
+
+    private  Double temperatureAnomolies;
+
+    private  Double  precipitationAnomolies;
+
+    private  Double vaiAnomolies;
+
+    private  String createdBy;
+
+    private  String createdTime;
+
+
+    public LocalDate getYearMonth() {
+        return yearMonth;
+    }
+
+    public void setYearMonth(LocalDate yearMonth) {
+        this.yearMonth = yearMonth;
+    }
+
+    public Double getSstAnomalyIndex() {
+        return sstAnomalyIndex;
+    }
+
+    public void setSstAnomalyIndex(Double sstAnomalyIndex) {
+        this.sstAnomalyIndex = sstAnomalyIndex;
+    }
+
+    public Double getTemperatureAnomolies() {
+        return temperatureAnomolies;
+    }
+
+    public void setTemperatureAnomolies(Double temperatureAnomolies) {
+        this.temperatureAnomolies = temperatureAnomolies;
+    }
+
+    public Double getPrecipitationAnomolies() {
+        return precipitationAnomolies;
+    }
+
+    public void setPrecipitationAnomolies(Double precipitationAnomolies) {
+        this.precipitationAnomolies = precipitationAnomolies;
+    }
+
+    public Double getVaiAnomolies() {
+        return vaiAnomolies;
+    }
+
+    public void setVaiAnomolies(Double vaiAnomolies) {
+        this.vaiAnomolies = vaiAnomolies;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(String createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/vo/RegionVGIVO.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.vo;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/19 16:53
+ */
+public class RegionVGIVO implements Serializable {
+    private  String id;
+
+    private  String region;
+
+    private  String regionEn;
+
+    private  String typeName;
+
+    private  String typeNameEn;
+
+    private  Double forest;
+
+    private  Double grassland;
+
+    private  Integer particularYear;
+
+    private  String createdBy;
+
+    private LocalDate createdTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRegionEn() {
+        return regionEn;
+    }
+
+    public void setRegionEn(String regionEn) {
+        this.regionEn = regionEn;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getTypeNameEn() {
+        return typeNameEn;
+    }
+
+    public void setTypeNameEn(String typeNameEn) {
+        this.typeNameEn = typeNameEn;
+    }
+
+    public Double getForest() {
+        return forest;
+    }
+
+    public void setForest(Double forest) {
+        this.forest = forest;
+    }
+
+    public Double getGrassland() {
+        return grassland;
+    }
+
+    public void setGrassland(Double grassland) {
+        this.grassland = grassland;
+    }
+
+    public Integer getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(Integer particularYear) {
+        this.particularYear = particularYear;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public LocalDate getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(LocalDate createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    @Override
+    public String toString() {
+        return "RegionVGIVO{" +
+                "id='" + id + '\'' +
+                ", region='" + region + '\'' +
+                ", regionEn='" + regionEn + '\'' +
+                ", typeName='" + typeName + '\'' +
+                ", typeNameEn='" + typeNameEn + '\'' +
+                ", forest=" + forest +
+                ", grassland=" + grassland +
+                ", particularYear=" + particularYear +
+                ", createdBy='" + createdBy + '\'' +
+                ", createdTime=" + createdTime +
+                '}';
+    }
+}

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

@@ -0,0 +1,57 @@
+<?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.AustraliaMiddleEastMapper">
+    <resultMap id="RM_AustraliaMiddleEast" type="com.ruoyi.system.vo.AustraliaMiddleEastVO">
+
+        <result property="yearMonth" column="year_month"/>
+        <result property="id" column="ID"/>
+        <result property="sstAnomalyIndex" column="sst_anomaly_index"/>
+        <result property="temperatureAnomolies" column="temperature_anomolies"/>
+        <result property="precipitationAnomolies" column="precipitation_anomolies"/>
+        <result property="vaiAnomolies" column="vai_anomolies"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        ID,year_month,sst_anomaly_index,temperature_anomolies,precipitation_anomolies,vai_anomolies,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectAustralia" resultMap="RM_AustraliaMiddleEast">
+        SELECT  <include refid="columns"/>  FROM  central_and_eastern_australia;
+    </select>
+
+    <delete id="DelAustralia">
+        DELETE FROM central_and_eastern_australia
+        WHERE ID=#{id}
+    </delete>
+    
+    <insert id="IntoAustralia">
+        <![CDATA[
+        INSERT INTO central_and_eastern_australia (
+            ID ,
+            year_month ,
+            sst_anomaly_index ,
+            temperature_anomolies ,
+            precipitation_anomolies ,
+            vai_anomolies ,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{yearMonth,jdbcType=DATE},
+                     #{sstAnomalyIndex,jdbcType=DOUBLE},
+                     #{temperatureAnomolies,jdbcType=DOUBLE},
+                     #{precipitationAnomolies,jdbcType=DOUBLE},
+                     #{vaiAnomolies,jdbcType=DOUBLE},
+                     #{createdBy,jdbcType=VARCHAR},
+                     #{createdTime,jdbcType=VARCHAR}
+                 )
+        ]]>
+    </insert>
+</mapper> 

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

@@ -0,0 +1,65 @@
+<?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.RegionVGIMapper">
+    <resultMap id="RM_RegionVGI" type="com.ruoyi.system.vo.RegionVGIVO">
+
+        <result property="region" column="region"/>
+        <result property="id" column="ID"/>
+        <result property="regionEn" column="region_en"/>
+        <result property="typeName" column="type_name"/>
+        <result property="typeNameEn" column="type_name_en"/>
+        <result property="forest" column="forest"/>
+        <result property="grassland" column="grassland"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,region,region_en,type_name,type_name_en,forest,created_by,created_time,grassland,particular_year
+        ]]>
+	</sql>
+
+    <select id="selectRegion" resultMap="RM_RegionVGI">
+        SELECT  <include refid="columns"/>  FROM  region_vgi;
+    </select>
+
+    <delete id="DelRegion">
+        DELETE FROM region_vgi
+        WHERE ID=#{id}
+    </delete>
+
+
+    <insert id="IntoRegion">
+        <![CDATA[
+        INSERT INTO region_vgi (
+            id,
+            region ,
+            region_en ,
+            type_name ,
+            type_name_en ,
+            forest ,
+            created_by ,
+            created_time,
+            grassland,
+            particular_year
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{region_en,jdbcType=VARCHAR},
+                     #{type_name,jdbcType=VARCHAR},
+                     #{type_name_en,jdbcType=TIMESTAMP},
+                     #{forest,jdbcType=DOUBLE},
+                     #{createdBy,jdbcType=VARCHAR},
+                     #{createdTime,jdbcType=DATE},
+                     #{grassland,jdbcType=DOUBLE},
+                     #{particularYear}
+                 )
+        ]]>
+    </insert>
+
+</mapper>