From 777fc2b301a2961e4dfab3585fbe5858bafe78ef Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Tue, 30 Mar 2021 18:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseCodeController.java | 26 +- .../controller/LibraryManageController.java | 8 +- .../ruoyi/content/service/LibraryService.java | 3 +- .../service/impl/ArticleServiceImpl.java | 2 +- .../service/impl/LibraryServiceImpl.java | 17 +- .../content/article/articleManage.html | 546 +++++++++++++++++- .../content/picAdverts/picAdverts.html | 2 +- 7 files changed, 571 insertions(+), 33 deletions(-) diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java index 0941d928e..398763425 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java @@ -268,6 +268,7 @@ public class BaseCodeController extends BaseController { Map policyMap = new HashMap(); String codeCode = request.getParameter("codeCode"); String codeType = request.getParameter("codeType"); + String flag = request.getParameter("flag"); // 查询栏目树 List columnList = baseCodeService.columnTree(codeCode, codeType); // policyMap.put("columnList", columnList); @@ -275,19 +276,28 @@ public class BaseCodeController extends BaseController { // msg.setObject(policyMap); // msg.setResult(true); - return initZtree(columnList); + return initZtree(columnList, flag); } - public List initZtree(List deptList) { + public List initZtree(List deptList, String flag) { List ztreeList = new ArrayList<>(); if (deptList != null && deptList.size() > 0) { - Ztree z = new Ztree(); - z.setId("FIRST_COLUMN"); - z.setpId(""); - z.setName("栏目"); - z.setTitle("栏目"); - ztreeList.add(z); + if (StringUtils.isBlank(flag)) { + Ztree z = new Ztree(); + z.setId("FIRST_COLUMN"); + z.setpId(""); + z.setName("栏目"); + z.setTitle("栏目"); + ztreeList.add(z); + } else if (StringUtils.equals(flag, "1")) { + Ztree z = new Ztree(); + z.setId("ARTICLE"); + z.setpId(""); + z.setName("文库"); + z.setTitle("文库"); + ztreeList.add(z); + } for (BaseCodeTree dept : deptList) { Ztree ztree = new Ztree(); ztree.setId(dept.getCodeCode()); diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java index ee325ab56..58eb2d3b3 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java @@ -1,6 +1,7 @@ package com.ruoyi.content.controller; +import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableSupport; @@ -31,7 +32,7 @@ import java.util.*; */ @Controller @RequestMapping("/article") -public class LibraryManageController { +public class LibraryManageController extends BaseController { private String prefix = "content/article"; @@ -462,10 +463,10 @@ public class LibraryManageController { */ @RequestMapping("/noSendPublishArticle") @ResponseBody - public PageDTO noSendPublishArticle(HttpServletRequest request, HttpServletResponse response) { + public TableDataInfo noSendPublishArticle(HttpServletRequest request, HttpServletResponse response) { 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"); @@ -475,7 +476,6 @@ public class LibraryManageController { String publishId = request.getParameter("publishId"); // 1.根据文章id去查publish表，找出该文章对应所有业务员 pageDTO = libraryService.noSendPublishArticle(articleId, startRow, rows, publishId); - pageDTO.setPage(Integer.parseInt(page)); return pageDTO; } catch (Exception e) { diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java index 934f8ef71..d3aa1f87f 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java @@ -1,6 +1,7 @@ package com.ruoyi.content.service; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.content.domain.BaseCode; import com.ruoyi.content.domain.PageDTO; import com.ruoyi.content.message.Message; @@ -127,7 +128,7 @@ public interface LibraryService { public Message onkeyExChange(String from, String to, String companyId, String branchId); - public PageDTO noSendPublishArticle(String articleId, int startRow, int rows, String publishId); + public TableDataInfo noSendPublishArticle(String articleId, int startRow, int rows, String publishId); public Message delOnTimeTask(String delId); 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 668360fb5..b8d2e3e01 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 @@ -66,7 +66,7 @@ public class ArticleServiceImpl implements ArticleService { originalUrl, createUser, author, ids, isAuthorization, isReserve, automaticName, introduction, isJoinActive); String companyId = "1";// 渠道id - String email = ""; + String email = "13152783264"; // 根据登录人查询登录信息（shiro里有缓存数据不是最新） CmsSysUser cmsSysUser = cmsSysUserExMapper.queryLoginInfoByEmail(email); // 此时后台管理员 diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java index 0414a29e0..d52676a80 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java @@ -1,10 +1,12 @@ package com.ruoyi.content.service.impl; +import com.github.pagehelper.PageInfo; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.content.constants.PropertiesConstants; import com.ruoyi.content.domain.*; import com.ruoyi.content.exception.BusinessException; @@ -962,9 +964,7 @@ public class LibraryServiceImpl implements LibraryService { LOGGER.info("接收到的参数：articleId【{}】,publishId[{}],agentCode[{}],sendType[{}],partyId[{}],sendTime[{}]", new Object[]{articleId, publishId, agentCode, sendType, partyId, sendTime}); Message msg = new Message(true, "推送文章成功"); - CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal(); - String companyId = userInfoDTO.getCompanyId(); - String email = userInfoDTO.getEmail(); + String email = "13152783264"; CmsSysUser cmsSysUser = this.cmsSysUserExMapper.queryLoginInfoByEmail(email); String userId = cmsSysUser.getUserId(); String sysUserName = cmsSysUser.getName(); @@ -1019,7 +1019,7 @@ public class LibraryServiceImpl implements LibraryService { } @Override - public PageDTO noSendPublishArticle(String articleId, int startRow, int rows, String publishId) { + public TableDataInfo noSendPublishArticle(String articleId, int startRow, int rows, String publishId) { LOGGER.info("查询未定时推送的文章列表，入参 articleId：【{}】，startRow：【{}】，rows：【{}】，publishId【{}】" , articleId, startRow, rows, publishId); HashMap paramMap = new HashMap<>(); @@ -1066,11 +1066,10 @@ public class LibraryServiceImpl implements LibraryService { ArticlePublishSendExample ex = new ArticlePublishSendExample(); ex.createCriteria().andArticleIdEqualTo(Integer.parseInt(articleId)).andPublishIdEqualTo(publishId); int count = articlePublishSendMapper.countByExample(ex); - PageDTO pageDTO = new PageDTO(); - pageDTO.setStartRow(startRow); - pageDTO.setDataRows(resultDTO); - pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1)); - pageDTO.setRecords(count); + TableDataInfo pageDTO = new TableDataInfo(); + pageDTO.setCode(0); + pageDTO.setRows(resultDTO); + pageDTO.setTotal(count); return pageDTO; } diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html index 3fb3e7124..5f02fa4bb 100644 --- a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html +++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html @@ -2,7 +2,15 @@ + + + +
@@ -38,19 +46,144 @@
-
-
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html index dd80c88d3..422067c28 100644 --- a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html +++ b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html @@ -1,5 +1,5 @@ - +