From 2bab7b1fbe99979841fcedef55280f8c641f6492 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sun, 25 Aug 2024 09:19:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=82=AE=E7=BC=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/inspectionProfiles/Project_Default.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 8d66637..c32584c 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,5 +1,6 @@
+
\ No newline at end of file
--
2.40.1
From 56c5bb26fdde95515ad7684e1931ab6b7e2c62f4 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sun, 25 Aug 2024 11:10:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=82=AE=E7=BC=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/muyu/domain/Postcode.java | 22 +++++++++++++++++++
.../mart/controller/MarketController.java | 8 +++++++
.../cloud/mart/service/MarketService.java | 3 +++
.../mart/service/impl/MarketServiceImpl.java | 9 ++++++++
.../muyu/cloud/mart/utils/BirthdayHelper.java | 1 +
.../com/muyu/cloud/mart/utils/Headlines.java | 1 +
.../com/muyu/cloud/mart/utils/IPLocation.java | 1 +
.../cloud/mart/utils/PostcodeInquire.java | 13 ++++++-----
.../com/muyu/cloud/mart/utils/Weather.java | 1 +
9 files changed, 54 insertions(+), 5 deletions(-)
create mode 100644 cloud-mart-common/src/main/java/com/muyu/domain/Postcode.java
diff --git a/cloud-mart-common/src/main/java/com/muyu/domain/Postcode.java b/cloud-mart-common/src/main/java/com/muyu/domain/Postcode.java
new file mode 100644
index 0000000..2efd05c
--- /dev/null
+++ b/cloud-mart-common/src/main/java/com/muyu/domain/Postcode.java
@@ -0,0 +1,22 @@
+package com.muyu.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author:chaiyapeng
+ * @Package:com.muyu.domain
+ * @Project:cloud-mart
+ * @name:Postcode
+ * @Date:2024/8/25 11:04
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Postcode {
+ private String postcode;
+ private Integer page;
+ private Integer pagesize;
+ private String dtype;
+}
diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java
index 0e27060..eba03ba 100644
--- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java
+++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java
@@ -9,6 +9,7 @@ import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.domain.Birthday;
import com.muyu.domain.Market;
+import com.muyu.domain.Postcode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
@@ -80,5 +81,12 @@ public class MarketController extends BaseController {
public Result getBirthday(@RequestBody Birthday birthday){
return marketService.getBirthday(birthday);
}
+ /**
+ * 邮编查询
+ */
+ @PostMapping("getPostcode")
+ public Result getPostcode(@RequestBody Postcode postcode){
+ return marketService.getPostcode(postcode);
+ }
}
diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java
index b5249d2..9146906 100644
--- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java
+++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.core.domain.Result;
import com.muyu.domain.Birthday;
import com.muyu.domain.Market;
+import com.muyu.domain.Postcode;
import java.util.List;
@@ -26,4 +27,6 @@ public interface MarketService extends IService {
Result getWeather();
Result getBirthday(Birthday birthday);
+
+ Result getPostcode(Postcode postcode);
}
diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java
index 203c794..89769e0 100644
--- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java
+++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java
@@ -10,6 +10,7 @@ import com.muyu.common.core.domain.Result;
import com.muyu.domain.Birthday;
import com.muyu.domain.Market;
import com.muyu.domain.PhonePlace;
+import com.muyu.domain.Postcode;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -106,4 +107,12 @@ public class MarketServiceImpl extends ServiceImpl impleme
StringBuffer stringBuffer = BirthdayHelper.queryBirthday(birthday);
return Result.success(stringBuffer);
}
+ /**
+ * 邮编查询
+ */
+ @Override
+ public Result getPostcode(Postcode postcode) {
+ StringBuffer stringBuffer = PostcodeInquire.queryPostcode(postcode);
+ return Result.success(stringBuffer);
+ }
}
diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/BirthdayHelper.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/BirthdayHelper.java
index 12d9c2a..f8aaacd 100644
--- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/BirthdayHelper.java
+++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/BirthdayHelper.java
@@ -17,6 +17,7 @@ import java.util.stream.Collectors;
* @Project:cloud-mart
* @name:BirthdayHelper
* @Date:2024/8/24 19:36
+ * 生辰助手
*/
public class BirthdayHelper {
diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/Headlines.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/Headlines.java
index 4521400..51379b7 100644
--- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/Headlines.java
+++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/Headlines.java
@@ -15,6 +15,7 @@ import static com.muyu.cloud.mart.config.IPLocation.params;
* @Project:cloud-mart
* @name:Headlines
* @Date:2024/8/24 18:39
+ * 新闻头条
*/
public class Headlines {
diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/IPLocation.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/IPLocation.java
index 5a4c788..2cbfe4e 100644
--- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/IPLocation.java
+++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/IPLocation.java
@@ -15,6 +15,7 @@ import java.util.stream.Collectors;
* @Project:cloud-mart
* @name:IPLocation
* @Date:2024/8/23 20:54
+ * IP查询归属地
*/
public class IPLocation {
public static StringBuffer queryIPLocation(String ip){
diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/PostcodeInquire.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/PostcodeInquire.java
index 5da3f3e..9518e09 100644
--- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/PostcodeInquire.java
+++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/PostcodeInquire.java
@@ -1,5 +1,7 @@
package com.muyu.cloud.mart.utils;
+import com.muyu.domain.Postcode;
+
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
@@ -18,16 +20,17 @@ import java.util.stream.Collectors;
*/
public class PostcodeInquire {
- public static StringBuffer queryPostcode(){
+ public static StringBuffer queryPostcode(Postcode postcode){
String apiKey = "0cabcd31c150369d8afb2c8b7e41a2c0";
String apiUrl = "http://v.juhe.cn/postcode/query";
HashMap map = new HashMap<>();
map.put("key", apiKey);
- map.put("postcode", "xxx");
- map.put("page", "20");
- map.put("pagesize", "");
- map.put("dtype", "json");
+ map.put("postcode", postcode.getPostcode());//邮编,如:215001
+ postcode.setPostcode(map.put("postcode", postcode.getPostcode()));
+ map.put("page", String.valueOf(postcode.getPage()));//页数,默认1
+ map.put("pagesize", "");//每页返回,默认:20,最大不超过50
+ map.put("dtype", "json");//返回数据的格式,xml或json,默认json
try {
URL url = new URL(String.format(apiUrl + "?" + params(map)));
BufferedReader in = new BufferedReader(new InputStreamReader((url.openConnection()).getInputStream()));
diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/Weather.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/Weather.java
index c5fa735..4efd595 100644
--- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/Weather.java
+++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/utils/Weather.java
@@ -16,6 +16,7 @@ import java.util.stream.Collectors;
* @Project:cloud-mart
* @name:Weather
* @Date:2024/8/24 18:51
+ * 气象预警
*/
public class Weather {
public static StringBuffer queryWeather() {
--
2.40.1