数据流动年份

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java

@@ -37,7 +37,8 @@ public class CityExpandControllerr {
      */
     @RequestMapping(value = "/selectCityExpand", method = {RequestMethod.GET})
     public AjaxResult selectCityExpand(@RequestParam(value = "city", required = false) String city,
-                                       @RequestParam(value = "country", required = false) String country, String year) {
+                                       @RequestParam(value = "country", required = false) String country,
+                                       @RequestParam(value = "year", required = false)String year) {
         List<CityFocusVO> value = service.selectExpand(city, country, year);
         return AjaxResult.success(value);
     }

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

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

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

@@ -7,6 +7,8 @@ package com.ruoyi.system.domain_yada;
 public class CityFocusVO extends SysBaseEntity {
     private String id;
 
+    private String year;
+
     private String xAxis;
 
     private String yAxis;
@@ -63,6 +65,15 @@ public class CityFocusVO extends SysBaseEntity {
 //        this.year = year;
 //    }
 
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
     public String getxAxisPy() {
         return xAxisPy;
     }

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

@@ -14,7 +14,8 @@ import java.util.List;
 public interface CityExpandMapper {
 
     List<CityFocusVO> selectExpand(@Param("city") String city,
-                                   @Param("country") String country);
+                                   @Param("country") String country,
+                                   @Param("year") String year);
 
     List<OrientationVO> selectOrientation(@Param("city") String city,
                                           @Param("superior") String superior,

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

@@ -26,7 +26,7 @@ public class CityExpandServiceimpl implements ICityExpandService {
 
     @Override
     public List<CityFocusVO> selectExpand(String city, String country, String year) {
-        return mapper.selectExpand(city, country);
+        return mapper.selectExpand(city, country,year);
     }
 
     @Override

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

@@ -51,7 +51,7 @@
 
     <sql id="columns">
 	    <![CDATA[
-        id,city,x_axis,y_axis,x_axis_py,y_axis_py,city_en,country
+        id,year,city,x_axis,y_axis,x_axis_py,y_axis_py,city_en,country
         ]]>
 	</sql>
 
@@ -64,6 +64,9 @@
         <if test="country!= null and country !=''">
             AND country = #{country}
         </if>
+        <if test="year!= null and year !=''">
+            AND year = #{year}
+        </if>
     </select>
 
     <resultMap id="RM_Inform" type="com.ruoyi.system.domain_yada.CityInformation">