springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,34 +23,24 @@ </component> <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentUserDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentUserDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussUserDTO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DiscussApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -116,11 +106,11 @@ </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> <recent name="com.panzhihua.applets.api" /> <recent name="com.panzhihua.timejob.config" /> <recent name="com.panzhihua.common.model.dtos.community" /> <recent name="com.panzhihua.common.exceptions" /> <recent name="com.panzhihua.common.model.vos" /> <recent name="com.panzhihua.common.model.dtos" /> </key> <key name="CopyFile.RECENT_KEYS"> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\timejob\src\main\resources" /> @@ -433,7 +423,7 @@ <workItem from="1610939265133" duration="8588000" /> <workItem from="1610956684718" duration="7037000" /> <workItem from="1611019208339" duration="94460000" /> <workItem from="1611365644515" duration="11851000" /> <workItem from="1611365644515" duration="21617000" /> </task> <servers /> </component> @@ -457,10 +447,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="249" y="0" key="#Project_Structure/0.0.1536.824@0.0.1536.824" timestamp="1608546608273" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611383660534"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611395776792"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611383660534" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611395776792" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -489,54 +479,54 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" /> <state width="1031" height="384" key="GridCell.Tab.0.bottom" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.0.bottom" timestamp="1611398020880"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.0.center" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" /> <state width="1031" height="256" key="GridCell.Tab.0.center" timestamp="1611398020879"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.0.left" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611398020879" /> <state width="1031" height="256" key="GridCell.Tab.0.left" timestamp="1611398020879"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.0.right" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611398020879" /> <state width="1031" height="256" key="GridCell.Tab.0.right" timestamp="1611398020879"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.1.bottom" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611398020879" /> <state width="1031" height="256" key="GridCell.Tab.1.bottom" timestamp="1611398020880"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.1.center" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" /> <state width="1031" height="256" key="GridCell.Tab.1.center" timestamp="1611398020880"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.1.left" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" /> <state width="1031" height="256" key="GridCell.Tab.1.left" timestamp="1611398020880"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.1.right" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" /> <state width="1031" height="256" key="GridCell.Tab.1.right" timestamp="1611398020880"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.2.bottom" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" /> <state width="1031" height="256" key="GridCell.Tab.2.bottom" timestamp="1611398020880"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.2.center" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" /> <state width="1031" height="256" key="GridCell.Tab.2.center" timestamp="1611398020880"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.2.left" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" /> <state width="1031" height="256" key="GridCell.Tab.2.left" timestamp="1611398020880"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.2.right" timestamp="1611388089438"> <state width="1031" height="256" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" /> <state width="1031" height="256" key="GridCell.Tab.2.right" timestamp="1611398020880"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="384" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="256" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611398020880" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -549,10 +539,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="270" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1606120706449" /> <state width="498" height="540" key="SwitcherDM" timestamp="1611386897102"> <state width="498" height="540" key="SwitcherDM" timestamp="1611391726458"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611386897102" /> <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611391726458" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1609398421992"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -561,10 +551,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611130640592" /> <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611365723051"> <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611395608489"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611365723051" /> <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611395608489" /> <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618"> <screen x="0" y="0" width="1536" height="824" /> </state> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
New file @@ -0,0 +1,126 @@ package com.panzhihua.applets.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO; import com.panzhihua.common.model.vos.community.ComActDiscussVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 15:30 **/ @Slf4j @Api(tags = {"一起议"}) @RestController @RequestMapping("/") public class DiscussApi extends BaseController { @Resource private CommunityService communityService; @ApiOperation(value = "一起议-新增") @PostMapping("discuss") public R addDiscuss(@RequestBody @Validated(AddGroup.class) ComActDiscussDTO comActDiscussDTO) { Integer type = comActDiscussDTO.getType(); String voteTitle = comActDiscussDTO.getVoteTitle(); List<String> discussOptions = comActDiscussDTO.getDiscussOptions(); if (type.intValue()==2 ) { if(ObjectUtils.isEmpty(voteTitle)){ return R.fail("投票标题不能为空"); } if(ObjectUtils.isEmpty(discussOptions)){ return R.fail("选项不能为空"); } } String address = comActDiscussDTO.getAddress(); if (ObjectUtils.isEmpty(address)) { return R.fail("地址不能为空"); } LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long userId = loginUserInfo.getUserId(); Long communityId = loginUserInfo.getCommunityId(); comActDiscussDTO.setUserId(userId); comActDiscussDTO.setCommunityId(communityId); return communityService.addDiscuss(comActDiscussDTO); } @ApiOperation(value = "一起议-分页查询",response = ComActDiscussVO.class) @PostMapping("pagediscuss") public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) { pageComActDiscussDTO.setCommunityId(this.getCommunityId()); return communityService.pageDiscussApplets(pageComActDiscussDTO); } @ApiOperation(value = "一起议-回复") @PostMapping("discusscomment") public R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) { String comment = comActDiscussCommentDTO.getComment(); if (ObjectUtils.isEmpty(comment)) { return R.fail("回复不能为空"); } Long discussId = comActDiscussCommentDTO.getDiscussId(); if (null==discussId||0==discussId) { return R.fail("一起议主键不能为空"); } comActDiscussCommentDTO.setUserId(this.getUserId()); return communityService.addDiscussComment(comActDiscussCommentDTO); } @ApiOperation(value = "一起议-点赞、取消点赞") @PutMapping("discussuser") public R putDiscussUser(@RequestBody @Validated ComActDiscussUserDTO comActDiscussUserDTO) { comActDiscussUserDTO.setUserId(this.getUserId()); return communityService.putDiscussUser(comActDiscussUserDTO); } @ApiOperation(value = "一起议-详情",response = ComActDiscussVO.class) @GetMapping("discuss") public R detailDiscuss(@RequestParam("id") Long id) { return communityService.detailDiscussApplets(id); } @ApiOperation(value = "一起议-评论-分页查询",response = ComActDiscussCommentVO.class) @PostMapping("pagediscusscomment") public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) { Long id = pageComActDiscussCommentDTO.getId(); if (null==id||0==id) { return R.fail("一起议主键不能为空"); } return communityService.pageDiscussCommentApplets(pageComActDiscussCommentDTO); } @ApiOperation(value = "一起议-评论-回复") @PostMapping("discusscommentback") public R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) { String comment = comActDiscussCommentDTO.getComment(); if (ObjectUtils.isEmpty(comment)) { return R.fail("回复不能为空"); } Long id = comActDiscussCommentDTO.getId(); if (null==id||0==id) { return R.fail("评论主键不能为空"); } comActDiscussCommentDTO.setUserId(this.getUserId()); return communityService.addDiscussCommentBack(comActDiscussCommentDTO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussUserDTO.java
New file @@ -0,0 +1,39 @@ package com.panzhihua.common.model.dtos.community; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议点赞 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-23 16:30 **/ @Data @ApiModel("一起议点赞") public class ComActDiscussUserDTO { @ApiModelProperty("主键") private Long id; @ApiModelProperty("一起议主键") @NotNull(message = "一起议主键不能为空") @Min(value = 1,message = "一起议主键不能为空") private Long discussId; @ApiModelProperty("用户主键") private Long userId; @ApiModelProperty("点赞时间") private Date createAt; @ApiModelProperty("操作类型 1 点赞 2 取消点赞") @Min(value = 1,message = "操作类型不能为空") private Integer type; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
@@ -37,4 +37,7 @@ @ApiModelProperty("查询结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date end; @ApiModelProperty(value = "登录用户",hidden = true) private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
@@ -6,6 +6,7 @@ import lombok.Data; import java.util.Date; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -44,8 +45,14 @@ @ApiModelProperty("评论人名字") private String userName; @ApiModelProperty("回复人名字") private String userNameBack; @ApiModelProperty("评论人手机号") private String phone; @ApiModelProperty("评论人头像") private String imageUrl; @ApiModelProperty("点赞数量") private Integer num; @@ -56,4 +63,8 @@ @ApiModelProperty("回复时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date timeBack; @ApiModelProperty("二级评论集合") private List<ComActDiscussCommentVO> comActDiscussCommentVOList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
@@ -60,4 +60,7 @@ @ApiModelProperty("发布人名字") private String userName; @ApiModelProperty("发布人头像") private String imageUrl; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -758,4 +758,36 @@ */ @PostMapping("pagediscusscomment") R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO); /** * 一起议-分页查询 小程序 * @param pageComActDiscussDTO 查询参数 * @return ComActDiscussVO 分页 */ @PostMapping("pagediscussapplets") R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO); /** * 一起议-点赞、取消点赞 * @param comActDiscussUserDTO 操作类型 * @return 操作结果 */ @PostMapping("putdiscussuser") R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO); /** * 一起议-评论-分页查询 小程序 * @param pageComActDiscussCommentDTO 分页参数 * @return ComActDiscussCommentVO */ @PostMapping("pagediscusscommentapplets") R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO); /** * 一起议-详情 小程序 * @param id 主键 * @return ComActDiscussVO */ @PostMapping("detaildiscussapplets") R detailDiscussApplets(@RequestParam("id") Long id); } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/ComActDiscussUserDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
@@ -1,9 +1,6 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.ComActActivityService; import com.panzhihua.service_community.service.ComActDiscussService; @@ -115,4 +112,44 @@ return comActDiscussService.pageDiscussComment(pageComActDiscussCommentDTO); } /** * 一起议-分页查询 小程序 * @param pageComActDiscussDTO 查询参数 * @return ComActDiscussVO 分页 */ @PostMapping("pagediscussapplets") public R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO){ return comActDiscussService.pageDiscussApplets(pageComActDiscussDTO); } /** * 一起议-点赞、取消点赞 * @param comActDiscussUserDTO 操作类型 * @return 操作结果 */ @PostMapping("putdiscussuser") public R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO){ return comActDiscussService.putDiscussUser(comActDiscussUserDTO); } /** * 一起议-评论-分页查询 小程序 * @param pageComActDiscussCommentDTO 分页参数 * @return ComActDiscussCommentVO */ @PostMapping("pagediscusscommentapplets") public R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO){ return comActDiscussService.pageDiscussCommentApplets(pageComActDiscussCommentDTO); } /** * 一起议-详情 小程序 * @param id 主键 * @return ComActDiscussVO */ @PostMapping("detaildiscussapplets") public R detailDiscussApplets(@RequestParam("id") Long id){ return comActDiscussService.detailDiscussApplets(id); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java
@@ -1,8 +1,12 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO; import com.panzhihua.service_community.model.dos.ComActDiscussCommentDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -22,4 +26,28 @@ // " </if> " + // " </where>" + // "</script>") @Select("" + "SELECT\n" + "u.`name` userName,\n" + "u.`image_url`,\n" + "u.phone,\n" + "c.`comment`,\n" + "c.`parent_id`,\n" + "c.`is_author`,\n" + "c.`is_topping`,\n" + "COUNT( cu.id ) num,\n" + "c.create_at,\n" + "c.id \n" + "FROM\n" + "com_act_discuss_comment c\n" + "JOIN sys_user u ON c.user_id = u.user_id\n" + "LEFT JOIN com_act_discuss_comment_user cu on c.id=cu.disscuss_comment_id\n" + "WHERE\n" + "FIND_IN_SET(\n" + "\tc.id,\n" + "getChildren ( #{id} )) and c.parent_id !=0 \n" + "GROUP BY c.id\n" + "ORDER BY\n" + "create_at desc") List<ComActDiscussCommentVO> selectChilds(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
@@ -8,6 +8,7 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO; import com.panzhihua.common.model.vos.community.ComActDiscussVO; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.service_community.model.dos.ComActDiscussDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -56,7 +57,7 @@ " </if> " + "GROUP BY\n" + "d.id" + ")t order by t.commentNum desc ,t.create_at desc "+ ")t order by t.create_at desc "+ "</script>") IPage<ComActDiscussVO> pageDiscuss(Page page, @Param("pageComActDiscussDTO") PageComActDiscussDTO pageComActDiscussDTO); @@ -87,7 +88,81 @@ " </where>" + "GROUP BY\n" + "c.id\n" + ")t order by num desc ,t.create_at desc"+ ")t order by t.create_at desc"+ "</script>") IPage<ComActDiscussCommentVO> pageDiscussComment(Page page, @Param("pageComActDiscussCommentDTO")PageComActDiscussCommentDTO pageComActDiscussCommentDTO); @Select("<script> " + "select t.* from ("+ "SELECT\n" + "d.id,\n" + "d.vote_title,\n" + "d.address,\n" + "d.photo_pah,\n" + "d.`discuss_subject`,\n" + "d.type,\n" + "COUNT( c.id ) commentNum,\n" + "COUNT( du.id ) signNum,\n" + "if(u.type=1,u.name,a.name) userName,\n" + "u.image_url,\n" + "d.create_at \n" + "FROM\n" + "com_act_discuss d\n" + "JOIN sys_user u ON d.user_id = u.user_id\n" + "JOIN com_act a ON d.community_id = a.community_id\n" + "LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id \n" + "LEFT JOIN com_act_discuss_user du ON d.id = du.discuss_id \n" + " where d.community_id=#{pageComActDiscussDTO.communityId}" + "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != ""'>" + " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' ) \n" + " </if> " + "<if test='pageComActDiscussDTO.userId != null and pageComActDiscussDTO.userId !=0 '>" + " and d.`user_id` = #{pageComActDiscussDTO.userId} \n" + " </if> " + "<if test='pageComActDiscussDTO.begin != null '>" + "AND d.create_at BETWEEN #{pageComActDiscussDTO.begin} \n" + "AND #{pageComActDiscussDTO.end} \n" + " </if> " + "GROUP BY\n" + "d.id" + ")t order by t.create_at desc "+ "</script>") IPage<ComActDiscussVO> pageDiscussApplets(Page page, @Param("pageComActDiscussDTO")PageComActDiscussDTO pageComActDiscussDTO); @Select("<script> " + "select * from ("+ "SELECT\n" + "u.`name` userName,\n" + "u.`image_url`,\n" + "u.phone,\n" + "c.`comment`,\n" + "c.`parent_id`,\n" + "c.`is_author`,\n" + "c.`is_topping`,\n" + "COUNT( cu.id ) num,\n" + "c.create_at,\n" + "c.id \n" + "FROM\n" + "com_act_discuss_comment c\n" + "JOIN sys_user u ON c.user_id = u.user_id \n" + "JOIN com_act_discuss d ON c.discuss_id = d.id \n" + "<if test='pageComActDiscussCommentDTO.name != null and pageComActDiscussCommentDTO.name.trim() != ""'>" + "AND u.`name` LIKE concat( #{pageComActDiscussCommentDTO.name}, '%' ) \n" + " </if> " + "<if test='pageComActDiscussCommentDTO.account != null and pageComActDiscussCommentDTO.account.trim() != ""'>" + "AND u.phone LIKE concat( #{pageComActDiscussCommentDTO.account}, '%' )\n" + " </if> " + "LEFT JOIN com_act_discuss_comment_user cu ON c.id = cu.disscuss_comment_id \n" + " <where>" + "<if test='pageComActDiscussCommentDTO.comment != null and pageComActDiscussCommentDTO.comment.trim() != ""'>" + "c.`comment` LIKE concat( '%', #{pageComActDiscussCommentDTO.comment" + "}, '%' ) \n" + " </if> " + " </where>" + "GROUP BY\n" + "c.id\n" + ")t order by t.is_topping desc , t.create_at desc"+ "</script>") IPage<ComActDiscussCommentVO> pageDiscussCommentApplets(Page page, @Param("pageComActDiscussCommentDTO")PageComActDiscussCommentDTO pageComActDiscussCommentDTO); @Select("select name from com_act where community_id=#{communityId}") ComActVO selectCommunity(Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java
@@ -31,7 +31,7 @@ /** * 用户主键 */ private Long user; private Long userId; /** * 点赞时间 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java
@@ -1,9 +1,6 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.vos.R; /** @@ -67,4 +64,28 @@ * @return ComActDiscussCommentVO */ R pageDiscussComment(PageComActDiscussCommentDTO pageComActDiscussCommentDTO); /** * 一起议-分页查询 小程序 * @param pageComActDiscussDTO 查询参数 * @return ComActDiscussVO 分页 */ R pageDiscussApplets(PageComActDiscussDTO pageComActDiscussDTO); /** * 一起议-点赞、取消点赞 * @param comActDiscussUserDTO 操作类型 * @return 操作结果 */ R putDiscussUser(ComActDiscussUserDTO comActDiscussUserDTO); /** * 一起议-评论-分页查询 小程序 * @param pageComActDiscussCommentDTO 分页参数 * @return ComActDiscussCommentVO */ R pageDiscussCommentApplets(PageComActDiscussCommentDTO pageComActDiscussCommentDTO); /** * 一起议-详情 小程序 * @param id 主键 * @return ComActDiscussVO */ R detailDiscussApplets(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
@@ -4,15 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO; import com.panzhihua.common.model.vos.community.ComActDiscussOptionVO; import com.panzhihua.common.model.vos.community.ComActDiscussVO; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComActDiscussOptionService; @@ -25,6 +23,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -116,6 +115,7 @@ Long userId = comActDiscussDO.getUserId(); LoginUserInfoVO loginUserInfoVO=comActDiscussDAO.selectUserByUserId(userId); comActDiscussVO.setUserName(loginUserInfoVO.getName()); return R.ok(comActDiscussVO); } @@ -147,6 +147,11 @@ } ComActDiscussCommentDO comActDiscussCommentDO=new ComActDiscussCommentDO(); BeanUtils.copyProperties(comActDiscussCommentDTO,comActDiscussCommentDO); Long userId = comActDiscussCommentDTO.getUserId(); Long userId1 = comActDiscussDO.getUserId(); if (userId.equals(userId1)) { comActDiscussCommentDO.setIsAuthor(1); } int insert = comActDiscussCommentDAO.insert(comActDiscussCommentDO); if (insert>0) { return R.ok(); @@ -253,11 +258,20 @@ return R.fail("评论不存在"); } Long discussId = comActDiscussCommentDO.getDiscussId(); ComActDiscussDO comActDiscussDO = comActDiscussDAO.selectById(discussId); if (ObjectUtils.isEmpty(comActDiscussDO)) { return R.fail("一起议不存在"); } Long userId = comActDiscussDO.getUserId(); Long userId1=comActDiscussCommentDTO.getUserId(); ComActDiscussCommentDO comActDiscussCommentDO1=new ComActDiscussCommentDO(); comActDiscussCommentDO1.setDiscussId(discussId); comActDiscussCommentDO1.setComment(comActDiscussCommentDTO.getComment()); comActDiscussCommentDO1.setUserId(comActDiscussCommentDTO.getUserId()); comActDiscussCommentDO1.setParentId(id); if (userId.equals(userId1)) { comActDiscussCommentDO1.setIsAuthor(1); } int insert = comActDiscussCommentDAO.insert(comActDiscussCommentDO1); if (insert>0) { return R.ok(); @@ -287,4 +301,162 @@ IPage<ComActDiscussCommentVO> iPage = comActDiscussDAO.pageDiscussComment(page, pageComActDiscussCommentDTO); return R.ok(iPage); } /** * 一起议-分页查询 小程序 * * @param pageComActDiscussDTO 查询参数 * @return ComActDiscussVO 分页 */ @Override public R pageDiscussApplets(PageComActDiscussDTO pageComActDiscussDTO) { Page page = new Page<>(); Long pageNum = pageComActDiscussDTO.getPageNum(); Long pageSize = pageComActDiscussDTO.getPageSize(); if (null==pageNum||0==pageNum) { pageNum = 1l; } if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComActDiscussVO> iPage = comActDiscussDAO.pageDiscussApplets(page, pageComActDiscussDTO); List<ComActDiscussVO> records = iPage.getRecords(); if (!ObjectUtils.isEmpty(records)) { records.forEach(comActDiscussVO -> { Integer type = comActDiscussVO.getType(); Long id = comActDiscussVO.getId(); if (type.intValue()==2) { List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, id)); List<ComActDiscussOptionVO> comActDiscussOptionVOS=new ArrayList<>(); comActDiscussOptionDOS.forEach(comActDiscussOptionDO -> { Long discussOptionDOId = comActDiscussOptionDO.getId(); Integer selectCount = comActDiscussOptionUserDAO.selectCount(new QueryWrapper<ComActDiscussOptionUserDO>().lambda().eq(ComActDiscussOptionUserDO::getDiscussOptionId, discussOptionDOId)); ComActDiscussOptionVO comActDiscussOptionVO=new ComActDiscussOptionVO(); BeanUtils.copyProperties(comActDiscussOptionDO,comActDiscussOptionVO); comActDiscussOptionVO.setNum(selectCount); comActDiscussOptionVOS.add(comActDiscussOptionVO); }); comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS); } }); } return R.ok(iPage); } /** * 一起议-点赞、取消点赞 * * @param comActDiscussUserDTO 操作类型 * @return 操作结果 */ @Override public R putDiscussUser(ComActDiscussUserDTO comActDiscussUserDTO) { Integer type = comActDiscussUserDTO.getType(); int num=0; ComActDiscussUserDO comActDiscussUserDO=new ComActDiscussUserDO(); BeanUtils.copyProperties(comActDiscussUserDTO,comActDiscussUserDO); if (type.intValue()==1) { num= comActDiscussUserDAO.insert(comActDiscussUserDO); }else{ num= comActDiscussUserDAO.delete(new QueryWrapper<ComActDiscussUserDO>().lambda().eq(ComActDiscussUserDO::getUserId,comActDiscussUserDTO.getUserId()).eq(ComActDiscussUserDO::getDiscussId,comActDiscussUserDTO.getDiscussId())); } if (num>0) { return R.ok(); } return R.fail(); } /** * 一起议-评论-分页查询 小程序 * * @param pageComActDiscussCommentDTO 分页参数 * @return ComActDiscussCommentVO */ @Override public R pageDiscussCommentApplets(PageComActDiscussCommentDTO pageComActDiscussCommentDTO) { Page page = new Page<>(); Long pageNum = pageComActDiscussCommentDTO.getPageNum(); Long pageSize = pageComActDiscussCommentDTO.getPageSize(); if (null==pageNum||0==pageNum) { pageNum = 1l; } if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComActDiscussCommentVO> iPage = comActDiscussDAO.pageDiscussCommentApplets(page, pageComActDiscussCommentDTO); List<ComActDiscussCommentVO> records = iPage.getRecords(); if (!ObjectUtils.isEmpty(records)) { records.forEach(comActDiscussCommentVO -> { List<ComActDiscussCommentVO> comActDiscussCommentVOList=new ArrayList<>(); Long id = comActDiscussCommentVO.getId(); comActDiscussCommentVOList=comActDiscussCommentDAO.selectChilds(id); if (!ObjectUtils.isEmpty(comActDiscussCommentVOList)) { List<ComActDiscussCommentVO> comActDiscussCommentVOS=comActDiscussCommentVOList; comActDiscussCommentVOList.forEach(comActDiscussCommentVO1 -> { Long parentId = comActDiscussCommentVO1.getParentId(); List<ComActDiscussCommentVO> collect = comActDiscussCommentVOS.stream().filter(comActDiscussCommentVO2 -> comActDiscussCommentVO2.getId().equals(parentId)).collect(Collectors.toList()); if (!ObjectUtils.isEmpty(collect)) { String userName = collect.get(0).getUserName(); comActDiscussCommentVO1.setUserNameBack(userName); } List<ComActDiscussCommentVO> collect1 = records.stream().filter(comActDiscussCommentVO2 -> comActDiscussCommentVO2.getId().equals(parentId)).collect(Collectors.toList()); if (!ObjectUtils.isEmpty(collect1)) { String userName = collect1.get(0).getUserName(); comActDiscussCommentVO1.setUserNameBack(userName); } }); comActDiscussCommentVO.setComActDiscussCommentVOList(comActDiscussCommentVOList); } }); } return R.ok(iPage); } /** * 一起议-详情 小程序 * * @param id 主键 * @return ComActDiscussVO */ @Override public R detailDiscussApplets(Long id) { ComActDiscussDO comActDiscussDO = comActDiscussDAO.selectById(id); if (ObjectUtils.isEmpty(comActDiscussDO)) { return R.fail("一起议不存在"); } ComActDiscussVO comActDiscussVO=new ComActDiscussVO(); BeanUtils.copyProperties(comActDiscussDO,comActDiscussVO); Integer integer = comActDiscussCommentDAO.selectCount(new QueryWrapper<ComActDiscussCommentDO>().lambda().eq(ComActDiscussCommentDO::getDiscussId, id)); comActDiscussVO.setCommentNum(integer); Integer integer1 = comActDiscussUserDAO.selectCount(new QueryWrapper<ComActDiscussUserDO>().lambda().eq(ComActDiscussUserDO::getDiscussId, id)); comActDiscussVO.setSignNum(integer1); Integer type = comActDiscussVO.getType(); if (type.intValue()==2) { List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, id)); List<ComActDiscussOptionVO> comActDiscussOptionVOS=new ArrayList<>(); comActDiscussOptionDOS.forEach(comActDiscussOptionDO -> { Long discussOptionDOId = comActDiscussOptionDO.getId(); Integer selectCount = comActDiscussOptionUserDAO.selectCount(new QueryWrapper<ComActDiscussOptionUserDO>().lambda().eq(ComActDiscussOptionUserDO::getDiscussOptionId, discussOptionDOId)); ComActDiscussOptionVO comActDiscussOptionVO=new ComActDiscussOptionVO(); BeanUtils.copyProperties(comActDiscussOptionDO,comActDiscussOptionVO); comActDiscussOptionVO.setNum(selectCount); comActDiscussOptionVOS.add(comActDiscussOptionVO); }); comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS); } Long userId = comActDiscussDO.getUserId(); LoginUserInfoVO loginUserInfoVO=comActDiscussDAO.selectUserByUserId(userId); comActDiscussVO.setUserName(loginUserInfoVO.getName()); Long communityId = comActDiscussDO.getCommunityId(); Integer type1 = loginUserInfoVO.getType(); if (type1.intValue()>1) { ComActVO comActVO=comActDiscussDAO.selectCommunity(communityId); comActDiscussVO.setUserName(comActVO.getName()); } return R.ok(comActDiscussVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: test # 指定配置文件的环境 profile: dev # 指定配置文件的环境 profiles: active: test active: dev eureka: client:
