tijiao

fhKeeper/formulahousekeeper/ArticleOperation/src/main/java/com/my/bigevent/controller/ArticleController.java

@@ -64,7 +64,7 @@ public class ArticleController
      */
     @PostMapping("/insertOrUpdateArticle")
     public Result insertOrUpdateArticle( @RequestParam(value = "title",required = true) String title,
-                                         @RequestParam(value = "categoryId",required = false) String categoryIds,
+                                         @RequestParam(value = "categoryIds",required = false) String categoryIds,
                                          @RequestParam(value = "content",required = true) String content,
                                          @RequestParam(value = "profile",required = false) String profile,
                                          @RequestParam(value = "state",required = true) String state,

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -1235,7 +1235,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             headList.add("备注");
             headList.add("印花税税目");
 
-            headList.add("付款日期");
+//            headList.add("付款日期");
             headList.add("已付款金额(元)");
             headList.add("付款类型");
             headList.add("凭证号");
@@ -1321,7 +1321,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                                 item.add("");
                             }
 
-                            item.add(payCustomizedList.get(j).getPayDate()==null?"":payCustomizedList.get(j).getPayDate());
+//                            item.add(payCustomizedList.get(j).getPayDate()==null?"":payCustomizedList.get(j).getPayDate());
                             item.add(payCustomizedList.get(j).getPayedAmount()==null?"":payCustomizedList.get(j).getPayedAmount()+"");
                             if (payCustomizedList.get(j).getPayType().booleanValue()){
                                 item.add("预付");
@@ -1338,7 +1338,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                                 item.add("" );
                             }
 
-                            item.add(payCustomizedList.get(j).getPayDate()==null?"":payCustomizedList.get(j).getPayDate());
+//                            item.add(payCustomizedList.get(j).getPayDate()==null?"":payCustomizedList.get(j).getPayDate());
                             item.add(payCustomizedList.get(j).getPayedAmount()==null?"":payCustomizedList.get(j).getPayedAmount()+"");
                             if (payCustomizedList.get(j).getPayType().booleanValue()){
                                 item.add("预付");

fhKeeper/formulahousekeeper/webttkuaiban/src/main/java/com/firerock/webttkuaiban/demos/controller/ArticleController.java

@@ -32,7 +32,7 @@ import java.util.Map;
 /**
  * @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
  */
-@Controller
+@RestController
 @RequestMapping("article")
 public class ArticleController {
 
@@ -82,4 +82,12 @@ public class ArticleController {
         return map;
     }
 
+    @GetMapping("/getArticleById")
+    public Object getArticleById(@RequestParam("id") Integer id){
+        Article article = articleService.getArticleById(id);
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", article);
+        return map;
+    }
+
 }

fhKeeper/formulahousekeeper/webttkuaiban/src/main/java/com/firerock/webttkuaiban/demos/mapper/ArticleMapper.java

@@ -2,19 +2,20 @@ package com.firerock.webttkuaiban.demos.mapper;
 
 import com.firerock.webttkuaiban.demos.pojo.Article;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
 @Mapper
 public interface ArticleMapper {
-    List<Article> pageList(Integer pageIndex, Integer pageSize,String info);
+    List<Article> pageList(@Param("pageIndex") Integer pageIndex,@Param("pageSize") Integer pageSize,@Param("info") String info);
 
-    Integer getTotal(String info);
+    Integer getTotal(@Param("info") String info);
 
     List<Article> latestList();
 
-    List<Article> relatedList(List<String> strings);
+    List<Article> relatedList(@Param("strings")List<String> strings,@Param("articleId")Integer articleId);
 
     @Select("select * from article where id = #{id}")
     Article getArticleById(Integer id);

fhKeeper/formulahousekeeper/webttkuaiban/src/main/java/com/firerock/webttkuaiban/demos/mapper/CategoryMapper.java

@@ -0,0 +1,12 @@
+package com.firerock.webttkuaiban.demos.mapper;
+
+import com.firerock.webttkuaiban.demos.pojo.Category;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface CategoryMapper {
+    List<Category> listByIds(@Param("categoryIds") List<String> categoryIds);
+}

fhKeeper/formulahousekeeper/webttkuaiban/src/main/java/com/firerock/webttkuaiban/demos/mapper/UserMapper.java

@@ -5,4 +5,5 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 @Mapper
 public interface UserMapper {
+
 }

fhKeeper/formulahousekeeper/webttkuaiban/src/main/java/com/firerock/webttkuaiban/demos/pojo/Article.java

@@ -29,6 +29,7 @@ public class Article {
     private Integer categoryId;//文章分类id
 
     private String categoryIds;//文章分类 category_ids
+    private String categoryNames;//文章分类 category_ids
     private Integer createUser;//创建人ID
 
     @JsonFormat(pattern = "yyyy-MM-dd")

fhKeeper/formulahousekeeper/webttkuaiban/src/main/java/com/firerock/webttkuaiban/demos/pojo/Category.java

@@ -0,0 +1,25 @@
+package com.firerock.webttkuaiban.demos.pojo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class Category {
+
+    private Integer id;//主键ID
+
+    private String categoryName;//分类名称
+
+    private String categoryAlias;//分类别名
+    private Integer createUser;//创建人ID
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")   // 规定时间格式
+    private LocalDateTime createTime;//创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")   // 规定时间格式
+    private LocalDateTime updateTime;//更新时间
+
+
+
+    }
+

fhKeeper/formulahousekeeper/webttkuaiban/src/main/java/com/firerock/webttkuaiban/demos/service/ArticleService.java

@@ -14,4 +14,6 @@ public interface ArticleService {
     List<Article> latestList();
 
     List<Article> relatedList(Integer id);
+
+    Article getArticleById(Integer id);
 }

fhKeeper/formulahousekeeper/webttkuaiban/src/main/java/com/firerock/webttkuaiban/demos/service/impl/ArticleServiceImpl.java

@@ -2,14 +2,17 @@ package com.firerock.webttkuaiban.demos.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.firerock.webttkuaiban.demos.mapper.ArticleMapper;
+import com.firerock.webttkuaiban.demos.mapper.CategoryMapper;
 import com.firerock.webttkuaiban.demos.mapper.UserMapper;
 import com.firerock.webttkuaiban.demos.pojo.Article;
+import com.firerock.webttkuaiban.demos.pojo.Category;
 import com.firerock.webttkuaiban.demos.service.ArticleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.StringJoiner;
 
 @Service
 public class ArticleServiceImpl implements ArticleService {
@@ -18,6 +21,8 @@ public class ArticleServiceImpl implements ArticleService {
     private UserMapper userMapper;
     @Autowired
     private ArticleMapper articleMapper;
+    @Autowired
+    private CategoryMapper categoryMapper;
 
 
     @Override
@@ -42,9 +47,27 @@ public class ArticleServiceImpl implements ArticleService {
         Article articleById = articleMapper.getArticleById(articleId);
         if (articleById!=null&& !StringUtils.isEmpty(articleById.getCategoryIds())){
             List<String> strings = JSONObject.parseArray(articleById.getCategoryIds(), String.class);
-            return articleMapper.relatedList(strings);
+            return articleMapper.relatedList(strings,articleById.getId());
         }else {
             return new ArrayList<>();
         }
     }
+
+    @Override
+    public Article getArticleById(Integer articleId) {
+        Article article = articleMapper.getArticleById(articleId);
+        if (article!=null&&article.getCategoryIds()!=null&& !StringUtils.isEmpty(article.getCategoryIds())) {
+            List<String> categoryIds = JSONObject.parseArray(article.getCategoryIds(), String.class);
+            List<Category> list = categoryMapper.listByIds(categoryIds);
+            StringJoiner stringJoiner = new StringJoiner(",");
+            if (list != null && !list.isEmpty()) {
+                list.forEach(a -> stringJoiner.add(a.getCategoryName()));
+                article.setCategoryNames(stringJoiner.toString());
+            }
+            else {
+                article.setCategoryNames("");
+            }
+        }
+        return article;
+    }
 }

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/application.properties

@@ -7,6 +7,7 @@ logging.level.com.hssx.user.mapper=debug
 mybatis-plus.type-aliases-package=com.firerock.webttkuaiban.demos.pojo/*
 mybatis-plus.mapper-locations=mapper/*.xml
 mybatis-plus.configuration.map-underscore-to-camel-case=true
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://47.101.180.183:17089/big_event?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/mapper/ArticleMapper.xml

@@ -17,7 +17,7 @@
         </where>
         order by  update_time DESC
         <if test="pageIndex!=null and pageSize!=null">
-            limit pageIndex,pageSize
+            limit #{pageIndex},#{pageSize}
         </if>
     </select>
     <select id="getTotal" resultType="java.lang.Integer">
@@ -46,6 +46,9 @@
         left join  article_cover_img aci on a.id=aci.article_id
         <where>
             a.state='已发布'
+            <if test="articleId!=null">
+                and a.id!=#{articleId}
+            </if>
             <if test="strings!=null">
                 and
                 <foreach collection="strings" item="item" separator="or" open="(" close=")">
@@ -54,6 +57,6 @@
             </if>
         </where>
         order by  update_time DESC
-        limit 6
+        limit 5
     </select>
 </mapper>

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/mapper/CategoryMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--这里是 ArticleMapper.java 接口文件的地址-->
+<mapper namespace="com.firerock.webttkuaiban.demos.mapper.CategoryMapper">
+
+    <select id="listByIds" resultType="com.firerock.webttkuaiban.demos.pojo.Category">
+        SELECT * from category
+        where id in
+        <foreach collection="categoryIds" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
+</mapper>