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

修改查询方法，增加查询条件

Browse Source
This commit is contained in:
songjinsheng
2022-06-20 17:06:48 +08:00
parent 7c5e92246f
commit 43ee95a198
44 changed files with 155 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java
View File

@ -10,9 +10,9 @@ public class AustraliaMiddleEastVO extends SysBaseEntity
{
private String id;
private Double yearMonth;
private String yearMonth;
private Double month;
private String month;
private Double sstAnomalyIndex;
@ -30,11 +30,11 @@ public class AustraliaMiddleEastVO extends SysBaseEntity
this.id = id;
}
public Double getYearMonth() {
public String getYearMonth() {
return yearMonth;
}
public void setYearMonth(Double yearMonth) {
public void setYearMonth(String yearMonth) {
this.yearMonth = yearMonth;
}
@ -70,11 +70,11 @@ public class AustraliaMiddleEastVO extends SysBaseEntity
this.vaiAnomolies = vaiAnomolies;
}
public Double getMonth() {
public String getMonth() {
return month;
}
public void setMonth(Double month) {
public void setMonth(String month) {
this.month = month;
}
}

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java
View File

@ -13,7 +13,8 @@ import java.util.List;
*/
public interface AorestCoverageMapper {
List<AorestCoverageVO> selectAorestCoverage();
List<AorestCoverageVO> selectAorestCoverage(@Param("region") String region,
@Param("particularYear") String particularYear);
Integer DelAorestCoverage(@Param("id") String id);

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java
View File

@ -13,7 +13,8 @@ import java.util.List;
*/
public interface AustraliaMiddleEastMapper {
List<AustraliaMiddleEastVO> selectAustralia();
List<AustraliaMiddleEastVO> selectAustralia(@Param("yearMonth") String yearMonth,
@Param("month") String month);
Integer DelAustralia(@Param("id") String id);

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java
View File

@ -4,6 +4,7 @@ import com.ruoyi.system.domain_yada.OceanTemperatureVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.time.LocalDate;
import java.util.List;
/**
@ -13,7 +14,7 @@ import java.util.List;
@Repository
public interface OceanTemperatureMapper {
List<OceanTemperatureVO> selectOcean();
List<OceanTemperatureVO> selectOcean(@Param("startDate") LocalDate startDate);
Integer DelOcean(@Param("id") String id);

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java
View File

@ -11,7 +11,8 @@ import java.util.List;
*/
public interface RegionVGIMapper {
List<RegionVGIVO> selectRegion();
List<RegionVGIVO> selectRegion(@Param("typeName") String typeName,
@Param("particularYear") String particularYear);
Integer DelRegion(@Param("id") String id);

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.system.mapper_yada;
import com.ruoyi.system.domain_yada.RegionalSystemVO;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDate;
import java.util.List;
/**
@ -11,7 +12,8 @@ import java.util.List;
*/
public interface RegionalSystemMapper {
List<RegionalSystemVO> selectRegional();
List<RegionalSystemVO> selectRegional(@Param("region") String region,
@Param("particularYear") String particularYear);
Integer DelRegional(@Param("id") String id);

5
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java
View File

@ -2,8 +2,10 @@ package com.ruoyi.system.mapper_yada;
import com.ruoyi.system.domain_yada.ThematicMapDomain;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.time.LocalDateTime;
import java.util.List;
/**
@ -15,7 +17,8 @@ public interface ThematicMapMapper {
* 获取所有专题图
* @return
*/
List<ThematicMapDomain> selectAllThematicMap();
List<ThematicMapDomain> selectAllThematicMap(@Param("pictureTime") LocalDateTime pictureTime,
@Param("pictureZh") String pictureZh);
/**
* 删除专题图根据编号

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java
View File

@ -12,7 +12,8 @@ import java.util.List;
*/
public interface UrbanMapper {
List<UrbanVO> selectUrban();
List<UrbanVO> selectUrban(@Param("name") String name,
@Param("particularYear") String particularYear);
Integer DelUrban(@Param("id") String id);

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java
View File

@ -11,7 +11,8 @@ import java.util.List;
*/
public interface VegetationCoverageMapper {
List<VegetationCoverageVO> selectVegetation();
List<VegetationCoverageVO> selectVegetation(@Param("region") String region,
@Param("particularYear") String particularYear);
Integer DelVegetation(@Param("id") String id);

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java
View File

@ -16,7 +16,7 @@ import java.util.List;
*/
public interface IAorestCoverageService {
public List<AorestCoverageVO> selectAorestCoverage();
public List<AorestCoverageVO> selectAorestCoverage(String region,String particularYear);
public Integer DelAorestCoverage(String id);

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java
View File

@ -12,7 +12,7 @@ import java.util.List;
*/
public interface IAustraliaMiddleEastService
{
public List<AustraliaMiddleEastVO> selectAustralia();
public List<AustraliaMiddleEastVO> selectAustralia(String yearMonth,String month);
public Integer DelAustralia(@Param("id") String id);

3
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java
View File

@ -4,6 +4,7 @@ import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import com.ruoyi.system.domain_yada.OceanTemperatureVO;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDate;
import java.util.List;
/**
@ -13,7 +14,7 @@ import java.util.List;
*/
public interface IOceanTemperatureService {
public List<OceanTemperatureVO> selectOcean();
public List<OceanTemperatureVO> selectOcean(LocalDate startDate);
public Integer DelOcean(@Param("id") String id);

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java
View File

@ -15,7 +15,7 @@ public interface IRegionVGIService {
* 查询
* @return
*/
public List<RegionVGIVO> selectRegion();
public List<RegionVGIVO> selectRegion(String typeName,String particularYear);
/**
* 删除

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java
View File

@ -13,7 +13,7 @@ import java.util.List;
*/
public interface IRegionalSystemService {
public List<RegionalSystemVO> selectRegional();
public List<RegionalSystemVO> selectRegional(String region,String particularYear);
public Integer DelRegional(@Param("id") String id);

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java
View File

@ -12,7 +12,7 @@ import java.util.List;
*/
public interface IUrbanService {
public List<UrbanVO> selectUrban();
public List<UrbanVO> selectUrban(String name, String particularYear);
public Integer DelUrban(@Param("id") String id);

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java
View File

@ -13,7 +13,7 @@ import java.util.List;
*/
public interface IVegetationCoverageService {
public List<VegetationCoverageVO> selectVegetation();
public List<VegetationCoverageVO> selectVegetation(String region,String particularYear);
public Integer DelVegetation(String id);

3
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.system.service_yada;
import com.ruoyi.system.domain_yada.ThematicMapDomain;
import java.time.LocalDateTime;
import java.util.List;
/**
@ -16,7 +17,7 @@ public interface ThematicMapService {
* 获取全部专题图
* @return
*/
List<ThematicMapDomain> selectAll();
List<ThematicMapDomain> selectAll(LocalDateTime pictureTime, String pictureZh);
/**
* 删除专题图根据编号

4
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java
View File

@ -26,8 +26,8 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService {
@Override
public List<AorestCoverageVO> selectAorestCoverage() {
return coverageMapper.selectAorestCoverage();
public List<AorestCoverageVO> selectAorestCoverage(String region,String particularYear) {
return coverageMapper.selectAorestCoverage(region,particularYear);
}
@Override

4
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java
View File

@ -21,9 +21,9 @@ public class AustraliaMiddleEastServiceimpl implements IAustraliaMiddleEastServi
private AustraliaMiddleEastMapper australiaMiddleEastMapper;
@Override
public List<AustraliaMiddleEastVO> selectAustralia()
public List<AustraliaMiddleEastVO> selectAustralia(String yearMonth,String month)
{
return australiaMiddleEastMapper.selectAustralia();
return australiaMiddleEastMapper.selectAustralia(yearMonth,month);
}
@Override

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java
View File

@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.util.List;
/**
@ -24,8 +25,8 @@ public class OceanTemperatureServiceimpl implements IOceanTemperatureService {
@Override
public List<OceanTemperatureVO> selectOcean() {
return oceanMapper.selectOcean();
public List<OceanTemperatureVO> selectOcean(LocalDate startDate) {
return oceanMapper.selectOcean(startDate);
}
@Override

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.system.service_yada.impl;
import com.ruoyi.system.mapper_yada.RegionVGIMapper;
import com.ruoyi.system.service_yada.IRegionVGIService;
import com.ruoyi.system.domain_yada.RegionVGIVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -21,8 +22,8 @@ public class RegionVGIServiceimpl implements IRegionVGIService {
private RegionVGIMapper vgiMapper;
@Override
public List<RegionVGIVO> selectRegion() {
return vgiMapper.selectRegion();
public List<RegionVGIVO> selectRegion(String typeName,String particularYear) {
return vgiMapper.selectRegion(typeName,particularYear);
}
@Override

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java
View File

@ -5,6 +5,7 @@ import com.ruoyi.system.domain_yada.RegionalSystemVO;
import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
import com.ruoyi.system.mapper_yada.RegionalSystemMapper;
import com.ruoyi.system.service_yada.IRegionalSystemService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -24,8 +25,8 @@ public class RegionalSystemServiceimpl implements IRegionalSystemService {
@Override
public List<RegionalSystemVO> selectRegional() {
return Regional.selectRegional();
public List<RegionalSystemVO> selectRegional(String region,String particularYear) {
return Regional.selectRegional(region,particularYear);
}
@Override

6
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java
View File

@ -3,9 +3,11 @@ package com.ruoyi.system.service_yada.impl;
import com.ruoyi.system.domain_yada.ThematicMapDomain;
import com.ruoyi.system.mapper_yada.ThematicMapMapper;
import com.ruoyi.system.service_yada.ThematicMapService;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
/**
@ -23,8 +25,8 @@ public class ThematicMapServiceImpl implements ThematicMapService {
* @return
*/
@Override
public List<ThematicMapDomain> selectAll(){
return thematicMapMapper.selectAllThematicMap();
public List<ThematicMapDomain> selectAll(LocalDateTime pictureTime,String pictureZh){
return thematicMapMapper.selectAllThematicMap(pictureTime,pictureZh);
}
/**

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java
View File

@ -4,6 +4,7 @@ import com.ruoyi.system.domain_yada.UrbanVO;
import com.ruoyi.system.mapper_yada.AorestCoverageMapper;
import com.ruoyi.system.mapper_yada.UrbanMapper;
import com.ruoyi.system.service_yada.IUrbanService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -23,8 +24,8 @@ public class UrbanServiceimpl implements IUrbanService {
@Override
public List<UrbanVO> selectUrban() {
return urbanMapper.selectUrban();
public List<UrbanVO> selectUrban(String name, String particularYear) {
return urbanMapper.selectUrban(name,particularYear);
}
@Override

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java
View File

@ -5,6 +5,7 @@ import com.ruoyi.system.domain_yada.VegetationCoverageVO;
import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
import com.ruoyi.system.mapper_yada.VegetationCoverageMapper;
import com.ruoyi.system.service_yada.IVegetationCoverageService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -25,8 +26,8 @@ public class VegetationCoverageServiceimpl implements IVegetationCoverageService
@Override
public List<VegetationCoverageVO> selectVegetation() {
return coverageMapper.selectVegetation();
public List<VegetationCoverageVO> selectVegetation(String region,String particularYear) {
return coverageMapper.selectVegetation(region,particularYear);
}
@Override

11
ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
View File

@ -24,7 +24,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectAorestCoverage" resultMap="RM_AorestCoverage">
SELECT <include refid="columns"/> FROM forest_coverage;
SELECT <include refid="columns"/> FROM forest_coverage
WHERE 1=1
<if test="particularYear!= null and particularYear !=''">
AND particular_year = #{particularYear}
</if>
<if test="region!= null and region !=''">
AND region = #{typeName}
</if>
</select>
<delete id="DelAorestCoverage">

13
ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml
View File

@ -24,7 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectAustralia" resultMap="RM_AustraliaMiddleEast">
SELECT <include refid="columns"/> FROM central_and_eastern_australia;
SELECT <include refid="columns"/> FROM central_and_eastern_australia
WHERE 1=1
<if test="yearMonth!= null and yearMonth !=''">
AND particular_month = #{yearMonth}
</if>
<if test="month!= null and month !=''">
AND month = #{month}
</if>
</select>
<delete id="DelAustralia">
@ -44,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
created_by ,
created_time
) VALUES (
#{yearMonth,jdbcType=INTEGER},
#{month,jdbcType=INTEGER},
#{yearMonth,jdbcType=VARCHAR},
#{month,jdbcType=VARCHAR},
#{sstAnomalyIndex,jdbcType=DOUBLE},
#{temperatureAnomolies,jdbcType=DOUBLE},
#{precipitationAnomolies,jdbcType=DOUBLE},

5
ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml
View File

@ -23,6 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectOcean" resultMap="RM_Ocean">
SELECT <include refid="columns"/> FROM sea_surface_temperature_anomaly
WHERE 1=1
<if test="startDate!= null and startDate !=''">
AND startDate > #{startDate}
</if>
</select>
<delete id="DelOcean">

9
ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml
View File

@ -25,7 +25,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectRegion" resultMap="RM_RegionVGI">
SELECT <include refid="columns"/> FROM region_vgi;
SELECT <include refid="columns"/> FROM region_vgi
WHERE 1=1
<if test="particularYear!= null and particularYear !=''">
AND particular_year = #{particularYear}
</if>
<if test="typeName!= null and typeName !=''">
AND type_name = #{typeName}
</if>
</select>
<delete id="DelRegion">

7
ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml
View File

@ -25,6 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectRegional" resultMap="RM_Regional">
SELECT <include refid="columns"/> FROM proportion_of_ecosystem_type_transfer
WHERE 1=1
<if test="particularYear!= null and particularYear !=''">
AND particular_year = #{particularYear}
</if>
<if test="region!= null and region !=''">
AND region = #{region}
</if>
</select>
<delete id="DelRegional">

10
ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
View File

@ -14,7 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pictureType" column="picture_type"/>
<result property="pictureTime" column="picture_time"/>
<result property="picturePath" column="picture_path"/>
<result property="pictureTime" column="picture_time"/>
<result property="remarks" column="remarks"/>
<result property="createdBy" column="created_by"/>
<result property="createdTime" column="created_time"/>
@ -27,7 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectAllThematicMap" resultMap="RM_ThematicMap">
SELECT <include refid="columns"/> FROM thematic_map;
SELECT <include refid="columns"/> FROM thematic_map
WHERE 1=1
<if test="pictureTime!= null and pictureTime !=''">
AND picture_time = #{pictureTime}
</if>
<if test="pictureZh!= null and pictureZh !=''">
AND picture_zh = #{pictureZh}
</if>
</select>
<delete id="deleteThematicMap">

7
ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml
View File

@ -23,6 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectUrban" resultMap="RM_Urban">
SELECT <include refid="columns"/> FROM urban_agglomeration_china
WHERE 1=1
<if test="particularYear!= null and particularYear !=''">
AND particular_year = #{particularYear}
</if>
<if test="name!= null and name !=''">
AND name = #{name}
</if>
</select>
<delete id="DelUrban">

7
ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml
View File

@ -25,6 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectVegetation" resultMap="RM_Vegetation">
SELECT <include refid="columns"/> FROM fvc_npp
WHERE 1=1
<if test="particularYear!= null and particularYear !=''">
AND particular_year = #{particularYear}
</if>
<if test="region != null and region !=''">
AND region = #{region}
</if>
</select>
<delete id="DelVegetation">