From 508887b10540c6606e6221de64e7bdaf26110f22 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 08 一月 2024 10:13:30 +0800
Subject: [PATCH] 修改ImgDAL操作方法

---
 JiangSu/cs/GridDAL.cs                |    2 +-
 JiangSu/cs/ModelDAL.cs               |    3 ++-
 JiangSu/Controllers/ImgController.cs |    2 +-
 JiangSu/cs/ImgDAL.cs                 |   30 +++++++++++++++---------------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/JiangSu/Controllers/ImgController.cs b/JiangSu/Controllers/ImgController.cs
index babafb6..8ca3868 100644
--- a/JiangSu/Controllers/ImgController.cs
+++ b/JiangSu/Controllers/ImgController.cs
@@ -140,7 +140,7 @@
         }
 
         [HttpGet]
-        public string GetGps()
+        public List<string> GetGps()
         {
             return Tools.GetImgGps(@"D:\SEM\鐥呭绀轰緥_pos\1.jpg");
         }
diff --git a/JiangSu/cs/GridDAL.cs b/JiangSu/cs/GridDAL.cs
index 8805682..6288f62 100644
--- a/JiangSu/cs/GridDAL.cs
+++ b/JiangSu/cs/GridDAL.cs
@@ -53,7 +53,7 @@
 
         public static int Insert(Grid grid)
         {
-            string sql = "insert into grid (json) values (@json);select last_insert_rowid();";
+            string sql = "insert into grid (json) values (@json); select last_insert_rowid();";
             SQLiteParameter[] sqlParams = Tools.GetSQLiteParams<Grid>(sql, grid);
 
             object obj = SQLiteHelper.ExecuteScalar(sql, sqlParams);
diff --git a/JiangSu/cs/ImgDAL.cs b/JiangSu/cs/ImgDAL.cs
index 62d3ebf..059288b 100644
--- a/JiangSu/cs/ImgDAL.cs
+++ b/JiangSu/cs/ImgDAL.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Data.SQLite;
 using System.Linq;
 using System.Web;
 
@@ -14,9 +15,10 @@
         public static List<Img> SelectByPage(string name, int pageSize = 10, int pageIndex = 1)
         {
             bool flag = string.IsNullOrWhiteSpace(name);
-            string sql = string.Format("select id, name, path, json, st_astext(geom) geom from sd.img {0} order by id limit {1} offset {2}", flag ? "" : "where upper(name) like @name", pageSize, pageSize * (pageIndex - 1));
+            string sql = string.Format("select * from img {0} order by id limit {1} offset {2}", flag ? "" : "where upper(name) like @name", pageSize, pageSize * (pageIndex - 1));
 
-            DataTable dt = flag ? Tools.PGHelper.GetDataTable(sql) : Tools.PGHelper.GetDataTable(sql, new NpgsqlParameter("@name", "%" + name.Trim().ToUpper() + "%"));
+            DataTable dt = flag ? SQLiteHelper.GetDataTable(sql) :
+                SQLiteHelper.GetDataTable(sql, new SQLiteParameter("@name", "%" + name.Trim().ToUpper() + "%"));
             if (null == dt || dt.Rows.Count == 0)
             {
                 return null;
@@ -29,11 +31,11 @@
 
         public static Img SelectById(long id)
         {
-            string sql = "select id, name, path, json, st_astext(geom) geom from sd.img where id = @id";
+            string sql = "select * from img where id = @id";
 
-            DbParameter param = new NpgsqlParameter("@id", id);
+            SQLiteParameter param = new SQLiteParameter("@id", id);
 
-            DataTable dt = Tools.PGHelper.GetDataTable(sql, param);
+            DataTable dt = SQLiteHelper.GetDataTable(sql, param);
             if (null == dt || dt.Rows.Count == 0)
             {
                 return null;
@@ -47,29 +49,27 @@
         public static int DeleteByIds(List<int> ids)
         {
             string str = string.Join(",", ids.ToArray());
-            string sql = string.Format("delete from sd.img where id in ({0})", str);
+            string sql = string.Format("delete from img where id in ({0})", str);
 
-            return Tools.PGHelper.ExecuteNonQuery(sql);
+            return SQLiteHelper.ExecuteNonQuery(sql);
         }
 
         public static int Insert(Img img)
         {
-            string geom = string.IsNullOrWhiteSpace(img.geom) ? "null" : string.Format("ST_GeomFromText('{0}')", img.geom);
-            string sql = string.Format("insert into sd.img (name, path, json, geom) values (@name, @path, @json, {0}) returning id", geom);
-            DbParameter[] sqlParams = Tools.GetPGParams<Img>(sql, img);
+            string sql = "insert into img (name, path, json, x, y, z) values (@name, @path, @json, @x, @y, @z); select last_insert_rowid();";
+            SQLiteParameter[] sqlParams = Tools.GetSQLiteParams<Img>(sql, img);
 
-            object obj = Tools.PGHelper.GetScalar(sql, sqlParams);
+            object obj = SQLiteHelper.ExecuteScalar(sql, sqlParams);
 
             return null == obj ? 0 : Convert.ToInt32(obj);
         }
 
         public static int UpdateById(Img img)
         {
-            string geom = string.IsNullOrWhiteSpace(img.geom) ? "" : string.Format(", geom = ST_GeomFromText('{0}')", img.geom);
-            string sql = string.Format("update sd.img set name = @name, path = @path, json = @json{0} where id = @id", geom);
-            DbParameter[] sqlParams = Tools.GetPGParams<Img>(sql, img);
+            string sql = "update img set name = @name, path = @path, json = @json, x = @x, y = @y, z = @z where id = @id";
+            SQLiteParameter[] sqlParams = Tools.GetSQLiteParams<Img>(sql, img);
 
-            return Tools.PGHelper.ExecuteNonQuery(sql, sqlParams);
+            return SQLiteHelper.ExecuteNonQuery(sql, sqlParams);
         }
     }
 }
diff --git a/JiangSu/cs/ModelDAL.cs b/JiangSu/cs/ModelDAL.cs
index 9267467..bcae797 100644
--- a/JiangSu/cs/ModelDAL.cs
+++ b/JiangSu/cs/ModelDAL.cs
@@ -55,12 +55,13 @@
 
         public static int Insert(Model model)
         {
-            string sql = "insert into model (name, json) values (@name, @json);select last_insert_rowid();";
+            string sql = "insert into model (name, json) values (@name, @json); select last_insert_rowid();";
             SQLiteParameter[] sqlParams = Tools.GetSQLiteParams<Model>(sql, model);
 
             //return SQLiteHelper.ExecuteNonQuery(sql, sqlParams);
 
             object obj = SQLiteHelper.ExecuteScalar(sql, sqlParams);
+
             return null == obj ? 0 : Convert.ToInt32(obj);
         }
 

--
Gitblit v1.9.3