From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 101 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
index 4bc7397..0301fdb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.bracelet.BraceletEarlyWarningDO;
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;
@@ -11,8 +12,10 @@
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
+import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
import com.panzhihua.common.model.vos.jinhui.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.bracelet.CommunityBraceletService;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
import com.panzhihua.common.service.user.UserService;
@@ -200,6 +203,16 @@
return jinhuiCommunityService.getListCategories(pageNum, pageSize);
}
+
+
+ @ApiOperation(value = "便民服务商家入驻")
+ @PostMapping("/merchant/addData")
+ public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item)
+ {
+ item.setAuditType("1");
+ item.setCreatedBy(getUserId()+"");
+ return jinhuiCommunityService.merchantAddData(item);
+ }
/***************************************************************************************************
*
@@ -797,11 +810,13 @@
* @param
* @return
*/
+ @ApiOperation(value = "我的提交办事指南列表",response = JinhuiQuestnaireUserAnswerVO.class)
@GetMapping("/answer/getList")
public R answerGetList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize)
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "transactType", required = false) String transactType)
{
- return jinhuiCommunityService.answerGetList(pageNum,pageSize,getUserId()+"");
+ return jinhuiCommunityService.answerGetList(pageNum,pageSize,getUserId()+"",transactType);
}
/**
@@ -809,6 +824,7 @@
* @param id
* @return
*/
+ @ApiOperation(value = "我的提交办事指南详情",response = JinhuiQuestnaireUserAnswerVO.class)
@GetMapping("/answer/getDetails")
public R answerGetDetails(@RequestParam("id") String id)
{
@@ -820,10 +836,12 @@
* @param
* @return
*/
+ @ApiOperation(value = "我的提交办事指南申请办理")
@PostMapping("/answer/addData")
public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
{
item.setUserId(getUserId()+"");
+ item.setTransactType("0");
return jinhuiCommunityService.answerAddData(item);
}
@@ -832,6 +850,7 @@
* @param item
* @return
*/
+ @ApiOperation(value = "我的提交办事指南申请编辑")
@PostMapping("/answer/editData")
public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
{
@@ -843,6 +862,7 @@
* @param id
* @return
*/
+ @ApiOperation(value = "我的提交办事指南申请删除")
@DeleteMapping("/answer/expurgateData")
public R answerExpurgateData(@RequestParam("id") String id)
{
@@ -850,6 +870,85 @@
}
+ /****************************************************************************************************************
+ *
+ *
+ * 金汇慈善公益
+ *
+ *
+ ******************************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+
+ @ApiOperation(value = "金汇慈善公益列表",response = JinhuiCharityVO.class)
+ @GetMapping("/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)
+ {
+ return jinhuiCommunityService.getCharityList(pageNum,pageSize,title,label,state);
+ }
+
+
+ /**
+ * 获取详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇慈善公益详情",response = JinhuiCharityVO.class)
+ @GetMapping("/getCharityDetails")
+ public R getCharityDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.getCharityDetails(id);
+ }
+
+
+ /******************************************************************************************************************
+ *
+ * 手环处理
+ *
+ *****************************************************************************************************************/
+
+ @Resource
+ private CommunityBraceletService communityBraceletService;
+ /**
+ * 微信处理接口
+ * @param braceletEarlyWarningDO
+ * @return
+ */
+ @PostMapping("/WXdispose")
+ public R WXdispose(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO)
+ {
+ if(com.panzhihua.common.utlis.StringUtils.isEmpty(braceletEarlyWarningDO.getDisposeText()))
+ {
+ return R.fail("处理内容不能为空");
+ }
+ braceletEarlyWarningDO.setDisposeType("2");
+ return communityBraceletService.WXdispose(braceletEarlyWarningDO);
+ }
+
+ /**
+ * 微信我的预警数据
+ * @return
+ */
+ @GetMapping("/braceletApi/getEarlyWarningList")
+ public R getList(@RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam(value = "equipmentNumber",required = false) String equipmentNumber,
+ @RequestParam(value = "type",required = false) String type,
+ @RequestParam(value = "userName",required = false) String userName,
+ @RequestParam(value = "phone",required = false) String phone)
+ {
+ return communityBraceletService.getList(pageNum,pageSize,getCommunityId()+"",equipmentNumber,
+ getUserId()+"",type,userName,phone);
+ }
+
}
--
Gitblit v1.7.1