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/JinHuiCommnuityApi.java | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 4 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 f5178bf..a8c69c9 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;
@@ -50,7 +53,7 @@
comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
comActActivityVO.setStatus(2);
comActActivityVO.setHasPrize(0);
- comActActivityVO.setHaveIntegralReward(0);
+ comActActivityVO.setHaveIntegralReward(2);
return communityService.addActivity(comActActivityVO);
}
@@ -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);
+ }
/***************************************************************************************************
*
@@ -357,9 +370,10 @@
@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 = "interspaceId",required = false) String interspaceId,
+ @RequestParam(value = "userId",required = false) String userId) {
return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType,
- state,interspaceTime,subscribeTimeFrame,interspaceId);
+ state,interspaceTime,subscribeTimeFrame,interspaceId,userId);
}
/**
@@ -523,7 +537,7 @@
@GetMapping("/shoppingGetDetails")
public R shoppingGetDetails(@RequestParam("id") String id)
{
- return jinhuiCommunityService.shoppingGetDetails(id);
+ return jinhuiCommunityService.shoppingGetDetails(id,getCommunityId()+"");
}
@@ -882,4 +896,60 @@
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