From 9c489de2ef8696002aa8c7c116c3029693826ed0 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Wed, 25 Dec 2024 15:51:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/controller/UserController.java  |  7 +++++++
 src/main/java/com/example/demo/domain/entity/User.java         |  1 +
 src/main/java/com/example/demo/mapper/UserMapper.java          | 10 ++++++----
 .../java/com/example/demo/serviceImpl/DetailYServiceImpl.java  |  2 +-
 .../java/com/example/demo/serviceImpl/UserServiceImpl.java     |  8 +++++---
 src/main/java/com/example/demo/sevice/UserSevice.java          |  4 +---
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/UserController.java b/src/main/java/com/example/demo/controller/UserController.java
index 8cf8d40..bebc32a 100644
--- a/src/main/java/com/example/demo/controller/UserController.java
+++ b/src/main/java/com/example/demo/controller/UserController.java
@@ -1,6 +1,7 @@
 package com.example.demo.controller;
 
 
+import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.domain.vo.UserVo;
 import com.example.demo.sevice.UserSevice;
@@ -27,4 +28,10 @@ public class UserController {
             return Result.error(e.getMessage());
         }
     }
+    @PostMapping("/search")
+    //调用service.area查询地区
+    public Result search() throws Exception {
+        return Result.success(userSevice.area());
+    }
+
 }
diff --git a/src/main/java/com/example/demo/domain/entity/User.java b/src/main/java/com/example/demo/domain/entity/User.java
index a0d8363..656af3c 100644
--- a/src/main/java/com/example/demo/domain/entity/User.java
+++ b/src/main/java/com/example/demo/domain/entity/User.java
@@ -18,6 +18,7 @@ public class User {
     private String phone;
     private String email;
     private String gender;
+    private String area;
     private Date birthday;
     private String head;
     private Integer UserFlag;
diff --git a/src/main/java/com/example/demo/mapper/UserMapper.java b/src/main/java/com/example/demo/mapper/UserMapper.java
index 08f468e..9406178 100644
--- a/src/main/java/com/example/demo/mapper/UserMapper.java
+++ b/src/main/java/com/example/demo/mapper/UserMapper.java
@@ -4,11 +4,8 @@ package com.example.demo.mapper;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.entity.UserGold;
 import com.example.demo.domain.vo.UserVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 @Mapper
@@ -108,6 +105,11 @@ public interface UserMapper {
     })
     int updateGold(UserGold userGold);
 
+    @Select({
+            "SELECT  DISTINCT area FROM `user`"
+    })
+    List<String> selectArea();
+
 //    //去掉免费金币，先去6个月，再去12月
 //    @Update({
 //            "<script>",
diff --git a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
index b1cce8c..c50ce53 100644
--- a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
@@ -36,7 +36,7 @@ public class DetailYServiceImpl implements DetailYService {
     public DetailYgold getgold(DetailYgold detailYgold) {
         return (DetailYgold) detailYMapper.selectgold(detailYgold);
     }
-
+    @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + #detailYgold.hashCode()")
     @Override
     public PageInfo<DetailYgold> selectgold(int pageNum, int pageSize, DetailYgold detailYgold) {
         PageHelper.startPage(pageNum, pageSize);
diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
index 5a0656b..01f31de 100644
--- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
@@ -3,16 +3,13 @@ package com.example.demo.serviceImpl;
 
 import com.example.demo.domain.entity.Detail;
 import com.example.demo.domain.entity.User;
-import com.example.demo.domain.vo.UserConsumeCoin;
 import com.example.demo.domain.vo.UserVo;
 import com.example.demo.mapper.UserMapper;
 import com.example.demo.sevice.UserSevice;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -41,6 +38,11 @@ public class UserServiceImpl implements UserSevice {
         return new PageInfo<>(list);
     }
 
+    @Override
+    public List<String> area() {
+        return userMapper.selectArea();
+    }
+
     //设置免费金币
 //    public User updateFreecoin(Detail userConsumeCoin) {
 //
diff --git a/src/main/java/com/example/demo/sevice/UserSevice.java b/src/main/java/com/example/demo/sevice/UserSevice.java
index b8197f3..c3f4f98 100644
--- a/src/main/java/com/example/demo/sevice/UserSevice.java
+++ b/src/main/java/com/example/demo/sevice/UserSevice.java
@@ -2,15 +2,13 @@ package com.example.demo.sevice;
 
 
 import com.example.demo.domain.entity.User;
-import com.example.demo.domain.vo.UserConsumeCoin;
 import com.example.demo.domain.vo.UserVo;
 import com.github.pagehelper.PageInfo;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface UserSevice {
     UserVo search(UserVo userVo) throws Exception;
     PageInfo<User> searchForPage(Integer pageNum, Integer pageSize, User User);
-
+    List<String> area();
 }