From eb80b83a3d4a0b59325e90405dc6c687c2904d3a Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 05 一月 2022 14:45:16 +0800
Subject: [PATCH] 商家后台相关代码提交

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  514 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 503 insertions(+), 11 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 ee3264b..e67238b 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,22 @@
 
 import java.util.List;
 
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -1069,10 +1085,11 @@
      *
      * @param userId
      *            用户id
+     * @param status
      * @return 活动列表
      */
     @PostMapping("listactivity")
-    R listActivity(@RequestParam("userId") Long userId);
+    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
 
     /**
      * 用户确认心愿
@@ -5302,11 +5319,11 @@
     R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);
 
     /**
-     * 根据社区活动id查询社区活动报名人员列表
+     * 根据社区活动id查询社区活动报名且未参与人员列表
      *
      * @param activityId
      *            活动id
-     * @return 社区活动报名人员列表
+     * @return 社区活动报名且未参与人员列表
      */
     @PostMapping("/integral/act/activity/admin")
     R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
@@ -7206,6 +7223,14 @@
     R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
 
     /**
+     * 居家隔离导出
+     * @param pageReserveRegisterDetailedAdminDTO
+     * @return
+     */
+    @PostMapping("/reserve/admin/homeQuarantine/export")
+    R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
+
+    /**
      * 分页查询物业宣传
      * @param pageComPropertyPublicityDTO
      * @return
@@ -7270,14 +7295,6 @@
      */
     @GetMapping("/property/publicity/incr-view")
     R incrPropertyPublicityView(@RequestParam("id") Long id);
-
-    /**
-     * 居家隔离导出
-     * @param pageReserveRegisterDetailedAdminDTO
-     * @return
-     */
-    @PostMapping("/reserve/admin/homeQuarantine/export")
-    R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
 
     /**
      * 获取预设图片
@@ -7490,4 +7507,479 @@
     @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
     @Async
     void updateAllHouseUnionAppCode();
+
+    /**
+     * 西区大屏治理数据
+     */
+    @GetMapping("/screen/getWestScreenStatics")
+    R westScreenStatics();
+
+    /**
+     * 西区大屏一标三实数据
+     * @return  西区大屏一标三实数据
+     */
+    @GetMapping("/screen/getComprehensivePopulationStatics")
+    R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);
+
+    @GetMapping("/screen/getComprehensiveStreetList")
+    R getComprehensiveStreetList();
+
+    /**
+     * 通过社区id查询社区账号密码
+     * @param communityId   社区id
+     * @return  查询社区账号密码
+     */
+    @GetMapping("/screen/getCommunityPassword")
+    R getCommunityPassword(@RequestParam("communityId") Long communityId);
+
+    @GetMapping("/reserve/bigScreenStaticsReserve")
+    R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 党员活动折线图
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/bigscreen/party/partyActivityLine")
+    R partyActivityLine(@RequestParam("communityId")Long communityId);
+
+    /**
+     * 党员积分前3
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/bigscreen/party/partyActivityTop")
+    R partyActivityTop(@RequestParam("communityId")Long communityId);
+
+    /**
+     * 社区服务大屏数据分析接口
+     */
+    @GetMapping("/screen/serviceData")
+    R serviceData(@RequestParam("communityId")Long communityId);
+
+    /**
+     * 服务居民接口
+     */
+    @GetMapping("/screen/serviceUser")
+    R serviceUser(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 大数据分析平台-居民自治
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/resident/autonomy")
+    R getResidentAutonomy(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 大数据分析平台-清网治格
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/grids/governance")
+    R getGridsGovernance(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 大数据分析平台-社区服务
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/community/service")
+    R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 分页获取热度排行商家
+     * @param pagePopularMerchantDTO
+     * @return
+     */
+    @PostMapping("/screen/merchant/popular")
+    R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);
+
+    /**
+     * 新版大屏首页接口
+     */
+    @GetMapping("/screen/indexInfo")
+    R indexInfo(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-微心愿
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/microWish")
+    R indexMicroWish(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-随手拍
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/easyPhoto")
+    R indexEasyPhoto(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-随手拍展示列表
+     * @return
+     */
+    @PostMapping("/screen/index/easyPhotoList")
+    R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-社区问卷
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/questionnaire")
+    R indexQuestionnaire(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-社区动态
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/dyn")
+    R indexDyn(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-社区动态展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/dynList")
+    R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-邻里圈
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/neighbor")
+    R indexNeighbor(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-邻里圈展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/neighborList")
+    R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-便民商家
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/merchant")
+    R indexMerchant(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-商家展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/merchantList")
+    R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-微心愿展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/microWishList")
+    R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-社区问卷展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/questionnaireList")
+    R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-居民活动
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/residentAct")
+    R indexResidentAct(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-居民活动展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/residentActList")
+    R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-志愿者活动
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/volunteerAct")
+    R indexVolunteerAct(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-志愿者活动展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/volunteerActList")
+    R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 新增数字商业街商家
+     * @param mcsMerchantDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/merchant/add")
+    R addMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+    /**
+     * 编辑数字商业街商家
+     * @param mcsMerchantDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/merchant/put")
+    R putMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+    /**
+     * 查询数字商业街商家详情
+     * @param merchantId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/merchant/get")
+    R getMcsMerchant(@RequestParam("merchantId") Long merchantId);
+
+    /**
+     * 删除数字商业街商家
+     * @param merchantId
+     * @param userId
+     * @return
+     */
+    @DeleteMapping("/microcommercialstreet/merchant/delete")
+    R deleteMcsMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("userId") Long userId);
+
+    /**
+     * 分页查询数字商业街商家
+     * @param pageMcsMerchantDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/merchant/page")
+    R pageMcsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);
+
+    /**
+     * 禁用/启用数字商业街商家
+     * @param disableOrEnableMcsMerchantDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/merchant/disable-or-enable")
+    R disableOrEnableMcsMerchant(@RequestBody DisableOrEnableMcsMerchantDTO disableOrEnableMcsMerchantDTO);
+
+    /**
+     * 获取所有数字商业街配置
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/config/all")
+    R getAllMcsConfig();
+
+    /**
+     * 修改数字商业街配置
+     * @param configs
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/config/put")
+    R putMcsConfig(@RequestBody List<McsConfigVO> configs);
+
+    /**
+     * 分页查询戳戳游戏
+     * @param pageMcsGameDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/game/page")
+    R pageMcsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);
+
+    /**
+     * 设为/取消游戏热门
+     * @param setPopularForGameDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/game/setPopular")
+    R setPopularForGame(@RequestBody SetPopularForGameDTO setPopularForGameDTO);
+
+    /**
+     * 上架/下架戳戳游戏
+     * @param setShelfForGameDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/game/setShelf")
+    R setShelfForGame(@RequestBody SetShelfForGameDTO setShelfForGameDTO);
+
+    /**
+     * 删除戳戳游戏
+     * @param gameId
+     * @param userId
+     * @return
+     */
+    @DeleteMapping("/microcommercialstreet/game/delete")
+    R deleteMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+    /**
+     * 分页查询戳戳资讯
+     * @param pageMcsInformationDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/information/page")
+    R pageMcsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);
+
+    /**
+     * 上架/下架戳戳资讯
+     * @param setShelfForInfoDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/information/setShelf")
+    R setShelfForMcsInfo(@RequestBody SetShelfForInfoDTO setShelfForInfoDTO);
+
+    /**
+     * 删除戳戳资讯
+     * @param infoId
+     * @param userId
+     * @return
+     */
+    @DeleteMapping("/microcommercialstreet/information/delete")
+    R deleteMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);
+
+    /**
+     * 分页查询评价记录
+     * @param pageMcsEvaluateDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/evaluate/page")
+    R pageMcsEvaluate(@RequestBody PageMcsEvaluateDTO pageMcsEvaluateDTO);
+
+    /**
+     * 查询评价记录详情
+     * @param evaluateId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/evaluate/get")
+    R getMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);
+
+    /**
+     * 删除评价记录
+     * @param evaluateId
+     * @return
+     */
+    @DeleteMapping("/microcommercialstreet/evaluate/delete")
+    R deleteMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);
+
+    /**
+     * 新增戳戳游戏
+     * @param mcsGameDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/game/add")
+    R addMcsGame(@RequestBody McsGameDTO mcsGameDTO);
+
+    /**
+     * 编辑戳戳游戏
+     * @param mcsGameDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/game/put")
+    R putMcsGame(@RequestBody McsGameDTO mcsGameDTO);
+
+    /**
+     * 发布戳戳游戏
+     * @param gameId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/game/publish")
+    R publishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+    /**
+     * 结束戳戳游戏
+     * @param gameId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/game/finish")
+    R finishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+    /**
+     * 戳戳游戏/资讯顶部统计数据
+     * @param type
+     * @param userId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/statistics/top")
+    R getTopStatistics(@RequestParam("type") Integer type, @RequestParam("userId") Long userId);
+
+    /**
+     * 新增戳戳资讯
+     * @param mcsInfoDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/information/add")
+    R addMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);
+
+    /**
+     * 编辑戳戳资讯
+     * @param mcsInfoDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/information/put")
+    R putMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);
+
+    /**
+     * 发布戳戳资讯
+     * @param infoId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/information/publish")
+    R publishMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);
+
+    /**
+     * 新增产品信息
+     * @param mcsProductDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/product/add")
+    R addMcsProduct(@RequestBody McsProductDTO mcsProductDTO);
+
+    /**
+     * 编辑产品信息
+     * @param mcsProductDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/product/put")
+    R putMcsProduct(@RequestBody McsProductDTO mcsProductDTO);
+
+    /**
+     * 删除产品信息
+     * @param productId
+     * @param userId
+     * @return
+     */
+    @DeleteMapping("/microcommercialstreet/product/delete")
+    R deleteMcsProduct(@RequestParam("productId") Long productId, @RequestParam("userId") Long userId);
+
+    /**
+     * 上架/下架产品信息
+     * @param setShelfForProductDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/product/setShelf")
+    R setShelfForMcsProduct(@RequestBody SetShelfForProductDTO setShelfForProductDTO);
+
+    /**
+     * 分页查询产品信息
+     * @param pageMcsProductDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/product/page")
+    R pageMcsProduct(@RequestBody PageMcsProductDTO pageMcsProductDTO);
 }

--
Gitblit v1.7.1