From b5ad7a1721bc76c2c4ab6d7a34eecb4da707ce3b Mon Sep 17 00:00:00 2001
From: chenchun <454313500@qq.com>
Date: Sat, 10 Sep 2022 20:25:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=A1=B5=E9=9D=A2=E4=B8=8E?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Config/SwaggerDoc.xml                     |  28 ++++++++++++++++++
 .../Controllers/DictionaryController.cs       |  25 ++++++++++++++++
 .../Controllers/DictionaryInfoController.cs   |  24 +++++++++++++++
 .../yi-sqlsugar-dev.db                        | Bin 126976 -> 126976 bytes
 Yi.Vue3.X.RuoYi/src/api/system/dict/data.js   |   4 +--
 Yi.Vue3.X.RuoYi/src/api/system/dict/type.js   |  11 +++++--
 .../src/views/system/dict/data.vue            |   2 +-
 .../src/views/system/dict/index.vue           |  16 +++++-----
 8 files changed, 96 insertions(+), 14 deletions(-)

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
index 73c9f8fe..7a8e4863 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
@@ -130,6 +130,20 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.DelList(System.Collections.Generic.List{System.Int64})">
+            <summary>
+            id范围删除
+            </summary>
+            <param name="ids"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.Update(Yi.Framework.Model.Models.DictionaryEntity)">
+            <summary>
+            更新
+            </summary>
+            <param name="dic"></param>
+            <returns></returns>
+        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.PageList(Yi.Framework.Model.Models.DictionaryInfoEntity,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             动态条件分页查询
@@ -159,6 +173,20 @@
             <param name="ids"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.Update(Yi.Framework.Model.Models.DictionaryInfoEntity)">
+            <summary>
+            更新
+            </summary>
+            <param name="dicInfo"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.GetById(System.Int64)">
+            <summary>
+            根据字典id获取字典信息表
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="T:Yi.Framework.ApiMicroservice.Controllers.FileController">
             <summary>
             文件
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DictionaryController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DictionaryController.cs
index 0fcc3abb..c5c38f6f 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DictionaryController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DictionaryController.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Yi.Framework.Common.Helper;
 using Yi.Framework.Common.Models;
 using Yi.Framework.Interface;
 using Yi.Framework.Model.Models;
@@ -73,5 +74,29 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         {
             return Result.Success().SetData(await _iDictionaryService._repository.GetListAsync());
         }
+
+
+        /// <summary>
+        /// id范围删除
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [HttpDelete]
+
+        public async Task<Result> DelList(List<long> ids)
+        {
+            return Result.Success().SetStatus(await _iDictionaryService._repository.DeleteByIdsAsync(ids.ToDynamicArray()));
+        }
+
+        /// <summary>
+        /// 更新
+        /// </summary>
+        /// <param name="dic"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<Result> Update(DictionaryEntity dic)
+        {
+            return Result.Success().SetStatus(await _iDictionaryService._repository.UpdateIgnoreNullAsync(dic));
+        }
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DictionaryInfoController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DictionaryInfoController.cs
index 06a321df..2a41bb27 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DictionaryInfoController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DictionaryInfoController.cs
@@ -76,5 +76,29 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             return Result.Success().SetStatus(await _iDictionaryInfoService._repository.DeleteByIdsAsync(ids.ToDynamicArray()));
         }
 
+
+        /// <summary>
+        /// 更新
+        /// </summary>
+        /// <param name="dicInfo"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<Result> Update(DictionaryInfoEntity dicInfo)
+        {
+            return Result.Success().SetStatus(await _iDictionaryInfoService._repository.UpdateIgnoreNullAsync(dicInfo));
+        }
+
+
+        /// <summary>
+        /// 根据字典id获取字典信息表
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("{id}")]
+        public async Task<Result> GetById(long id)
+        {
+            return Result.Success().SetData(await _iDictionaryInfoService._repository.GetByIdAsync(id));
+        }
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index 323989b1dc070edce32ee6587b9d8c6d6f6a745b..bc2597acdd9b90ed09ea2b331fc1aeb42169b108 100644
GIT binary patch
delta 368
zcmZp8z~1nHeS$Qj-$WT_M!&{{tqF|F`dJn+@Gsgd=rDsnE{0KnO_Tu$j2WCcfRwDF
z=#dR?CLa=DD6T9vF)}bR(lxNuH8fB#GO#i<vNAA06S4pb=@}bY8d_SK7#bNH8krax
zKik^<V*S*oQ@f0|Enxh`F9b1<7ic;Ye+&cv4*r<UiV6Yz^-)ZGY@+f&+rf5oh>ITC
zWY5I}u^DWZv7w<M$W$zLq6!%qS(zH@8Jk!dn3|cIg0#3X^05gE%Q7%HGca&4a7Y7v
z^}7+`tHSbBLnELfpejrc8e8g_n;2Ob8=C?B0y2pU?Cj?Z{9pK=Zx$@L%|H2oKC2Ma
TrA*w+Y@86IxBolO$fN)ORG3_x

delta 219
zcmZp8z~1nHeS$Qj+e8^>Mz_X<tqF|F`dRif@bBL&=&+UF(Vmf?O_~7+oEaE6fRv=@
zk;vGaO#%!hsl_FRM#e@4Mn<{@mb!)p3Wmm3CYDyFhI;0vCT13fMup`mh2^Q+7BK$e
z7l7#D1sNp3z`(y3X!tgMFK1~<VYtbnN0!h3=ma<T+1BnC>!+gGU}<G+Xk}uiXJ&2;
bwAz9TX5N?0f(38+*?AylZ2xzjkx2mnC+ItU

diff --git a/Yi.Vue3.X.RuoYi/src/api/system/dict/data.js b/Yi.Vue3.X.RuoYi/src/api/system/dict/data.js
index 5ff5ac04..8f7766ea 100644
--- a/Yi.Vue3.X.RuoYi/src/api/system/dict/data.js
+++ b/Yi.Vue3.X.RuoYi/src/api/system/dict/data.js
@@ -12,7 +12,7 @@ export function listData(query) {
 // 查询字典数据详细
 export function getData(dictCode) {
   return request({
-    url: '/system/dict/data/' + dictCode,
+    url: '/dictionaryInfo/getById/' + dictCode,
     method: 'get'
   })
 }
@@ -37,7 +37,7 @@ export function addData(data) {
 // 修改字典数据
 export function updateData(data) {
   return request({
-    url: '/system/dict/data',
+    url: '/dictionaryInfo/update',
     method: 'put',
     data: data
   })
diff --git a/Yi.Vue3.X.RuoYi/src/api/system/dict/type.js b/Yi.Vue3.X.RuoYi/src/api/system/dict/type.js
index f886c6a8..347686d6 100644
--- a/Yi.Vue3.X.RuoYi/src/api/system/dict/type.js
+++ b/Yi.Vue3.X.RuoYi/src/api/system/dict/type.js
@@ -29,7 +29,7 @@ export function addType(data) {
 // 修改字典类型
 export function updateType(data) {
   return request({
-    url: '/system/dict/type',
+    url: '/dictionary/update',
     method: 'put',
     data: data
   })
@@ -37,9 +37,14 @@ export function updateType(data) {
 
 // 删除字典类型
 export function delType(dictId) {
+  if("string"==typeof(dictId))
+{
+  dictId=[dictId];
+}
   return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'delete'
+    url: '/dictionary/delList',
+    method: 'delete',
+    data:dictId
   })
 }
 
diff --git a/Yi.Vue3.X.RuoYi/src/views/system/dict/data.vue b/Yi.Vue3.X.RuoYi/src/views/system/dict/data.vue
index 3356f84e..26fefe3a 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/dict/data.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/dict/data.vue
@@ -221,7 +221,7 @@ const data = reactive({
     pageSize: 10,
     dictName: undefined,
     dictType: undefined,
-    isDeleted: undefined
+    isDeleted: false
   },
   rules: {
     dictLabel: [{ required: true, message: "数据标签不能为空", trigger: "blur" }],
diff --git a/Yi.Vue3.X.RuoYi/src/views/system/dict/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/dict/index.vue
index 049eaad5..43f53c85 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/dict/index.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/dict/index.vue
@@ -19,9 +19,9 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="状态" prop="status">
+         <el-form-item label="状态" prop="isDeleted">
             <el-select
-               v-model="queryParams.status"
+               v-model="queryParams.isDeleted"
                placeholder="字典状态"
                clearable
                style="width: 240px"
@@ -206,7 +206,7 @@ const data = reactive({
     pageSize: 10,
     dictName: undefined,
     dictType: undefined,
-    isDeleted: undefined
+    isDeleted: false
   },
   rules: {
     dictName: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],
@@ -233,7 +233,7 @@ function cancel() {
 /** 表单重置 */
 function reset() {
   form.value = {
-    Id: undefined,
+    id: undefined,
     dictName: undefined,
     dictType: undefined,
     isDeleted: false,
@@ -260,14 +260,14 @@ function handleAdd() {
 }
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.dictId);
+  ids.value = selection.map(item => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
-  const dictId = row.dictId || ids.value;
+  const dictId = row.id || ids.value;
   getType(dictId).then(response => {
     form.value = response.data;
     open.value = true;
@@ -278,7 +278,7 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["dictRef"].validate(valid => {
     if (valid) {
-      if (form.value.dictId != undefined) {
+      if (form.value.id != undefined) {
         updateType(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
@@ -296,7 +296,7 @@ function submitForm() {
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const dictIds = row.dictId || ids.value;
+  const dictIds = row.id || ids.value;
   proxy.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
     return delType(dictIds);
   }).then(() => {