上传文件附件

src/main/java/com/izouma/jmrh/domain/Article.java

@@ -1,6 +1,7 @@
 package com.izouma.jmrh.domain;
 
 import com.izouma.jmrh.annotations.Searchable;
+import com.izouma.jmrh.converter.FileObjectListConverter;
 import com.izouma.jmrh.enums.AuditStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +12,7 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 @Entity
@@ -56,4 +58,12 @@ public class Article extends BaseEntity {
 
     @ApiModelProperty("来源")
     private String source;
+
+
+
+    //添加附件的功能
+    @ApiModelProperty("附件")
+    @Convert(converter = FileObjectListConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private List<FileObject> attachment;
 }

src/main/java/com/izouma/jmrh/domain/ResourceSupplyAndDemand.java

@@ -1,6 +1,7 @@
 package com.izouma.jmrh.domain;
 
 import com.izouma.jmrh.annotations.Searchable;
+import com.izouma.jmrh.converter.FileObjectListConverter;
 import com.izouma.jmrh.converter.StringArrayConverter;
 import com.izouma.jmrh.enums.AuditStatus;
 import com.izouma.jmrh.enums.ConversationStatus;
@@ -79,4 +80,10 @@ public class ResourceSupplyAndDemand extends BaseEntity {
 
     @ApiModelProperty("审核时间")
     private LocalDateTime auditTime;
+
+    //添加附件的功能
+    @ApiModelProperty("附件")
+    @Convert(converter = FileObjectListConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private List<FileObject> attachment;
 }

src/main/java/com/izouma/jmrh/repo/ConversationRepo.java

@@ -25,7 +25,8 @@ public interface ConversationRepo extends JpaRepository<Conversation, Long>, Jpa
     Conversation findFirstByUserIdAndToUserIdOrderByIdDesc(Long userId, Long toUserId);
 
 
-    Conversation findBySndIdAAndUserId(Long sendId,Long userId);
+    @Query("SELECT c FROM Conversation c WHERE c.sndId = :sndId AND c.userId = :userId")
+    Conversation findBySndIdAAndUserId(Long sndId,Long userId);
 
     @Transactional
     @Modifying

src/main/java/com/izouma/jmrh/service/CommentService.java

@@ -85,10 +85,10 @@ public class CommentService {
         if (likeRecord == null) {
             likeRecordRepo.save(LikeRecord.builder()
 //                    .postId(comment.getPostId())
-                    .commentId(comment.getId())
-                    .userId(SecurityUtils.getAuthenticatedUser().getId())
-                    .dislike(dislike)
-                    .build());
+                                          .commentId(comment.getId())
+                                          .userId(SecurityUtils.getAuthenticatedUser().getId())
+                                          .dislike(dislike)
+                                          .build());
             if (dislike) {
                 comment.setDislikeNum(comment.getDislikeNum() + 1);
             } else {
@@ -141,12 +141,12 @@ public class CommentService {
                 commentDTO.setNickname(user.getNickname());
             });
             finalLikeRecords.stream()
-                    .filter(likeRecord -> comment.getId().equals(likeRecord.getCommentId()))
-                    .findAny()
-                    .ifPresent(likeRecord -> {
-                        commentDTO.setLiked(!likeRecord.isDislike());
-                        commentDTO.setDisliked(likeRecord.isDislike());
-                    });
+                            .filter(likeRecord -> comment.getId().equals(likeRecord.getCommentId()))
+                            .findAny()
+                            .ifPresent(likeRecord -> {
+                                commentDTO.setLiked(!likeRecord.isDislike());
+                                commentDTO.setDisliked(likeRecord.isDislike());
+                            });
             return commentDTO;
         });
     }

src/main/java/com/izouma/jmrh/web/ArticleController.java

@@ -11,6 +11,7 @@ import com.izouma.jmrh.service.ArticleService;
 import com.izouma.jmrh.utils.ObjUtils;
 import com.izouma.jmrh.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +25,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/article")
 @AllArgsConstructor
+@Slf4j
 public class ArticleController extends BaseController {
     private ArticleService articleService;
     private ArticleRepo    articleRepo;
@@ -32,6 +34,7 @@ public class ArticleController extends BaseController {
     @PostMapping("/save")
     @OperLog(value = "发布管理-编辑", type = "编辑")
     public Article save(@RequestBody Article record) {
+        log.info("Article record是:{}--->",record);
         if (record.getId() != null) {
             Article orig = articleRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);

src/main/java/com/izouma/jmrh/web/ProjectManagementController.java

@@ -8,6 +8,7 @@ import com.izouma.jmrh.repo.ProjectManagementRepo;
 import com.izouma.jmrh.utils.ObjUtils;
 import com.izouma.jmrh.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/projectManagement")
 @AllArgsConstructor
+@Slf4j
 public class ProjectManagementController extends BaseController {
     private ProjectManagementService projectManagementService;
     private ProjectManagementRepo    projectManagementRepo;
@@ -26,6 +28,7 @@ public class ProjectManagementController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public ProjectManagement save(@RequestBody ProjectManagement record) {
+        log.info("ProjectManagement record是:{}",record);
         if (record.getId() != null) {
             ProjectManagement orig = projectManagementRepo.findById(record.getId())
                     .orElseThrow(new BusinessException("无记录"));

src/main/vue/src/views/ArticleAudit.vue

@@ -65,6 +65,9 @@
                 </template>
             </el-table-column>
             <el-table-column prop="type.name" label="类型"> </el-table-column>
+
+            <el-table-column prop="attachment" label="附件"> </el-table-column>
+
             <el-table-column prop="createdAt" label="发布日期" width="150"> </el-table-column>
 
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>

src/main/vue/src/views/ArticleEdit.vue

@@ -21,6 +21,11 @@
             <el-form-item prop="content" label="内容" style="width:1000px">
                 <rich-text v-model="formData.content"></rich-text>
             </el-form-item>
+
+            <el-form-item prop="attachment" label="附件">
+                <file-upload v-model="formData.attachment" :limit="10" format="json"></file-upload>
+            </el-form-item>
+
             <el-form-item prop="publish" label="发布">
                 <el-radio v-model="formData.publish" :label="true">是</el-radio>
                 <el-radio v-model="formData.publish" :label="false">否</el-radio>

src/main/vue/src/views/ArticleList.vue

@@ -49,6 +49,9 @@
                 </template>
             </el-table-column>
             <el-table-column prop="mainType" label="类型"> </el-table-column>
+
+            <el-table-column prop="attachment" label="附件"> </el-table-column>
+
             <el-table-column prop="createdAt" label="发布日期" width="150"> </el-table-column>
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
             <el-table-column prop="auditTime" label="审核时间" width="150"></el-table-column>

src/main/vue/src/views/PolicyEdit.vue

@@ -18,6 +18,11 @@
             <el-form-item prop="content" label="内容" style="width:1000px">
                 <rich-text v-model="formData.content"></rich-text>
             </el-form-item>
+
+            <el-form-item prop="attachment" label="附件">
+                <file-upload v-model="formData.attachment" :limit="10" format="json"></file-upload>
+            </el-form-item>
+
             <el-form-item prop="publish" label="发布">
                 <el-radio v-model="formData.publish" :label="true">是</el-radio>
                 <el-radio v-model="formData.publish" :label="false">否</el-radio>

src/main/vue/src/views/PolicyList.vue

@@ -55,6 +55,9 @@
                 </template>
             </el-table-column>
             <el-table-column prop="type.name" label="类型"> </el-table-column>
+
+            <el-table-column prop="attachment" label="附件"> </el-table-column>
+
             <el-table-column prop="createdAt" label="发布日期" width="150"> </el-table-column>
 
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>

src/main/vue/src/views/PostAudit.vue

@@ -29,6 +29,9 @@
             <el-table-column prop="content" label="内容"> </el-table-column>
             <el-table-column prop="pics" label="图片"> </el-table-column>
             <el-table-column prop="type" label="类型" :formatter="typeFormatter"> </el-table-column>
+
+            <el-table-column prop="attachment" label="附件"> </el-table-column>
+
             <el-table-column prop="commentNum" label="评论数"> </el-table-column>
             <el-table-column prop="viewNum" label="热度"> </el-table-column>
             <el-table-column prop="likeNum" label="赞数"> </el-table-column>

src/main/vue/src/views/ResourceSupplyAndDemandAudit.vue

@@ -37,6 +37,9 @@
             <el-table-column prop="phone" label="联系方式"> </el-table-column>
             <el-table-column prop="address" label="联系地址"> </el-table-column>
             <el-table-column prop="status" label="审核状态" :formatter="statusFormatter"> </el-table-column>
+
+            <el-table-column prop="attachment" label="附件"> </el-table-column>
+
             <el-table-column prop="images" label="图片">
                 <template slot-scope="{ row }">
                     <el-image

src/main/vue/src/views/ResourceSupplyAndDemandEdit.vue

@@ -38,6 +38,11 @@
                     </el-option>
                 </el-select>
             </el-form-item>
+
+            <el-form-item prop="attachment" label="附件">
+                <file-upload v-model="formData.attachment" :limit="10" format="json"></file-upload>
+            </el-form-item>
+
             <el-form-item prop="images" label="图片">
                 <multi-upload v-model="formData.images"></multi-upload>
             </el-form-item>

src/main/vue/src/views/ResourceSupplyAndDemandList.vue

@@ -37,6 +37,9 @@
             <el-table-column prop="address" label="联系地址"> </el-table-column>
             <el-table-column prop="status" label="审核状态" :formatter="statusFormatter"> </el-table-column>
             <el-table-column prop="auditTime" label="审核时间" width="150"></el-table-column>
+
+            <el-table-column prop="attachment" label="附件"> </el-table-column>
+
             <el-table-column prop="images" label="图片">
                 <template slot-scope="{ row }">
                     <el-image