From ef66a3ff00a49653a50cc3f52710a4b62f33713d Mon Sep 17 00:00:00 2001
From: machao <1550409116@qq.com>
Date: Wed, 7 Dec 2022 17:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B5=81=E5=8A=A8=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/yada/CityExpandControllerr.java    |  3 ++-
 ruoyi-admin/src/main/resources/application.yml        |  5 +++--
 .../com/ruoyi/system/domain_yada/CityFocusVO.java     | 11 +++++++++++
 .../ruoyi/system/mapper_yada/CityExpandMapper.java    |  3 ++-
 .../service_yada/impl/CityExpandServiceimpl.java      |  2 +-
 .../main/resources/mapper/system/CityExpandMapper.xml |  5 ++++-
 6 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java
index 4a898d448..333f88f2c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java
+++ b/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);
     }
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 5aebc9856..ccf944ba4 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/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: /
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java
index c3235a708..f9500155b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java
+++ b/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;
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java
index fb98e77b2..377d0e322 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java
+++ b/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,
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java
index 9d91333e6..b5e47f46d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java
+++ b/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
diff --git a/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml b/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml
index 570944a21..d215aee9d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml
+++ b/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">