diff --git a/assets/flutter.db b/assets/flutter.db index 5cd3c7a..132af61 100644 Binary files a/assets/flutter.db and b/assets/flutter.db differ diff --git a/lib/widget_system/repositories/dao/category_dao.dart b/lib/widget_system/repositories/dao/category_dao.dart index 943229d..c349b29 100644 --- a/lib/widget_system/repositories/dao/category_dao.dart +++ b/lib/widget_system/repositories/dao/category_dao.dart @@ -29,7 +29,7 @@ class CategoryDao { //插入方法 String addSql = //插入数据 "INSERT INTO " - "widget_category(id,name,color,info,priority,image,created,updated) " + "category(id,name,color,info,priority,image,created,updated) " "VALUES (?,?,?,?,?,?,?,?);"; return await db.transaction((tran) async => await tran.rawInsert(addSql, [ category.id, @@ -46,7 +46,7 @@ class CategoryDao { Future update(CategoryPo widget) async { //插入方法 String updateSql = //插入数据 - "UPDATE widget_category SET name=? , color=? ,info=?, priority=?,image=?,updated=? " + "UPDATE category SET name=? , color=? ,info=?, priority=?,image=?,updated=? " "WHERE id = ?"; return await db.transaction((tran) async => @@ -66,7 +66,7 @@ class CategoryDao { Future addWidget(int categoryId,int widgetId,) async { String addSql = //插入数据 "INSERT INTO " - "category_widget_bloc(widgetId,categoryId) " + "category_widget(widgetId,categoryId) " "VALUES (?,?);"; return await db.transaction((tran) async => await tran.rawInsert(addSql, [ widgetId, @@ -77,7 +77,7 @@ class CategoryDao { Future addWidgets(int categoryId,List widgetIds) async { String addSql = //插入数据 "INSERT INTO " - "category_widget_bloc(widgetId,categoryId) VALUES "; + "category_widget(widgetId,categoryId) VALUES "; String args = ''; @@ -95,7 +95,7 @@ class CategoryDao { Future existByName(String name) async { String sql = //插入数据 - "SELECT COUNT(name) as count FROM widget_category " + "SELECT COUNT(name) as count FROM category " "WHERE name = ?"; List> rawData = await db.rawQuery(sql, [name]); if (rawData.length > 0) { @@ -107,8 +107,8 @@ class CategoryDao { Future>> queryAll() async { List> data = await db.rawQuery( "SELECT c.id,c.name,c.info,c.color,c.image,c.created,c.updated,c.priority,COUNT(cw.categoryId) as `count`" - "FROM widget_category AS c " - "LEFT JOIN category_widget_bloc AS cw " + "FROM category AS c " + "LEFT JOIN category_widget AS cw " "ON c.id = cw.categoryId GROUP BY c.id " "ORDER BY priority DESC,created DESC", []); @@ -117,7 +117,7 @@ class CategoryDao { Future> categoryWidgetIds(int id) async { List> data = await db.rawQuery( - "SELECT categoryId FROM `category_widget_bloc`" + "SELECT categoryId FROM `category_widget`" "WHERE widgetId = ?", [id]); return data.toList().map((e)=>e["categoryId"]).toList(); @@ -127,7 +127,7 @@ class CategoryDao { Future deleteCollect(int id) async { await db.execute( - "DELETE FROM category_widget_bloc " + "DELETE FROM category_widget " "WHERE categoryId = ?", [id]); return await db.execute( @@ -138,10 +138,10 @@ class CategoryDao { Future clear() async { await db.execute( - "DELETE FROM category_widget_bloc " + "DELETE FROM category_widget " "WHERE categoryId >0"); return await db.execute( - "DELETE FROM widget_category " + "DELETE FROM category " "WHERE id > 0"); } @@ -149,7 +149,7 @@ class CategoryDao { //插入方法 String deleteSql = //插入数据 "DELETE FROM " - "category_widget_bloc WHERE categoryId = ? AND widgetId = ? "; + "category_widget WHERE categoryId = ? AND widgetId = ? "; return await db .transaction((tran) async => await tran.rawInsert(deleteSql, [ categoryId, @@ -159,7 +159,7 @@ class CategoryDao { Future existWidgetInCollect(int categoryId, int widgetId) async { String sql = //插入数据 - "SELECT COUNT(id) as count FROM category_widget_bloc " + "SELECT COUNT(id) as count FROM category_widget " "WHERE categoryId = ? AND widgetId = ?"; List> rawData = await db.rawQuery(sql, [categoryId, widgetId]); if (rawData.length > 0) { @@ -184,7 +184,7 @@ class CategoryDao { Future>> loadCollectWidgets(int categoryId) async{ String querySql = //插入数据 "SELECT * FROM widget " - "WHERE id IN (SELECT widgetId FROM category_widget_bloc WHERE categoryId = ?) " + "WHERE id IN (SELECT widgetId FROM category_widget WHERE categoryId = ?) " "ORDER BY lever DESC"; return await db.rawQuery(querySql,[categoryId]); @@ -193,7 +193,7 @@ class CategoryDao { Future> loadCollectWidgetIds(int categoryId) async{ String querySql = //插入数据 "SELECT id FROM widget " - "WHERE id IN (SELECT widgetId FROM category_widget_bloc WHERE categoryId = ?) " + "WHERE id IN (SELECT widgetId FROM category_widget WHERE categoryId = ?) " "ORDER BY lever DESC"; var data = await db.rawQuery(querySql,[categoryId]); diff --git a/lib/widget_system/repositories/dao/widget_dao.dart b/lib/widget_system/repositories/dao/widget_dao.dart index 910e962..d7a64da 100644 --- a/lib/widget_system/repositories/dao/widget_dao.dart +++ b/lib/widget_system/repositories/dao/widget_dao.dart @@ -54,7 +54,7 @@ class WidgetDao { Future>> search(SearchArgs arguments) async { return await db.rawQuery( "SELECT * " - "FROM widget WHERE name liked_widget_bloc ? AND lever IN(?,?,?,?,?) ORDER BY lever DESC", + "FROM widget WHERE name like ? AND lever IN(?,?,?,?,?) ORDER BY lever DESC", ["%${arguments.name}%", ...arguments.stars]); } }