springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -16,6 +16,7 @@ import com.panzhihua.common.model.dtos.community.social.PageProjectDTO; import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO; import com.panzhihua.common.utlis.DateUtils; import io.swagger.annotations.ApiParam; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.StringRedisTemplate; @@ -530,4 +531,17 @@ public R selectAutomessageSysUserById(@RequestParam("id")Long id){ return communityService.selectAutomessageSysUserById(id); } @ApiOperation("新增投诉建议或问题留言") @PostMapping("addFeedBack") public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){ return userService.addFeedback(sysUserFeedbackDTO); } @ApiOperation("查看自己的投诉建议或问题留言记录") @GetMapping("myFeedBack") public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){ return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.ChangePasswordVO; @@ -10,6 +11,7 @@ import com.panzhihua.common.utlis.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -84,5 +86,17 @@ return R.ok(); } @ApiOperation("新增投诉建议或问题留言") @PostMapping("addFeedBack") public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){ return userService.addFeedback(sysUserFeedbackDTO); } @ApiOperation("查看自己的投诉建议或问题留言记录") @GetMapping("myFeedBack") public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){ return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActProceedingsDTO.java
@@ -69,5 +69,7 @@ */ private Date updateBy; private String workTime; private static final long serialVersionUID = 1L; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java
@@ -37,4 +37,6 @@ private String phone; private String areaCode; private Integer type; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.java
@@ -50,4 +50,19 @@ @ApiModelProperty("1投诉建议2问题留言") private Integer type; @ApiModelProperty("页数") private Integer page; @ApiModelProperty("每页大小") private Integer size; @ApiModelProperty("用户昵称") private String nickName; @ApiModelProperty("用户姓名") private String name; @ApiModelProperty("电话") private String phone; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java
@@ -69,5 +69,8 @@ */ private Date updateBy; @ApiModelProperty("工作时间") private String workTime; private static final long serialVersionUID = 1L; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -10513,6 +10513,12 @@ @DeleteMapping("/point/delete") R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator); /** * 统计问题清单 * */ @GetMapping("/dataCount") R dataCount(); @DeleteMapping("/proceedings/remove") R removeProceedings(@RequestParam("id") Long id); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFeedBackApi.java
New file @@ -0,0 +1,48 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.SysUserFeedbackVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.validated.PageGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController @RequestMapping("/feedBack") @Api(tags = "问题留言和投诉建议") public class ComActFeedBackApi extends BaseController { @Resource private UserService userService; @ApiOperation(value = "分页查询用户意见反馈", response = SysUserFeedbackVO.class) @PostMapping("pagefeedback") public R pageFeedback(@RequestBody @Validated(PageGroup.class) PageFeedBackDTO pageFeedBackDTO) { pageFeedBackDTO.setAreaCode(this.getAreaCode()); return userService.pageFeedback(pageFeedBackDTO); } @ApiOperation(value = "反馈意见详情", response = SysUserFeedbackVO.class) @GetMapping("feedback") public R detailFeedback(@RequestParam("id") Long id) { return userService.detailFeedback(id); } @ApiOperation(value = "删除意见反馈") @DeleteMapping("feedback") public R deleteFeedback(@RequestParam("id") Long id) { return userService.deleteFeedback(id); } @ApiOperation("回复意见反馈或修改意见反馈回复") @PostMapping("feedback") public R replyFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO){ return userService.updateFeedBack(sysUserFeedbackVO); } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActPorceedingsApi.java
@@ -6,22 +6,20 @@ import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController @RequestMapping("/proceedings") @Api(tags = "议事委员会") @Api(tags = {"议事委员会"}) public class ComActPorceedingsApi { @Resource private CommunityService communityService; @ApiOperation(value = "分页查询议事委员会列表",response = ComActProceedingsVO.class) @GetMapping public R list(@RequestParam(value = "page",required = false) Integer page, @RequestParam(value = "size",required = false) Integer size, @RequestParam(value = "keyWord",required = false) String keyWord){ @@ -29,10 +27,15 @@ } @ApiOperation("新增或修改议事委员会") @PostMapping public R addOrUpdate(@RequestBody ComActProceedingsDTO comActProceedingsDTO){ return communityService.addOrUpdateProceedings(comActProceedingsDTO); } @DeleteMapping("/{id}") @ApiOperation("删除议事委员会") public R remove(@PathVariable Long id){ return communityService.removeProceedings(id); } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyApi.java
@@ -1,9 +1,11 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.ComActProceedingsDTO; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActCommiteeVO; import com.panzhihua.common.model.vos.community.ComActProceedingsVO; import com.panzhihua.common.model.vos.community.ComPropertyVO; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; @@ -31,12 +33,13 @@ * @param commonPage 查询实体 * @return 所有数据 */ @ApiOperation(value = "物业公司列表",response = ComPropertyVO.class) @ApiOperation(value = "物业公司列表", response = ComPropertyVO.class) @PostMapping("queryAll") public R selectAll(@RequestBody CommonPage commonPage) { commonPage.setParamId(this.getCommunityId()); return this.communityService.comPropertySelectAll(commonPage); } /** * 新增数据 * springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActProceedingsApi.java
@@ -42,5 +42,9 @@ return comActProceedingsService.addOrUpdate(comActProceedingsDTO); } @DeleteMapping("/remove") public R removeProceedings(@RequestParam("id") Long id){ return R.ok(comActProceedingsService.removeById(id)); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -2710,12 +2710,4 @@ return automessageSysUserService.selectAutomessageSysUserById(id); } /** * 获取问题清单,需求清单,报道服务活动数量 * */ @GetMapping("/dataCount") public R dataCount(){ return null; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -3,6 +3,7 @@ import java.util.List; import com.panzhihua.common.model.vos.community.ComActPasswordVo; import com.panzhihua.common.model.vos.community.DataCount; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java
@@ -2,6 +2,8 @@ import java.io.Serializable; import java.util.Date; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -64,6 +66,11 @@ * 修改人 */ private Date updateBy; /** * 工作时间 * */ private String workTime; private static final long serialVersionUID = 1L; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -5,6 +5,7 @@ import javax.annotation.Resource; import com.panzhihua.common.model.vos.community.DataCount; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -199,4 +200,5 @@ return R.ok(iPage); } }