From 0d4762e5225919eaeefd69f7465b292cbd684feb Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Wed, 4 Sep 2024 12:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E5=8D=83=E4=B8=87=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 25 +++++++--
 .../java/com/muyu/domain/DataMillion.java     | 18 +++++++
 .../controller/DataMillionController.java     | 17 +++++++
 .../mart/controller/MarketController.java     |  6 +--
 .../cloud/mart/mapper/DataMillionMapper.java  | 16 ++++++
 .../mart/service/DataMillionService.java      | 14 +++++
 .../cloud/mart/service/MarketService.java     |  1 -
 .../service/impl/DataMillionServiceImpl.java  | 51 +++++++++++++++++++
 .../mart/service/impl/MarketServiceImpl.java  | 20 +-------
 .../resources/mapper/DataMillionMapper.xml    |  7 +++
 .../{MarketMappers.xml => MarketMapper.xml}   |  0
 11 files changed, 147 insertions(+), 28 deletions(-)
 create mode 100644 cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java
 create mode 100644 cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/DataMillionController.java
 create mode 100644 cloud-port-server/src/main/java/com/muyu/cloud/mart/mapper/DataMillionMapper.java
 create mode 100644 cloud-port-server/src/main/java/com/muyu/cloud/mart/service/DataMillionService.java
 create mode 100644 cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/DataMillionServiceImpl.java
 create mode 100644 cloud-port-server/src/main/resources/mapper/DataMillionMapper.xml
 rename cloud-port-server/src/main/resources/mapper/{MarketMappers.xml => MarketMapper.xml} (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 199437a..2d28ae7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d7f9db40-65da-4834-b29d-bbe0bd94d010" name="更改" comment="天气预警">
+      <change afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/DataMillionController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/mapper/DataMillionMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/DataMillionService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/DataMillionServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/cloud-port-server/src/main/resources/mapper/DataMillionMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/cloud-etl/error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/cloud-etl/error.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/cloud-etl/info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/cloud-etl/info.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cloud-port-server/src/main/resources/mapper/MarketMappers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-server/src/main/resources/mapper/MarketMapper.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -17,6 +24,7 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="Interface" />
         <option value="Class" />
       </list>
     </option>
@@ -139,6 +147,9 @@
       <workItem from="1725238963629" duration="8237000" />
       <workItem from="1725325573388" duration="1221000" />
       <workItem from="1725345043314" duration="1792000" />
+      <workItem from="1725350762294" duration="4960000" />
+      <workItem from="1725380326630" duration="2900000" />
+      <workItem from="1725415396368" duration="2602000" />
     </task>
     <task id="LOCAL-00001" summary="初始化">
       <option name="closed" value="true" />
@@ -372,7 +383,15 @@
       <option name="project" value="LOCAL" />
       <updated>1725244257747</updated>
     </task>
-    <option name="localTasksCounter" value="30" />
+    <task id="LOCAL-00030" summary="天气预警">
+      <option name="closed" value="true" />
+      <created>1725350926810</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1725350926810</updated>
+    </task>
+    <option name="localTasksCounter" value="31" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java b/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java
new file mode 100644
index 0000000..a252df3
--- /dev/null
+++ b/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java
@@ -0,0 +1,18 @@
+package com.muyu.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author：chaiyapeng
+ * @Package：com.muyu.domain
+ * @Project：cloud-port
+ * @name：DataMillion
+ * @Date：2024/9/4 12:07
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataMillion {
+}
diff --git a/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/DataMillionController.java b/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/DataMillionController.java
new file mode 100644
index 0000000..d516bcf
--- /dev/null
+++ b/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/DataMillionController.java
@@ -0,0 +1,17 @@
+package com.muyu.cloud.mart.controller;
+
+import com.muyu.common.core.web.controller.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author：chaiyapeng
+ * @Package：com.muyu.cloud.mart.controller
+ * @Project：cloud-port
+ * @name：DataMillion
+ * @Date：2024/9/4 12:02
+ */
+@RestController
+@RequestMapping("million")
+public class DataMillionController extends BaseController {
+}
diff --git a/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java b/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java
index 714174a..6bac474 100644
--- a/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java
+++ b/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java
@@ -41,11 +41,7 @@ public class MarketController extends BaseController {
      * 两千万条数据查询
      * @return
      */
-    @GetMapping("findMarketList")
-    public Result<TableDataInfo<Market>> findMarketList(){
-        List<Market> list = marketService.findMarketList();
-        return getDataTable(list);
-    }
+
 
     /**
      * 手机号查询归属地
diff --git a/cloud-port-server/src/main/java/com/muyu/cloud/mart/mapper/DataMillionMapper.java b/cloud-port-server/src/main/java/com/muyu/cloud/mart/mapper/DataMillionMapper.java
new file mode 100644
index 0000000..53c3061
--- /dev/null
+++ b/cloud-port-server/src/main/java/com/muyu/cloud/mart/mapper/DataMillionMapper.java
@@ -0,0 +1,16 @@
+package com.muyu.cloud.mart.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.domain.DataMillion;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author：chaiyapeng
+ * @Package：com.muyu.cloud.mart.mapper
+ * @Project：cloud-port
+ * @name：DataMillionMapper
+ * @Date：2024/9/4 12:03
+ */
+@Mapper
+public interface DataMillionMapper extends BaseMapper<DataMillion> {
+}
diff --git a/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/DataMillionService.java b/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/DataMillionService.java
new file mode 100644
index 0000000..a29533d
--- /dev/null
+++ b/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/DataMillionService.java
@@ -0,0 +1,14 @@
+package com.muyu.cloud.mart.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.domain.DataMillion;
+
+/**
+ * @Author：chaiyapeng
+ * @Package：com.muyu.cloud.mart.service
+ * @Project：cloud-port
+ * @name：DataMillionService
+ * @Date：2024/9/4 12:04
+ */
+public interface DataMillionService extends IService<DataMillion> {
+}
diff --git a/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java b/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java
index 6c0889a..88305b1 100644
--- a/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java
+++ b/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java
@@ -17,7 +17,6 @@ import java.util.List;
  * @Date：2024/8/21 21:54
  */
 public interface MarketService extends IService<Market> {
-    List<Market> findMarketList();
 
     Result phonePlace(String tel);
 
diff --git a/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/DataMillionServiceImpl.java b/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/DataMillionServiceImpl.java
new file mode 100644
index 0000000..f632a80
--- /dev/null
+++ b/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/DataMillionServiceImpl.java
@@ -0,0 +1,51 @@
+package com.muyu.cloud.mart.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.cloud.mart.mapper.DataMillionMapper;
+import com.muyu.cloud.mart.service.DataMillionService;
+import com.muyu.domain.DataMillion;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author：chaiyapeng
+ * @Package：com.muyu.cloud.mart.service.impl
+ * @Project：cloud-port
+ * @name：DataMillionServiceImpl
+ * @Date：2024/9/4 12:04
+ */
+@Service
+@Log4j2
+public class DataMillionServiceImpl
+        extends ServiceImpl<DataMillionMapper, DataMillion>
+        implements DataMillionService {
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java b/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java
index 9072a3f..e58be45 100644
--- a/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java
+++ b/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java
@@ -40,25 +40,7 @@ public class MarketServiceImpl extends ServiceImpl<MarketMapper, Market> impleme
     @Autowired
     private RedisTemplate<String,String>redisTemplate;
 
-    @Override
-    public List<Market> findMarketList() {
-        if (redisTemplate.hasKey("list")){
-            List<String> list = redisTemplate.opsForList().range("list", 0, -1);
-            ArrayList<Market> markets = new ArrayList<>();
-            for (String s : list) {
-                markets.add(JSON.parseObject(s, Market.class));
-            }
-            return markets;
-        }
-        startPage();
-//        List<Market> list = marketService.findMarketList();
-        List<Market> list = marketMapper.selectList(null);
-        for (Market market1 : list) {
-            redisTemplate.opsForList().rightPush("list", JSON.toJSONString(market1));
-        }
-        return list;
-    }
-//    public static final PhoneNumberOfflineGeocoder GEOCODER = PhoneNumberOfflineGeocoder.getInstance();
+
 
 
     /**
diff --git a/cloud-port-server/src/main/resources/mapper/DataMillionMapper.xml b/cloud-port-server/src/main/resources/mapper/DataMillionMapper.xml
new file mode 100644
index 0000000..235047c
--- /dev/null
+++ b/cloud-port-server/src/main/resources/mapper/DataMillionMapper.xml
@@ -0,0 +1,7 @@
+<?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.muyu.cloud.mart.mapper.DataMillionMapper">
+
+</mapper>
diff --git a/cloud-port-server/src/main/resources/mapper/MarketMappers.xml b/cloud-port-server/src/main/resources/mapper/MarketMapper.xml
similarity index 100%
rename from cloud-port-server/src/main/resources/mapper/MarketMappers.xml
rename to cloud-port-server/src/main/resources/mapper/MarketMapper.xml