From c92c380b8f29ad485024d3d1948d0d0fce56b0d6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 13 四月 2022 20:48:47 +0800
Subject: [PATCH] 党员双报到，问题清单，需求清单，资源清单接口开发
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 265 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 241 insertions(+), 24 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 7c5b52e..492d3f3 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
@@ -2,6 +2,36 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.dtos.community.reserve.*;
+import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
+import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.building.admin.*;
+import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
+import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
+import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.vos.*;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
+import com.panzhihua.common.model.vos.community.social.*;
+import io.swagger.annotations.ApiOperation;
+import com.panzhihua.common.model.vos.community.*;
+import org.springframework.beans.BeanUtils;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -22,15 +52,6 @@
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerEditDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
-import com.panzhihua.common.model.dtos.common.AddComMngVolunteerOrgTeamDto;
-import com.panzhihua.common.model.dtos.common.AddComMngVolunteerServiceTypeDto;
-import com.panzhihua.common.model.dtos.common.AddComMngVolunteerSkillDto;
-import com.panzhihua.common.model.dtos.common.EditComMngVolunteerOrgTeamDto;
-import com.panzhihua.common.model.dtos.common.EditComMngVolunteerServiceTypeDto;
-import com.panzhihua.common.model.dtos.common.EditComMngVolunteerSkillDto;
-import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
-import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
-import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
@@ -214,18 +235,6 @@
import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
-import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
-import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
-import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
@@ -411,7 +420,7 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-12-07 15:59
**/
-@FeignClient(name = "community")
+@FeignClient(name = "huacheng-community")
public interface CommunityService {
/**
* 新增社区活动
@@ -5010,7 +5019,7 @@
* @return 邻里圈话题列表
*/
@GetMapping("/neighbor/getNeighborTopicByApp")
- R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);
+ R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name,@RequestParam("belongType") Integer belongType);
/**
* 综治后台-查询社区列表
@@ -8623,7 +8632,7 @@
* @return 查找结果
*/
@PostMapping("/comActSocialWorker/{id}")
- R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
+ R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
/**
* 批量导入社工
@@ -9332,4 +9341,212 @@
@GetMapping("/activity/partyMemberCount")
R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);
+
+ /**
+ * 根据小区id查询楼栋列表
+ * @param villageId 小区id
+ * @return 查询楼栋列表
+ */
+ @GetMapping("/building/getBuildListByVillageId")
+ R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
+ /**
+ * 党员活动详情数据
+ * @return
+ */
+ @PostMapping("/activity/partyMemberDetail")
+ R partyMemberDetail(@RequestBody CommonPage commonPage);
+ /**
+ * 导出党员活动详情数据
+ * @return
+ */
+ @PostMapping("/activity/exportPartyMemberDetail")
+ R exportPartyMemberDetail(@RequestBody CommonPage commonPage);
+
+ /**
+ * 金沙定制页面-党建引领基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/partyBuildIng/base")
+ R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/partyAct")
+ R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 议事投票展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/discuss")
+ R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/fourMember/base")
+ R getFourMemberBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-五微服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/fms/base")
+ R getFmsBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-微团队展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/fms/team")
+ R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 杨家坪定制页面-居家养老基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/alarm/base")
+ R getAlarmBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-报警记录展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/alarm/record")
+ R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 杨家坪定制页面-报警设备点位图
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/alarm/pointMap")
+ R getAlarmPointMap(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-志愿服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/volunteer/base")
+ R getVolunteerBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 金沙定制页面-志愿线展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/microWish")
+ R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员解决问题展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/fourMember/resolve")
+ R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员院落议事展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/courtyard/list")
+ R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-院落议事
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/courtyard/base")
+ R getCourtyardBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @PostMapping("/comActEasyPhotoHandler/page")
+ R queryEasyPhotoHandler(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @PostMapping("/comActEasyPhotoHandler/edit")
+ R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);
+
+ @GetMapping("/reserve/fiveCount")
+ R fiveCount(@RequestParam("reserveId") Long reserveId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActReserveDangerArea/queryAll")
+ R selectAllComActReserveDangerArea(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActReserveDangerArea/{id}")
+ R selectOneComActReserveDangerArea(@PathVariable("id") Long id);
+
+ /**
+ * 修改数据
+ *
+ * @param comActReserveDangerAreaVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActReserveDangerArea/update")
+ R updateComActReserveDangerArea(@RequestBody ComActReserveDangerAreaVO comActReserveDangerAreaVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActReserveDangerArea/del")
+ R deleteComActReserveDangerArea(@RequestParam("id") Long id);
+
+ /**
+ * 风险区数据统计
+ * @return
+ */
+ @GetMapping("/comActReserveDangerArea/statics")
+ R staticsComActReserveDangerArea();
+
+ /**
+ * 批量设置起始时间
+ * @param editDangerBatchDTO
+ * @return
+ */
+ @PostMapping("/comActReserveDangerArea/updateBatch")
+ R updateBatchComActReserveDangerArea(@RequestBody EditDangerBatchDTO editDangerBatchDTO);
}
--
Gitblit v1.7.1