From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 28 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index f3aacc8..2145e69 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -7,11 +7,16 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import javax.validation.Valid;
+import cn.hutool.core.util.StrUtil;
import com.panzhihua.applets.umf.UmfPayUtil;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.HttpStatus;
+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;
@@ -261,7 +266,8 @@
@ApiOperation(value = "我的活动", response = ComActActivityVO.class)
@GetMapping("listactivity")
- public R listActivity(@RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) {
+ public R listActivity(@RequestParam(value = "status", required = false) Integer status,
+ @RequestParam(value = "type", required = false) Integer type) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
@@ -296,28 +302,15 @@
comActActRegistVOS.forEach(activitySignInVO -> {
if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
currentList.add(activitySignInVO);
- if(comActActivityVO.getType()!=3&&comActActivityVO.getType()!=5){
+ if(activitySignInVO.getEndTime()!=null){
comActActivityVO.setIsComment(1);
if(comActActivityVO.getTimes()==null){
comActActivityVO.setTimes(1);
- comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+ comActActivityVO.setAward(activitySignInVO.getAward());
}
else {
comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
- comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
- }
- }
- else {
- if(activitySignInVO.getEndTime()!=null){
- comActActivityVO.setIsComment(1);
- if(comActActivityVO.getTimes()==null){
- comActActivityVO.setTimes(1);
- comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
- }
- else {
- comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
- comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
- }
+ comActActivityVO.setAward(comActActivityVO.getAward() + activitySignInVO.getAward());
}
}
}
@@ -329,15 +322,8 @@
}
Integer limit = comActActivityVO.getLimit();
if(limit != null && limit>0 &¤tList.size()>0){
- if(comActActivityVO.getType()==3||comActActivityVO.getType()==5){
- if(limit==currentList.size()&¤tList.get(currentList.size()-1).getEndTime()!=null){
- comActActivityVO.setIsRegist(1);
- }
- }
- else {
- if(limit==currentList.size()){
- comActActivityVO.setIsRegist(1);
- }
+ if(limit==currentList.size()&¤tList.get(currentList.size()-1).getEndTime()!=null){
+ comActActivityVO.setIsRegist(1);
}
}
});
@@ -415,8 +401,11 @@
public R addFeedback(@RequestBody @Validated(AddGroup.class) SysUserFeedbackDTO sysUserFeedbackDTO) {
// 微信内容审核
String msg = sysUserFeedbackDTO.getContent();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
@@ -510,6 +499,21 @@
return R.ok();
}
+ /**
+ * 获取动作人员详情
+ * @param communityId
+ * @param phone
+ * @return
+ */
+ @ApiOperation(value = "社区工做人员详情")
+ @GetMapping("/getComPbServiceTeamData")
+ public R getComPbServiceTeamData(@RequestParam("communityId") String communityId,
+ @RequestParam("phone") String phone)
+ {
+ return partyBuildingService.getComPbServiceTeamData(communityId,phone);
+ }
+
+
@ApiOperation(value = "获取用户电子档案", response = UserArchivesVO.class)
@PostMapping("getUserArchives")
public R getUserArchives() {
@@ -530,4 +534,31 @@
userArchivesVO.setUserId(userId);
return userService.updateUserArchives(userArchivesVO);
}
+
+ @ApiOperation(value = "分页查询用户报名的项目")
+ @PostMapping("project")
+ public R pageProjectWhichIsSignedByUser(@RequestBody @Valid PageProjectDTO pageProjectDTO) {
+ pageProjectDTO.setUserId(this.getUserId());
+ return communityService.pageProjectWhichIsSignedByUser(pageProjectDTO);
+ }
+
+ @ApiOperation("获取用户")
+ @GetMapping("selectAutomessageSysUserById")
+ public R selectAutomessageSysUserById(@RequestParam("id")Long id){
+ return communityService.selectAutomessageSysUserById(id);
+ }
+
+ @ApiOperation("新增投诉建议或问题留言")
+ @PostMapping("addFeedBack")
+ public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
+ sysUserFeedbackDTO.setCommunityId(null);
+ return userService.addFeedback(sysUserFeedbackDTO);
+ }
+
+ @ApiOperation("查看自己的投诉建议或问题留言记录")
+ @GetMapping("myFeedBack")
+ public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type,@RequestParam("propertyId")Long propertyId){
+ return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type,propertyId);
+ }
+
}
--
Gitblit v1.7.1