Merge remote-tracking branch 'origin/master'

src/main/java/com/lovenav/service/UrlCateListService.java

@@ -14,4 +14,7 @@ public interface UrlCateListService {
     public String countCateContainUrlNumber(String userId);
 
     public JSONArray getUrl(String userId);
+    public String selectUrListCateByUrlCateId(Integer cateId);
+    public UrlCateList selectByPrimaryKey(Integer id);
+
 }

src/main/java/com/lovenav/service/UrlListService.java

@@ -13,5 +13,5 @@ public interface UrlListService {
 
     public int updateUrlStatusListById(UrlList urlList);
 
-
+    public List<UrlList> selectUrListByNeedLogin();
 }

src/main/java/com/lovenav/service/serviceImpl/BannersServiceImpl.java

@@ -1,6 +1,6 @@
 package com.lovenav.service.serviceImpl;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.lovenav.dao.BannersDao;
 import com.lovenav.entity.Banners;
 import com.lovenav.service.BannersService;
@@ -59,9 +59,8 @@ public class BannersServiceImpl implements BannersService {
     }
 
 //    展示banner
-    @Override
     public String View_banner(){
-        List<Banners> list = bannersDao.selectByAllBanners();
+        List<Banners> list = bannersDao.selectAllBanners();
         return JSON.toJSONString(list);
     }
 }

src/main/java/com/lovenav/service/serviceImpl/CommentServiceImpl.java

@@ -6,11 +6,8 @@ import com.lovenav.dao.CommentDao;
 import com.lovenav.dao.UserDao;
 import com.lovenav.entity.Comment;
 import com.lovenav.service.CommentService;
-import org.apache.ibatis.jdbc.Null;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.HashMap;
 import java.util.List;
 
@@ -69,7 +66,7 @@ public class CommentServiceImpl implements CommentService {
 
 //    显示评论
     public String View_comment(){
-        List<Comment> list = commentDao.selectByAllComment();
+        List<Comment> list = commentDao.selectAllComment();
         return JSON.toJSONString(list);
     }
 

src/main/java/com/lovenav/service/serviceImpl/UrlCateListServiceImpl.java

@@ -58,7 +58,14 @@ public class UrlCateListServiceImpl implements UrlCateListService {
         return urlCateListDao.selectUrListByUserId(userId);
     }
 
+    public String selectUrListCateByUrlCateId(Integer cateId){
+        return urlCateListDao.selectUrListCateByUrlCateId(cateId);
+    }
 
+    public UrlCateList selectByPrimaryKey(Integer id)
+    {
+        return urlCateListDao.selectByPrimaryKey(id);
+    }
 
     public String countCateContainUrlNumber(String email){
         User user = userDao.selectByEmail(email);

src/main/java/com/lovenav/service/serviceImpl/UrlLiserServiceImpl.java

@@ -41,6 +41,8 @@ public class UrlLiserServiceImpl implements UrlListService {
         Date date = new Date();
         urlList.setCreatetime(date.getTime());
         urlList.setViews(Long.valueOf("0"));
+        Byte b = 0;
+        urlList.setNeedLogin(b);
         int flag = urlListDao.insert(urlList);
         return flag;
     }
@@ -49,6 +51,13 @@ public class UrlLiserServiceImpl implements UrlListService {
         return urlListDao.selectUrList();
     }
 
+
+    public List<UrlList> selectUrListByNeedLogin(){
+        return urlListDao.selectUrListByNeedLogin();
+    }
+
+
+
     public UrlList selectUrListByInput(String input)
     {
         return urlListDao.selectUrListByInput(input);