From b567d7ff3b6a4fb6f4080e6686e75cbc535de55b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 30 六月 2023 15:05:03 +0800
Subject: [PATCH] 修改三资公开查询新增账号
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 123 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 121 insertions(+), 2 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 9d31f0c..5765f62 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
@@ -578,6 +578,16 @@
R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
/**
+ * 分页查询随手拍 浪潮专用
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 心愿列表
+ */
+ @GetMapping("pageEasyPhotoAdminLC")
+ R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize);
+
+ /**
* 随手拍详情
*
* @param id
@@ -2255,6 +2265,17 @@
R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);
/**
+ * 查询省下所有区域 tree结构
+ *
+ * @param provinceAdcode
+ * 省份code
+ * @param areaCode
+ * @return 查询结果
+ */
+ @GetMapping("/common/data/area/basiclevel")
+ R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);
+
+ /**
* 分页查询街道
*
* @param pageComStreetDTO
@@ -3419,7 +3440,7 @@
* @return 详情
*/
@GetMapping("/detailworkguide")
- R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);
+ R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId);
/**
* 办事指南_分页
@@ -11148,7 +11169,105 @@
* @return
*/
@PostMapping("pageActivityBigScreen")
- R pageActivityBigScreen(@RequestBody CommonPage commonPage);
+ R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 疫情防控 健康码统计
+ * @return
+ */
+ @GetMapping("/comActAcidRecord/selectColorMarkGroup")
+ R selectColorMarkGroup();
+
+
+ @GetMapping("easyphoto/selectStatisticsPhoto")
+ R selectStatisticsPhoto();
+
+ /**
+ * 获取商家周围 n(km)的自提点数量
+ *
+ * @param distance
+ * @return
+ */
+ @GetMapping("/convenient/point/findPointNumByDistance")
+ R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng);
+
+
+ /**
+ * 普达大屏-自治动态
+ * */
+ @GetMapping("/pudaScreen/autonomyDynamic")
+ R autonomyDynamic();
+
+ /**
+ * 普达大屏-红色物业
+ * */
+ @GetMapping("/pudaScreen/propertyDynamic")
+ R propertyDynamic();
+
+ /**
+ * 普达大屏-党建数据
+ **/
+ @GetMapping("/pudaScreen/partyData")
+ R partyData();
+
+ /**
+ *
+ * 普达大屏-居民信息
+ * */
+ @GetMapping("/pudaScreen/peopleInfo")
+ R peopleInfo();
+
+
+ /**
+ * 普达大屏-小区院落
+ * */
+ @GetMapping("/pudaScreen/countryard")
+ R countryard();
+
+ /**
+ * 普达大屏-基础数据
+ * */
+ @GetMapping("/pudaScreen/basicData")
+ R basicData();
+
+ /**
+ * 普达大屏-特殊人群
+ * */
+ @GetMapping("/pudaScreen/specialPeople")
+ R specialPeople();
+
+
+
+ /**
+ * 通过洗车订单查询银联订单
+ *
+ * @param Id
+ * @return
+ */
+ @GetMapping("/unionpay/detail")
+ R queryById(@RequestParam("Id") String id);
+
+
+ /**
+ * 通过银联订单查询洗车订单
+ *
+ * @param Id
+ * @return
+ */
+ @GetMapping("/unionpay/unionpayDetail")
+ R carWashById(@RequestParam("Id") String id);
+
+ /**
+ * 新增洗车订单和银联订单关系
+ * @param carWashId
+ * @param unionpayOrderId
+ * @param money
+ * @return
+ */
+ @PostMapping("/unionpay/add")
+ int add(@RequestParam("carWashId") String carWashId,
+ @RequestParam("unionpayOrderId") String unionpayOrderId,
+ @RequestParam("money") String money);
}
--
Gitblit v1.7.1