From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  324 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 314 insertions(+), 10 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 c31fbf7..60a2e85 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
@@ -3,18 +3,22 @@
 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;
@@ -51,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;
@@ -255,6 +257,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -1520,6 +1523,16 @@
     @PostMapping("pagediscusscommentapplets")
     R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
 
+
+    /**
+     * 议事投票-评论-删除 小程序
+     *
+     *            分页参数
+     * @return ComActDiscussCommentVO
+     */
+    @GetMapping("deleteCommentApplets")
+    R deleteCommentApplets(@RequestParam("id") String id);
+
     /**
      * 议事投票-评论-分页查询 小程序 脱敏
      *
@@ -2707,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);
 
     /**
      * 小程序-新增问卷调查浏览数量
@@ -5046,6 +5059,8 @@
     @GetMapping("/neighbor/getNeighborTopicByApp")
     R getNeighborTopicByApp(@RequestParam("name") String name);
 
+    @GetMapping("/neighbor/getNeighborTopicByAppNew")
+    R getNeighborTopicByAppNew(@RequestParam("name") String name);
     /**
      * 删除话题
      * @param id
@@ -9950,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
@@ -11416,7 +11447,7 @@
      * @param grantIntegral
      * @return
      */
-    @PostMapping("/grantIntegral")
+    @PostMapping("/VolunteerActivitiesPeople/grantIntegral")
     public R grantIntegral(@RequestBody GrantIntegral grantIntegral);
 
     /**************************************************************************************************************
@@ -11511,7 +11542,7 @@
     public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
 
 
-    @PostMapping("/unmount")
+    @PostMapping("/VolunteerIntegralMerchant/unmount")
     public R  VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO);
 
     @DeleteMapping("/VolunteerIntegralMerchant/deleteById")
@@ -11541,7 +11572,8 @@
                      @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 = "orderType", required = false) String orderType,
+                     @RequestParam(value = "merchantId", required = false) String merchantId);
 
     /**
      * 查询详情
@@ -11644,4 +11676,276 @@
     @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();
+
+
+
 }

--
Gitblit v1.7.1