From 68a4e9a454dcb6ba024623243828923bf10f28e7 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Wed, 4 Sep 2024 15:00:01 +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                           | 19 ++++++++++++++++---
 .../java/com/muyu/domain/DataMillion.java     |  1 +
 .../controller/DataMillionController.java     | 14 ++++++++++++++
 .../service/impl/DataMillionServiceImpl.java  |  7 ++++---
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 66d906a..0f2d677 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d7f9db40-65da-4834-b29d-bbe0bd94d010" name="更改" comment="两千万数据框架" />
+    <list default="true" id="d7f9db40-65da-4834-b29d-bbe0bd94d010" name="更改" comment="两千万数据框架">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/DataMillionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/DataMillionController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/DataMillionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/DataMillionServiceImpl.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -138,7 +143,7 @@
       <workItem from="1725345043314" duration="1792000" />
       <workItem from="1725350762294" duration="4960000" />
       <workItem from="1725380326630" duration="2900000" />
-      <workItem from="1725415396368" duration="3489000" />
+      <workItem from="1725415396368" duration="5071000" />
     </task>
     <task id="LOCAL-00001" summary="初始化">
       <option name="closed" value="true" />
@@ -388,7 +393,15 @@
       <option name="project" value="LOCAL" />
       <updated>1725423093550</updated>
     </task>
-    <option name="localTasksCounter" value="32" />
+    <task id="LOCAL-00032" summary="两千万数据框架">
+      <option name="closed" value="true" />
+      <created>1725431886701</created>
+      <option name="number" value="00032" />
+      <option name="presentableId" value="LOCAL-00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1725431886701</updated>
+    </task>
+    <option name="localTasksCounter" value="33" />
     <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
index 58e1929..c9a19de 100644
--- a/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java
+++ b/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java
@@ -16,4 +16,5 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class DataMillion {
     private Long id;
+    private String name;
 }
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
index d516bcf..3581dee 100644
--- 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
@@ -1,9 +1,19 @@
 package com.muyu.cloud.mart.controller;
 
+import cn.hutool.db.PageResult;
+import com.dtflys.forest.annotation.Post;
+import com.muyu.cloud.mart.service.DataMillionService;
 import com.muyu.common.core.web.controller.BaseController;
+import com.muyu.domain.DataMillion;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.xml.transform.Result;
+import java.util.List;
+
 /**
  * @Author：chaiyapeng
  * @Package：com.muyu.cloud.mart.controller
@@ -14,4 +24,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("million")
 public class DataMillionController extends BaseController {
+    @Autowired
+    private DataMillionService dataMillionService;
+
+
 }
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
index f632a80..1d90778 100644
--- 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
@@ -5,6 +5,7 @@ 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,9 +17,9 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @Log4j2
-public class DataMillionServiceImpl
-        extends ServiceImpl<DataMillionMapper, DataMillion>
-        implements DataMillionService {
+public class DataMillionServiceImpl extends ServiceImpl<DataMillionMapper, DataMillion> implements DataMillionService {
+    @Autowired
+    private DataMillionMapper dataMillionMapper;
 }