From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java | 984 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 971 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
index f804970..0b0b1a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -2,18 +2,19 @@
import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
-import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
-import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
+import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
+import com.panzhihua.common.model.vos.jinhui.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
/**
* 金汇社区
@@ -86,6 +87,11 @@
public R recordExpurgateData(@RequestParam("id") String id);
+ /*************************************************************************************************
+ *
+ * 办事指南
+ *
+ ***************************************************************************************************/
/**
* 办事指南_新增
@@ -96,7 +102,7 @@
*/
@PostMapping("/JinhuiWorkGuide/addworkguide")
@Transactional(rollbackFor = Exception.class)
- public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId);
+ public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") String userId);
/**
* 办事指南_编辑
@@ -106,7 +112,7 @@
*/
@PostMapping("/JinhuiWorkGuide/editworkguide")
@Transactional(rollbackFor = Exception.class)
- public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId) ;
+ public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") String userId) ;
/**
* 办事指南_详情
@@ -136,7 +142,7 @@
* @return 删除结果
*/
@PostMapping("/JinhuiWorkGuide/delectworkguide")
- R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId) ;
+ R delectWorkGuide(@RequestParam("workGuideId") String workGuideId) ;
/**
* 分页查询办事执念-分类管理 addWorkGuideClassify 分页查询办事执念-分类管理
@@ -166,7 +172,7 @@
* @date 2021/8/31 15:03
*/
@GetMapping("/JinhuiWorkGuide/workGuide/classify/delete")
- public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId) ;
+ public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") String workGuideClassifyId) ;
/**
* 办事指南-分类管理列表查询 getWorkGuideClassifyList 办事指南-分类管理列表查询
@@ -191,8 +197,960 @@
* @return 办事指南列表数据
*/
@GetMapping("/JinhuiWorkGuide/listworkguide/classify")
- public R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId) ;
+ public R listWorkGuideByClassifyId(@RequestParam("classifyId") String classifyId) ;
+ /**********************************************************************************************
+ *
+ *
+ * 便民服务
+ *
+ *
+ ************************************************************************************************/
+
+ /**
+ * 删除便民服务商家
+ *
+ * @param merchantId
+ * @return
+ */
+ @DeleteMapping("/jinhuiMerchant/delete")
+ public R deleteMerchant(@RequestParam("merchantId") String merchantId);
+
+ /**
+ * 分页查询便民服务商家 运营后台
+ *
+ * @param pageConvenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/page")
+ public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO);
+
+ /**
+ * 获取便民服务商家详情
+ *
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/get")
+ public R getMerchant(@RequestParam("merchantId") String merchantId);
+
+
+ /**
+ * 分页查询 商家类别
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/getCategories")
+ public R getListCategories(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+
+ @PostMapping("/jinhuiMerchant/addData")
+ public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item);
+
+ @PostMapping("/jinhuiMerchant/editData")
+ public R merchantEditData(@RequestBody JinhuiConvenientMerchantVO item);
+
+ /**************************************************************************************************************
+ *
+ *
+ * 商家评论
+ *
+ *
+ *************************************************************************************************************/
+ /**
+ * 商家评论列表
+ * @param pageNum
+ * @param pageSize
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/jinghuiMerchantEvaluate/getList")
+ public R merchantEvaluateGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("merchantId") String merchantId);
+
+ /**
+ * 商家评论列单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinghuiMerchantEvaluate/getDetails")
+ public R merchantEvaluateGetDetails(@RequestParam("id") String id);
+ /**
+ * 商家评论列添加
+ * @param
+ * @return
+ */
+ @PostMapping("/jinghuiMerchantEvaluate/addData")
+ public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item);
+
+ /**
+ * 商家评论列编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/jinghuiMerchantEvaluate/editData")
+ public R merchantEvaluateEditData(@RequestBody JinghuiMerchantEvaluateVO item);
+
+ /**
+ * 商家评论列删除
+ * @param id
+ * @return
+ */
+ @PostMapping("/jinghuiMerchantEvaluate/expurgateData")
+ public R merchantEvaluateExpurgateData(@RequestParam("id") String id);
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇预约空间
+ *
+ *
+ *********************************************************************************************************/
+ /**
+ * 金汇空间预约模块分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceGetList")
+ public R interspaceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "intendantType",required = false) String intendantType);
+
+ /**
+ * 金汇空间预约模块单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceGetDetails")
+ public R interspaceGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 金汇空间预约模块新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceAddData")
+ public R interspaceAddData(@RequestBody JinhuiInterspaceVO item);
+
+
+ /**
+ * 金汇空间预约模块编辑
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceEditData")
+ public R interspaceEditData(@RequestBody JinhuiInterspaceVO item);
+
+
+ /**
+ * 金汇空间预约模块删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceExpurgateData")
+ public R interspaceExpurgateData(@RequestParam("id") String id);
+
+
+ /****************************************************************************************************
+ *
+ *
+ * 空间预约分类
+ *
+ *
+ ******************************************************************************************************/
+ /**
+ * 空间预约分类分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceTypeGetList")
+ public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+ /**
+ * 空间预约分类单个详情
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceTypeGetDetails")
+ public R interspaceTypeGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 空间预约分类新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceTypeAddData")
+ public R interspaceTypeAddData(@RequestBody JinhuiInterspaceTypeVO item);
+
+ /**
+ * 空间预约分类编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceTypeEditData")
+ public R interspaceTypeEditData(@RequestBody JinhuiInterspaceTypeVO item);
+
+
+ /**
+ * 空间预约分类删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/JinhuiInterspace/interspaceTypeExpurgateData")
+ public R interspaceTypeExpurgateData(@RequestParam("id") String id);
+
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 空间预约申请
+ *
+ *
+ **************************************************************************************************************/
+ /**
+ * 空间预约申请分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/applyFor/getList")
+ public R applyForGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "intendantType",required = false) String intendantType,
+ @RequestParam(value = "state",required = false) String state,
+ @RequestParam(value = "interspaceTime",required = false) String interspaceTime,
+ @RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
+ @RequestParam(value = "interspaceId",required = false) String interspaceId,
+ @RequestParam(value = "userId",required = false) String userId);
+
+ /**
+ * 空间预约申请详情
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/applyFor/getDetails")
+ public R applyForGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 空间预约申请新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/applyFor/addData")
+ public R applyForAddData(@RequestBody JinhuiInterspaceApplyForVO item);
+
+ /**
+ * 空间预约申请编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/applyFor/editData")
+ public R applyForEditData(@RequestBody JinhuiInterspaceApplyForVO item);
+
+ /**
+ * 空间预约申请删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/JinhuiInterspace/applyFor/expurgateData")
+ public R applyForExpurgateData(@RequestParam("id") String id);
+
+
+ /**************************************************************************************************************
+ *
+ *
+ * 金汇微心愿
+ *
+ *
+ ***************************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/micro/volunteering/getList")
+ public R volunteeringGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "state", required = false)String state);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/micro/volunteering/getDetails")
+ public R volunteeringGetDetails(@RequestParam("id") String id);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/micro/volunteering/addData")
+ public R volunteeringAddData(@RequestBody JinhuiMicroVolunteeringVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/micro/volunteering/editData")
+ public R volunteeringEditData(@RequestBody JinhuiMicroVolunteeringVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/micro/volunteering/expurgateData")
+ public R volunteeringExpurgateData(@RequestParam("id") String id);
+
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 金汇微心愿分类
+ *
+ *
+ *****************************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/micro/type/getList")
+ public R volunteeringTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/micro/type/getDetails")
+ public R volunteeringTypeGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/micro/type/addData")
+ public R volunteeringTypeAddData(@RequestBody JinhuiMicroVolunteeringTypeVO item);
+
+ /**
+ * 编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/micro/type/editData")
+ public R volunteeringTypeEditData(@RequestBody JinhuiMicroVolunteeringTypeVO item);
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/micro/type/expurgateData")
+ public R volunteeringTypeExpurgateData(@RequestParam("id") String id);
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇商城商品
+ *
+ *
+ *********************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/shoppingGetList")
+ public R shoppingGetList(@RequestParam("pageNum") int pageNum,
+ @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);
+
+
+ @GetMapping("/jinhuiShopping/shoppingGetDetails")
+ public R shoppingGetDetails(@RequestParam("id") String id,@RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiShopping/shoppingAddData")
+ public R shoppingAddData(@RequestBody JinhuiShoppingVO item);
+
+
+ @PostMapping("/jinhuiShopping/shoppingEditData")
+ public R shoppingEditData(@RequestBody JinhuiShoppingVO item);
+
+ @DeleteMapping("/jinhuiShopping/shoppingExpurgateData")
+ public R shoppingExpurgateData(@RequestParam("id") String id);
+
+
+ /********************************************************************************************************
+ *
+ *
+ * 金汇商城商品订单
+ *
+ *
+ ********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/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);
+
+ /**
+ * 分页详情
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/orderGetDetails")
+ public R orderGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiShopping/orderAddData")
+ public R orderAddData(@RequestBody JinhuiShoppingOrderVO item);
+
+
+ /**
+ * 编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiShopping/orderEditData")
+ public R orderEditData(@RequestBody JinhuiShoppingOrderVO item);
+
+
+ /**
+ * 取消
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/orderCancelOrder")
+ public R orderCancelOrder(@RequestParam("orderId") String orderId);
+
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/jinhuiShopping/orderExpurgateData")
+ public R orderExpurgateData(@RequestParam("id") String id);
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 社区配置兑换地址 时间
+ *
+ * *******************************************************************************************************
+ * @return
+ */
+
+ @GetMapping("/jinhuiConfig/configGetDetails")
+ public R configGetDetails(@RequestParam("communityId") String communityId);
+
+
+ @PostMapping("/jinhuiConfig/configAddData")
+ public R configAddData(@RequestBody JinhuiConfigVO item);
+
+ @PostMapping("/jinhuiConfig/configEditData")
+ public R configEditData(@RequestBody JinhuiConfigVO item);
+
+ @DeleteMapping("/jinhuiConfig/configExpurgateData")
+ public R configExpurgateData(@RequestParam("communityId") String communityId);
+
+
+
+ /*************************************************************************************************************
+ *
+ *
+ * 商家分类
+ *
+ *
+ **************************************************************************************************************/
+
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/getDetailsCategories")
+ public R getDetailsCategories(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/addDataCategories")
+ public R addDataCategories(@RequestBody JinhuiComConvenientServiceCategoriesVO item);
+
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/editDataCategories")
+ public R editDataCategories(@RequestBody JinhuiComConvenientServiceCategoriesVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/expurgateDataCategories")
+ public R expurgateDataCategories(@RequestParam("id") String id);
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇体验活动
+ *
+ *
+ **********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceGetList")
+ public R experienceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "activityName", required = false) String activityName,
+ @RequestParam(value = "activityType", required = false) String activityType,
+ @RequestParam(value = "starTime", required = false) Date starTime,
+ @RequestParam(value = "endTime", required = false) Date endTime);
+
+ /**
+ * 单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceGetDetails")
+ public R experienceGetDetails(@RequestParam("id") String id,
+ @RequestParam(value = "userId", required = false) String userId);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/experienceAddData")
+ public R experienceAddData(@RequestBody JinhuiExperienceActivityVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/experienceEditData")
+ public R experienceEditData(@RequestBody JinhuiExperienceActivityVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceExpurgateData")
+ public R experienceExpurgateData(@RequestParam("id") String id);
+
+
+ /******************************************************************************************************
+ *
+ * 金汇文章
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleGetList")
+ public R articleGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "articleType", required = false) String articleType,
+ @RequestParam(value = "conditionType", required = false) String conditionType);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleGetDetails")
+ public R articleGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiArticle/articleAddData")
+ public R articleAddData(@RequestBody JinhuiArticleManagementVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/JinhuiArticle/articleEditData")
+ public R articleEditData(@RequestBody JinhuiArticleManagementVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleExpurgateData")
+ public R articleExpurgateData(@RequestParam("id") String id);
+
+
+
+ /*******************************************************************************************************
+ *
+ * 金汇报名体验
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/applyExperienceGetList")
+ public R applyExperienceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "isFeedback", required = false) String isFeedback,
+ @RequestParam(value = "activityId", required = false) String activityId);
+
+
+ @GetMapping("/JinhuiExperience/applyExperienceGetDetails")
+ public R applyExperienceGetDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "activityId", required = false) String activityId);
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/applyExperienceAddData")
+ public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item);
+
+ @PostMapping("/JinhuiExperience/applyExperienceEditData")
+ public R applyExperienceEditData(@RequestBody JinhuiApplyExperienceVO item);
+
+ @DeleteMapping("/JinhuiExperience/applyExperienceExpurgateData")
+ public R applyExperienceExpurgateData(@RequestParam("id") String id);
+
+
+ /**
+ * 填写反馈接口
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/applyExperienceFilIn")
+ public R filIn(@RequestParam("userId") String userId,
+ @RequestParam("activityId") String activityId,
+ @RequestParam("content") String content);
+
+
+
+ /**************************************************************************************************************
+ *
+ *
+ * 定时任务
+ *
+ *
+ *******************************************************************************************************************/
+
+ //金汇社区定时任务
+ @GetMapping("/JinhuiExperience/timedTaskJinhuiActivitiesJobHandler")
+ public R timedTaskJinhuiActivitiesJobHandler();
+
+
+
+ /************************************************************************************************************
+ *
+ *
+ * 用户提交办理 /JinhuiWorkGuide/
+ *
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiWorkGuide/answer/getList")
+ public R answerGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "transactType", required = false) String transactType);
+
+ /**
+ * 获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiWorkGuide/answer/getDetails")
+ public R answerGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiWorkGuide/answer/addData")
+ public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/JinhuiWorkGuide/answer/editData")
+ public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/JinhuiWorkGuide/answer/expurgateData")
+ public R answerExpurgateData(@RequestParam("id") String id);
+
+
+
+
+ /********************************************************************************************************
+ *
+ *
+ * 金汇网格
+ *
+ *
+ ****************************************************************************************************/
+
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getReseauList")
+ public R getReseauList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+ @GetMapping("/jinhuiReseau/getReseauDetails")
+ public R getReseauDetails(@RequestParam("id")String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiReseau/addReseauData")
+ public R addReseauData(@RequestBody JinhuiReseauVO item);
+
+
+ @PostMapping("/jinhuiReseau/editReseauData")
+ public R editReseauData(@RequestBody JinhuiReseauVO item);
+
+ @PostMapping("/jinhuiReseau/expurgateReseauData")
+ public R expurgateReseauData(@RequestParam("id") String id);
+
+
+ /**
+ * 获取未绑定人员的网格
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getReseauBoxList")
+ public R getReseauBoxList();
+
+ /********************************************************************************************************
+ *
+ *
+ * 金汇网格员
+ *
+ *
+ ****************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getPeopleList")
+ public R getPeopleList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+ /**
+ * 分页查询
+ * 获取本社区用户
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getPeopleUserList")
+ public R getPeopleUserList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "nameAndPhone", required = false) String nameAndPhone);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getPeopleDetails")
+ public R getPeopleDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiReseau/addPeopleData")
+ public R addPeopleData(@RequestBody JinhuiReseauPeopleVO item);
+
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/jinhuiReseau/editPeopleData")
+ public R editPeopleData(@RequestBody JinhuiReseauPeopleVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/jinhuiReseau/expurgatePeopleData")
+ public R expurgatePeopleData(@RequestParam("id") String id);
+
+
+ /****************************************************************************************************************
+ *
+ *
+ * 金汇慈善公益
+ *
+ *
+ ******************************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiCharity/getCharityList")
+ public R getCharityList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "title", required = false) String title,
+ @RequestParam(value = "label", required = false) String label,
+ @RequestParam(value = "state", required = false) String state);
+
+ /**
+ * 金汇大屏用
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiCharity/getJinhuiCharityList")
+ public R getJinhuiCharityList();
+
+ /**
+ * 获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiCharity/getCharityDetails")
+ public R getCharityDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiCharity/addCharityData")
+ public R addCharityData(@RequestBody JinhuiCharityVO item);
+
+ @PostMapping("/JinhuiCharity/editCharityData")
+ public R editCharityData(@RequestBody JinhuiCharityVO item);
+
+ @DeleteMapping("/JinhuiCharity/expurgateCharityData")
+ public R expurgateCharityData(@RequestParam("id") String id);
+
+
+ /***************************************************************************************************************
+ *
+ * 金汇大屏
+ *
+ **************************************************************************************************************/
+ /**
+ * 金汇首页数据
+ * @return
+ */
+ @GetMapping("/JinhuiLargeScreen/getIndexInfo")
+ public R getIndexInfo();
+
+
+ /**
+ * 金汇大屏社区服务
+ * @return
+ */
+ @GetMapping("/JinhuiLargeScreen/getCommunityServices")
+ public R getCommunityServices();
+
+ /**
+ * 金汇居家养老
+ * @return
+ */
+ @GetMapping("/JinhuiLargeScreen/getOldMan")
+ public R getOldMan();
}
--
Gitblit v1.7.1