From df80023baf4e5eba2de7dcbe9dd1bdd3aeaa607e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 14 一月 2025 12:58:50 +0800
Subject: [PATCH] 设备档案 增加 字段； IP地址，MAC地址，联网方式，采集类型，采集方式 HMacAddress varchar(50) //数采MAC地址 HIPAddress varchar(50) //数采IP地址 HLinkNETMode varchar(50) //联网方式 HCollectMode varchar(50) //采集方式 HCollectClass varchar(50) //采集类型
---
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
index f4b8ec3..95d5d5b 100644
--- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
@@ -31,30 +31,31 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_View where 1=1 ", "h_v_IF_DataDictionary_View");
+ ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_View where 1=1 order by HItemID desc", "h_v_IF_DataDictionary_View");
}
else
{
string sql1 = "select * from h_v_IF_DataDictionary_View where 1=1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_View");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -118,7 +119,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
--
Gitblit v1.9.1