租车指南用车指南更新

ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java

@@ -4,7 +4,7 @@ import java.util.List;
 import com.ruoyi.bst.article.domain.Article;
 import com.ruoyi.bst.article.domain.ArticleVO;
 import com.ruoyi.bst.article.domain.ArticleQuery;
-import com.ruoyi.bst.articleCategory.domain.ArticleCategoryQuery;
+import com.ruoyi.bst.device.domain.DeviceVO;
 
 /**
  * 文章Service接口
@@ -63,7 +63,18 @@ public interface ArticleService
     public int deleteArticleById(Long id);
 
 
-    ArticleVO selectArticleByCode(ArticleQuery articleQuery);
-
     List<ArticleVO> selectArticleByCategoryId(Long categoryId);
+
+    /**
+     * 查询设备
+     *
+     * @param code 设备主键
+     * @return 设备
+     */
+    public ArticleVO selectArticleByCode(String code, boolean scope);
+
+    default ArticleVO selectArticleByCode(String code) {
+        return this.selectArticleByCode(code, false);
+    }
+
 }

ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java

@@ -2,27 +2,22 @@ package com.ruoyi.bst.article.service.impl;
 
 import java.util.List;
 
-import com.ruoyi.bst.area.service.AreaService;
+import com.github.pagehelper.PageHelper;
 import com.ruoyi.bst.article.service.ArticleService;
-import com.ruoyi.bst.articleCategory.domain.ArticleCategoryQuery;
 import com.ruoyi.bst.articleCategory.domain.ArticleCategoryVO;
 import com.ruoyi.bst.articleCategory.domain.enums.ArticleCategoryStatus;
 import com.ruoyi.bst.articleCategory.service.ArticleCategoryService;
-import com.ruoyi.bst.device.domain.DeviceVO;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServiceUtil;
+import com.ruoyi.common.utils.collection.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.bst.article.mapper.ArticleMapper;
 import com.ruoyi.bst.article.domain.Article;
 import com.ruoyi.bst.article.domain.ArticleVO;
 import com.ruoyi.bst.article.domain.ArticleQuery;
-import com.ruoyi.bst.article.service.ArticleService;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import javax.print.ServiceUI;
-
 /**
  * 文章Service业务层处理
  *
@@ -144,13 +139,27 @@ public class ArticleServiceImpl implements ArticleService
     }
 
 
-    @Override
-    public ArticleVO selectArticleByCode(ArticleQuery articleQuery) {
-        return articleMapper.selectArticleByCode(articleQuery);
-    }
 
     @Override
     public List<ArticleVO> selectArticleByCategoryId(Long categoryId) {
         return articleMapper.selectChildrenById(categoryId);
     }
+
+    @Override
+    public ArticleVO selectArticleByCode(String code, boolean scope) {
+        if (code == null) {
+            return null;
+        }
+
+        ArticleQuery query = new ArticleQuery();
+        query.setCode(code);
+        query.setScope(scope);
+        return this.selectOne(query);
+    }
+
+    private ArticleVO selectOne(ArticleQuery query) {
+        PageHelper.startPage(1, 1);
+        List<ArticleVO> list = articleMapper.selectArticleList(query);
+        return CollectionUtils.firstElement(list);
+    }
 }

ruoyi-web/src/main/java/com/ruoyi/web/app/AppArticleController.java

@@ -26,7 +26,10 @@ public class AppArticleController extends BaseController {
     @Anonymous
     public AjaxResult getGuide(ArticleQuery articleQuery) {
         startPage();
-        return AjaxResult.success(articleService.selectArticleList(articleQuery));
+        if (articleQuery.getCode() == null){
+            return AjaxResult.error("指南类型不能为空");
+        }
+        return AjaxResult.success(articleService.selectArticleByCode(articleQuery.getCode()));
     }
 
 }