springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java
@@ -2,7 +2,10 @@ import javax.annotation.Resource; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.service.user.UserService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -30,6 +33,8 @@ public class ComPropertyApi extends BaseController { @Resource private CommunityService communityService; @Resource private UserService userService; /** * 分页查询所有数据 @@ -50,4 +55,17 @@ public R detailProperty(@RequestParam("id") Long id) { return this.communityService.detailProperty(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/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -464,4 +464,10 @@ public R detailCommunity(@RequestParam("id") Long id) { return communityService.detailCommunity(id); } @ApiOperation(value = "获取问题清单,需求清单,报道服务活动数量",response = DataCount.class) @GetMapping("/dataCount") public R dataCount(){ return communityService.dataCount(); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java
@@ -237,7 +237,7 @@ return userService.deleteFeedback(id); } @ApiOperation("回复意见反馈") @ApiOperation("回复意见反馈或修改意见反馈回复") @PostMapping("feedback") public R replyFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO){ return userService.updateFeedBack(sysUserFeedbackVO); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.java
@@ -47,4 +47,7 @@ @ApiModelProperty(value = "状态 0", hidden = true) private Integer status; @ApiModelProperty("1投诉建议2问题留言") private Integer type; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/DataCount.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.common.model.vos.community; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("问题清单、需求清单、报到服务活动数量") public class DataCount { @ApiModelProperty("问题清单数") private Integer questions; @ApiModelProperty("需求清单数") private Integer demands; @ApiModelProperty("报道服务活动数") private Integer activities; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -10512,4 +10512,7 @@ */ @DeleteMapping("/point/delete") R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator); @GetMapping("/dataCount") R dataCount(); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1323,4 +1323,7 @@ * */ @PostMapping("/feedBackReply") R updateFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO); @GetMapping("/myFeedBack") R myFeedBack(@RequestParam("userId") Long userId,@RequestParam(value = "type",required = false)Integer type); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActPorceedingsApi.java
@@ -33,4 +33,6 @@ return communityService.addOrUpdateProceedings(comActProceedingsDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -2709,4 +2709,13 @@ public R selectAutomessageSysUserById(@RequestParam("id") Long id){ return automessageSysUserService.selectAutomessageSysUserById(id); } /** * 获取问题清单,需求清单,报道服务活动数量 * */ @GetMapping("/dataCount") public R dataCount(){ return null; } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1504,8 +1504,12 @@ @PostMapping("/feedBackReply") public R feedBackReply(@RequestBody SysUserFeedbackVO sysUserFeedbackVO){ return null; return userService.feedBackReply(sysUserFeedbackVO); } @GetMapping("/myFeedBack") public R myFeedBack(@RequestParam("userId")Long id,@RequestParam(value = "type",required = false)Integer type){ return userService.myFeedBack(id,type); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java
@@ -64,4 +64,9 @@ * 状态 */ private Integer status; /** * 问题留言或投诉建议 * */ private Integer type; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -953,4 +953,14 @@ * 移除专家权限 * */ R removeExpertRole(String phone); /** * 回复用户反馈 * */ R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO); /** * 查看我的问题留言或者问题留言记录 * */ R myFeedBack(Long id,Integer type); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3928,6 +3928,19 @@ return R.ok(); } @Override public R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO) { SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO(); BeanUtils.copyProperties(sysUserFeedbackVO, sysUserFeedbackDO); return R.ok(sysUserFeedbackDAO.updateById(sysUserFeedbackDO)); } @Override public R myFeedBack(Long id,Integer type) { List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id)); return R.ok(sysUserFeedbackDOS); } @Override public R getAreaAndStreet() {