springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -5,6 +5,8 @@ import com.panzhihua.common.model.dtos.shop.*; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO; import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO; import com.panzhihua.common.model.vos.shop.*; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
@@ -34,6 +34,6 @@ private String releaseContent; @ApiModelProperty(value = "社区id",hidden = true) private String communityId; private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
@@ -29,6 +29,10 @@ @ApiModelProperty("职位") @NotBlank(groups = AddGroup.class,message = "职位不能为空") private String job; @ApiModelProperty("职位") @NotBlank(groups = AddGroup.class,message = "职位不能为空") private String jobTwo; @ApiModelProperty("岗位职责") @NotBlank(groups = AddGroup.class,message = "岗位职责不能为空") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos.neighbor; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,7 +22,7 @@ private Long releaseId; @ApiModelProperty("发布人") private Long releaseName; private String releaseName; @ApiModelProperty("发布人电话") private String releasePhone; @@ -61,6 +62,7 @@ private Integer viewsNum; @ApiModelProperty("发布时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("评论数") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos.neighbor; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +18,7 @@ private Long id; @ApiModelProperty("发布人") private Long releaseName; private String releaseName; @ApiModelProperty("发布人电话") private String releasePhone; @@ -50,6 +51,7 @@ private Integer isBoutique; @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java
@@ -29,6 +29,9 @@ @ApiModelProperty("职位") private String job; @ApiModelProperty("职位2") private String jobTwo; @ApiModelProperty("岗位职责") private String jobResponsibilities; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -24,6 +24,7 @@ import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO; import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO; import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO; import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO; import com.panzhihua.common.model.vos.shop.ShopOperLogVO; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; @@ -2281,10 +2282,10 @@ /** * 后台修改邻里圈 * @param comActNeighborCircleAdminDTO 请求参数 * @param editNeighborCircleAdminVO 请求参数 */ @PostMapping("/neighbor/changeStatusByAdmin") R changeStatusByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO); R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO); /** @@ -2300,7 +2301,7 @@ * @param id 邻里圈id * @return 邻里圈列表 */ @PostMapping("/neighbor/detailNeighborByAdmin") @GetMapping("/neighbor/detailNeighborByAdmin") R detailNeighborByAdmin(@RequestParam("id")Long id); /** @@ -2388,7 +2389,7 @@ R detailNeighborCommentReply(@RequestParam("id") Long id); /** * 评论的状态_修改 * 评论回复状态_修改 * @param changeStatusReplyVO 参数 */ @PostMapping("/neighbor/changeCommentReplyStatusByAdmin") springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborApi.java
New file @@ -0,0 +1,107 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO; import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO; import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.neighbor.*; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; /** * @auther llming * @describe */ @Slf4j @RestController @RequestMapping("/neighbor/") @Api(tags = {"邻里圈服务"}) public class NeighborApi extends BaseController { @Resource private CommunityService communityService; @ApiOperation(value = "邻里圈_分页",response = ComActNeighborCircleAdminVO.class) @PostMapping("pageNeighborByAdmin") R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO){ LoginUserInfoVO loginUserInfo = getLoginUserInfo(); comActNeighborCircleAdminDTO.setCommunityId(loginUserInfo.getCommunityId()); return communityService.pageNeighborByAdmin(comActNeighborCircleAdminDTO); } /** * 后台修改邻里圈 * @param editNeighborCircleAdminVO 请求参数 */ @ApiOperation(value = "邻里圈_修改") @PostMapping("changeStatusByAdmin") R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){ return communityService.changeStatusByAdmin(editNeighborCircleAdminVO); } /** * 邻里圈_后台删除 * @param id 邻里圈id * @return 邻里圈列表 */ @ApiOperation(value = "邻里圈_删除") @PostMapping("deleteByAdmin") R deleteByAdmin(@RequestParam("id")Long id){ return communityService.deleteByAdmin(id); } @ApiOperation(value = "邻里圈_基础详情",response = DetailNeighborCircleAdminVO.class) @GetMapping("detailNeighborByAdmin") R detailNeighborByAdmin(@RequestParam("id")Long id){ return communityService.detailNeighborByAdmin(id); } @ApiOperation(value = "邻里圈的所有评论_分页",response = ComActNeighborCommentByAdminVO.class) @PostMapping("detailNeighborAllCommentByAdmin") R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto){ return communityService.detailNeighborAllCommentByAdmin(dto); } @ApiOperation(value = "评论的状态_修改") @PostMapping("changeCommentStatusByAdmin") R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo){ return communityService.changeCommentStatusByAdmin(vo); } @ApiOperation(value = "邻里圈评论_详情",response = ComActNeighborCommentByAdminVO.class) @GetMapping("detailNeighborCommentByAdmin") R detailNeighborCommentByAdmin(@RequestParam("id") Long id){ return communityService.detailNeighborCommentByAdmin(id); } @ApiOperation(value = "邻里圈评论回复_分页",response = ComActNeighborCommentReplyByAdminVO.class) @PostMapping("detailNeighborCommentAllReply") R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto){ return communityService.detailNeighborCommentAllReply(dto); } @ApiOperation(value = "邻里圈评论回复_基本详情",response = ComActNeighborCommentReplyByAdminVO.class) @PostMapping("detailNeighborCommentReply") R detailNeighborCommentReply(@RequestParam("id") Long id){ return communityService.detailNeighborCommentReply(id); } @ApiOperation(value = "评论回复状态_修改") @PostMapping("changeCommentReplyStatusByAdmin") R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO){ return communityService.changeCommentReplyStatusByAdmin(changeStatusReplyVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -71,12 +71,12 @@ "com_act_neighbor_circle nc\n" + "LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" + "<where>"+ "nc.community_id = #{neighborCircleAdminDTO.communityId}"+ "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent.trim() != ""'>" + "and t.release_content LIKE concat('%',#{neighborCircleAdminDTO.releaseContent}, '%' ) " + "nc.community_id = #{neighborCircleAdminDTO.communityId} \n"+ "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != ""'>" + "and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%') \n" + " </if> " + "<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" + "and t.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} " + "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} \n" + " </if> " + "</where>"+ "order by nc.`status` asc,nc.create_at desc " + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -399,11 +399,13 @@ @Override public R detailNeighborByAdmin(Long id) { ComActNeighborCircleDO comActNeighborCircleDO = this.baseMapper.selectById(id); AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getReleaseId()); if (comActNeighborCircleDO == null) { return R.fail("id有误"); } DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO(); BeanUtils.copyProperties(comActNeighborCircleDO, vo); vo.setReleaseName(user.getName()); return R.ok(vo); } @@ -454,7 +456,7 @@ if(replyDO==null){ return R.fail("id有误!"); } ComActNeighborCircleCommentReplyDO vo = new ComActNeighborCircleCommentReplyDO(); ComActNeighborCommentReplyByAdminVO vo = new ComActNeighborCommentReplyByAdminVO(); BeanUtils.copyProperties(replyDO,vo); return R.ok(vo); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java
@@ -33,6 +33,10 @@ */ private String job; /** * 职位2 */ private String jobTwo; /** * 岗位职责 */ private String jobResponsibilities;
