From fbba6d6e8ccf4b052735bd51fd04ff7cb5c16b78 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 19 九月 2023 17:32:30 +0800
Subject: [PATCH] 设备类型接口修改、导入问题修改、缺陷定义接口开发

---
 VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs |  150 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 113 insertions(+), 37 deletions(-)

diff --git a/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
index 6e80d4d..fba962b 100644
--- a/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
@@ -2375,20 +2375,18 @@
 
 
         #region[璁惧绫诲瀷鏌ヨ]
-        public static ToMessage DeviceTypeSearch(int startNum, int endNum, string prop, string order)
+        public static ToMessage DeviceTypeSearch()
         {
-            var dynamicParams = new DynamicParameters();
             try
             {
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
-                var total = 0; //鎬绘潯鏁�
-                var sql = @"select id, code,name,remark 
+                var sql = @"select id, code,name 
                             from TEqpType";
-                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+                var data = DapperHelper.selecttable(sql);
                 mes.code = "200";
                 mes.Message = "鏌ヨ鎴愬姛!";
-                mes.count = total;
-                mes.data = data.ToList();
+                mes.count = data.Rows.Count;
+                mes.data = data;
             }
             catch (Exception e)
             {
@@ -2402,7 +2400,7 @@
         #endregion
 
         #region[璁惧绫诲瀷鏂板]
-        public static ToMessage AddUpdateDeviceType(List<ObjectDataCont> json, User us)
+        public static ToMessage AddUpdateDeviceType(string OperType, List<ObjectDataCont> json, User us)
         {
             var sql = "";
             List<object> list = new List<object>();
@@ -2410,39 +2408,117 @@
             try
             {
                 list.Clear();
-                //寰幆鍐欏叆璁惧绫诲瀷琛�
-                for (int i = 0; i < json.Count; i++)
+                if (OperType == "Add")
                 {
-                    sql = @"insert into TEqpType(code,name,lm_user,lm_date,remark) values(@code,@name,@username,@createdate,@description)";
-                    list.Add(new
+                    //鍒ゆ柇璁惧绫诲瀷鏄惁閲嶅
+                    sql = @"select *  from TEqpType where code=@devtypecode";
+                    dynamicParams.Add("@devtypecode", json[0].code);
+                    var data = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data.Rows.Count > 0)
                     {
-                        str = sql,
-                        parm = new
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.Message = "璁惧绫诲瀷缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+                        mes.data = null;
+                        return mes;
+                    }
+                    //鍒ゆ柇璁惧绫诲瀷鍚嶇О鏄惁閲嶅
+                    sql = @"select *  from TEqpType where name=@devtypename";
+                    dynamicParams.Add("@devtypename", json[0].name);
+                    var data1 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data1.Rows.Count > 0)
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.Message = "璁惧绫诲瀷鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+                        mes.data = null;
+                        return mes;
+                    }
+                    //寰幆鍐欏叆璁惧绫诲瀷琛�
+                    for (int i = 0; i < json.Count; i++)
+                    {
+                        sql = @"insert into TEqpType(code,name,lm_user,lm_date,remark) values(@code,@name,@username,@createdate,@description)";
+                        list.Add(new
                         {
-                            code = json[i].code,
-                            name = json[i].name,
-                            username = us.usercode,
-                            createdate = DateTime.Now.ToString(),
-                            description = json[i].description
-                        }
-                    });
+                            str = sql,
+                            parm = new
+                            {
+                                code = json[i].code,
+                                name = json[i].name,
+                                username = us.usercode,
+                                createdate = DateTime.Now.ToString(),
+                                description = json[i].description
+                            }
+                        });
+                    }
+
+                    bool aa = DapperHelper.DoTransaction(list);
+                    if (aa)
+                    {
+                        //鍐欏叆鎿嶄綔璁板綍琛�
+                        LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚澶囩被鍨�:" + string.Join(",", json.Select(m => m.code)), us.usertype);
+                        mes.code = "200";
+                        mes.count = 0;
+                        mes.Message = "鎿嶄綔鎴愬姛!";
+                        mes.data = null;
+                    }
+                    else
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.Message = "鎿嶄綔澶辫触!";
+                        mes.data = null;
+                    }
                 }
-                bool aa = DapperHelper.DoTransaction(list);
-                if (aa)
+                if (OperType == "Update")
                 {
-                    //鍐欏叆鎿嶄綔璁板綍琛�
-                    LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚澶囩被鍨�:" + string.Join(",", json.Select(m => m.code)), us.usertype);
-                    mes.code = "200";
-                    mes.count = 0;
-                    mes.Message = "鎿嶄綔鎴愬姛!";
-                    mes.data = null;
-                }
-                else
-                {
-                    mes.code = "300";
-                    mes.count = 0;
-                    mes.Message = "鎿嶄綔澶辫触!";
-                    mes.data = null;
+                    //鍒ゆ柇璁惧鍚嶇О鏄惁閲嶅
+                    sql = @"select *  from TEqpType where  code<>@devtypecode and name=@devtypename";
+                    dynamicParams.Add("@devtypecode", json[0].code);
+                    dynamicParams.Add("@devtypename", json[0].name);
+                    var data1 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data1.Rows.Count > 0)
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.Message = "璁惧绫诲瀷鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+                        mes.data = null;
+                        return mes;
+                    }
+                    for (int i = 0; i < json.Count; i++)
+                    {
+                        sql = @"update TEqpType set name=@devtypename,remark=@remark,lm_user=@lm_user,lm_date=@lm_date
+                                where code=@devtypecode";
+                        list.Add(new
+                        {
+                            str = sql,
+                            parm = new
+                            {
+                                devtypecode = json[i].code,
+                                devtypename = json[i].name,
+                                remark = json[i].description,
+                                lm_user= us.usercode,
+                                lm_date = DateTime.Now.ToString()
+                            }
+                        });
+                    }
+                    bool aa = DapperHelper.DoTransaction(list);
+                    if (aa)
+                    {
+                        //鍐欏叆鎿嶄綔璁板綍琛�
+                        LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚澶囩被鍨�:" + string.Join(",", json.Select(m => m.code)), us.usertype);
+                        mes.code = "200";
+                        mes.count = 0;
+                        mes.Message = "鎿嶄綔鎴愬姛!";
+                        mes.data = null;
+                    }
+                    else
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.Message = "鎿嶄綔澶辫触!";
+                        mes.data = null;
+                    }
                 }
             }
             catch (Exception e)
@@ -2686,7 +2762,7 @@
         #endregion
 
         #region[璁惧淇℃伅鍒犻櫎]
-        public static ToMessage DeleteDeviceManger(string devicecode,User us)
+        public static ToMessage DeleteDeviceManger(string devicecode, User us)
         {
             var sql = "";
             List<object> list = new List<object>();

--
Gitblit v1.9.3