From 71949fe2af29b044d2d584e48df30a3f28fd2024 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:25:47 +0800
Subject: [PATCH] 判断一个点是否在一组经纬度包围圈内工具类
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 334 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 329 insertions(+), 5 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 b6336fe..fecb3f9 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
@@ -16,6 +16,8 @@
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
+import com.panzhihua.common.model.dtos.vaccines.*;
+import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
@@ -29,11 +31,13 @@
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.util.List;
/**
@@ -189,6 +193,16 @@
*/
@PostMapping("detaileasyphoto")
R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 随手拍删除
+ *
+ * @param id 随手拍主键
+ * @param userId 登录用户id
+ * @return 详情内容
+ */
+ @PostMapping("deleteEasyPhoto")
+ R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
/**
* 分页查询微心愿
@@ -758,7 +772,7 @@
*
* @return
*/
- @PostMapping("timedtaskactmicrowishall")
+ @PostMapping("timedtaskactmicrowish")
R timedTaskActMicroWishAll();
/**
@@ -1175,7 +1189,7 @@
R deleteOpsHouse(@RequestParam("id") Long id);
/**
- * 一起议-分页查询
+ * 房屋租售-分页查询
*
* @param pageComOpsHouseDTO 查询参数
* @return ComOpsHouseVO
@@ -1345,7 +1359,7 @@
* @param list 便民服务集合
*/
@PostMapping("/convenient/serve/import")
- R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam("communityId") Long communityId);
+ R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam(value = "communityId",required = false) Long communityId);
/**
* 导出房屋信息
@@ -2179,11 +2193,11 @@
/**
* 编辑实有人口
- * @param editComMngPopulationVO
+ * @param populationEditDTO
* @return
*/
@PostMapping("/common/data/population/edit")
- R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @RequestParam("communityId") Long communityId);
+ R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO, @RequestParam("communityId") Long communityId);
/**
* 微心愿删除
@@ -2395,6 +2409,22 @@
*/
@PostMapping("/neighbor/changeCommentReplyStatusByAdmin")
R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);
+ /**
+ * 邻里圈取消点赞
+ * @param fabulousAppDTO 请求参数
+ * @return 取消点赞结果
+ */
+ @PostMapping("/neighbor/neighborFabulousCancelByApp")
+ R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 添加邻里圈浏览记录
+ * @param addBrowseAppDTO 请求参数
+ * @return 返回参数
+ */
+ @PostMapping("/neighbor/neighborAddBrowseByApp")
+ R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO);
+
/**
* 邻里圈_添加
@@ -2403,4 +2433,298 @@
@PostMapping("/neighbor/addNeighborByAdmin")
R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO);
+ /**
+ * 分页查询评论下所有回复
+ * @param commentReplyAppDTO 请求参数
+ * @return 回复列表
+ */
+ @PostMapping("/neighbor/neighborCommentReplyByApp")
+ R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO);
+
+ /**
+ * 实有房屋_编辑
+ * @param villageId 实有房屋id
+ * @param comMngVillageVO 请求参数
+ * @return
+ */
+ @PostMapping("/editvillage/{villageId}")
+ R editvillage(@PathVariable("villageId") Long villageId,@RequestBody ComMngVillageVO comMngVillageVO);
+
+ /**
+ * 商城系统配置
+ * @param comShopSysConfDTO
+ * @return
+ */
+ @PostMapping("/shop/conf/edit")
+ R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO);
+
+ /**
+ * 商城系统配置查询
+ * @param pageComShopSysConfDTO
+ * @return
+ */
+ @PostMapping("/shop/conf/get")
+ R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO);
+
+ /**
+ * 编辑实有人口_电子档案
+ * @param userElectronicFileVO
+ * @return
+ */
+ @PostMapping("/common/data/population/edit/electronicArchives")
+ R editUserElectronicFile(@RequestBody UserElectronicFileVO userElectronicFileVO);
+
+ /**
+ * 实有人口统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/population/statistics")
+ R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询房屋级联菜单
+ * @param cascadeHouseDTO 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/common/data/population/cascade/list")
+ R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+
+ /**
+ * 分页查询房屋列表
+ * @param populationHouseAdminDTO 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/common/data/population/page/house")
+ R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO);
+
+ /**
+ * 根据id查询实有房屋信息
+ * @param houseId 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/common/data/population/house/detail")
+ R getHouseDetail(@RequestParam(value = "houseId") Long houseId);
+
+ /**
+ * 编辑实有房屋信息
+ * @param houseEditAdminDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/edit")
+ R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO);
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ * @param Ids 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/house/delete")
+ R deleteHouses(@RequestBody List<Long> Ids);
+
+ /**
+ * 实有房屋统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/population/house/statistics")
+ R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 根据社区id查询社区所有省市区
+ * @param communityId 社区id
+ * @return 社区所在省市区
+ */
+ @PostMapping("/common/data/village/getRegion")
+ R getRegion(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 统计社区内小区数量
+ * @param communityId 社区id
+ * @return 统计小区数量
+ */
+ @PostMapping("/common/data/village/statistics")
+ R villageStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 小区详情
+ * @param villageId 小区id
+ * @return 小区详情
+ */
+ @PostMapping("/village/getVillage")
+ R getVillage(@RequestParam("villageId") Long villageId);
+
+ /**
+ * 新增高龄认证
+ * @param eldersAuthAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eldersauth/add")
+ R add(@RequestBody EldersAuthAddDTO eldersAuthAddDTO);
+
+ /**
+ * 修改高龄认证
+ * @param eldersAuthEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eldersauth/edit")
+ R edit(@RequestBody EldersAuthEditDTO eldersAuthEditDTO);
+
+ /**
+ * 分页查找高龄认证
+ * @param pageEldersAuthDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eldersauth/page")
+ R query(@RequestBody PageEldersAuthDTO pageEldersAuthDTO);
+
+ /**
+ * 删除高龄认证
+ * @param eldersAuthDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eldersauth/delete")
+ R delete(@RequestBody EldersAuthDeleteDTO eldersAuthDeleteDTO);
+
+ /**
+ * 查询高龄认证详细信息
+ * @param id 高龄认证 id
+ * @return 查找结果
+ */
+ @PostMapping("/eldersauth/{id}")
+ R<EldersAuthDetailsVO> eldersAuthDetails(@PathVariable("id") Long id);
+
+ /**
+ * 获取用户家庭成员
+ * @param userId 用户ID
+ * @return
+ */
+ @PostMapping("/eldersauth/getMyfamilyElders/{userId}")
+ R getMyfamilyElders(@PathVariable("userId") Long userId);
+
+ /**
+ * 查询导出高龄老人
+ * @param pageEldersAuthDTO
+ * @return
+ */
+ @PostMapping("/eldersauth/eldersAuthQuery")
+ R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO);
+
+ /**
+ * 通过家庭成员ID添加
+ * @param eldersAuthAddByFamilyDTO 添加信息
+ * @return
+ */
+ @PostMapping("/eldersauth/addByFamilyUser")
+ R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO);
+
+
+ /**
+ * 添加高龄认证反馈
+ * @param eldersAuthFeedbackAddDTO
+ * @return
+ */
+ @PostMapping("/eldersauth/addFeedback")
+ R addFeedback(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);
+
+ /**
+ * 小程序-查询疫苗分类列表
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/app/list")
+ R getVaccinesListByApp();
+
+ /**
+ * 小程序-疫苗类型对应家庭成员接种列表
+ * @return 疫苗类型对应家庭成员接种列表
+ */
+ @PostMapping("/vaccines/app/user/list")
+ R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO);
+
+ /**
+ * 小程序-报名疫苗
+ * @param enrollByAppDTO 请求参数
+ * @return 报名结果
+ */
+ @PostMapping("/vaccines/app/enroll")
+ R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO);
+
+ /**
+ * 小程序-查询用户家庭成员接种记录
+ * @param userId 用户id
+ * @return 用户家庭成员接种记录
+ */
+ @PostMapping("/vaccines/app/user/inoculation/list")
+ R getVaccinesUserInoculationListByApp(@RequestParam("userId") Long userId);
+
+ /**
+ * 后台管理-查询疫苗分类列表
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/admin/list")
+ R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 修改疫苗分类信息
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/vaccines/admin/edit")
+ R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 新增疫苗分类信息
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/vaccines/admin/add")
+ R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 查询疫苗登记列表
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 登记列表
+ */
+ @PostMapping("/vaccines/admin/enroll/list")
+ R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 删除疫苗分类信息
+ * @param id 疫苗分类id
+ * @return 删除结果
+ */
+ @PostMapping("/vaccines/admin/enroll/delete")
+ R deleteVaccinesByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 根据条件导出登记列表
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 登记列表
+ */
+ @PostMapping("/vaccines/admin/enroll/export")
+ R exportVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 查询接种记录列表
+ * @param inoculationByAdminDTO 请求参数
+ * @return 接种记录列表
+ */
+ @PostMapping("/vaccines/admin/inoculation/list")
+ R getVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);
+
+ /**
+ * 接种记录信息导出
+ * @param inoculationByAdminDTO 请求参数
+ * @return 导出结果
+ */
+ @PostMapping("/vaccines/admin/inoculation/export")
+ R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);
+
+ /**
+ * 查询疫苗分类列表
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/admin/enroll/type/list")
+ R getEnrollTypeListByAdmin();
}
--
Gitblit v1.7.1