From 5a994cbf03f7b81506dbd0e982ec34e7936e546c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 22 十一月 2023 16:04:34 +0800
Subject: [PATCH] 修改路北社区定时任务3
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 405 insertions(+), 9 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 d9d5f1a..50aa117 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
@@ -1,11 +1,13 @@
package com.panzhihua.common.service.partybuilding;
-import com.panzhihua.common.model.dtos.partybuilding.NeedProblemClaimDTO;
-import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
-import com.panzhihua.common.model.dtos.partybuilding.NeedProblemUnitTaskDTO;
+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.List;
/**
*
@@ -46,12 +48,25 @@
@GetMapping("/NeedProblem/getList")
public R getNeedProblemList(@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 = "communityId", required = false)String communityId);
+ @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 = "userIds", required = false)String userIds,
+ @RequestParam(value = "userId", required = false)String userId);
+
+
@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);
@@ -69,14 +84,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);
@@ -85,7 +100,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")
@@ -118,6 +135,385 @@
public R expurgateNeedTaskData(@RequestParam("id") String id);
+ /*******************************************************************************************************************
+ *
+ * 新双争双评社区共建
+ *
+ ****************************************************************************************************************/
+ @GetMapping("/NewFightCommunity/getNeedClaimList")
+ public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "userId", required = false) String userId);
+
+ @GetMapping("/NewFightCommunity/getNeedClaimDetails")
+ public R getNewFightCommunityDetails(@RequestParam("id") String id,
+ @RequestParam(value = "userId", required = false) String userId);
+
+ @PostMapping("/NewFightCommunity/addNeedClaimData")
+ public R addNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
+
+ @PostMapping("/NewFightCommunity/editNeedClaimData")
+ public R editNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateNeedClaimData")
+ public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id);
+
+
+ /**************************************************************************************************************
+ *
+ * 项目规划
+ *
+ ****************************************************************************************************************/
+
+ @GetMapping("/NewFightCommunity/getProjectPlanList")
+ public R getProjectPlanList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId);
+
+ @GetMapping("/NewFightCommunity/getProjectPlanDetails")
+ public R getProjectPlanDetails(@RequestParam("id") String id);
+
+ @PostMapping("/NewFightCommunity/addProjectPlanData")
+ public R addProjectPlanData(@RequestBody NewFightProjectPlanDTO item);
+
+ @PostMapping("/NewFightCommunity/editProjectPlanData")
+ public R editProjectPlanData(@RequestBody NewFightProjectPlanDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateProjectPlanData")
+ public R expurgateProjectPlanData(@RequestParam("id") String id);
+
+
+ @GetMapping("/NewFightCommunity/editProjectPlanAccomplish")
+ public R editProjectPlanAccomplish(@RequestParam("id") String id);
+
+
+ /********************************************************************************************************
+ *
+ * 项目参与
+ *
+ ******************************************************************************************************/
+
+
+ @GetMapping("/NewFightCommunity/getJoinList")
+ public R getJoinList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId);
+
+ @GetMapping("/NewFightCommunity/getJoinDetails")
+ public R getJoinDetails(@RequestParam("id") String id);
+
+ @PostMapping("/NewFightCommunity/addJoinData")
+ public R addJoinData(@RequestBody NewFightProjectJoinDTO item);
+
+ @PostMapping("/NewFightCommunity/editJoinData")
+ public R editJoinData(@RequestBody NewFightProjectJoinDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateJoinData")
+ public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "projectId", required = false) String projectId,
+ @RequestParam(value = "userId", required = false) String userId);
+
+
+
+ /********************************************************************************************************
+ *
+ * 项目评论
+ *
+ ******************************************************************************************************/
+ @GetMapping("/NewFightCommunity/getEvaluateList")
+ public R getEvaluateList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId);
+
+ @GetMapping("/NewFightCommunity/getEvaluateDetails")
+ public R getEvaluateDetails(@RequestParam("id") String id);
+
+
+ @PostMapping("/NewFightCommunity/addEvaluateData")
+ public R addEvaluateData(@RequestBody NewFightProjectEvaluateDTO item);
+
+ @PostMapping("/NewFightCommunity/editEvaluateData")
+ public R editEvaluateData(@RequestBody NewFightProjectEvaluateDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateEvaluateData")
+ 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);
+
+ @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);
+
+
+ /*****************************************************************************************************
+ *
+ * 用户积分任务完成情况
+ *
+ *******************************************************************************************************/
+ /**
+ * 列表
+ * @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);
+
+ /**
+ * 分页详情
+ * @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
+ */
+ @GetMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler")
+ public R timedNewFightNeedProblemInventoryHandler();
+
+
--
Gitblit v1.7.1