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/NewStriveAppApi.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 100 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
index 6282607..8ad62eb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
import com.panzhihua.common.service.user.UserService;
@@ -26,6 +27,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
@Slf4j
@@ -74,12 +77,28 @@
public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "search", required = false)String search,
+ @RequestParam(value = "classifyId", required = false)String classifyId,
@RequestParam(value = "status", required = false)String status,
@RequestParam(value = "kind", required = false)String kind,
@RequestParam(value = "userId", required = false)String userId,
- @RequestParam(value = "communityId", required = false)String communityId)
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime)
{
- return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",communityId);
+ Date start=null;
+ Date end=null;
+
+ try {
+ if(!StringUtils.isEmpty(startTime)) {
+ start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
+ }
+ if(!StringUtils.isEmpty(startTime)) {
+ end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId,"1",start,end);
}
@@ -89,9 +108,28 @@
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "search", required = false)String search,
@RequestParam(value = "status", required = false)String status,
- @RequestParam(value = "kind", required = false)String kind)
+ @RequestParam(value = "kind", required = false)String kind,
+ @RequestParam(value = "isDisplay", required = false)String isDisplay,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime)
{
- return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"");
+ Date start=null;
+ Date end=null;
+
+ try {
+ if(!StringUtils.isEmpty(startTime)) {
+ start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
+ }
+ if(!StringUtils.isEmpty(startTime)) {
+ end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+
+
+ return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"",isDisplay,start,end);
}
@@ -190,10 +228,12 @@
@ApiOperation(value = "代单位任务报名列表", response = NeedProblemUnitTaskDTO.class)
@GetMapping("/getNeedTaskList")
public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageNum") int pageSize,
- @RequestParam(value = "unitId", required = false) String unitId)
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "kind", required = false) String kind,
+ @RequestParam(value = "status", required = false) String status)
{
- return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId);
+ return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId,kind,status);
}
@ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)
@@ -234,10 +274,15 @@
@ApiOperation(value = "社区共建项目列表", response = NewFightCommunityConstructionDTO.class)
@GetMapping("/getNewFightCommunityList")
public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize)
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId", required = false) String communityId)
{
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getCommunityId()+"";
+ }
return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize,
- getCommunityId()+"",null);
+ communityId,null);
}
@ApiOperation(value = "社区共建项目详情", response = NewFightCommunityConstructionDTO.class)
@@ -540,9 +585,11 @@
@GetMapping("/getResourceSharingList")
public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
- @RequestParam(value = "communityId", required = false)String communityId)
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "unitId", required = false)String unitId,
+ @RequestParam(value = "meritId", required = false) String meritId)
{
- return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null);
+ return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,unitId,meritId);
}
@ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)
@@ -561,7 +608,7 @@
@ApiOperation(value = "积分商品列表", response = NewFightShoppingVO.class)
@GetMapping("/getFightShoppingList")
public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageNum") int pageSize,
+ @RequestParam("pageSize") int pageSize,
@RequestParam(value = "goodName", required = false)String goodName,
@RequestParam(value = "goodType", required = false)String goodType,
@RequestParam(value = "id", required = false)String id)
@@ -645,6 +692,19 @@
/**
+ * 每日签到记录列表 前15条
+ * @return
+ */
+ @ApiOperation(value = "每日签到记录列表 前15条", response = IntegratingTaskVO.class)
+ @GetMapping("/IntegratingTask/getEverydayList")
+ public R getEverydayList()
+ {
+ return newStriveForFeign.getEverydayList(getUserId()+"",getCommunityId()+"");
+ }
+
+
+
+ /**
* 添加或者修改积分
* @param item
* @return
@@ -676,10 +736,12 @@
@RequestParam(value = "orderNumber", required = false)String orderNumber,
@RequestParam(value = "goodName", required = false)String goodName,
@RequestParam(value = "name", required = false)String name,
- @RequestParam(value = "cancelType", required = false)String cancelType)
+ @RequestParam(value = "cancelType", required = false)String cancelType,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "orderType", required = false) String orderType)
{
return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber,
- goodName,name,cancelType,getCommunityId()+"");
+ goodName,name,cancelType,getCommunityId()+"",merchantId,orderType);
}
/**
@@ -703,8 +765,9 @@
@PostMapping("/orderAddData")
public R orderAddData(@RequestBody NewFightShoppingOrderVO item)
{
- item.setCommunityId(getCommunityId()+"");
- item.setUserId(getUserId()+"");
+// item.setCommunityId(getCommunityId()+"");
+// item.setUserId(getUserId()+"");
+// item.setOrderType("1");
return newStriveForFeign.orderAddData(item);
}
@@ -766,8 +829,29 @@
}
+ @ApiOperation(value = "获取社区积分排名")
+ @GetMapping("/getIntegralUserRank")
+ public R getIntegralUserRank()
+ {
+ return communityService.getIntegralUserRank(getCommunityId(),getUserId());
+ }
+ @ApiOperation(value = "是否是商家 如果是商家返回商家id")
+ @GetMapping("/selectUserBind")
+ public R selectUserBind()
+ {
+ return newStriveForFeign.selectUserBind(getCommunityId()+"",getUserId()+"");
+ }
+
+
+
+ @ApiOperation(value = "搜索用户", response = SysUserVO.class)
+ @GetMapping("/selectUserList")
+ public R selectUserList(@RequestParam("phoneOrname") String phoneOrname)
+ {
+ return newStriveForFeign.selectUserList(getCommunityId()+"",phoneOrname);
+ }
}
--
Gitblit v1.7.1