diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java index a38227c81..c489332e2 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java @@ -1,5 +1,7 @@ package com.ruoyi.content.controller; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.content.domain.ArticleInfo; import com.ruoyi.content.domain.PageDTO; @@ -12,6 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -30,50 +33,39 @@ import java.util.UUID; */ @Controller @RequestMapping("/article") -public class ArticleManageController { +public class ArticleManageController extends BaseController { + private final static Logger logger = LoggerFactory.getLogger(ArticleManageController.class); + private String prefix = "content/article"; + @Autowired private ArticleService articleService; + @GetMapping("list") + public String articleList() { + return prefix + "/articleList"; + } + /** * 查询所有公司发布的文章信息 * * @param request - * @param response * @return */ @RequestMapping("/articleArry") @ResponseBody - public PageDTO articleArry(HttpServletRequest request, HttpServletResponse response) { + public TableDataInfo articleArry(HttpServletRequest request) throws Exception { logger.info("查询文章列表的控制层方法开始！"); - Thread.currentThread().setName(UUID.randomUUID().toString()); - PageDTO pageDTO = new PageDTO(); - try { - String rowsVal = request.getParameter("rows"); - String page = request.getParameter("page"); - String articelName = request.getParameter("articelName"); - String articelAuthor = request.getParameter("articelAuthor"); - String channelId = request.getParameter("channelId"); - String special = request.getParameter("special"); - String articleState = request.getParameter("articleState"); - int rows = Integer.parseInt(rowsVal); - int startRow = rows * (Integer.parseInt(page) - 1); - List list = articleService.queryArticle(startRow, rows, articelName, articelAuthor, - special, channelId, articleState); - pageDTO.setPage(Integer.parseInt(page)); - pageDTO.setStartRow(startRow); - pageDTO.setDataRows(list); - int count = articleService.countArticleInfoByState(articelName, articelAuthor, special, channelId, - articleState); - pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1)); - pageDTO.setRecords(count); - pageDTO.setPage(Integer.parseInt(page)); - } catch (Exception e) { - logger.info("查询当前用户发布的文章失败【{}】", e.getMessage()); - e.printStackTrace(); - } + String articelName = request.getParameter("articleName"); + String articelAuthor = request.getParameter("articelAuthor"); + String channelId = request.getParameter("channelId"); + String special = request.getParameter("special"); + String articleState = request.getParameter("articleState"); + startPage(); + List list = articleService.queryArticle(articelName, articelAuthor, + special, channelId, articleState); logger.info("查询文章列表的控制层方法结束！"); - return pageDTO; + return getDataTable(list); } /** diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java index dec476aa6..912100bbd 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java @@ -1,5 +1,8 @@ package com.ruoyi.content.controller; +import com.ruoyi.common.core.page.PageDomain; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.content.domain.ClickTrackInfo; import com.ruoyi.content.domain.ClickUserInfo; import com.ruoyi.content.domain.PageDTO; @@ -42,24 +45,27 @@ public class StaffArticleManageController { */ @RequestMapping("/articleSharingTrackList") @ResponseBody - public PageDTO articleSharingTrack(HttpServletRequest request) { + public TableDataInfo articleSharingTrack(HttpServletRequest request) { logger.info("查询文章分享阅读轨迹的控制层方法开始！"); Thread.currentThread().setName(UUID.randomUUID().toString()); - PageDTO pageDTO = new PageDTO(); + TableDataInfo pageDTO = new TableDataInfo(); try { - String rowsVal = request.getParameter("rows"); - String page = request.getParameter("page"); - int rows = Integer.parseInt(rowsVal); - int startRow = rows * (Integer.parseInt(page) - 1); + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum() - 1; + Integer pageSize = pageDomain.getPageSize(); String articleId = request.getParameter("articleId"); + if (StringUtils.isBlank(articleId)) { + return pageDTO; + } // 1.根据文章id去查publish表，找出该文章对应所有业务员 - pageDTO = staffArticleManageService.querySalesmanByArticleId(articleId, startRow, rows); - pageDTO.setPage(Integer.parseInt(page)); - + pageDTO = staffArticleManageService.querySalesmanByArticleId(articleId, pageNum, pageSize); return pageDTO; } catch (Exception e) { logger.info("系统异常！", e); + pageDTO.setCode(0); + pageDTO.setRows(new ArrayList<>()); + pageDTO.setTotal(0); return pageDTO; } @@ -73,29 +79,31 @@ public class StaffArticleManageController { */ @RequestMapping("/publishInfoList") @ResponseBody - public PageDTO publishInfoList(HttpServletRequest request) { - - + public TableDataInfo publishInfoList(HttpServletRequest request) { Thread.currentThread().setName(UUID.randomUUID().toString()); - PageDTO pageDTO = new PageDTO(); + TableDataInfo pageDTO = new TableDataInfo(); try { - String rowsVal = request.getParameter("rows"); - String page = request.getParameter("page"); - int rows = Integer.parseInt(rowsVal); - int startRow = rows * (Integer.parseInt(page) - 1); + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum() - 1; + Integer pageSize = pageDomain.getPageSize(); String userId = request.getParameter("userId"); String articleId = request.getParameter("articleId"); + if (StringUtils.isAnyBlank(articleId, userId)) { + return pageDTO; + } + logger.info("查询该业务员userId[{}]的文章articleId[{}]发布情况开始！", userId, articleId); - // 1.根据文章id去查publish表，找出该文章对应所有业务员 - pageDTO = staffArticleManageService.queryClickInfoByUserId(userId, articleId, startRow, rows); - pageDTO.setPage(Integer.parseInt(page)); + pageDTO = staffArticleManageService.queryClickInfoByUserId(userId, articleId, pageNum, pageSize); return pageDTO; } catch (Exception e) { logger.info("系统异常！", e); + pageDTO.setCode(0); + pageDTO.setRows(new ArrayList<>()); + pageDTO.setTotal(0); return pageDTO; } @@ -109,16 +117,18 @@ public class StaffArticleManageController { */ @RequestMapping("/articleSharingTrackInfo") @ResponseBody - public Message articleSharingTrackInfo(HttpServletRequest request) { + public TableDataInfo articleSharingTrackInfo(HttpServletRequest request) { Thread.currentThread().setName(UUID.randomUUID().toString()); Message msg = new Message(); - Map returnMap = new HashMap(); List clickUserInfos = new ArrayList(); ClickTrackInfo clickTrackInfo = new ClickTrackInfo(); logger.info("查询用户查看分享文章轨迹信息的控制层方法开始！"); String clickId = request.getParameter("clickId"); + TableDataInfo pageDTO = new TableDataInfo(); if (StringUtils.isBlank(clickId)) { - returnMap.put("ClickTrackInfo", clickTrackInfo); + pageDTO.setCode(0); + pageDTO.setRows(new ArrayList<>()); + pageDTO.setTotal(0); } else { clickTrackInfo = staffArticleManageService.articleSharingTrackInfo(clickId); //发布人id @@ -135,41 +145,51 @@ public class StaffArticleManageController { logger.info("转换后的用户昵称为:" + userInfo.getNickName()); } else { userInfo.setNickName("后台管理员"); - userInfo.setHeadImgUrl("/static/common/image/logo.png"); + userInfo.setHeadImgUrl("/img/admin.png"); userInfo.setOpenid(""); } - returnMap.put("userInfo", userInfo); + ClickUserInfo clickUserInfo1 = new ClickUserInfo(); + clickUserInfo1.setNickName(userInfo.getNickName()); + clickUserInfo1.setHeadImgUrl(userInfo.getHeadImgUrl()); + clickUserInfo1.setOpenId(userInfo.getOpenid()); + clickUserInfos.add(clickUserInfo1); String clickUserInfo = clickTrackInfo.getClickUserInfo(); + List c = new ArrayList(); if (StringUtils.isNotBlank(clickUserInfo)) { - clickUserInfos = JsonUtil.JsonToCollectionType(clickUserInfo, List.class, ClickUserInfo.class); + c = JsonUtil.JsonToCollectionType(clickUserInfo, List.class, ClickUserInfo.class); - for (ClickUserInfo clickUserInfo2 : clickUserInfos) { + for (ClickUserInfo clickUserInfo2 : c) { try { clickUserInfo2.setNickName( new String(Base64.getDecoder().decode(clickUserInfo2.getNickName()), "UTF-8")); + clickUserInfos.add(clickUserInfo2); } catch (UnsupportedEncodingException e) { throw new BusinessException("用户昵称解码异常[{" + e.getMessage() + "}]"); } } } - returnMap.put("ClickUserInfoList", clickUserInfos); String clickUserNickname = clickTrackInfo.getClickUserNickname(); if (StringUtils.isNotBlank(clickUserNickname)) { try { clickTrackInfo.setClickUserNickname( new String(Base64.getDecoder().decode(clickUserNickname), "UTF-8")); + ClickUserInfo clickUserInfo4 = new ClickUserInfo(); + clickUserInfo4.setNickName(clickTrackInfo.getClickUserNickname()); + clickUserInfo4.setHeadImgUrl(clickTrackInfo.getClickUserHeadimgurl()); + clickUserInfo4.setOpenId(clickTrackInfo.getClickOpenId()); + clickUserInfo4.setToShareState(clickTrackInfo.getFromShareState()); + clickUserInfos.add(clickUserInfo4); } catch (UnsupportedEncodingException e) { throw new BusinessException("用户昵称解码异常[{" + e.getMessage() + "}]"); } } - returnMap.put("ClickTrackInfo", clickTrackInfo); - msg.setInfo("获取浏览详情查询成功"); - msg.setResult(true); - msg.setObject(returnMap); + pageDTO.setCode(0); + pageDTO.setRows(clickUserInfos); + pageDTO.setTotal(clickUserInfos.size()); } logger.info("查询用户查看分享文章轨迹信息的控制层方法结束！"); - return msg; + return pageDTO; } // // 复制链路 diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java index 2df1fce5e..813dc0721 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java @@ -23,8 +23,7 @@ public interface ArticleQueryMapper { int updatePublishedArticle(Map articleMap); public List selectAllWithLimit(@Param(value = "companyId") String companyId, - @Param(value = "articleState") List articleState, @Param(value = "startRow") int startRow, - @Param(value = "rows") int rows, @Param(value = "articelName") String articelName, + @Param(value = "articleState") List articleState, @Param(value = "articelName") String articelName, @Param(value = "articelAuthor") String articelAuthor, @Param(value = "special") String special, @Param(value = "channelId") String channelId); ArticleInfo queryArticleInfoByCompanyId(@Param("companyId") String companyId, @Param("originalUrl") String originalUrl); diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java index df5359f87..72a8c3c0c 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java @@ -85,7 +85,7 @@ public interface ArticleService { * * @return */ - public List queryArticle(int startRow, int rows, String articelName, String articelAuthor, + public List queryArticle(String articelName, String articelAuthor, String special, String articelType, String articleState) throws Exception; /** diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java index 9b5e2bda1..1ce9ab45e 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java @@ -1,5 +1,6 @@ package com.ruoyi.content.service; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.content.domain.ArticleInfo; import com.ruoyi.content.domain.ClickTrackInfo; import com.ruoyi.content.domain.PageDTO; @@ -34,7 +35,7 @@ public interface StaffArticleManageService { * @param rows * @return */ - public PageDTO querySalesmanByArticleId(String articleId, int startRow, int rows); + public TableDataInfo querySalesmanByArticleId(String articleId, int startRow, int rows); /** * 根据用户id查询浏览表 @@ -44,6 +45,6 @@ public interface StaffArticleManageService { * @param rows * @return */ - public PageDTO queryClickInfoByUserId(String userId, String articleId, int startRow, int rows); + public TableDataInfo queryClickInfoByUserId(String userId, String articleId, int startRow, int rows); } diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java index a881db6f4..668360fb5 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java @@ -471,13 +471,12 @@ public class ArticleServiceImpl implements ArticleService { * 查询用户当前发布的文章，分页展示 */ @Override - public List queryArticle(int startRow, int rows, String articelName, String articelAuthor, + public List queryArticle(String articelName, String articelAuthor, String special, String channelId, String articleState) { LOGGER.info("查询文章列表的业务层方法开始！"); - LOGGER.info("拿到的参数 startRow【{}】，rows【{}】，文章名称【{}】，文章作者【{}】，一级分类【{}】，二级分类【{}】，文章状态【{}】", startRow, rows, + LOGGER.info("拿到的参数 ，文章名称【{}】，文章作者【{}】，一级分类【{}】，二级分类【{}】，文章状态【{}】", articelName, articelAuthor, special, channelId, articleState); - CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal(); - String companyId = userInfoDTO.getCompanyId();// 公司id + String companyId = "1";// 公司id List list = new ArrayList(); if (StringUtils.isBlank(articleState)) { @@ -498,10 +497,10 @@ public class ArticleServiceImpl implements ArticleService { if (StringUtils.isBlank(channelId)) { channelId = ""; } - List articleList = articleQueryMapper.selectAllWithLimit(companyId, list, startRow, rows, + List articleList = articleQueryMapper.selectAllWithLimit(companyId, list, articelName, articelAuthor, special, channelId); if (articleList == null || articleList.size() < 1) { - LOGGER.info("根据用户查询已发布的文章，未查询到数据【{}】", JsonUtil.objectToJackson(userInfoDTO)); + LOGGER.info("根据用户查询已发布的文章，未查询到数据"); throw new BusinessException("您还没有发布过文章！"); } for (PublishedArticleInfo publishedArticleInfo : articleList) { @@ -916,8 +915,7 @@ public class ArticleServiceImpl implements ArticleService { LOGGER.info("文章列表的删除功能的业务层方法开始！"); String updateDate = DateUtil.currentDate(); String updateTime = DateUtil.currentTime(); - CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal(); - String updateUser = userInfoDTO.getUserId(); + String updateUser = "1"; LOGGER.info("管理员updateUser【{}】文章列表的删除功能的业务层方法中拿到的文章的id【{}】", updateUser, id); Message msg = new Message(); if (StringUtils.isBlank(id)) { diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java index 844016ebd..69987feb4 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java @@ -1,5 +1,6 @@ package com.ruoyi.content.service.impl; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.content.domain.*; import com.ruoyi.content.exception.BusinessException; import com.ruoyi.content.mapper.*; @@ -51,7 +52,7 @@ public class StaffArticleManageServiceimpl implements StaffArticleManageService } @Override - public PageDTO querySalesmanByArticleId(String articleId, int startRow, int rows) { + public TableDataInfo querySalesmanByArticleId(String articleId, int startRow, int rows) { List list = articlePublishTrackQueryMapper.queryPublishUserInfo(articleId, startRow, rows); List ywyList = new ArrayList<>(); @@ -87,7 +88,7 @@ public class StaffArticleManageServiceimpl implements StaffArticleManageService ywyForwardUserInfo.setNickName("后台管理员"); ywyForwardUserInfo.setArticleId(articleId); ywyForwardUserInfo.setCreateDate(apt.getCreateDate()); - ywyForwardUserInfo.setHeadImgUrl("/static/common/image/logo.png"); + ywyForwardUserInfo.setHeadImgUrl("/img/admin.png"); ywyForwardUserInfo.setUserId(publishUserId); } ywyList.add(ywyForwardUserInfo); @@ -99,16 +100,15 @@ public class StaffArticleManageServiceimpl implements StaffArticleManageService ArticlePublishTrackExample.Criteria criteria = example.createCriteria(); criteria.andArticleIdEqualTo(articleId); int count = articlePublishTrackMapper.countByExample(example); - PageDTO pageDTO = new PageDTO(); - pageDTO.setStartRow(startRow); - pageDTO.setDataRows(ywyList); - pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1)); - pageDTO.setRecords(count); - return pageDTO; + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(0); + rspData.setRows(ywyList); + rspData.setTotal(count); + return rspData; } @Override - public PageDTO queryClickInfoByUserId(String userId, String articleId, int startRow, int rows) { + public TableDataInfo queryClickInfoByUserId(String userId, String articleId, int startRow, int rows) { List list = clickTrackInfoQueryMapper.queryClickInfoByUserId(userId, articleId, startRow, rows); List YwyPublishInfolList = new ArrayList<>(); @@ -139,11 +139,10 @@ public class StaffArticleManageServiceimpl implements StaffArticleManageService criteria.andPublishUserIdEqualTo(userId); criteria.andArticleIdEqualTo(articleId); int count = clickTrackInfoMapper.countByExample(example); - PageDTO pageDTO = new PageDTO(); - pageDTO.setStartRow(startRow); - pageDTO.setDataRows(YwyPublishInfolList); - pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1)); - pageDTO.setRecords(count); + TableDataInfo pageDTO = new TableDataInfo(); + pageDTO.setCode(0); + pageDTO.setRows(YwyPublishInfolList); + pageDTO.setTotal(count); return pageDTO; } } diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml index 2fd5e5d84..73f876f10 100644 --- a/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml +++ b/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml @@ -1,157 +1,157 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT COUNT(ct.CLICK_USER_ID) FROM click_track_info ct WHERE ct.PUBLISH_USER_ID = ap.USER_ID AND ct.ARTICLE_ID = ap.ARTICLE_ID - + SELECT COUNT(ct.CLICK_USER_ID) FROM click_track_info ct WHERE ct.PUBLISH_USER_ID = ap.USER_ID AND ct.ARTICLE_ID = ap.ARTICLE_ID AND ct.SHARE_STATE!='0' - + SELECT COUNT(ct.CLICK_ID) FROM click_track_info ct WHERE ct.ARTICLE_ID = #{articleId,jdbcType=VARCHAR} - + SELECT COUNT(FORWARD_ID) FROM article_forward_track aft WHERE aft.ARTICLE_ID = #{articleId,jdbcType=VARCHAR} - - - - - - - - + + + + + + + + - - + + - - + + - - SELECT ct.CLICK_USER_NICKNAME,ct.WATCH_TIME,ct.CREATE_DATE,ct.CREATE_TIME,ct.SHARE_STATE, CLICK_USER_HEADIMGURL @@ -161,17 +161,17 @@ =#{articleId,jdbcType=VARCHAR} - - SELECT COUNT(1) FROM article_info WHERE ORIGINAL_URL = #{originalUrl,jdbcType=VARCHAR} - - SELECT ARTICLE_ID, ARTICLE_NAME, PUSH_DATE, ARTICLE_AUTHOR, ARTICLE_EDIT_URL, ARTICLE_VIEW_URL, LIST_PIC_URL, @@ -190,92 +190,90 @@ #{originalUrl,jdbcType=VARCHAR} - - - UPDATE article_info ai,article_publish_track ap - set ap.UPDATE_DATE = - #{updateDate,jdbcType=VARCHAR},ap.UPDATE_TIME = - #{updateTime,jdbcType=VARCHAR} - - ,ai.ARTICLE_CONTENT = - #{articleContent,jdbcType=LONGVARCHAR} - - - ,ai.SHARE_TITLE = #{shareTitle,jdbcType=VARCHAR} - - - ,ai.ARTICLE_NAME = #{articleName,jdbcType=VARCHAR} - - - ,ap.AD_ID = #{adId,jdbcType=VARCHAR} - - - ,ap.CARD_ID = #{cardId,jdbcType=VARCHAR} - - WHERE ai.ARTICLE_ID=ap.ARTICLE_ID AND ap.PUBLISH_ID = - #{publishId,jdbcType=VARCHAR} - + + + UPDATE article_info ai,article_publish_track ap + set ap.UPDATE_DATE = + #{updateDate,jdbcType=VARCHAR},ap.UPDATE_TIME = + #{updateTime,jdbcType=VARCHAR} + + ,ai.ARTICLE_CONTENT = + #{articleContent,jdbcType=LONGVARCHAR} + + + ,ai.SHARE_TITLE = #{shareTitle,jdbcType=VARCHAR} + + + ,ai.ARTICLE_NAME = #{articleName,jdbcType=VARCHAR} + + + ,ap.AD_ID = #{adId,jdbcType=VARCHAR} + + + ,ap.CARD_ID = #{cardId,jdbcType=VARCHAR} + + WHERE ai.ARTICLE_ID=ap.ARTICLE_ID AND ap.PUBLISH_ID = + #{publishId,jdbcType=VARCHAR} + - + - - - select ARTICLE_ID, ARTICLE_NAME, PUSH_DATE, ARTICLE_AUTHOR, ARTICLE_EDIT_URL, ARTICLE_VIEW_URL, @@ -290,89 +288,87 @@ #{articleId,jdbcType=INTEGER} - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-content/src/main/resources/static/img/admin.png b/ruoyi-content/src/main/resources/static/img/admin.png new file mode 100644 index 000000000..03bcac981 Binary files /dev/null and b/ruoyi-content/src/main/resources/static/img/admin.png differ diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleList.html b/ruoyi-content/src/main/resources/templates/content/article/articleList.html new file mode 100644 index 000000000..3265e694a --- /dev/null +++ b/ruoyi-content/src/main/resources/templates/content/article/articleList.html @@ -0,0 +1,571 @@ + + + + + + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-content/src/main/resources/templates/content/column/column.html b/ruoyi-content/src/main/resources/templates/content/column/column.html index 73d0ef5ce..71bd113ea 100644 --- a/ruoyi-content/src/main/resources/templates/content/column/column.html +++ b/ruoyi-content/src/main/resources/templates/content/column/column.html @@ -28,7 +28,6 @@ -
@@ -74,7 +73,7 @@