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/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java | 451 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 437 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
index f141ca7..372cf63 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -2,10 +2,13 @@
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.building.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
/**
*
@@ -46,19 +49,32 @@
@GetMapping("/NeedProblem/getList")
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 = "userIds", required = false)String userIds,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "isDisplay", required = false)String isDisplay,
+ @RequestParam(value = "startTime", required = false) Date startTime,
+ @RequestParam(value = "endTime", required = false) Date endTime);
@GetMapping("/NeedProblem/getMyJoinNeedProblemList")
public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
@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 = "userId", required = false)String userId);
+ @RequestParam(value = "userIds", required = false)String userIds,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "isDisplay", required = false)String isDisplay,
+ @RequestParam(value = "startTime", required = false) Date startTime,
+ @RequestParam(value = "endTime", required = false) Date endTime);
@GetMapping("/NeedProblem/getDetails")
- public R getNeedProblemDetails(@RequestParam("id") String id);
+ public R getNeedProblemDetails(@RequestParam("id") String id,@RequestParam("userIds") String userIds);
@PostMapping("/NeedProblem/addData")
public R addNeedProblemData(@RequestBody NeedProblemInventoryDTO item);
@@ -76,14 +92,14 @@
*
*******************************************************************************************************/
@GetMapping("/NeedClaim/getNeedClaimList")
- public R getNeedClaimList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize,
- @RequestParam(value = "kind", required = false) String kind,
+ public R getNeedClaimList(@RequestParam(value = "taskId", required = false) String taskId,
@RequestParam(value = "userId", required = false) String userId,
@RequestParam(value = "unitId", required = false) String unitId);
@GetMapping("/NeedClaim/getNeedClaimDetails")
- public R getNeedClaimDetails(@RequestParam("id") String id);
+ public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId);
@PostMapping("/NeedClaim/addNeedClaimData")
public R addNeedClaimData(@RequestBody NeedProblemClaimDTO item);
@@ -92,7 +108,9 @@
public R editNeedClaimData(@RequestBody NeedProblemClaimDTO item);
@DeleteMapping("/NeedClaim/expurgateNeedClaimData")
- public R expurgateNeedClaimData(@RequestParam("id") String id);
+ public R expurgateNeedClaimData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId);
@GetMapping("/NeedClaim/needClaimSignIn")
@@ -109,8 +127,10 @@
@GetMapping("/NeedTask/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);
@GetMapping("/NeedTask/getNeedTaskDetails")
public R getNeedTaskDetails(@RequestParam("id") String id);
@@ -137,7 +157,8 @@
@RequestParam(value = "userId", required = false) String userId);
@GetMapping("/NewFightCommunity/getNeedClaimDetails")
- public R getNewFightCommunityDetails(@RequestParam("id") String id);
+ public R getNewFightCommunityDetails(@RequestParam("id") String id,
+ @RequestParam(value = "userId", required = false) String userId);
@PostMapping("/NewFightCommunity/addNeedClaimData")
public R addNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
@@ -146,7 +167,7 @@
public R editNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
@DeleteMapping("/NewFightCommunity/expurgateNeedClaimData")
- public R expurgateNewFightCommunityData(@RequestParam("id") String id);
+ public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id);
/**************************************************************************************************************
@@ -173,6 +194,10 @@
public R expurgateProjectPlanData(@RequestParam("id") String id);
+ @GetMapping("/NewFightCommunity/editProjectPlanAccomplish")
+ public R editProjectPlanAccomplish(@RequestParam("id") String id);
+
+
/********************************************************************************************************
*
* 项目参与
@@ -195,7 +220,9 @@
public R editJoinData(@RequestBody NewFightProjectJoinDTO item);
@DeleteMapping("/NewFightCommunity/expurgateJoinData")
- public R expurgateJoinData(@RequestParam("id") String id);
+ public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "projectId", required = false) String projectId,
+ @RequestParam(value = "userId", required = false) String userId);
@@ -204,7 +231,6 @@
* 项目评论
*
******************************************************************************************************/
-
@GetMapping("/NewFightCommunity/getEvaluateList")
public R getEvaluateList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@@ -224,5 +250,402 @@
public R expurgateEvaluateData(@RequestParam("id") String id);
+ /************************************************************************************************************
+ *
+ * 资源共享
+ *
+ *************************************************************************************************************/
+
+ @GetMapping("/ResourceSharing/getResourceSharingList")
+ public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "unitId", required = false)String unitId,
+ @RequestParam(value = "meritId", required = false) String meritId);
+
+ @GetMapping("/ResourceSharing/getResourceSharingDetails")
+ public R getResourceSharingDetails(@RequestParam("id") String id);
+
+ @PostMapping("/ResourceSharing/addResourceSharingData")
+ public R addResourceSharingData(@RequestBody NewFightResourceSharingDTO item);
+
+ @PostMapping("/ResourceSharing/editResourceSharingData")
+ public R editResourceSharingData(@RequestBody NewFightResourceSharingDTO item);
+
+ @DeleteMapping("/ResourceSharing/expurgateResourceSharingData")
+ public R expurgateResourceSharingData(@RequestParam("id") String id);
+
+
+ /************************************************************************************************************
+ *
+ * 社区设置兑换时间地点
+ *
+ ******************************************************************************************************************/
+ @GetMapping("/FightConfig/getConfigDetails")
+ public R getConfigDetails(@RequestParam("communityId") String communityId);
+
+
+ @PostMapping("/FightConfig/addConfigData")
+ public R addConfigData(@RequestBody NewFightConfigVO item);
+
+ @PostMapping("/FightConfig/editConfigData")
+ public R editConfigData(@RequestBody NewFightConfigVO item);
+
+
+ @DeleteMapping("/FightConfig/expurgateConfigData")
+ public R expurgateConfigData(@RequestParam("communityId") String communityId);
+
+
+ /*******************************************************************************************************
+ *
+ * 积分商城
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/FightShopping/getFightShoppingList")
+ public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("communityId") String communityId,
+ @RequestParam(value = "goodName", required = false)String goodName,
+ @RequestParam(value = "goodType", required = false)String goodType,
+ @RequestParam(value = "id", required = false)String id);
+
+
+ @GetMapping("/FightShopping/getFightShoppingDetails")
+ public R getFightShoppingDetails(@RequestParam("id") String id);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/FightShopping/addFightShoppingData")
+ public R addFightShoppingData(@RequestBody NewFightShoppingVO item);
+
+
+ @PostMapping("/FightShopping/editFightShoppingData")
+ public R editFightShoppingData(@RequestBody NewFightShoppingVO item);
+
+ @DeleteMapping("/FightShopping/expurgateFightShoppingData")
+ public R expurgateFightShoppingData(@RequestParam("id") String id);
+
+
+ /*******************************************************************************************************
+ *
+ * 商家模块
+ *
+ * ********************************************************************************************************/
+
+ /**
+ * 删除便民服务商家
+ *
+ * @param merchantId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/FightConvenient/deleteMerchantById")
+ public R deleteMerchantById(@RequestParam("communityId") String merchantId);
+
+ /**
+ * 编辑状态
+ *
+ * @param merchantId
+ * @param status
+ * @return
+ */
+ @GetMapping("/FightConvenient/editMerchantStatus")
+ public R editMerchantStatus(@RequestParam("communityId") String merchantId,
+ @RequestParam("status") String status);
+
+ /**
+ * 分页查询便民服务商家 运营后台
+ *
+ * @return
+ */
+ @GetMapping("/FightConvenient/pageMerchant")
+ public R pageMerchant(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("communityId") String communityId,
+ @RequestParam(value = "isDel", required = false) String isDel,
+ @RequestParam(value = "keyword", required = false)String keyword,
+ @RequestParam(value = "status", required = false)String status) ;
+
+ /**
+ * 查询商家信息
+ *
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/FightConvenient/selectMerchantById")
+ public R selectMerchantById(@RequestParam("merchantId") String merchantId);
+
+ @PostMapping("/FightConvenient/addMerchantData")
+ public R addMerchantData(@RequestBody NewFightConvenientMerchantVO item) ;
+
+ @PostMapping("/FightConvenient/editMerchantData")
+ public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item);
+
+
+ @GetMapping("/FightConvenient/selectUserList")
+ public R selectUserList(@RequestParam("communityId") String communityId,
+ @RequestParam("phoneOrname") String phoneOrname);
+
+
+
+ @GetMapping("/FightConvenient/selectUserListB")
+ public R selectUserListB(@RequestParam("communityId") String communityId,
+ @RequestParam("phoneOrname") String phoneOrname);
+
+
+
+ @GetMapping("/FightConvenient/selectUserBind")
+ public R selectUserBind(@RequestParam("communityId") String communityId,
+ @RequestParam("userId") String userId);
+
+ /*****************************************************************************************************
+ *
+ * 用户积分任务完成情况
+ *
+ *******************************************************************************************************/
+ /**
+ * 列表
+ * @param
+ * @return
+ */
+ @GetMapping("/IntegratingTask/getTaskList")
+ public R getIntegratingTaskList(@RequestParam("userId") String userId,
+ @RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/IntegratingTask/addIntegratingTaskData")
+ public R addIntegratingTaskData(@RequestBody IntegratingTaskVO item);
+
+
+ /**
+ * 添加或者修改积分
+ * @param item
+ * @return
+ */
+ @PostMapping("/IntegratingTask/upIntegral")
+ public R upIntegral(@RequestBody NewFightIntegral item);
+
+
+ /**
+ * 每日签到记录列表 前15条
+ * @param userId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/IntegratingTask/getEverydayList")
+ public R getEverydayList(@RequestParam("userId") String userId,
+ @RequestParam("communityId") String communityId);
+
+
+ /*******************************************************************************************************************
+
+ *
+ * 商品订单
+ *
+ ****************************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/NewFightOrder/orderGetList")
+ public R orderGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "goodsId", required = false)String goodsId,
+ @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 = "communityId", required = false)String communityId,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "orderType", required = false) String orderType);
+
+ /**
+ * 分页详情
+ * @param
+ * @return
+ */
+ @GetMapping("/NewFightOrder/orderGetDetails")
+ public R orderGetDetails(@RequestParam("id") String id,
+ @RequestParam(value = "communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/NewFightOrder/orderAddData")
+ public R orderAddData(@RequestBody NewFightShoppingOrderVO item);
+
+
+ /**
+ * 编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/NewFightOrder/orderEditData")
+ public R orderEditData(@RequestBody NewFightShoppingOrderVO item);
+
+
+ /**
+ * 取消
+ * @param
+ * @return
+ */
+ @GetMapping("/NewFightOrder/orderCancelOrder")
+ public R orderCancelOrder(@RequestParam("orderId") String orderId,
+ @RequestParam(value = "communityId") String communityId);
+
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/NewFightOrder/orderExpurgateData")
+ public R orderExpurgateData(@RequestParam("id") String id,
+ @RequestParam(value = "communityId") String communityId);
+
+
+
+
+
+
+
+
+
+
+
+ /**
+ * 每日定时清空 定时任务
+ */
+ @GetMapping("/IntegratingTask/everydaYtruncateData")
+ public R truncateData();
+
+
+ /**
+ * 新双争双评需求问题清单 任务认领 开始 结束 定时任务
+ * @return
+ */
+ @PostMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler")
+ public R timedNewFightNeedProblemInventoryHandler();
+
+
+ //定时任务 社区组织共建 定时更新项目进度
+ @PostMapping("/NewFightCommunity/taskTimed/getListTime")
+ public R taskTimedGetListTime();
+
+
+ /******************************************************************************************************************
+ *
+ * 街道大屏
+ *
+ *****************************************************************************************************************/
+
+
+ @GetMapping("/StreetBigScreen/getCommunityId")
+ public R getCommunityId(@RequestParam("streetId") String streetId);
+
+
+ /**
+ * 获取核心指标数据
+ * @param streetId
+ * @return
+ */
+ @GetMapping("/StreetBigScreen/getCoreData")
+ public R getCoreData(@RequestParam(value = "streetId", required = false) String streetId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "type", required = false)String type,
+ @RequestParam(value = "starTime", required = false)String starTime,
+ @RequestParam(value = "endTime", required = false)String endTime);
+
+
+ /**
+ * 获取三务三资数据
+ * @param streetId
+ * @param communityId
+ * @param type
+ * @param starTime
+ * @param endTime
+ * @return
+ */
+ @GetMapping("/StreetBigScreen/getThreeNum")
+ public R getThreeNum(@RequestParam(value = "streetId", required = false) String streetId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "type", required = false)String type,
+ @RequestParam(value = "starTime", required = false)String starTime,
+ @RequestParam(value = "endTime", required = false)String endTime);
+
+
+
+ /**
+ * 双报到双服务
+ * @param streetId
+ * @param communityId
+ * @param type
+ * @param starTime
+ * @param endTime
+ * @return
+ */
+ @GetMapping("/StreetBigScreen/getDoubleRegistration")
+ public R getDoubleRegistration(@RequestParam(value = "streetId", required = false) String streetId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "type", required = false)String type,
+ @RequestParam(value = "starTime", required = false)String starTime,
+ @RequestParam(value = "endTime", required = false)String endTime);
+
+ /**
+ * 随手拍 微心愿
+ * @param streetId
+ * @param communityId
+ * @param type
+ * @param starTime
+ * @param endTime
+ * @return
+ */
+ @GetMapping("/StreetBigScreen/getPhotoMicroWish")
+ public R getPhotoMicroWish(@RequestParam(value = "streetId", required = false) String streetId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "type", required = false)String type,
+ @RequestParam(value = "starTime", required = false)String starTime,
+ @RequestParam(value = "endTime", required = false)String endTime);
+
+
+
+ /**
+ * 社区活动、议事投票、问卷调查、社区动态发布趋势
+ * @param streetId
+ * @param communityId
+ * @param type
+ * @param starTime
+ * @param endTime
+ * @return
+ */
+ @GetMapping("/StreetBigScreen/getAllData")
+ public R getAllData(@RequestParam(value = "streetId", required = false) String streetId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "type", required = false)String type,
+ @RequestParam(value = "starTime", required = false)String starTime,
+ @RequestParam(value = "endTime", required = false)String endTime);
+
+
+ /**
+ * 新双争双评需求问题清单 签退时间更新
+ * @return
+ */
+ @GetMapping("/NeedClaim/upNewFightNeedProblemClaimEndTime")
+ public R upNewFightNeedProblemClaimEndTime();
}
\ No newline at end of file
--
Gitblit v1.7.1