修改文件上传类型限制

mitao

2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d

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

@@ -1,19 +1,24 @@
package com.panzhihua.common.service.community;

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;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.dtos.community.enterprise.*;
import com.panzhihua.common.model.dtos.community.large.AreaStreetDetail;
import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.sanshuo.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.partybuilding.QryReportResp;
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;
@@ -24,7 +29,10 @@
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
@@ -33,6 +41,9 @@
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.shop.AddShopFlowerGoodsVO;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
@@ -44,8 +55,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;
@@ -203,101 +212,12 @@
import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationElderExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationPensionExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.model.vos.community.ComStreetVO;
import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
@@ -335,6 +255,9 @@
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -596,6 +519,16 @@
    R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 分页查询随手拍   浪潮专用
     *
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 心愿列表
     */
    @GetMapping("pageEasyPhotoAdminLC")
    R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize);

    /**
     * 随手拍详情
     *
     * @param id
@@ -606,6 +539,19 @@
     */
    @PostMapping("detaileasyphoto")
    R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 随手拍详情
     *
     * @param id
     *            随手拍主键
     * @param userId
     *            登录用户id
     * @return 详情内容
     */
    @PostMapping("detaileasyphotodesensitize")
    R detailEasyPhotoDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);


    /**
     * 随手拍删除
@@ -638,6 +584,15 @@
     */
    @PostMapping("pagemicrowish/applets")
    R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);
    /**
     * 小程序分页查询微心愿
     *
     * @param comActMicroWishVO
     *            查询参数
     * @return 分页集合
     */
    @PostMapping("pagemicrowish/appletsDesensitize")
    R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 心愿详情
@@ -650,6 +605,17 @@
     */
    @PostMapping("detailmicrowish")
    R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
    /**
     * 心愿详情
     *
     * @param id
     *            查询主键
     * @param userId
     *            登录用户id
     * @return 心愿内容
     */
    @PostMapping("detailmicrowishdesensitize")
    R detailMicroWishDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 审核、分配、反馈心愿
@@ -1332,6 +1298,17 @@
    R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 小程序分页查询随手拍
     *
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 返回结果
     */
    @PostMapping("pageeasyphotoappletsdesensitize")
    R pageEasyPhotoAppletsDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);


    /**
     * 随手拍评论分页查询
     *
     * @param pageComActEasyPhotoCommentDTO
@@ -1340,6 +1317,16 @@
     */
    @PostMapping("pagecomacteasyphotocomment")
    R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);

    /**
     * 随手拍评论分页查询 - 脱敏
     *
     * @param pageComActEasyPhotoCommentDTO
     *            查询参数
     * @return 查询结果
     */
    @PostMapping("pagecomacteasyphotocommentdesensitize")
    R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);

    /**
     * 评论点赞/取消点赞
@@ -1506,6 +1493,15 @@
     */
    @PostMapping("pagediscussapplets")
    R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
    /**
     * 议事投票-分页查询 小程序 -脱敏
     *
     * @param pageComActDiscussDTO
     *            查询参数
     * @return ComActDiscussVO 分页
     */
    @PostMapping("pagediscussappletsdesensitize")
    R pageDiscussAppletsDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

    /**
     * 议事投票-点赞、取消点赞
@@ -1527,6 +1523,26 @@
    @PostMapping("pagediscusscommentapplets")
    R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);


    /**
     * 议事投票-评论-删除 小程序
     *
     *            分页参数
     * @return ComActDiscussCommentVO
     */
    @GetMapping("deleteCommentApplets")
    R deleteCommentApplets(@RequestParam("id") String id);

    /**
     * 议事投票-评论-分页查询 小程序 脱敏
     *
     * @param pageComActDiscussCommentDTO
     *            分页参数
     * @return ComActDiscussCommentVO
     */
    @PostMapping("pagediscusscommentappletsdesensitize")
    R pageDiscussCommentAppletsDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

    /**
     * 议事投票-详情 小程序
     *
@@ -1538,6 +1554,17 @@
     */
    @PostMapping("detaildiscussapplets")
    R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
    /**
     * 议事投票-详情 小程序
     *
     * @param id
     *            主键
     * @param userId
     *            登录用户主键
     * @return ComActDiscussVO
     */
    @PostMapping("detaildiscussappletsdesensitize")
    R detailDiscussAppletsDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 议事投票-投票
@@ -2189,6 +2216,19 @@
    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,
                        @RequestParam(value = "appId", required = false) String appId);

    /**
     * 分页查询街道
     *
     * @param pageComStreetDTO
@@ -2680,7 +2720,7 @@
     * @return 问卷调查详情
     */
    @GetMapping("/questnaire/view/detail")
    R viewDetail(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
    R viewDetail( @RequestParam("questId") Long questId,@RequestParam("userId") Long userId);

    /**
     * 小程序-新增问卷调查浏览数量
@@ -2866,6 +2906,73 @@
     */
    @GetMapping("/shop/changeShopGoodsStatus")
    R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

    /**
     * 商品列表-分页查询
     *
     * @param pageComShopGoodsDTO
     *            添加数据
     */
    @PostMapping("/shopFlower/pageGoods")
    R pageFlowerGoodsList(@RequestBody PageComShopFlowerGoodsDTO pageComShopGoodsDTO);

    /**
     * 商品列表-分页查询
     *
     * @param comShopFlowerGoodsDTO
     *            添加数据
     */
    @PostMapping("/shopFlower/pageShopFlowerGoodsByApp")
    R pageShopFlowerGoodsByApp(@RequestBody  ComShopFlowerGoodsDTO comShopFlowerGoodsDTO);


    /**
     * 新增商品
     *
     * @param addShopGoodsVO
     * @return
     */
    @PostMapping("/shopFlower/saveShopGoods")
    R saveFlowerShopGoods(@RequestBody AddShopFlowerGoodsVO addShopGoodsVO);

    /**
     * 编辑商品
     *
     * @param id
     * @param addShopGoodsVO
     * @return
     */
    @PostMapping("/shopFlower/editShopGoods/{id}")
    R editFlowerShopGoods(@PathVariable("id") Long id, @RequestBody AddShopFlowerGoodsVO addShopGoodsVO);

    /**
     * 删除商品
     *
     * @param goodsId
     * @return
     */
    @DeleteMapping("/shopFlower/deleteShopGoods")
    R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId);

    /**
     * 修改商品状态
     *
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/changeShopGoodsStatus")
    R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

    /**
     * 商品详情
     *
     * @param goodsId
     * @return
     */
    @GetMapping("/shopFlower/shopGoodsDetail")
    R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);



    /**
     * 结果
@@ -3286,7 +3393,7 @@
     * @return 详情
     */
    @GetMapping("/detailworkguide")
    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);
    R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId);

    /**
     * 办事指南_分页
@@ -3387,6 +3494,15 @@
    @PostMapping("/neighbor/pageNeighborByAdmin")
    R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);

    /**
     * 统计大屏查询清单列表
     *
     * @param comActNeighborCircleAdminDTO
     *            请求参数
     * @return 邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighborByBigScreen")
    R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
    /**
     * 后台修改邻里圈
     *
@@ -4943,6 +5059,8 @@
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("name") String name);

    @GetMapping("/neighbor/getNeighborTopicByAppNew")
    R getNeighborTopicByAppNew(@RequestParam("name") String name);
    /**
     * 删除话题
     * @param id
@@ -6408,6 +6526,14 @@
    R getMerchant(@RequestParam("merchantId") Long merchantId);

    /**
     * 获取便民服务商家详情
     * @param userId
     * @return
     */
    @GetMapping("/convenient/merchant/getMerchantByUserId")
    R getMerchantByUserId(@RequestParam("userId") Long userId);

    /**
     * 禁用/启用便民服务商家
     * @param disableOrEnableConvenientMerchantDTO
     * @return
@@ -6437,6 +6563,14 @@
     */
    @GetMapping("/convenient/getUserMerchantInfoByAccount")
    R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);

    /**
     * 获取用户便民服务商家详情
     * @param account 商家绑定账号
     * @return
     */
    @GetMapping("/convenient/getMerchantInfoByAccount")
    R<ConvenientMerchantVO> getMerchantInfoByAccount(@RequestParam("account") String account);

    /**
     * 获取商便民服务商家信息
@@ -9831,12 +9965,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
@@ -10449,7 +10599,7 @@

    @GetMapping("/sanshuo/expert/backstageList2")
    R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
                          @RequestParam(value = "size",required = false)Integer size);
                          @RequestParam(value = "size",required = false)Integer size,@RequestParam(value = "keyWord",required = false)String  keyWord);

    /**
     * 查询社区id集合
@@ -10510,16 +10660,23 @@
     * @param operator
     * @return
     */
    @DeleteMapping("/point/delete")
    @DeleteMapping("/convenient/point/delete")
    R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);

    /**
     * 便民服务详情 自提点
     * @param pointId
     * @return
     */
    @GetMapping("/convenient/point/detail")
    R detailPoint(@RequestParam("pointId") Long pointId);

    /**
     * 新增商品分类
     * @param convenientGoodsCategoryDTO
     * @return
     */
    @PostMapping("/goodsCategory/add")
    @PostMapping("/convenient/goodsCategory/add")
    R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

    /**
@@ -10527,7 +10684,7 @@
     * @param convenientGoodsCategoryDTO
     * @return
     */
    @PutMapping("/goodsCategory/put")
    @PutMapping("/convenient/goodsCategory/put")
    R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

    /**
@@ -10535,7 +10692,7 @@
     * @param categoryId
     * @return
     */
    @DeleteMapping("/goodsCategory/delete")
    @DeleteMapping("/convenient/goodsCategory/delete")
    R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

    /**
@@ -10543,7 +10700,7 @@
     * @param categoryId
     * @return
     */
    @GetMapping("/goodsCategory/get")
    @GetMapping("/convenient/goodsCategory/get")
    R getGoodsCategory(@RequestParam("categoryId") Long categoryId);

    /**
@@ -10551,7 +10708,7 @@
     * @param pageConvenientGoodsCategoryDTO
     * @return
     */
    @PostMapping("/goodsCategory/page")
    @PostMapping("/convenient/goodsCategory/page")
     R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);

    @GetMapping("/dataCount")
@@ -10559,4 +10716,1236 @@

    @DeleteMapping("/proceedings/remove")
    R removeProceedings(@RequestParam("id") Long id);

    /**
     * 获取物业公司通知公告列表
     * */
    @GetMapping("comProperty/noticeList")
    R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);

    /**
     * 获取所有商品分类
     * @return
     */
    @GetMapping("/convenient/goodsCategory/getAllGoodsCategories")
    R getAllGoodsCategories();

    /**
     * 分页查询用户收货地址列表
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 用户收货地址列表
     */
    @PostMapping("/shopFlower/shopUserAddressList")
    R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);

    /**
     * 用户添加收货地址
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 添加结果
     */
    @PostMapping("/shopFlower/shopAddUserAddress")
    R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户修改收货地址
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 修改结果
     */
    @PostMapping("/shopFlower/shopEditUserAddress")
    R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户删除收货地址
     *
     * @param addressId
     *            收货地址id
     * @return 删除结果
     */
    @DeleteMapping("/shopFlower/shopDelUserAddress")
    R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);

    /**
     * 订单预览
     *
     * @param orderPreviewDTO 请求参数
     * @return 订单预览数据
     */
    @PostMapping("/shopFlower/orderPreview")
    R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);

    /**
     * 创建订单
     *
     * @param orderCreateDTO 创建订单请求参数
     * @return 创建结果
     */
    @PostMapping("/shopFlower/orderCreate")
    R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO);

    /**
     * 分页查询用户订单列表
     *
     * @param comOrderListDTO 请求参数
     * @return 查询结果
     */
    @PostMapping("/shopFlower/pageOrderList")
    R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO);

    /**
     * 根据订单id查询订单详情
     *
     * @param orderId 订单id
     * @return 订单详情
     */
    @GetMapping("/shopFlower/orderDetail")
    R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone);

    /**
     * 根据订单id取消订单
     *
     * @param comShopOrderQueryDTO 请求参数
     * @return 取消结果
     */
    @PostMapping("/shopFlower/orderCancel")
    R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 根据订单id删除订单
     *
     * @param orderId 订单id
     * @return 删除结果
     */
    @DeleteMapping("/shopFlower/orderDelete")
    R orderDeleteFlower(@RequestParam("orderId") Long orderId);

    /**
     * 根据订单id确认收货
     *
     * @param comShopOrderQueryDTO 请求参数
     * @return 确认结果
     */
    @PostMapping("/shopFlower/orderConfirm")
    R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 分页查询 商家订单
     *
     * @param pageComShopOrderSearchDTO 分页数据
     * @return 分页订单
     */
    @PostMapping("/shopFlower/order/page")
    R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
    /**
     * 订单发货
     *
     * @param orderShipDTO 发货信息
     * @return 发货结果
     */
    @PostMapping("/shopFlower/shipOrder")
    R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO);

    /**
     * 订单配送
     *
     * @param deliverDTO 订单ID
     * @return 配送结果
     */
    @PostMapping("/shopFlower/deliverOrder")
    R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);

    /**
     * 订单配送
     *
     * @param deliverDTO 订单ID
     * @return 配送完成
     */
    @PostMapping("/shopFlower/finishDeliverOrder")
    R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);

    /**
     * 获取当前商铺周围的自提点信息以及距离手机距离
     *
     * @param merchantId
     * @return
     */
    @GetMapping("/convenient/point/findPointByMerchantId")
    R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng);

    /**
     * 保存评价
     * @param comShopFlowerEvaluateDTO
     * @return
     */
    @PostMapping("/shopFlower/saveEvaluate")
    R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO);

    /**
     * 分页查询评价
     * @param pageComShopFlowerEvaluateDTO
     * @return
     */
    @PostMapping("/shopFlower/pageEvaluate")
    R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);

    /**
     * 评价详情
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/detailEvaluate")
    R detailEvaluate(@RequestParam("id") Long id);

    /**
     * 删除评价
     * @param id
     * @return
     */
    @DeleteMapping("/shopFlower/deleteEvaluate")
    R deleteEvaluate(@RequestParam("id") Long id);

    /**
     * 取货码
     * @param id
     * @return
     */
    @ApiOperation(value = "取货码")
    @GetMapping("/shopFlower/getQRCode")
    R getQRCode(@RequestParam("id") Long id);

    /**
     * 保存配送单
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("/shopFlower/saveDelivery")
    R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

    /**
     * 更新配送单
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("/shopFlower/updateDelivery")
    R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

    /**
     * 已配送、已送达 分页查询
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("/shopFlower/pageDelivery")
    R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

    /**
     * 未配送 分页查询
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("/shopFlower/pageNoDelivery")
    R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

    /**
     * 未配送-开始配送-订单列表
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageNoDeliveryOrderList")
    R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

    /**
     * 根据商家id查询商家的订单
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderByStoreId")
    R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

    /**
     * 微信支付订单回调
     *
     * @param wxPayNotifyOrderDTO
     *            订单支付回调参数
     */
    @PostMapping("/shopFlower/wxOrderPayNotify")
    void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);

    /**
     * 点击去支付订单
     *
     * @param orderPayDTO
     *            请求参数
     * @return 支付对象
     */
    @PostMapping("/shopFlower/wxPay")
    R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO);

    /**
     * 获取社区动态置顶banner
     * @param communityId  社区id
     * */
    @PostMapping("/easyphoto/getUserRewardsNew")
    R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

    /**
     * 统计查询订单数量
     * @param deliveryType
     * @param userId
     * @return
     */
    @GetMapping("/shopFlower/selectCountByDeliveryType")
    R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("userId")  Long userId);

    /**
     * 查询我的店铺各类统计数据
     * @param userId
     * @return
     */
    @GetMapping("/shopFlower/selectCountByUserId")
    R selectCountByUserId(@RequestParam("userId") Long userId);


    /**
     * 创建退款订单
     * @param comShopFlowerRefundOrderDTO
     * @return
     */
    @PostMapping("/shopFlower/createRefundOrder")
    R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);

    /**
     * 分页查询
     * @param pageComOrderRefundDTO
     * @return
     */
    @PostMapping("/shopFlower/pageRefundOrder")
    R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO);

    /**
     * 修改退款订单
     * @param comShopFlowerRefundOrderDTO
     * @return
     */
    @PostMapping("/shopFlower/updateRefundOrder")
    R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);


    /**
     * 商家后台-退款申请统计
     * @param storeId
     * @return
     */
    @GetMapping("/shopFlower/selectCountGroupStatus")
    R selectCountGroupStatus(@RequestParam("storeId") Long storeId);

    /**
     * 新增商品浏览量
     * @param goodsId
     * @return
     */
    @GetMapping("/shopFlower/incrGoodsView")
    R incrGoodsView(@RequestParam("goodsId") Long goodsId);

    /**
     * 出入账分页
     * @param pageComShopFlowerOrderPayDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderPay")
    R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);

    /**
     * 获取商家的营业额和可结算金额
     * @param storeId
     * @return
     */
    @GetMapping("/shopFlower/getQuota")
    R getQuota(@RequestParam("storeId") Long storeId);

    /**
     * 取消退款
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/refundOrderCancel")
    R refundOrderCancel(@RequestParam("id") Long id);

    /**
     * 退款订单详情
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/refundOrderDetail")
    R refundOrderDetail(@RequestParam("id") Long id);

    /**
     * 清点商品 确认送达详情
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderByDeliveryNo")
    R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

    /**
     * 商家后台经营数据统计-上
     * @param storeId
     * @return
     */
    @GetMapping("/shopFlower/selectSumOrderAndAmountByStoreId")
    R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId);

    /**
     * 统计时间区域的订单量 15天 30天 一年
     * @param storeId
     * @param type
     * @return
     */
    @GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type")  Integer type,@RequestParam("tab")  Integer tab);

    /**
     * 统计上架的上下架商品数量
     * @param userId
     * @return
     */
    @GetMapping("/shopFlower/countSaleByUserId")
    R countSaleByUserId(@RequestParam("userId") Long userId);

    /**
     * 查询统计基础数据
     * @return
     */
    @GetMapping("/selectBasicData")
    R selectBasicData();

    /**
     * 统计在职干部特长
     * @return
     */
    @GetMapping("/statisticsPbMemberType")
    R statisticsPbMemberType();


    /**
     * 统计单位
     * @return
     */
    @GetMapping("/selectUnitByNatureName")
    R selectUnitByNatureName();

    /**
     * 大屏-社区活动分页
     * @return
     */
    @PostMapping("pageActivityBigScreen")
    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();



    /**
     * 通过洗车订单查询银联订单
     *
     * @return
     */
    @GetMapping("/unionpay/detail")
    R queryById(@RequestParam("Id") String 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);






    /*********************************************************************************************************
     *
     *
     *                   最美志愿者
     *
     *
     * *********************************************************************************************************/
    @GetMapping("/MostBeautifu/queryById")
    public R queryById2(@RequestParam("id") String Id);


    /**
     * 分页查询
     * @param name
     * @param unmountType
     * @return
     */
    @GetMapping("/MostBeautifu/getqueryList")
    public R queryList(@RequestParam("pageNum") int pageNum,
                       @RequestParam("pageSize")int pageSize,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "unmountType", required = false) String unmountType);



    /**
     * 新增
     * @param mostBeautifulVolunteerVO
     * @return
     */
    @PostMapping("/MostBeautifu/addMostBeautiful")
    public R insertMostBeautifulVolunteer(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);


    /**
     * 更新
     * @param mostBeautifulVolunteerVO
     * @return
     */
    @PostMapping("/MostBeautifu/upMostBeautiful")
    public R updateById(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);


    /**
     * 删除
     * @param Id
     * @return
     */
    @DeleteMapping("/MostBeautifu/delectVuId")
    public R deleteById(@RequestParam("id")  String Id);


    /********************************************************************************************************************
     *
     *
     *        志愿者活动
     *
     *
     *******************************************************************************************************************/
    /**
     * 获取单个详情
     * @param id
     * @return
     */
    @GetMapping("Volunteer/queryById")
    R volunteerQueryById(@RequestParam("id") String id);

    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("Volunteer/queryList")
    R volunteerQueryList(@RequestParam("pageNum") int pageNum,
                                       @RequestParam("pageSize") int pageSize,
                                       @RequestParam(value = "name", required = false) String name,
                                       @RequestParam(value = "acState", required = false) String acState,
                                       @RequestParam(value = "acType", required = false) String acType,
                                       @RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime,
                                       @RequestParam(value = "actityEndTime", required = false) Date actityEndTime);

    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("Volunteer/insertVolunteer")
    R insertVolunteer(@RequestBody VolunteerActivityVO volunteerActivityVO);


    @PostMapping("Volunteer/updateById")
    R volunteerUpdateById(@RequestBody VolunteerActivityVO volunteerActivityVO);


    @DeleteMapping("Volunteer/deleteById")
    R volunteerDeleteById(@RequestParam("id") String id);



    /**
     * 定时刷新活动状态
     * @return
     */
    @GetMapping("/Volunteer/timedTaskVolunteerActivitiesJobHandler")
    public R  timedTaskVolunteerActivitiesJobHandler();


    /*******************************************************************************************************************
     *
     *
     *                             志愿者活动类型
     *
     *
     *******************************************************************************************************************/

    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerType/volunteerTypeGetList")
    public R volunteerTypeGetList(@RequestParam("pageNum")  int pageNum,
                                  @RequestParam("pageSize")  int pageSize,
                                  @RequestParam("type")   String type);

    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/VolunteerType/insertvolunteerType")
    public R insertvolunteerType(@RequestBody VolunteerTypeVO volunteerTypeVO);

    /**
     * 更新
     * @param volunteerTypeVO
     * @return
     */
    @PostMapping("/VolunteerType/volunteerTypeUpdate")
    public R volunteerTypeUpdate(@RequestBody VolunteerTypeVO volunteerTypeVO);

    /**
     * 删除
     * @param id
     * @return
     */
    @DeleteMapping("/VolunteerType/volunteerTypeDelete")
    public R volunteerTypeDelete(@RequestParam("id") String id);

    /*****************************************************************************************************************
     *
     *
     *                                      志愿者参加活动
     *
     *
     ****************************************************************************************************************/
    /**
     * 志愿者单个详情
     * @param id
     * @return
     */
    @GetMapping("/VolunteerActivitiesPeople/vapGetById")
    public R vapGetById(@RequestParam("id") String id);

    /**
     * 参与人员列表
     * @param activityId
     * @param communityId
     * @return
     */
    @GetMapping("/VolunteerActivitiesPeople/vapGetList")
    public R  vapGetList(@RequestParam("activityId") String activityId,
                         @RequestParam("communityId") String communityId);

    /**
     * 添加参与人员
     * @param volunteerActivitiesPeopleVO
     * @return
     */
    @PostMapping("/VolunteerActivitiesPeople/vapInsert")
    public R  vapInsert(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);

    /**
     * 修改参与人员
     * @param volunteerActivitiesPeopleVO
     * @return
     */
    @PostMapping("/VolunteerActivitiesPeople/vapUpdate")
    public R  vapUpdate(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);

    /**
     * 删除参与人员
     * @param id
     * @return
     */
    @DeleteMapping("/VolunteerActivitiesPeople/vapDelete")
    public R vapDelete(@RequestParam("id") String id);


    /**
     * 志愿者活动  奖励发放
     * @param grantIntegral
     * @return
     */
    @PostMapping("/VolunteerActivitiesPeople/grantIntegral")
    public R grantIntegral(@RequestBody GrantIntegral grantIntegral);

    /**************************************************************************************************************
     *
     *
     *                      积分明细记录
     *
     *****************************************************************************************************************/
    /**
     * 获取单个详情
     *
     * @param id
     * @return
     */
    @GetMapping("/VolunteerIntegralRecord/getId")
    public R VolunteerIntegralRecordGetId(@RequestParam("id") String id);

    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @GetMapping("/VolunteerIntegralRecord/getList")
    public R VolunteerIntegralRecordGetList(@RequestParam("pageNum") int pageNum,
                                            @RequestParam("pageSize")  int pageSize,
                                            @RequestParam("userId") String userId);

    /**
     * 新增
     *
     * @param
     * @return
     */
    @PostMapping("/VolunteerIntegralRecord/insertVolunteer")
    public R VolunteerIntegralRecordInsertVolunteer(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);

    /**
     * 便捷
     * @param
     * @return
     */
    @PostMapping("/VolunteerIntegralRecord/updateId")
    public R VolunteerIntegralRecordUpdateId(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);

    /**
     * 删除
     * @param id
     * @return
     */
    @DeleteMapping("/VolunteerIntegralRecord/deleteId")
    public R VolunteerIntegralRecordDeleteId(@RequestParam("id") String id);

    /*************************************************************************************************************
     *
     *
     *                            路北社区积分商城
     *
     *
     ****************************************************************************************************************/

    /**
     * 获取单个详情
     * @param id
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/queryById")
    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id);

    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/queryList")
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                       @RequestParam("pageSize")  int pageSize,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "state", required = false) String state,
                        @RequestParam(value = "goodType", required = false) String goodType,
                        @RequestParam(value = "merchantId", required = false) String merchantId);

    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
    public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO);

    @PostMapping("/VolunteerIntegralMerchant/updateById")
    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);


    @PostMapping("/VolunteerIntegralMerchant/unmount")
    public R  VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO);

    @DeleteMapping("/VolunteerIntegralMerchant/deleteById")
    public R  VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id);


    /***********************************************************************************************************
     *
     *
     *                   订单兑换
     *
     *
     ***********************************************************************************************************/

    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/order/getList")
    public R getList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize")  int pageSize,
                     @RequestParam(value = "goodsId", required = false) String goodsId,
                     @RequestParam(value = "orderNumber", required = false) String orderNumber,
                     @RequestParam(value = "goodsName", required = false) String goodsName,
                     @RequestParam(value = "condition", required = false) String condition,
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId,
                     @RequestParam(value = "userId", required = false) String userId,
                     @RequestParam(value = "orderType", required = false) String orderType,
                     @RequestParam(value = "merchantId", required = false) String merchantId);

    /**
     * 查询详情
     * @param id
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/order/getData")
    public R getData(@RequestParam("id") String id);

    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/VolunteerIntegralMerchant/order/insertData")
    public R insertData(@RequestBody VolunteerCreditsExchangeVO item);

    /**
     * 新增用户购买商家商品记录
     * @param
     * @return
     */
    @PostMapping("/VolunteerIntegralMerchant/order/insertMerchantData")
    public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item);

    /**
     * 更新
     * @param item
     * @return
     */
    @PostMapping("/VolunteerIntegralMerchant/order/update")
    public R update(@RequestBody VolunteerCreditsExchangeVO item);

    /**
     * 删除
     * @param id
     * @return
     */
    @DeleteMapping("/VolunteerIntegralMerchant/order/delete")
    public R delete(@RequestParam("id") String id);

    /**
     * 核销
     * @param id
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/order/conditionData")
    public R conditionData(@RequestParam("id") String id);

    /*****************************************************************************************************************
     *
     *
     *                        路北社区商家管理
     *
     *
     *****************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerMerchant/getList")
    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "merchantState", required = false) String merchantState,
                                      @RequestParam(value = "merchantType", required = false) String merchantType,
                                      @RequestParam(value = "name", required = false) String name,
                                      @RequestParam(value = "communityId", required = false) String communityId);

    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/VolunteerMerchant/insert")
    public R insertVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);


    @PostMapping("/VolunteerMerchant/update")
    public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);


    @DeleteMapping("/VolunteerMerchant/delete")
    public R deleteVolunteerMerchant(@RequestParam("id") String id);

    @GetMapping("/VolunteerMerchant/getUser")
    public R volunteerMerchantGetUser(@RequestParam("communityId") String communityId,
                                      @RequestParam(value = "userName", required = false) String userName,
                                      @RequestParam(value = "userPhone", required = false)String userPhone);


    @GetMapping("/VolunteerMerchant/getById")
    public R volunteerMerchantGetById(@RequestParam("id") String id);

    /**
     * 是否是商家
     * @param userId
     * @return
     */
    @GetMapping("/VolunteerMerchant/isMerchant")
    public R isMerchant(@RequestParam("userId") String userId);


    /**
     * 社区取消订单
     * @param id
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/order/communityCancellation")
    public R communityCancellation(@RequestParam("id") String id);





    /****************************************************************************************************************
     *
     *                      商家评论
     *
     ***************************************************************************************************************/

    /**
     * 商家评论分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerMerchant/evaluate/getList")
    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
                                     @RequestParam("pageSize") int pageSize,
                                     @RequestParam("communityId") String communityId,
                                     @RequestParam("merchantId") String merchantId);

    /**
     * 商家评论获取详情
     * @param id
     * @return
     */
    @GetMapping("/VolunteerMerchant/evaluate/getData")
    public R volunteerMerchantGetData(@RequestParam("id") String id);

    /**
     * 商家评论新增评价
     * @return
     */
    @PostMapping("/VolunteerMerchant/evaluate/insert")
    public R volunteerMerchantInsert(@RequestBody VolunteerMerchantEvaluateVO item);

    /**
     * 商家评论更新评价
     * @return
     */
    @PostMapping("/VolunteerMerchant/evaluate/update")
    public R volunteerMerchantUpdate(@RequestBody VolunteerMerchantEvaluateVO item);


    /**
     * 商家评论删除评价
     * @param id
     * @return
     */
    @DeleteMapping("/VolunteerMerchant/evaluate/delete")
    public R volunteerMerchantDelete(@RequestParam("id") String id);



    /***************************************************************************************************************
     *
     *                               路北社区商家提现
     *
     ****************************************************************************************************************/

    /**
     * 商家提现列表啊
     * @param disposeType
     * @return
     */
    @GetMapping("/VolunteerMerchant/withdraw/getList")
    public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "disposeType", required = false) String disposeType,
                             @RequestParam(value = "merchantName", required = false) String merchantName,
                             @RequestParam(value = "merchantId", required = false) String  merchantId,
                             @RequestParam(value = "communityId", required = false) String communityId);

    /**
     * 新增商家提现
     * @param item
     * @return
     */
    @PostMapping("/VolunteerMerchant/withdraw/insert")
    public R WithdrawInsert(@RequestBody VolunteerMerchantWithdrawVO item);

    /**
     * 编辑商家提现
     * @param item
     * @return
     */
    @PostMapping("/VolunteerMerchant/withdraw/update")
    public R WithdrawUpdate(@RequestBody VolunteerMerchantWithdrawVO item);

    /**
     * 删除商家提现
     * @param id
     * @return
     */
    @GetMapping("/VolunteerMerchant/withdraw/delete")
    public R WithdrawDelete(@RequestParam("id") String id);

    /**
     * 处理商家提现
     * @param id
     * @return
     */
    @GetMapping("/VolunteerMerchant/withdraw/dispose")
    public R WithdrawDispose(@RequestParam("id") String id);




    /***************************************************************************************************************
     *
     *                               路北社区系统配置   商家折扣      兑换地点信息
     *
     ****************************************************************************************************************/

    /**
     * 详情
     * @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);
    /**
     * 查询 一标三实 数据
     */
    @GetMapping("/largeScreen/sumAreaStreet")
     R<SumAreaStreetResp> sumAreaStreet();


    /**
     *  下拉 明细
     */
    @GetMapping(("/largeScreen/areaStreetDetail"))
     R<AreaStreetDetail> areaStreetDetail(@RequestParam("code") String code,
                                          @RequestParam("type") String type);

    @GetMapping("/largeScreen/qryReport")
    R<List<QryReportResp>> qryReport(@RequestParam(value = "yearTime",required = false) String yearTime);


    /*****************************************************************************************************************
     *
     *                                         社区宣传
     *
     ******************************************************************************************************************/
    @GetMapping("/sys/conf/getCommunityPublicityData")
    public R getCommunityPublicityData(@RequestParam("communityId") String communityId);

    @PostMapping("/sys/conf/addCommunityPublicityDate")
    public R addCommunityPublicityDate(@RequestBody CommunityPublicityVO item);

    @PostMapping("/sys/conf/editCommunityPublicityDate")
    public R editCommunityPublicityDate(@RequestBody CommunityPublicityVO item);

    @DeleteMapping("/sys/conf/deleteCommunityPublicityData")
    public R deleteCommunityPublicityData(@RequestParam("communityId") String communityId);



    /**
     * 社区活动自动定时更新用户未签退时间
     * @return
     */
    @GetMapping("/comActAcidRecord/comActActRegistUpdateEndTime")
    public R comActActRegistUpdateEndTime();



}