From 7617ba506515cd53172177e0fe89b6ecc8148229 Mon Sep 17 00:00:00 2001
From: xiaoguo <xiaoguo75131@163.com>
Date: Wed, 1 Nov 2023 23:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PVDEMCS/.vs/PVDEMCS/v17/.suo                  | Bin 163840 -> 163840 bytes
 .../Repositories/Impl/DeviceRepository.cs     |  16 ++++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo
index 691c933c9705609a517b57fce5fbcbd92e235162..e318c28d2bdb149fc2b747107011bfab668eee9e 100644
GIT binary patch
delta 916
zcmbu*T}V@57zc2l*K?+gH20Aoo9L3cEKR3Lvls^rlM#hF8U#kGi>wR#SP{`po#l;D
zi1ZT2n+#4N7(}&Gj7s{DAcC-{i)=;EuDpnd!0IBi|6_}8i(dHgJn!c@&!g*hUAK?)
z(7_wMUZM6J4Gqp%32~9ARXUXFjs=W{yu7?+;0B%_Lac@`oPkD2!fn_LKX9fWaS%4i
zgyM1^N2Y)iyuh!>Q6*TxNdyZ8unpG3c32_bD=Qsk$OhmD48cZOp?V98ku5$DR>O|H
znCypDuocSXX|=xXCbBy)k8_6+C*U5$Aq9M$M@=s8&PDk_)zy-(&D;aquO1Y-_Sv!P
zf+pZTa6kAq_k*kYr+(l(|J7Q=-4Fxr4!<YQDxD4+CV$t7xQ~nHi(GsyltTwZfy<Yp
zs!v&bc~Y&c<)j3w9Df(gIsXoilh~`b=9lCzHJu_=?zdg?dxYh0c}wPJVft-S_Xe!M
zy9}io{5H$K0qd>8{3udw0bvEIGE{T|FI48fpv&emm-LlhCl6=tyI8*uldv;)Mt&=;
zq+Qr9Q=ejK53*;bW*ZNaz$a4?s<G(H0+|CI`7l;%d@2;qbV#EoWJIr0&<YMc&o{e-
z5nU%VOB<dlGPejL+eJ>JagIu@y0MvR<J4=aN>_DJmW&roqRtqZpi%2Ve>;s2lQ_2=
z1wG0Xn4Q9$F8*`Xw>ow#*m$euWnXgE5qgtc6S;OiJv;rlJ8pa*>PyU3$lh0OYsc7S
X!p;A!`T$og+plPYS~jg^Y3jmH!LB47

delta 1172
zcmbW0ZAep57{~89ZqxZz>n>Zma@m|KO=f6Rtf6ILL1j^3kfa6W2Z^NU?Ta^*FtRXD
zc>}5JVj}g$b_*+_7Y%yBeCbUy3*5)@W07Cf{?EJvu|9Ri?>^7-KhMtD|Lj~viB*)?
zhGMq<?v500?(mJ=9@MM&4aQCjn<=%xAxTmeNCQ*GID$MC_zf)^@eFtf4ueUfuLk)R
zQDu^2NT@?4>SGFRkC5yFYd{IOFGfunwh6RUqB;twy;Cf-?z2%A8R?jDigV`7@N(x-
ziN{u_{UDN)zy!8~XduSSin$^5g}hj%y~M~Bb1*~OBqPrBC8NFtX8JmT`d_}>(8InE
zi@+jK4t4`FX1H|a(XaMGpqOC9D#XoTn^Du;-zP!p|C~hn?31t<+mL4()u`v{6V|Bs
z#&NqC^2ZC8zeDtom$4-xXI)>=;kM}RwIfWM$AcxD>)btQ*7ovX7U?eNxm+vb!POqF
zdsYrJt%7R-i`K&%Wv}k7A7a5GmZr0wDW+8>&)y-IcF^ifZMlrAJ6G|59=O<*aF2B}
zwR<tkiKG99jsioBK9SYzUo1)YULQ&gmUOcy7AFZ;t4sKJqBRpOU#U-@D2?LPWGoR?
z#N<}wq}3vxHS)-XB>e)kjfPJ3CFFa+Wkb7y*aTEiYG~Bgj64Gz2dBUS&_Z|QCK3%C
z0<EA8SV23WFXkKZ4&pMLLZ<D3q0oJyj;CV4FPA?zssl!RX+-Lv@e1{8@CLk{G1rT{
z5A=fp@D98OAHYZO2@Ha7*gM4*LN>kL^z#SQrR*m?t-m94;&YypEKC83iAlRx_q-U6
zR`;vS-f1spV@&H!Y-(nTs$6ByM1HMTw10P~N;9jJ3#1j251#_C0q?j^+9aw|GIY=K
kVb<s<48OZhEGx<fWzmu}Uq9xkXW<)B69{z%LagiBAIaah<NyEw

diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/DeviceRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/DeviceRepository.cs
index f894ace..7e631e8 100644
--- a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/DeviceRepository.cs
+++ b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/DeviceRepository.cs
@@ -126,12 +126,12 @@ namespace PVDEMCS.Services.Repositories.Impl
                 var query = context.DeviceInfos.Where(f => !f.IsDelete);
                 if (query.Where(f => f.DeviceName == entity.DeviceName).FirstOrDefault() != null)
                 {
-                    result.Message = $"没有找到Id:【{entity.DeviceName}】的数据";
+                    result.Message = $"已存在DeviceName:【{entity.DeviceName}】的数据";
                     return result;
                 }
                 if (query.Where(f => f.DeviceCode == entity.DeviceCode).FirstOrDefault() != null)
                 {
-                    result.Message = $"没有找到Id:【{entity.DeviceCode}】的数据";
+                    result.Message = $"已存在DeviceCode:【{entity.DeviceCode}】的数据";
                     return result;
                 }
 
@@ -163,12 +163,12 @@ namespace PVDEMCS.Services.Repositories.Impl
                 }
                 if (query.Where(f => f.DeviceName == entity.DeviceName && f.Id != entity.Id).FirstOrDefault() != null)
                 {
-                    result.Message = $"没有找到Id:【{entity.DeviceName}】的数据";
+                    result.Message = $"已存在DeviceName:【{entity.DeviceName}】的数据";
                     return result;
                 }
                 if (query.Where(f => f.DeviceCode == entity.DeviceCode && f.Id != entity.Id).FirstOrDefault() != null)
                 {
-                    result.Message = $"没有找到Id:【{entity.DeviceCode}】的数据";
+                    result.Message = $"已存在DeviceCode:【{entity.DeviceCode}】的数据";
                     return result;
                 }
 
@@ -355,12 +355,12 @@ namespace PVDEMCS.Services.Repositories.Impl
                 var query = context.DevicePoints.Where(f => !f.IsDelete);
                 if (query.Where(f => f.PointName == entity.PointName).FirstOrDefault() != null)
                 {
-                    result.Message = $"没有找到Id:【{entity.PointName}】的数据";
+                    result.Message = $"已存在PointName:【{entity.PointName}】的数据";
                     return result;
                 }
                 if (query.Where(f => f.PointCode == entity.PointCode).FirstOrDefault() != null)
                 {
-                    result.Message = $"没有找到Id:【{entity.PointCode}】的数据";
+                    result.Message = $"已存在PointCode:【{entity.PointCode}】的数据";
                     return result;
                 }
 
@@ -393,12 +393,12 @@ namespace PVDEMCS.Services.Repositories.Impl
                 }
                 if (query.Where(f => f.PointName == entity.PointName && f.Id != entity.Id).FirstOrDefault() != null)
                 {
-                    result.Message = $"没有找到Id:【{entity.PointName}】的数据";
+                    result.Message = $"已存在PointName:【{entity.PointName}】的数据";
                     return result;
                 }
                 if (query.Where(f => f.PointCode == entity.PointCode && f.Id != entity.Id).FirstOrDefault() != null)
                 {
-                    result.Message = $"没有找到Id:【{entity.PointCode}】的数据";
+                    result.Message = $"已存在PointCode:【{entity.PointCode}】的数据";
                     return result;
                 }
                 update.DeviceId = entity.DeviceId;