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/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 103 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 61 insertions(+), 42 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java index 10eddf1..b0cf792 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java @@ -1,23 +1,26 @@ package com.panzhihua.applets.api; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.time.LocalDateTime; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.alibaba.fastjson.JSONObject; +import cn.binarywang.wx.miniapp.api.WxMaSecCheckService; +import com.alibaba.fastjson.JSON; import com.panzhihua.applets.config.MinioUtil; +import com.panzhihua.applets.config.WxMaConfiguration; import com.panzhihua.applets.umf.UmfPayUtil; import com.panzhihua.applets.unionpay.*; +import com.panzhihua.common.constants.Constants; +import com.panzhihua.common.constants.FtpConstants; +import com.panzhihua.common.constants.UserConstants; import com.panzhihua.common.controller.BaseController; -import com.panzhihua.common.model.dtos.wx.UnionpayCarWash; +import com.panzhihua.common.model.dtos.bracelet.BraceletEarlyWarningDO; +import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.Base64File; +import com.panzhihua.common.model.vos.community.WeatherVO; +import com.panzhihua.common.model.vos.user.UserPhoneVO; +import com.panzhihua.common.service.bracelet.CommunityBraceletService; +import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import net.coobird.thumbnailator.Thumbnails; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.RandomUtils; @@ -27,19 +30,16 @@ import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import com.alibaba.fastjson.JSON; -import com.panzhihua.applets.config.WxMaConfiguration; -import com.panzhihua.common.constants.Constants; -import com.panzhihua.common.constants.FtpConstants; -import com.panzhihua.common.constants.UserConstants; -import com.panzhihua.common.model.vos.R; -import com.panzhihua.common.model.vos.community.WeatherVO; -import com.panzhihua.common.model.vos.user.UserPhoneVO; -import com.panzhihua.common.service.community.CommunityService; -import cn.binarywang.wx.miniapp.api.WxMaSecCheckService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed; import static com.panzhihua.common.utlis.PayUtil.makeUUID; @@ -85,6 +85,9 @@ private WxMaConfiguration wxMaConfiguration; @Resource private CommunityService communityService; + + @Resource + private CommunityBraceletService communityBraceletService; @Resource private MinioUtil minioUtil; @Resource @@ -309,26 +312,42 @@ @ApiOperation("银联退款查询接口") @GetMapping("/unionpayRefundQuery") public R unionpayRefundQuery(@RequestParam("merOrderId")String merOrderId){ -// String map= RefundQuery.refundQuery(merOrderId); - - R r=communityService.queryById("5935"); - log.error("花城洗车银联退款数据 :" + r); - if(r.getCode()==200) - { - UnionpayCarWash wash= JSONObject.parseObject(r.getData().toString(),UnionpayCarWash.class); - if(wash!=null) - { - String re=Refund.sendOrder(wash.getMoney(),wash.getUnionpayOrderId()); - log.error("花城洗车银联退款数据2 :" + re); - } - - } - - - return communityService.queryById("5935"); + String map= RefundQuery.refundQuery(merOrderId); + return R.ok(map); } + /** + * 获取预警数据 + * @param communityId + * @return + */ + @ApiOperation("微信手环人员处理工单列表") + @GetMapping("bracelet/getEarlyWarningList") + public R getList(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("communityId") String communityId, + @RequestParam("disposeUserId") String disposeUserId, + @RequestParam("type") String type) + { + return communityBraceletService.getList(pageNum,pageSize,communityId,"",disposeUserId,type,"",""); + } + + /** + * 微信处理接口 + * @param braceletEarlyWarningDO + * @return + */ + @PostMapping("bracelet/WXdispose") + public R WXdispose(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO) + { + if(StringUtils.isEmpty(braceletEarlyWarningDO.getDisposeText())) + { + return R.fail("处理内容不能为空"); + } + braceletEarlyWarningDO.setDisposeType("2"); + return communityBraceletService.WXdispose(braceletEarlyWarningDO); + } -- Gitblit v1.7.1