温红权 6 years ago
parent
commit
8a79d08be1

+ 14 - 0
src/main/java/cn/com/liandisys/ycjt/ggcx/admin/controller/cms/ArticleController.java

@@ -226,6 +226,20 @@ public class ArticleController {
         redirectAttributes.addAttribute("message", "删除文章成功");
         return "redirect:list";
     }
+    @RequestMapping(value = "publish")
+    public String publish(Article article, RedirectAttributes redirectAttributes) throws UnsupportedEncodingException, APIConnectionException, APIRequestException {
+
+    	Article articlec = articleService.findOne(article.getId());
+    	articlec.setDelFlag("0");
+    	articleService.save(articlec);
+        redirectAttributes.addAttribute("message", "发布文章成功");
+     // 栏目区分为 2:交通要闻时 发推送消息
+        if (article.getCategory() != null && "2".equals(article.getCategory().getId()) 
+        		&& "1".equals(article.getAppIndexView())) {
+            sendMessage(article.getTitle());
+        }
+        return "redirect:list";
+    }
 
     /**
      * 通过编号获取文章标题

+ 2 - 0
src/main/java/cn/com/liandisys/ycjt/ggcx/admin/service/cms/ArticleService.java

@@ -69,7 +69,9 @@ public class ArticleService {
         }
         article.setUpdateBy(UserUtils.getPrincipal());
         article.setUpdateDate(new Date());
+        if(article.getDelFlag()==null) {
         article.setDelFlag(Article.DEL_FLAG_NORMAL);
+        }
         ArticleData articleData = article.getArticleData();
         articleData = articleDataDao.save(articleData);
         articleDao.save(article);

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/cms/articleList.jsp

@@ -64,7 +64,7 @@
 					<a href="${ctx}/cms/article/delete?id=${article.id}&categoryId=${article.category.id}" onclick="return confirmx('确认要删除该文章吗?', this.href)" >删除</a>
 					<c:if test="${article.delFlag eq 1 && user.loginName!='ycjtj'}">
 					
-				<a href="${ctx}/cms/article/delete?id=${article.id}&isRe=true&categoryId=${article.category.id}" onclick="return confirmx('确认要发布该文章吗?', this.href)" >发布</a>
+				<a href="${ctx}/cms/article/publish?id=${article.id}&categoryId=${article.category.id}" onclick="return confirmx('确认要发布该文章吗?', this.href)" >发布</a>
 				</c:if>
 					
 				</td>