和

whole-estate/src/main/java/com/example/wholeestate/controller/AppointmentController.java

@@ -48,7 +48,7 @@ public class AppointmentController extends BaseController {
     })
     public ResponseBean openidAppointementList(@PathVariable("openid") String openid, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iAppointmentService.addAppointment(openid, parameter);
+        responseBean = iAppointmentService.addWxAppointment(openid, parameter);
         return responseBean;
     }
 

whole-estate/src/main/java/com/example/wholeestate/controller/CommentController.java

@@ -73,7 +73,7 @@ public class CommentController extends BaseController {
     @RequestMapping(value = "/comment/add", method = RequestMethod.POST)
     @ApiOperation(value = "添加评论", notes = "添加评论")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "customerId用户ID;commentType评论类型;mainId评论类型;parentId父级;commentContent评论内容")
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "customerId用户ID;commentType评论类型;mainId评论类型;parentId父级;commentContent评论内容;imgArray图片URL数组")
     })
     public ResponseBean addComment(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
@@ -119,7 +119,7 @@ public class CommentController extends BaseController {
     @RequestMapping(value = "/wx/comment/add/{openid}", method = RequestMethod.POST)
     @ApiOperation(value = "微信小程序添加评论", notes = "微信小程序添加评论")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "commentType评论类型;mainId评论类型;parentId父级;commentContent评论内容")
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "commentType评论类型;mainId评论类型;parentId父级;commentContent评论内容;imgArray图片URL数组")
     })
     public ResponseBean addWxComment(@PathVariable("openid") String openid,@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();

whole-estate/src/main/java/com/example/wholeestate/model/Comment.java

@@ -82,4 +82,10 @@ public class Comment implements Serializable {
     @TableField(exist = false)
     private List<Comment> childComment;
 
+    /**
+     * 评论的图片
+     */
+    @TableField(exist = false)
+    private List<CommentImg> commentImgList;
+
 }

whole-estate/src/main/java/com/example/wholeestate/service/IAppointmentService.java

@@ -29,6 +29,6 @@ public interface IAppointmentService extends IService<Appointment> {
      * @param parameter
      * @return
      */
-    ResponseBean addAppointment(String openid, String parameter);
+    ResponseBean addWxAppointment(String openid, String parameter);
 
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/AppointmentServiceImpl.java

@@ -49,7 +49,7 @@ public class AppointmentServiceImpl extends ServiceImpl<AppointmentMapper, Appoi
     }
 
     @Override
-    public ResponseBean addAppointment(String openid, String parameter) {
+    public ResponseBean addWxAppointment(String openid, String parameter) {
         ResponseBean responseBean = new ResponseBean();
         Appointment appointment = JSONObject.parseObject(parameter, Appointment.class);
 
@@ -59,6 +59,7 @@ public class AppointmentServiceImpl extends ServiceImpl<AppointmentMapper, Appoi
 
         appointment.setCustomerId(customer.getCustomerId());
         appointment.setAppointmentId(idGen.nextId() + "");
+        appointment.setStatus(1);
         appointmentMapper.insert(appointment);
         responseBean.addSuccess("操作成功!");
         return responseBean;

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -261,7 +261,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
          //插入户型图片
         for (BuildingImg img:buildingImgs){
             BuildingImg Images = new BuildingImg();
-            Images.setImgId(img.getBuildingId());
+            Images.setImgId(idGen.nextId() + "");
             Images.setBuildingId(building.getBuildingId());
             Images.setImgType(img.getImgType());
             Images.setUrl(img.getUrl());
@@ -278,6 +278,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
         }
         building.setStatus(1);
+        building.setCreateDate(LocalDateTime.now());
+        building.setApartmentId(idGen.nextId() + "");
         buildingApartmentMapper.insert(building);
         responseBean.addSuccess("成功");
         return responseBean;

whole-estate/src/main/java/com/example/wholeestate/service/impl/CommentServiceImpl.java

@@ -7,12 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.common.uuid.IdGen;
+import com.example.wholeestate.dao.CommentImgMapper;
 import com.example.wholeestate.dao.CommentMapper;
 import com.example.wholeestate.dao.CustomerMapper;
-import com.example.wholeestate.model.Activity;
-import com.example.wholeestate.model.Comment;
-import com.example.wholeestate.model.Customer;
-import com.example.wholeestate.model.SysUser;
+import com.example.wholeestate.model.*;
 import com.example.wholeestate.service.ICommentService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,12 +36,21 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
     @Autowired
     private CustomerMapper customerMapper;
 
+    @Autowired
+    private CommentImgMapper commentImgMapper;
+
     private IdGen idGen = IdGen.get();
 
     @Override
     public ResponseBean addComment(String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        Comment comment = JSONObject.parseObject(parameter, Comment.class);
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+
+        // 评论的图片
+        String [] imgArray = jsonObject.getJSONArray("imgArray").toArray(new String[]{});
+
+        Comment comment = jsonObject.toJavaObject(Comment.class);
         comment.setCreateDate(LocalDateTime.now());
         comment.setStatus(1);
 
@@ -64,6 +71,20 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
             responseBean.addError("评论失败!");
             return responseBean;
         }
+
+        // 插入评论
+        for (int i =0; i < imgArray.length; i++) {
+            CommentImg commentImg = new CommentImg();
+            commentImg.setImgId(idGen.nextId() + "");
+            commentImg.setCommentId(comment.getCommentId());
+            commentImg.setImgUrl(imgArray[i]);
+            commentImg.setOrderNo(i);
+            commentImg.setStatus(1);
+
+            commentImgMapper.insert(commentImg);
+        }
+
+
         responseBean.addSuccess("评论成功!");
         return responseBean;
     }
@@ -80,6 +101,15 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         commentQueryWrapper.eq("comment_type", commentType);
         commentQueryWrapper.eq(StringUtils.isNotBlank(mainId),"main_id", mainId);
         IPage<Comment> commentIPage = commentMapper.selectPage(page, commentQueryWrapper);
+        commentIPage.getRecords().forEach(e -> {
+            // 查询图片
+            QueryWrapper<CommentImg> queryCommentImgWrapper = new QueryWrapper<>();
+            queryCommentImgWrapper.eq("comment_id", e.getCommentId());
+            queryCommentImgWrapper.eq("status", 1);
+            queryCommentImgWrapper.orderByAsc("order_no");
+            List<CommentImg> commentImgs = commentImgMapper.selectList(queryCommentImgWrapper);
+            e.setCommentImgList(commentImgs);
+        });
 
         responseBean.addSuccess(commentIPage);
         return responseBean;
@@ -103,6 +133,14 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
             childCommentQuery.eq("parent_id", e.getCommentId());
             List<Comment> comments = commentMapper.selectList(childCommentQuery);
             e.setChildComment(comments);
+
+            // 查询图片
+            QueryWrapper<CommentImg> queryCommentImgWrapper = new QueryWrapper<>();
+            queryCommentImgWrapper.eq("comment_id", e.getCommentId());
+            queryCommentImgWrapper.eq("status", 1);
+            queryCommentImgWrapper.orderByAsc("order_no");
+            List<CommentImg> commentImgs = commentImgMapper.selectList(queryCommentImgWrapper);
+            e.setCommentImgList(commentImgs);
         });
 
         responseBean.addSuccess(commentIPage);
@@ -112,7 +150,13 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
     @Override
     public ResponseBean addWxComment(String openid, String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        Comment comment = JSONObject.parseObject(parameter, Comment.class);
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+
+        // 评论的图片
+        String [] imgArray = jsonObject.getJSONArray("imgArray").toArray(new String[]{});
+
+        Comment comment = jsonObject.toJavaObject(Comment.class);
         comment.setCreateDate(LocalDateTime.now());
         comment.setStatus(1);
 
@@ -134,6 +178,19 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
             responseBean.addError("评论失败!");
             return responseBean;
         }
+
+        // 插入评论
+        for (int i =0; i < imgArray.length; i++) {
+            CommentImg commentImg = new CommentImg();
+            commentImg.setImgId(idGen.nextId() + "");
+            commentImg.setCommentId(comment.getCommentId());
+            commentImg.setImgUrl(imgArray[i]);
+            commentImg.setOrderNo(i);
+            commentImg.setStatus(1);
+
+            commentImgMapper.insert(commentImg);
+        }
+
         responseBean.addSuccess("评论成功!");
         return responseBean;
     }