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 | 366 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 358 insertions(+), 8 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 04ec022..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,15 +3,19 @@
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;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
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;
@@ -49,7 +53,7 @@
comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
comActActivityVO.setStatus(2);
comActActivityVO.setHasPrize(0);
- comActActivityVO.setHaveIntegralReward(0);
+ comActActivityVO.setHaveIntegralReward(2);
return communityService.addActivity(comActActivityVO);
}
@@ -155,9 +159,8 @@
*/
@ApiOperation(value = "删除便民服务商家")
@DeleteMapping("/merchant/delete")
- public R deleteMerchant(@RequestParam("merchantId") String merchantId,
- @RequestParam("operator") String operator) {
- return jinhuiCommunityService.deleteMerchant(merchantId, operator);
+ public R deleteMerchant(@RequestParam("merchantId") String merchantId) {
+ return jinhuiCommunityService.deleteMerchant(merchantId);
}
/**
@@ -168,7 +171,9 @@
*/
@ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class)
@PostMapping("/merchant/page")
- public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) {
+ public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO)
+ {
+ pageConvenientMerchantDTO.setAuditType("2");
return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO);
}
@@ -198,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);
+ }
/***************************************************************************************************
*
@@ -243,6 +258,7 @@
@ApiOperation(value = "商家评论列添加")
@PostMapping("/merchantEvaluate/addData")
public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item) {
+ item.setUserId(getUserId()+"");
return jinhuiCommunityService.merchantEvaluateAddData(item);
}
@@ -354,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);
}
/**
@@ -520,7 +537,7 @@
@GetMapping("/shoppingGetDetails")
public R shoppingGetDetails(@RequestParam("id") String id)
{
- return jinhuiCommunityService.shoppingGetDetails(id);
+ return jinhuiCommunityService.shoppingGetDetails(id,getCommunityId()+"");
}
@@ -602,4 +619,337 @@
}
+ @ApiOperation(value = "订单核销")
+ @GetMapping("/orderCheck")
+ public R orderEditData(@RequestParam("id") String id)
+ {
+
+ if(StringUtils.isEmpty(id))
+ {
+ return R.fail("订单id不能为空");
+ }
+
+ JinhuiShoppingOrderVO vo=new JinhuiShoppingOrderVO();
+ vo.setId(id);
+ vo.setCancelType("1");
+ vo.setCancelTime(new Date());
+ return jinhuiCommunityService.orderEditData(vo);
+ }
+
+
+ /******************************************************************************************************
+ *
+ * 金汇文章
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇文章列表", response = JinhuiArticleManagementVO.class)
+ @GetMapping("/articleGetList")
+ public R articleGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return jinhuiCommunityService.articleGetList(pageNum,pageSize,"1","1");
+ }
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇文章详情", response = JinhuiArticleManagementVO.class)
+ @GetMapping("/articleGetDetails")
+ public R articleGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.articleGetDetails(id);
+ }
+
+
+
+ /*************************************************************************************************************
+ *
+ * 金汇体验活动
+ *
+ ***************************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "体验活动列表", response = JinhuiExperienceActivityVO.class)
+ @GetMapping("/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)
+ {
+ return jinhuiCommunityService.experienceGetList(pageNum,pageSize,activityName,activityType,starTime,endTime);
+ }
+
+ /**
+ * 单个详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "体验活动单个详情", response = JinhuiExperienceActivityVO.class)
+ @GetMapping("/experienceGetDetails")
+ public R experienceGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.experienceGetDetails(id,getUserId()+"");
+ }
+
+
+
+
+ /*******************************************************************************************************
+ *
+ * 金汇报名体验
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇报名体验列表", response = JinhuiApplyExperienceVO.class)
+ @GetMapping("/applyExperienceGetList")
+ public R applyExperienceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "isFeedback", required = false) String isFeedback,
+ @RequestParam(value = "activityId", required = false) String activityId)
+ {
+ return jinhuiCommunityService.applyExperienceGetList(pageNum,pageSize,getUserId()+"",isFeedback,activityId);
+ }
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇报名体验详情", response = JinhuiApplyExperienceVO.class)
+ @GetMapping("/applyExperienceGetDetails")
+ public R applyExperienceGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.applyExperienceGetDetails(id,null,null);
+ }
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇报名体验新增")
+ @PostMapping("/applyExperienceAddData")
+ public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item)
+ {
+ item.setUserId(getUserId()+"");
+ return jinhuiCommunityService.applyExperienceAddData(item);
+ }
+
+
+ /**
+ * 填写反馈接口
+ * @return
+ */
+ @ApiOperation(value = "金汇报名体验填写反馈接口")
+ @GetMapping("/applyExperienceFilIn")
+ public R filIn(@RequestParam("activityId") String activityId,
+ @RequestParam("content") String content)
+ {
+ return jinhuiCommunityService.filIn(getUserId()+"",activityId,content);
+ }
+
+
+ /******************************************************************************************************
+ *
+ * 金汇家园
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇家园列表", response = JinhuiArticleManagementVO.class)
+ @GetMapping("/homeGetList")
+ public R homeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return jinhuiCommunityService.articleGetList(pageNum,pageSize,null,"2");
+ }
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇家园详情", response = JinhuiArticleManagementVO.class)
+ @GetMapping("/homeGetDetails")
+ public R homeGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.articleGetDetails(id);
+ }
+
+
+ /************************************************************************************************************
+ *
+ *
+ * 用户提交办理 /JinhuiWorkGuide/
+ *
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "我的提交办事指南列表",response = JinhuiQuestnaireUserAnswerVO.class)
+ @GetMapping("/answer/getList")
+ public R answerGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "transactType", required = false) String transactType)
+ {
+ return jinhuiCommunityService.answerGetList(pageNum,pageSize,getUserId()+"",transactType);
+ }
+
+ /**
+ * 获取详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "我的提交办事指南详情",response = JinhuiQuestnaireUserAnswerVO.class)
+ @GetMapping("/answer/getDetails")
+ public R answerGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.answerGetDetails(id);
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "我的提交办事指南申请办理")
+ @PostMapping("/answer/addData")
+ public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
+ {
+ item.setUserId(getUserId()+"");
+ item.setTransactType("0");
+ return jinhuiCommunityService.answerAddData(item);
+ }
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @ApiOperation(value = "我的提交办事指南申请编辑")
+ @PostMapping("/answer/editData")
+ public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
+ {
+ return jinhuiCommunityService.answerEditData(item);
+ }
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "我的提交办事指南申请删除")
+ @DeleteMapping("/answer/expurgateData")
+ public R answerExpurgateData(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.answerExpurgateData(id);
+ }
+
+
+ /****************************************************************************************************************
+ *
+ *
+ * 金汇慈善公益
+ *
+ *
+ ******************************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @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