修改

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/MapServicesVO.java

@@ -29,6 +29,8 @@ public class MapServicesVO extends SysBaseEntity
      */
     private  String resolvingPower;
 
+    private  String serviceType;
+
     public String getId() {
         return id;
     }
@@ -76,4 +78,12 @@ public class MapServicesVO extends SysBaseEntity
     public void setResolvingPower(String resolvingPower) {
         this.resolvingPower = resolvingPower;
     }
+
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java

@@ -24,8 +24,7 @@ public interface AorestCoverageMapper {
 
     List<UploadFile> selectUpload(@Param("fileId") String fileId,@Param("fileName") String fileName);
 
-    List<Dictionary> selectDic(@Param("codingType") String codingType,@Param("codingType1") String codingType1,
-                               @Param("codingType2") String codingType2);
+    List<Dictionary> selectDic(@Param("codingType") String codingType);
 
     List<Dictionary> selectNow(@Param("codingType2") String codingType2);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java

@@ -22,5 +22,6 @@ public interface CityExpandMapper {
                                            @Param("country") String country);
 
     List<CityInformation> selectInfrom(@Param("city") String city,
-                                       @Param("country") String country);
+                                       @Param("country") String country,
+                                       @Param("year") String year);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java

@@ -30,7 +30,8 @@ public interface ThematicMapMapper {
      * @return
      */
     List<MapServicesVO> selMapServers(@Param("chartName") String chartName,
-                                      @Param("chartType") String chartType);
+                                      @Param("chartType") String chartType,
+                                      @Param("particularYear") String particularYear);
 
     /**
      * 删除专题图根据编号

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java

@@ -26,7 +26,6 @@ public interface IAorestCoverageService {
 
     public List<UploadFile> selectUpload(String fileId,String fileName);
 
-    List<Dictionary> selectDic(String codingType,String codingType1,
-                                String codingType2);
+    List<Dictionary> selectDic(String codingType);
     List<Dictionary> selectNow(String codingType2);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java

@@ -17,5 +17,5 @@ public interface ICityExpandService {
 
     List<OrientationVO> selectOrientation(String city, String superior,String country);
 
-    List<CityInformation> selectInfrom(String city, String country);
+    List<CityInformation> selectInfrom(String city, String country,String year);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java

@@ -27,7 +27,7 @@ public interface ThematicMapService {
      * @param chartType
      * @return
      */
-    List<MapServicesVO> selMapServers(String chartName, String chartType);
+    List<MapServicesVO> selMapServers(String chartName, String chartType,String particularYear);
 
     /**
      * 删除专题图根据编号

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

@@ -51,9 +51,8 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService {
     }
 
     @Override
-    public List<Dictionary> selectDic(String codingType,String codingType1,
-                                      String codingType2) {
-        return  coverageMapper.selectDic(codingType,codingType1,codingType2);
+    public List<Dictionary> selectDic(String codingType) {
+        return  coverageMapper.selectDic(codingType);
     }
 
     @Override

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.List;
 
 /**
@@ -34,7 +35,7 @@ public class CityExpandServiceimpl implements ICityExpandService {
     }
 
     @Override
-    public List<CityInformation> selectInfrom(String city, String country) {
-        return mapper.selectInfrom(city,country);
+    public List<CityInformation> selectInfrom(String city, String country,String year) {
+        return mapper.selectInfrom(city,country,year);
     }
 }

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

@@ -31,8 +31,8 @@ public class ThematicMapServiceImpl implements ThematicMapService {
     }
 
     @Override
-    public List<MapServicesVO> selMapServers(String chartName, String chartType) {
-        return thematicMapMapper.selMapServers(chartName,chartType);
+    public List<MapServicesVO> selMapServers(String chartName, String chartType,String particularYear) {
+        return thematicMapMapper.selMapServers(chartName,chartType,particularYear);
     }
 
     /**

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

@@ -125,25 +125,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ]]>
 	</sql>
 
+
     <select id="selectDic" resultMap="RM_Dictionary">
         select <include refid="columnsdic"/> from dictionary
-        where dictionary in
-              (SELECT A.dictionary FROM dictionary a
-               join (select dictionary from dictionary
-               where 1=1
-                <if test="codingType!= null and codingType !=''">
-                    AND coding_type = #{codingType}
-                </if>
-                <if test="codingType1!= null and codingType1 !=''">
-                    AND dictionary = #{codingType1}
-                </if>
-                   ) b on a.coding_type=b.dictionary
-                <if test="codingType2!= null and codingType2 !=''">
-                    AND a.dictionary = #{codingType2}
-                </if>
-                          )
+        where 1=1
+        <if test="codingType!= null and codingType !=''">
+            AND coding_type = #{codingType}
+        </if>
+
     </select>
 
+<!--    <select id="selectDic" resultMap="RM_Dictionary">-->
+<!--        select <include refid="columnsdic"/> from dictionary-->
+<!--        where dictionary in-->
+<!--              (SELECT A.dictionary FROM dictionary a-->
+<!--               join (select dictionary from dictionary-->
+<!--               where 1=1-->
+<!--                <if test="codingType!= null and codingType !=''">-->
+<!--                    AND coding_type = #{codingType}-->
+<!--                </if>-->
+<!--                <if test="codingType1!= null and codingType1 !=''">-->
+<!--                    AND dictionary = #{codingType1}-->
+<!--                </if>-->
+<!--                   ) b on a.coding_type=b.dictionary-->
+<!--                <if test="codingType2!= null and codingType2 !=''">-->
+<!--                    AND a.dictionary = #{codingType2}-->
+<!--                </if>-->
+<!--                          )-->
+<!--    </select>-->
+
 
     <select id="selectNow" resultMap="RM_Dictionary">
         select <include refid="columnsdic"/> from dictionary

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

@@ -98,6 +98,10 @@
         <if test="country!= null and country !=''">
             AND country = #{country}
         </if>
+        <if test="year!= null and year !=''">
+            AND year = #{year}
+        </if>
+
     </select>
 
 </mapper>

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="particularYear" column="particular_year"/>
         <result property="layer" column="layer"/>
         <result property="resolvingPower" column="resolving_power"/>
+        <result property="serviceType" column="service_type"/>
     </resultMap>
 
     <sql id="columns">
@@ -34,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</sql>
     <sql id="cloumns_Map">
 	    <![CDATA[
-        id,chart_name,chart_type,particular_year,layer,resolving_power
+        id,chart_name,chart_type,particular_year,layer,resolving_power,service_type
         ]]>
 	</sql>
 
@@ -48,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="chartName!= null and chartName !=''">
             AND chart_name = #{chartName}
         </if>
+        <if test="particularYear!= null and particularYear !=''">
+            AND particular_year = #{particularYear}
+        </if>
     </select>
 
     <select id="selectAllThematicMap" resultMap="RM_ThematicMap">