Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-06-07 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -5,25 +5,39 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.*;
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.*;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
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;

/**
@@ -179,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);

    /**
     * 分页查询微心愿
@@ -748,7 +772,7 @@
     *
     * @return
     */
    @PostMapping("timedtaskactmicrowishall")
    @PostMapping("timedtaskactmicrowish")
    R timedTaskActMicroWishAll();

    /**
@@ -1165,7 +1189,7 @@
    R deleteOpsHouse(@RequestParam("id") Long id);

    /**
     * 一起议-分页查询
     * 房屋租售-分页查询
     *
     * @param pageComOpsHouseDTO 查询参数
     * @return ComOpsHouseVO
@@ -1335,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);

    /**
     * 导出房屋信息
@@ -1647,6 +1671,14 @@
     */
    @PostMapping("/common/data/population/detail")
    R detailPopulation(@RequestParam(value = "populationId") Long populationId);

    /**
     * 根据id查询实有人口电子档案信息
     * @param populationId  实有人口id
     * @return  实有人口电子档信息
     */
    @PostMapping("/common/data/population/electronicArchives")
    R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId);


    /**
@@ -2161,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);

    /**
     * 微心愿删除
@@ -2230,4 +2262,469 @@
    @PostMapping("/delectworkguide")
    R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);

    /**
     * 分页查询邻里圈
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighborByApp")
    R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

    /**
     * 用户发布邻里圈审核
     * @param addNeighborCircleAppDTO   邻里圈请求参数
     * @return  发布结果
     */
    @PostMapping("/neighbor/addNeighborByApp")
    R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO);

    /**
     * 用户查看邻里圈详情
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈详情
     */
    @PostMapping("/neighbor/neighborDetailByApp")
    R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);

    /**
     * 管理后台查询邻里圈列表
     * @param comActNeighborCircleAdminDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighborByAdmin")
    R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);


    /**
     * 后台修改邻里圈
     * @param editNeighborCircleAdminVO  请求参数
     */
    @PostMapping("/neighbor/changeStatusByAdmin")
    R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);


    /**
     * 邻里圈_后台删除
     * @param id  邻里圈id
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/deleteByAdmin")
    R deleteByAdmin(@RequestParam("id")Long id);

    /**
     * 查看邻里圈基础_详情
     * @param id  邻里圈id
     * @return  邻里圈列表
     */
    @GetMapping("/neighbor/detailNeighborByAdmin")
    R detailNeighborByAdmin(@RequestParam("id")Long id);

    /**
     * 邻里圈的所有评论_分页
     * @param dto 请求参数
     * @return 评论列表
     */
    @PostMapping("/neighbor/detailNeighborAllCommentByAdmin")
    R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto);

    /**
     * 评论的状态_修改
     * @param vo 请求参数
     */
    @PostMapping("/neighbor/changeCommentStatusByAdmin")
    R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo);

    /**
     * 邻里圈评论_详情
     * @param id 评论id
     */
    @GetMapping("/neighbor/detailNeighborCommentByAdmin")
    R detailNeighborCommentByAdmin(@RequestParam("id") Long id);


    /**
     * 用户查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/neighborExamineByApp")
    R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

    /**
     * 邻里圈点赞
     * @param fabulousAppDTO    请求参数
     * @return  点赞结果
     */
    @PostMapping("/neighbor/neighborFabulousByApp")
    R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);

    /**
     * 邻里圈转发
     * @param forwardAppDTO 请求参数
     * @return  转发结果
     */
    @PostMapping("/neighbor/neighborForwardByApp")
    R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO);

    /**
     * 邻里圈评论
     * @param commentAppDTO 请求参数
     * @return  评论结果
     */
    @PostMapping("/neighbor/neighborCommentByApp")
    R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO);

    /**
     * 邻里圈回复
     * @param replyAppDTO   请求参数
     * @return  回复结果
     */
    @PostMapping("/neighbor/neighborReplyByApp")
    R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO);

    /**
     * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
     * @return  执行结果
     */
    @PostMapping("/neighbor/timeTaskCircleFlow")
    R timedTaskNeighborCircleRecord();

    /**
     * 邻里圈评论回复_分页
     * @param dto 参数
     */
    @PostMapping("/neighbor/detailNeighborCommentAllReply")
    R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto);

    /**
     * 邻里圈评论回复_基本详情
     * @param id 参数
     */
    @GetMapping("/neighbor/detailNeighborCommentReply")
    R detailNeighborCommentReply(@RequestParam("id") Long id);

    /**
     * 评论回复状态_修改
     * @param changeStatusReplyVO 参数
     */
    @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);


    /**
     * 邻里圈_添加
     * @param addNeighborCircleAdminVO 参数
     */
    @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();
}