From cdca957e4835e359a89fe4c7c9833ab0c78ee4e3 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 01 四月 2024 11:18:10 +0800
Subject: [PATCH] 修改西区uu洗车登录接口500 7
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 131 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 125 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 8a3fe37..f0e44d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3,9 +3,10 @@
import java.util.Date;
import java.util.List;
-import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.*;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.acid.*;
+import com.panzhihua.common.model.dtos.community.building.BuildingDto;
import com.panzhihua.common.model.dtos.community.convenient.*;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
@@ -51,8 +52,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
-import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
-import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerAddDTO;
@@ -255,6 +254,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -5046,6 +5046,8 @@
@GetMapping("/neighbor/getNeighborTopicByApp")
R getNeighborTopicByApp(@RequestParam("name") String name);
+ @GetMapping("/neighbor/getNeighborTopicByAppNew")
+ R getNeighborTopicByAppNew(@RequestParam("name") String name);
/**
* 删除话题
* @param id
@@ -9950,12 +9952,28 @@
* 单位活动统计
*/
@GetMapping("/neighbor/activityAnalysis")
- R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
- @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
+ R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "range",required = false)Integer range,
+ @RequestParam(value = "communityId",required = false) Long communityId,
@RequestParam(value = "page",required = false) Integer page,
@RequestParam(value = "size",required = false) Integer size,
@RequestParam(value = "belongTo",required = false) String belongTo,
- @RequestParam(value = "unitId",required = false) Long unitId,@RequestParam(value = "loginAccount",required = false) String loginAccount);
+ @RequestParam(value = "unitId",required = false) Long unitId,
+ @RequestParam(value = "loginAccount",required = false) String loginAccount,
+ @RequestParam(value = "searchContent",required = false) String searchContent);
+
+ @GetMapping("/neighbor/export")
+ public List<ExcelDO> export(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "communityId",required = false) Long communityId);
+
+ @GetMapping("/neighbor/partyExcel")
+ public List<PartyExcelDO> partyExcel(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "communityId",required = false) Long communityId,
+ @RequestParam(value = "unitId",required = false) Long unitId);
+
/**
* 批量删除活动
* @param ids
@@ -11762,13 +11780,114 @@
+ /***************************************************************************************************************
+ *
+ * 路北社区系统配置 商家折扣 兑换地点信息
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/Community/Config/getData")
+ public R ConfiggetData(@RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/Community/Config/insertvo")
+ public R Configinsertvo(@RequestBody VolunteerCommunityConfigVO item);
+
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 社区折扣
+ *
+ *
+ ******************************************************************************************************************/
+
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/community/discount/getList")
+ public R CommunityDiscountgetList(@RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/community/discount/insert")
+ public R CommunityDiscountinsert(@RequestBody VolunteerCommunityDiscountVO item);
+
+
+ @PostMapping("/VolunteerMerchant/community/discount/update")
+ public R CommunityDiscountupdate(@RequestBody VolunteerCommunityDiscountVO item);
+
+
+ @DeleteMapping("/VolunteerMerchant/community/discount/delete")
+ public R CommunityDiscountdelete(@RequestParam("id") String id);
+ /**
+ * 报名/取消报名社区活动
+ * 金汇社区专用
+ * @param signactivityVO
+ * 报名参数
+ * @return 报名 取消报名 结果
+ */
+ @PostMapping("/jinhui/jinhuiSignActivity")
+ public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO);
+
+
+
+ /**
+ * 用户签到
+ * 金汇社区专用
+ * @param comActActRegistVO 签到参数
+ * @return 签到结果
+ */
+ @PostMapping("/jinhui/jinhuiActivitySignIn")
+ public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO);
+ @GetMapping("/integral/user/getIntegralUserRank")
+ public R getIntegralUserRank(@RequestParam("communityId") Long communityId,
+ @RequestParam("userId") Long userId);
+
+
+ @GetMapping("/largeScreen/panzhihuaMap")
+ public R panzhihuaMap(@RequestParam("areaCode")String areaCode);
+
+ @GetMapping("/largeScreen/oneTagThreeReal")
+ public R oneTagThreeReal(@RequestParam("streetId") Long streetId);
+
+ @PostMapping("/largeScreen/searchStreet")
+ public R searchStreet(@RequestBody BuildingDto buildingDto);
+
+ @PostMapping("/largeScreen/huachengDyn")
+ public R huachengDyn(@RequestBody ComActDynVO comActDynVO);
+
+ @GetMapping("/largeScreen/getScreenStatics")
+ public R getScreenStatics();
+
+ @GetMapping("/largeScreen/populationStatics")
+ public R populationStatics(@RequestParam("streetId") Long streetId);
+
+ @GetMapping("/largeScreen/probably")
+ public R probably(@RequestParam("year") Integer year,@RequestParam("belongTo") String belongTo);
}
--
Gitblit v1.7.1