Merge branch 'xxy' of xuxinyi/ideaDemo into master

pom.xml

@@ -37,6 +37,17 @@
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>provided</scope> <!-- 添加 Tomcat 依赖 -->
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.29</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

src/main/java/com/example/demo/DemoApplication.java

@@ -1,10 +1,12 @@
 package com.example.demo;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
+@MapperScan("com.example.demo")
 public class DemoApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {

src/main/java/com/example/demo/controllers/PoiController.java

@@ -1,47 +1,52 @@
 package com.example.demo.controllers;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.demo.pojo.Poi;
+import com.example.demo.service.IPoiService;
+import com.example.demo.service.Impl.PoiServiceImpI;
 import com.example.demo.vo.PoiVo;
 import com.example.demo.vo.Result;
 import lombok.extern.slf4j.Slf4j;
 import lombok.var;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @Slf4j
 @RequestMapping("/poi")
 public class PoiController {
 
+    @Autowired
+    private PoiServiceImpI poiService;
+
     @GetMapping("/list")
     public Result list(@RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "1") int pageSize){
-        var poi1 = new PoiVo();
-        poi1.name = "张三";
-        poi1.description = "123";
-
-        var poi2 = new PoiVo();
-        poi2.name = "李四";
-        poi2.description = "1234";
-        List<PoiVo> poiList = new ArrayList<>();
-        poiList.add(poi1);
-        poiList.add(poi2);
-        return Result.success(poiList);
+        Page<Poi> page = new Page<>(1, 2);
+        IPage<Poi> pageres = poiService.page(page);
+
+        List<PoiVo> poiVoList = pageres.getRecords().stream().map(poi-> {
+            PoiVo poiVo = new PoiVo();
+            BeanUtils.copyProperties(poi, poiVo);
+            return poiVo;
+        }).collect(Collectors.toList());
+        return Result.success(poiVoList);
     }
 
     @GetMapping("/detail/{id}")
     public Result detail(@PathVariable int id){
-        var poi1 = new PoiVo();
-        poi1.name = "张三";
-        poi1.description = "123";
-        List<PoiVo> poiList = new ArrayList<>();
-        poiList.add(poi1);
-        return Result.success(poiList);
+        Poi poi = poiService.getById(id);
+        return Result.success(poi);
     }
 
     @PostMapping("/add")
     public Result add(@RequestBody Poi info){
+        poiService.save(info);
         return Result.success();
     }
 

src/main/java/com/example/demo/mapper/PoiMapper.java

@@ -0,0 +1,8 @@
+package com.example.demo.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.demo.pojo.Poi;
+
+public interface PoiMapper extends BaseMapper<Poi> {
+
+}

src/main/java/com/example/demo/pojo/Poi.java

@@ -1,14 +1,18 @@
 package com.example.demo.pojo;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
-@Setter
-@Getter
+@Data
+@TableName("poi_table")
 public class Poi {
-    public String name = null;
-    public String description = null;
-//    public float lat;
-//    public float lng;
+    private int id;
+    private String name;
 
+    private String description;
+    private Float lat;
+    private Float lng;
+    private String picUrl;
 }

src/main/java/com/example/demo/service/IPoiService.java

@@ -0,0 +1,8 @@
+package com.example.demo.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.demo.pojo.Poi;
+
+public interface IPoiService extends IService<Poi> {
+
+}

src/main/java/com/example/demo/service/Impl/PoiServiceImpI.java

@@ -0,0 +1,11 @@
+package com.example.demo.service.Impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.demo.mapper.PoiMapper;
+import com.example.demo.pojo.Poi;
+import com.example.demo.service.IPoiService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PoiServiceImpI extends ServiceImpl<PoiMapper, Poi> implements IPoiService {
+}

src/main/java/com/example/demo/vo/PoiVo.java

@@ -1,14 +1,12 @@
 package com.example.demo.vo;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
-@Setter
-@Getter
-public class PoiVo {
-    public String name = null;
-    public String description = null;
-//    public float lat;
-//    public float lng;
+import java.util.List;
 
+@Data
+public class PoiVo {
+    private int id;
+    private String name = null;
+    private String description = null;
 }

src/main/resources/application.yml

@@ -0,0 +1,9 @@
+spring:
+  application:
+    name: Server
+
+  datasource:
+    url: jdbc:mysql://60.204.139.57:3306/college_poi
+    username: root
+    password: 1
+    driver-class-name: com.mysql.cj.jdbc.Driver