liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新一下比较函数

This commit is contained in:
luchenqun 2017-02-04 22:40:21 +08:00
parent 9f2d396199
commit 0ea5887444
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
database/db.js
View File

@ -31,15 +31,15 @@ client.connect();
// update delete 返回影响的行数 // update delete 返回影响的行数
var db = { var db = {
} }
// var sql = "SELECT * FROM `users` WHERE `username` = 'luchenqun'"; // var sql = "SELECT * FROM `users` WHERE `username` = 'luchenqun'";
// client.query(sql, (err, result) => { // client.query(sql, (err, result) => {
// if (err) { // if (err) {
// console.log(err); // console.log(err);
// } else { // } else {
// console.log(result); // console.log(result);
// } // }
// }); // });
db.addBookmark = function(user_id, bookmark) { db.addBookmark = function(user_id, bookmark) {
var sql = "INSERT INTO `bookmarks` (`user_id`, `title`, `description`, `url`, `public`, `click_count`) VALUES ('" + user_id + "', '" + bookmark.title + "', '" + bookmark.description + "', '" + bookmark.url + "', '" + bookmark.public + "', '1')"; var sql = "INSERT INTO `bookmarks` (`user_id`, `title`, `description`, `url`, `public`, `click_count`) VALUES ('" + user_id + "', '" + bookmark.title + "', '" + bookmark.description + "', '" + bookmark.url + "', '" + bookmark.public + "', '1')";
@ -290,7 +290,7 @@ db.getBookmarksTable = function(params) {
var sql = "SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d') as last_click FROM `bookmarks` WHERE 1=1"; var sql = "SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d') as last_click FROM `bookmarks` WHERE 1=1";
if (user_id) { if (user_id) {
sql += " AND `user_id` = '" + user_id + "'" sql += " AND `user_id` = '" + user_id + "' ORDER BY click_count DESC"
} }
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
@ -322,7 +322,7 @@ db.getBookmarksByTag = function(params) {
params.currentPage = params.currentPage || 1; params.currentPage = params.currentPage || 1;
params.perPageItems = params.perPageItems || 20; params.perPageItems = params.perPageItems || 20;
var sql = "SELECT bookmarks.id, bookmarks.user_id, bookmarks.title, bookmarks.description, bookmarks.url, bookmarks.public, bookmarks.click_count, DATE_FORMAT(bookmarks.created_at, '%Y-%m-%d') as created_at, DATE_FORMAT(bookmarks.last_click, '%Y-%m-%d') as last_click FROM `tags_bookmarks`, `bookmarks` WHERE tags_bookmarks.tag_id = '" + tag_id + "' AND tags_bookmarks.bookmark_id = bookmarks.id"; var sql = "SELECT bookmarks.id, bookmarks.user_id, bookmarks.title, bookmarks.description, bookmarks.url, bookmarks.public, bookmarks.click_count, DATE_FORMAT(bookmarks.created_at, '%Y-%m-%d') as created_at, DATE_FORMAT(bookmarks.last_click, '%Y-%m-%d') as last_click FROM `tags_bookmarks`, `bookmarks` WHERE tags_bookmarks.tag_id = '" + tag_id + "' AND tags_bookmarks.bookmark_id = bookmarks.id ORDER BY bookmarks.click_count DESC";
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
client.query(sql, (err, result) => { client.query(sql, (err, result) => {

1
public/scripts/controllers/bookmarks-controller.js
View File

@ -98,6 +98,7 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
} }
} else { } else {
$scope.bookmarks = data; $scope.bookmarks = data;
data.forEach((item) => console.log(item.name, item.click));
if ($scope.bookmarks.length == 0) { if ($scope.bookmarks.length == 0) {
toastr.info('您还没有书签，请点击菜单栏的添加按钮进行添加', "提示"); toastr.info('您还没有书签，请点击菜单栏的添加按钮进行添加', "提示");
} }

7
routes/api.js
View File

@ -219,16 +219,17 @@ api.get('/bookmarks', function(req, res) {
tag.click = 0; tag.click = 0;
tag.bookmarks = []; tag.bookmarks = [];
} }
tag.click += bookmark.click_count;
if (bookmark.id && tag.bookmarks.length < 31) { if (bookmark.id && tag.bookmarks.length < 31) {
tag.click += bookmark.click_count;
tag.bookmarks.push(bookmark); tag.bookmarks.push(bookmark);
} }
}); });
if (result && result.length > 0) { if (result && result.length > 0) {
data.push(tag); data.push(tag);
} }
data.sort((a, b) => a.click < b.click) data.sort((a, b) => b.click - a.click);
// console.log(JSON.stringify(data)); // console.log(JSON.stringify(data));
res.json(data); res.json(data);
}) })
.catch((err) => console.log('bookmarks navigate err', err)); .catch((err) => console.log('bookmarks navigate err', err));