From 460f7c242f6562213fe0263e170d958c8179166a Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Fri, 31 Dec 2021 00:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A1=E3=80=81=E8=8B=B1?=
 =?UTF-8?q?=E8=AF=AD=E5=8D=95=E8=AF=8D=E6=A8=A1=E5=9D=97=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?id=E6=9F=A5=E8=AF=A2=E5=8E=9F=E5=85=88=E6=8A=BD=E5=B1=89?=
 =?UTF-8?q?=E4=B8=AA=E4=BF=AE=E6=94=B9=E5=85=AC=E7=94=A8=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=8E=B0=E5=B7=B2=E6=8A=BD=E7=A6=BB?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/business/english/word.js     |  8 ++++++
 .../src/views/business/english/word/index.vue | 11 +++++---
 .../controller/EnglishWordController.java     | 28 +++++++++++++------
 .../xjs/word/service/IEnglishWordService.java |  9 ++++--
 .../service/impl/EnglishWordServiceImpl.java  |  7 ++++-
 5 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/ruoyi-ui/src/api/business/english/word.js b/ruoyi-ui/src/api/business/english/word.js
index 6ee255a0..a8725cc6 100644
--- a/ruoyi-ui/src/api/business/english/word.js
+++ b/ruoyi-ui/src/api/business/english/word.js
@@ -17,6 +17,14 @@ export function getWord(id) {
   })
 }
 
+export function getWordRPC(id) {
+  return request({
+    url: '/english/word/rpc/' + id,
+    method: 'get'
+  })
+}
+
+
 // 新增英语单词
 export function addWord(data) {
   return request({
diff --git a/ruoyi-ui/src/views/business/english/word/index.vue b/ruoyi-ui/src/views/business/english/word/index.vue
index f72e59d4..143acf63 100644
--- a/ruoyi-ui/src/views/business/english/word/index.vue
+++ b/ruoyi-ui/src/views/business/english/word/index.vue
@@ -154,7 +154,7 @@
     />
 
     <!-- 修改英语单词对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body >
       <el-form ref="formEdit" :model="form" :rules="rulesEdit" label-width="80px">
         <el-form-item label="英语单词" prop="englishWord">
           <el-input v-model="form.englishWord" placeholder="请输入英语单词"/>
@@ -189,7 +189,7 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" v-loading="loadingEdit">
         <el-button type="primary" @click="submitFormEdit">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -258,7 +258,7 @@
 </template>
 
 <script>
-import {listWord, getWord, delWord, addWord, updateWord} from "@/api/business/english/word";
+import {listWord, getWord, delWord, addWord, updateWord,getWordRPC} from "@/api/business/english/word";
 
 export default {
   name: "Word",
@@ -271,6 +271,7 @@ export default {
       drawer: false,
       // 遮罩层
       loading: true,
+      loadingEdit: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -343,7 +344,7 @@ export default {
     //根据id查询放入抽屉
     findById(id) {
       this.loadingC = true;
-      getWord(id).then(res => {
+      getWordRPC(id).then(res => {
         this.form = res.data
         this.loadingC = false
       })
@@ -435,8 +436,10 @@ export default {
       this.$refs["formEdit"].validate(valid => {
           if (valid) {
             if (this.form.id != null) {
+              this.loadingEdit= true
               updateWord(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
+                this.loadingEdit= false
                 this.open = false;
                 this.getList();
               });
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java
index 02459e5c..d81d7fce 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java
@@ -43,6 +43,25 @@ public class EnglishWordController extends BaseController {
     }
 
 
+    /**
+     * 获取英语单词详细信息RPC
+     */
+    @RequiresPermissions("english:word:query")
+    @GetMapping(value = "/rpc/{id}")
+    public AjaxResult getInfoRPC(@PathVariable("id") Long id) {
+        return AjaxResult.success(englishWordService.selectEnglishWordToRPC(id));
+    }
+
+    /**
+     * 获取英语单词详细信息
+     */
+    @RequiresPermissions("english:word:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(englishWordService.selectById(id));
+    }
+
+
     //------------------------代码自动生成-----------------------------------
 
     /**
@@ -68,14 +87,7 @@ public class EnglishWordController extends BaseController {
         util.exportExcel(response, list, "英语单词数据");
     }
 
-    /**
-     * 获取英语单词详细信息
-     */
-    @RequiresPermissions("english:word:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(englishWordService.selectEnglishWordById(id));
-    }
+
 
     /**
      * 新增英语单词
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java
index 69f2a3c9..645d0d6f 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java
@@ -18,15 +18,18 @@ public interface IEnglishWordService {
      */
     List<EnglishWord> getEnglishWordByCollect();
 
-
-    //------------------------代码自动生成-----------------------------------
     /**
      * 查询英语单词
      *
      * @param id 英语单词主键
      * @return 英语单词
      */
-    public EnglishWord selectEnglishWordById(Long id);
+    public EnglishWord selectEnglishWordToRPC(Long id);
+
+    EnglishWord selectById(Long id);
+
+
+    //------------------------代码自动生成-----------------------------------
 
     /**
      * 查询英语单词列表
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java
index 2b2b527e..196fd338 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java
@@ -53,7 +53,7 @@ public class EnglishWordServiceImpl implements IEnglishWordService {
      * @return 英语单词
      */
     @Override
-    public EnglishWord selectEnglishWordById(Long id) {
+    public EnglishWord selectEnglishWordToRPC(Long id) {
         EnglishWord englishWord = englishWordMapper.selectById(id);
         Optional.ofNullable(englishWord).orElseThrow(() -> new BusinessException("数据丢失了~~~~"));
         //每次调用查看次数+1
@@ -81,6 +81,11 @@ public class EnglishWordServiceImpl implements IEnglishWordService {
         return englishWord;
     }
 
+    @Override
+    public EnglishWord selectById(Long id) {
+        return englishWordMapper.selectEnglishWordById(id);
+    }
+
     /**
      * 新增英语单词
      *