修改文件上传类型限制

mitao

2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java

@@ -5,8 +5,14 @@
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
import com.panzhihua.common.service.user.UserService;
@@ -21,6 +27,8 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;

@Slf4j
@@ -69,11 +77,28 @@
    public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
                                @RequestParam("pageSize") int pageSize,
                                @RequestParam(value = "search", required = false)String search,
                                @RequestParam(value = "classifyId", required = false)String classifyId,
                                @RequestParam(value = "status", required = false)String status,
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId)
                                @RequestParam(value = "userId", required = false)String userId,
                                @RequestParam(value = "communityId", required = false)String communityId,
                                @RequestParam(value = "startTime", required = false) String startTime,
                                @RequestParam(value = "endTime", required = false) String endTime)
    {
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",getCommunityId()+"");
        Date start=null;
        Date end=null;

        try {
            if(!StringUtils.isEmpty(startTime)) {
                start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
            }
            if(!StringUtils.isEmpty(startTime)) {
                end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
            }
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId,"1",start,end);
    }


@@ -83,9 +108,28 @@
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "search", required = false)String search,
                                      @RequestParam(value = "status", required = false)String status,
                                      @RequestParam(value = "kind", required = false)String kind)
                                      @RequestParam(value = "kind", required = false)String kind,
                                      @RequestParam(value = "isDisplay", required = false)String isDisplay,
                                      @RequestParam(value = "startTime", required = false) String startTime,
                                      @RequestParam(value = "endTime", required = false) String endTime)
    {
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"");
        Date start=null;
        Date end=null;

        try {
            if(!StringUtils.isEmpty(startTime)) {
                start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
            }
            if(!StringUtils.isEmpty(startTime)) {
                end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
            }
        } catch (ParseException e) {
            e.printStackTrace();
        }



        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"",isDisplay,start,end);
    }


@@ -135,9 +179,11 @@

    @ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
    @GetMapping("/getNeedClaimDetails")
    public R getNeedClaimDetails(@RequestParam("id") String id)
    public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
                                 @RequestParam(value = "taskId", required = false) String taskId,
                                 @RequestParam(value = "userId", required = false) String userId)
    {
        return newStriveForFeign.getNeedClaimDetails(id);
        return newStriveForFeign.getNeedClaimDetails(id,taskId,userId);
    }

    @ApiOperation(value = "任务报名")
@@ -156,9 +202,11 @@

    @ApiOperation(value = "取消报名")
    @DeleteMapping("/expurgateNeedClaimData")
    public R expurgateNeedClaimData(@RequestParam("id") String id)
    public R expurgateNeedClaimData(@RequestParam(value = "id", required = false) String id,
                                    @RequestParam(value = "taskId", required = false) String taskId,
                                    @RequestParam(value = "userId", required = false) String userId)
    {
        return newStriveForFeign.expurgateNeedClaimData(id);
        return newStriveForFeign.expurgateNeedClaimData(id,taskId,userId);
    }


@@ -180,10 +228,12 @@
    @ApiOperation(value = "代单位任务报名列表", response = NeedProblemUnitTaskDTO.class)
    @GetMapping("/getNeedTaskList")
    public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageNum") int pageSize,
                             @RequestParam(value = "unitId", required = false) String unitId)
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "unitId", required = false) String unitId,
                             @RequestParam(value = "kind", required = false) String kind,
                             @RequestParam(value = "status", required = false) String status)
    {
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId);
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId,kind,status);
    }

    @ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)
@@ -224,17 +274,22 @@
    @ApiOperation(value = "社区共建项目列表", response = NewFightCommunityConstructionDTO.class)
    @GetMapping("/getNewFightCommunityList")
    public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize)
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "communityId", required = false)  String communityId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }
        return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize,
                getCommunityId()+"",getUserId()+"");
                communityId,null);
    }

    @ApiOperation(value = "社区共建项目删除", response = NewFightCommunityConstructionDTO.class)
    @ApiOperation(value = "社区共建项目详情", response = NewFightCommunityConstructionDTO.class)
    @GetMapping("/getNewFightCommunityDetails")
    public R getNewFightCommunityDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getNewFightCommunityDetails(id);
        return newStriveForFeign.getNewFightCommunityDetails(id,getUserId()+"");
    }

    @ApiOperation(value = "社区共建项目添加")
@@ -253,11 +308,9 @@

    @ApiOperation(value = "社区共建项目删除")
    @DeleteMapping("/expurgateNewFightCommunityData")
    public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id,
                                            @RequestParam(value = "taskId", required = false) String taskId,
                                            @RequestParam(value = "userId", required = false) String userId)
    public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id)
    {
        return newStriveForFeign.expurgateNewFightCommunityData(id,taskId,userId);
        return newStriveForFeign.expurgateNewFightCommunityData(id);
    }


@@ -301,11 +354,7 @@
    @PostMapping("/editProjectPlanAccomplish")
    public R editProjectPlanAccomplish(@RequestParam("id") String id)
    {
        NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
        item.setId(id);
        item.setAffirmTime(new Date());
        item.setAccomplish("1");
        return newStriveForFeign.editProjectPlanData(item);
        return newStriveForFeign.editProjectPlanAccomplish(id);
    }


@@ -355,9 +404,11 @@

    @ApiOperation(value = "项目参与人员取消报名")
    @DeleteMapping("/expurgateJoinData")
    public R expurgateJoinData(@RequestParam("id") String id)
    public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
                               @RequestParam(value = "projectId", required = false) String projectId,
                               @RequestParam(value = "userId", required = false) String userId)
    {
        return newStriveForFeign.expurgateJoinData(id);
        return newStriveForFeign.expurgateJoinData(id,projectId,userId);
    }


@@ -407,7 +458,7 @@

    /*******************************************************************************************************************
     *
     *
     *                                  微心愿app
     *
     * ****************************************************************************************************************/

@@ -524,7 +575,283 @@
    }


    /************************************************************************************************************
     *
     *                       资源共享
     *
     *************************************************************************************************************/

    @ApiOperation(value = "资源共享列表", response = NewFightResourceSharingDTO.class)
    @GetMapping("/getResourceSharingList")
    public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "communityId", required = false)String communityId,
                                    @RequestParam(value = "unitId", required = false)String unitId,
                                    @RequestParam(value = "meritId", required = false) String meritId)
    {
        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,unitId,meritId);
    }

    @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)
    @GetMapping("/getResourceSharingDetails")
    public R getResourceSharingDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getResourceSharingDetails(id);
    }


    /*******************************************************************************************************
     *
     *                   积分商城
     *
     *******************************************************************************************************/
    @ApiOperation(value = "积分商品列表", response = NewFightShoppingVO.class)
    @GetMapping("/getFightShoppingList")
    public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
                                  @RequestParam("pageSize") int pageSize,
                                  @RequestParam(value = "goodName", required = false)String goodName,
                                  @RequestParam(value = "goodType", required = false)String goodType,
                                  @RequestParam(value = "id", required = false)String id)
    {
        return newStriveForFeign.getFightShoppingList(pageNum,pageSize,getCommunityId()+"",
                goodName,goodType,id);
    }


    @ApiOperation(value = "积分商品详情", response = NewFightShoppingVO.class)
    @GetMapping("/getFightShoppingDetails")
    public R getFightShoppingDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getFightShoppingDetails(id);
    }


    /*******************************************************************************************************
     *
     *                                           商家模块
     *
     * ********************************************************************************************************/

    @ApiOperation(value = "商家列表", response = NewFightConvenientMerchantVO.class)
    @GetMapping("/pageMerchant")
    public R pageMerchant(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam(value = "keyword", required = false)String keyword)
    {
        return newStriveForFeign.pageMerchant(pageNum,pageSize,getCommunityId()+"","0",
                keyword,"1");
    }

    /**
     * 查询商家信息
     *
     * @param merchantId
     * @return
     */
    @ApiOperation(value = "商家详情", response = NewFightConvenientMerchantVO.class)
    @GetMapping("/selectMerchantById")
    public R selectMerchantById(@RequestParam("merchantId") String merchantId)
    {
        return newStriveForFeign.selectMerchantById(merchantId);
    }



    /*****************************************************************************************************
     *
     *                                       用户积分任务完成情况
     *
     *******************************************************************************************************/
    /**
     * 列表
     * @param
     * @return
     */
    @ApiOperation(value = "用户积分任务列表", response = IntegratingTaskVO.class)
    @GetMapping("/getTaskList")
    public R getIntegratingTaskList()
    {
        return newStriveForFeign.getIntegratingTaskList(getUserId()+"",
                getCommunityId()+"");
    }

    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "用户积分任务去完成  只传 status ")
    @PostMapping("/addIntegratingTaskData")
    public R addIntegratingTaskData(@RequestBody IntegratingTaskVO item)
    {
        item.setIsDraw("1");
        item.setUserId(getUserId()+"");
        item.setCommunityId(getCommunityId()+"");
        return newStriveForFeign.addIntegratingTaskData(item);
    }


    /**
     * 每日签到记录列表  前15条
     * @return
     */
    @ApiOperation(value = "每日签到记录列表  前15条", response = IntegratingTaskVO.class)
    @GetMapping("/IntegratingTask/getEverydayList")
    public R  getEverydayList()
    {
        return newStriveForFeign.getEverydayList(getUserId()+"",getCommunityId()+"");
    }



    /**
     * 添加或者修改积分
     * @param item
     * @return
     */
    @ApiOperation(value = "用户领取积分")
    @PostMapping("/IntegratingTask/upIntegral")
    public R upIntegral(@RequestBody NewFightIntegral item)
    {
        return newStriveForFeign.upIntegral(item);
    }


    /*******************************************************************************************************************
     *
     *                                        商品订单
     *
     ****************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "订单列表", response = NewFightShoppingOrderVO.class)
    @GetMapping("/orderGetList")
    public R orderGetList(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam(value = "userId", required = false)String userId,
                          @RequestParam(value = "goodsId", required = false)String goodsId,
                          @RequestParam(value = "orderNumber", required = false)String orderNumber,
                          @RequestParam(value = "goodName", required = false)String goodName,
                          @RequestParam(value = "name", required = false)String name,
                          @RequestParam(value = "cancelType", required = false)String cancelType,
                          @RequestParam(value = "merchantId", required = false) String merchantId,
                          @RequestParam(value = "orderType", required = false) String orderType)
    {
        return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber,
                goodName,name,cancelType,getCommunityId()+"",merchantId,orderType);
    }

    /**
     * 分页详情
     * @param
     * @return
     */
    @ApiOperation(value = "订单详情", response = NewFightShoppingOrderVO.class)
    @GetMapping("/orderGetDetails")
    public R orderGetDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.orderGetDetails(id,getCommunityId()+"");
    }

    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "订单添加")
    @PostMapping("/orderAddData")
    public R orderAddData(@RequestBody NewFightShoppingOrderVO item)
    {
//        item.setCommunityId(getCommunityId()+"");
//        item.setUserId(getUserId()+"");
//        item.setOrderType("1");
        return newStriveForFeign.orderAddData(item);
    }


    /**
     * 编辑
     * @param
     * @return
     */
    @ApiOperation(value = "订单编辑", response = NewFightShoppingOrderVO.class)
    @PostMapping("/NewFightOrder/orderEditData")
    public R orderEditData(@RequestBody NewFightShoppingOrderVO item)
    {
        return newStriveForFeign.orderEditData(item);
    }


    /**
     * 取消
     * @param
     * @return
     */
    @ApiOperation(value = "订单取消")
    @GetMapping("/orderCancelOrder")
    public R orderCancelOrder(@RequestParam("orderId") String orderId)
    {
        return newStriveForFeign.orderCancelOrder(orderId,getCommunityId()+"");
    }


    /**
     * 删除
     * @param
     * @return
     */
    @ApiOperation(value = "订单删除")
    @DeleteMapping("/orderExpurgateData")
    public R orderExpurgateData(@RequestParam("id") String id)
    {
        return newStriveForFeign.orderExpurgateData(id,getCommunityId()+"");
    }


    @ApiOperation(value = "订单核销")
    @GetMapping("/orderCheck")
    public R orderEditData(@RequestParam("id") String id)
    {

        if(org.apache.commons.lang3.StringUtils.isEmpty(id))
        {
            return R.fail("订单id不能为空");
        }

        NewFightShoppingOrderVO vo=new NewFightShoppingOrderVO();
        vo.setId(id);
        vo.setCancelType("1");
        vo.setCancelTime(new Date());
        return newStriveForFeign.orderEditData(vo);
    }


    @ApiOperation(value = "获取社区积分排名")
    @GetMapping("/getIntegralUserRank")
    public R  getIntegralUserRank()
    {
        return communityService.getIntegralUserRank(getCommunityId(),getUserId());
    }


    @ApiOperation(value = "是否是商家   如果是商家返回商家id")
    @GetMapping("/selectUserBind")
    public R selectUserBind()
    {
        return newStriveForFeign.selectUserBind(getCommunityId()+"",getUserId()+"");
    }



    @ApiOperation(value = "搜索用户", response = SysUserVO.class)
    @GetMapping("/selectUserList")
    public R selectUserList(@RequestParam("phoneOrname") String phoneOrname)
    {
        return newStriveForFeign.selectUserList(getCommunityId()+"",phoneOrname);
    }


}