no message

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

@@ -1,5 +1,35 @@
-package com.ruoyi.web.controller.yada;/**
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.CityFocusVO;
+import com.ruoyi.system.service_yada.ICityExpandService;
+import org.apache.ibatis.annotations.Param;
+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.xml.crypto.Data;
+import java.util.List;
+
+/**
+ * 城市扩张
  * @Author: JinSheng Song
  * @Date: 2022/7/1 10:09
- */public class CityExpandControllerr {
+ */
+
+@RestController
+@RequestMapping(value = "/CityExpand",produces = "application/json;charset=UTF-8")
+public class CityExpandControllerr
+{
+    @Resource
+    private ICityExpandService service;
+
+    @RequestMapping(value = "/selectCityExpand",method = {RequestMethod.GET})
+    public AjaxResult selectCityExpand(@Param("city") String city,@Param("cityCh") String cityCh,
+                                       @Param("year") String year)
+    {
+        List<CityFocusVO> value=service.selectExpand(city,cityCh,year);
+        return  AjaxResult.success(value);
+    }
 }

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

@@ -75,7 +75,7 @@ public class ThematicMapController {
         List<MapServicesVO> res= thematicMapService.selMapServers(chartName,chartType);
         return AjaxResult.success(res);
     }
-    
+
     /**
      * 删除方法
      * @param id id

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

@@ -1,5 +1,88 @@
-package com.ruoyi.system.domain_yada;/**
+package com.ruoyi.system.domain_yada;
+
+/**
  * @Author: JinSheng Song
  * @Date: 2022/7/1 10:15
- */public class CityFocusVO {
+ */
+public class CityFocusVO extends  SysBaseEntity
+{
+    private  String id;
+
+    private  String xAxis;
+
+    private  String yAxis;
+
+    private  String city;
+
+    private  String year;
+
+    private  String xAxisPy;
+
+    private  String yAxisPy;
+
+    private  String cityCh;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getxAxis() {
+        return xAxis;
+    }
+
+    public void setxAxis(String xAxis) {
+        this.xAxis = xAxis;
+    }
+
+    public String getyAxis() {
+        return yAxis;
+    }
+
+    public void setyAxis(String yAxis) {
+        this.yAxis = yAxis;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getxAxisPy() {
+        return xAxisPy;
+    }
+
+    public void setxAxisPy(String xAxisPy) {
+        this.xAxisPy = xAxisPy;
+    }
+
+    public String getyAxisPy() {
+        return yAxisPy;
+    }
+
+    public void setyAxisPy(String yAxisPy) {
+        this.yAxisPy = yAxisPy;
+    }
+
+    public String getCityCh() {
+        return cityCh;
+    }
+
+    public void setCityCh(String cityCh) {
+        this.cityCh = cityCh;
+    }
 }

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

@@ -1,5 +1,17 @@
-package com.ruoyi.system.mapper_yada;/**
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.CityFocusVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
  * @Author: JinSheng Song
  * @Date: 2022/7/1 10:12
- */public class CityExpandMapper {
+ */
+public interface CityExpandMapper {
+
+    List<CityFocusVO> selectExpand(@Param("city") String city,
+                                              @Param("cityCh") String cityCh,
+                                              @Param("year") String year);
 }

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

@@ -1,5 +1,15 @@
-package com.ruoyi.system.service_yada;/**
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.CityFocusVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
  * @Author: JinSheng Song
  * @Date: 2022/7/1 10:11
- */public interface ICityExpandService {
+ */
+public interface ICityExpandService {
+
+    List<CityFocusVO> selectExpand(String city,String cityCh,String year);
 }

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

@@ -1,5 +1,28 @@
-package com.ruoyi.system.service_yada.impl;/**
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.CityFocusVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper_yada.CityExpandMapper;
+import com.ruoyi.system.service_yada.ICityExpandService;
+import org.springframework.stereotype.Service;
+
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
  * @Author: JinSheng Song
  * @Date: 2022/7/1 10:12
- */public class CityExpandServiceimpl {
+ */
+@Service
+public class CityExpandServiceimpl implements ICityExpandService {
+
+
+    @Resource
+    private CityExpandMapper mapper;
+
+    @Override
+    public List<CityFocusVO> selectExpand(String city, String cityCh, String year) {
+        return mapper.selectExpand(city,cityCh,year);
+    }
 }

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

@@ -0,0 +1,40 @@
+<?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_yada.CityExpandMapper">
+
+    <resultMap id="RM_Expand" type="com.ruoyi.system.domain_yada.CityFocusVO">
+        <result property="id" column="id"/>
+        <result property="year" column="year"/>
+        <result property="city" column="city"/>
+        <result property="xAxis" column="x_axis"/>
+        <result property="yAxis" column="y_axis"/>
+        <result property="xAxisPy" column="x_axis_py"/>
+        <result property="yAxisPy" column="y_axis_py"/>
+        <result property="cityCh" column="city_ch"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,year,city,x_axis,y_axis,x_axis_py,y_axis_py,city_ch
+        ]]>
+	</sql>
+
+    <select id="selectExpand" resultMap="RM_Expand">
+        SELECT  <include refid="columns"/>  FROM  Urban_center_of_gravity
+        where 1=1
+        <if test="city!= null and city !=''">
+            AND city = #{city}
+        </if>
+        <if test="cityCh!= null and cityCh !=''">
+            AND city_ch = #{cityCh}
+        </if>
+        <if test="year!= null and year !=''">
+            AND year = #{year}
+        </if>
+    </select>
+
+</mapper>