浏览代码

修改bug

jinshihui 1 月之前
父节点
当前提交
b2c6241f42

+ 2 - 2
nightFragrance-admin/src/main/java/com/ylx/web/controller/common/CommonController.java

@@ -173,8 +173,8 @@ public class CommonController {
             for (MultipartFile fileItem : file) {
                 // 上传并返回新文件名称
                 String fileName = FileUploadUtils.upload(filePath, fileItem);
-                String url = serverConfig.getUrl() + fileName;
-                urls.add(url);
+                //String url = serverConfig.getUrl() + fileName;
+                urls.add(fileName);
                 fileNames.add(fileName);
                 newFileNames.add(FileUtils.getName(fileName));
                 originalFilenames.add(fileItem.getOriginalFilename());

+ 6 - 4
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsController.java

@@ -3,6 +3,7 @@ package com.ylx.web.controller.massage;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -222,6 +223,7 @@ public class TJsController extends BaseController {
     @ApiOperation("微信查询技师列表")
     public R wxSelect(Page<TJs> page, TJsVo js) {
         try {
+            log.info("微信查询技师列表,请求参数:{}", JSON.toJSONString(js));
             if (js.getLatitude() != null && js.getLongitude() != null) {
                 // 检查经纬度是否在合理范围内
                 Location location = new Location();
@@ -230,16 +232,16 @@ public class TJsController extends BaseController {
                 location.setLimit(100L); // 考虑将此值作为参数或配置项
                 location.setRadius(1000.00);
                 List<TJs> nearbyTechnicians = locationUtil.dis(location);
+                log.info("附近的技师:{}",JSON.toJSONString(nearbyTechnicians));
+
                 if (nearbyTechnicians != null) {
                     Map<String, BigDecimal> collect = nearbyTechnicians.stream().collect(Collectors.toMap(TJs::getcPhone, TJs::getDistance));
                     js.setIds(nearbyTechnicians.stream().map(TJs::getcPhone).collect(Collectors.toList()));
-                    log.info("缓存技师===========>:{}", JSONUtil.toJsonStr(nearbyTechnicians.stream().map(TJs::getcPhone).collect(Collectors.toList())));
+                    log.info("缓存技师:{}", JSONUtil.toJsonStr(nearbyTechnicians.stream().map(TJs::getcPhone).collect(Collectors.toList())));
 
-                    int size = (int) page.getSize();
                     int pageNum = (int) page.getCurrent();
+                    int size = (int) page.getSize();
 
-                    page.setCurrent(1);
-                    page.setSize(100);
                     Page<TJs> all = jsService.getAll(page, js);
                     log.info("总条数============>:{},当前页:{}", all.getRecords().size(), pageNum);
                     all.getRecords().forEach(item -> {

+ 1 - 1
nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/TJsVo.java

@@ -26,7 +26,7 @@ public class TJsVo extends TJs {
     private String free;
 
     /**
-     *
+     * 技师的手机号码列表
      */
     private List<String> ids;
 

+ 5 - 5
nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TbFileServiceImpl.java

@@ -118,12 +118,12 @@ public class TbFileServiceImpl extends ServiceImpl<TbFileMapper, TbFile> impleme
             TbFile dbFile = this.getByMd5(md5);
             if (null != dbFile) {
                 // 文件已存在,直接返回已有文件的访问信息(秒传)
-                ajax.put("url", serverConfig.getUrl() + dbFile.getFileUrl());
+                ajax.put("url",  dbFile.getFileUrl());
                 ajax.put("fileName", dbFile.getFileUrl());
                 ajax.put("newFileName", FileUtils.getName(dbFile.getFileUrl()));
                 ajax.put("originalFilename", dbFile.getFileName());
                 // 封面图URL路径(针对视频文件)
-                ajax.put("coverUrl", serverConfig.getUrl()+dbFile.getCoverUrl());
+                ajax.put("coverUrl", dbFile.getCoverUrl());
                 return ajax;
             }
 
@@ -148,13 +148,13 @@ public class TbFileServiceImpl extends ServiceImpl<TbFileMapper, TbFile> impleme
             substring = substring.replace("\\", "/");
 
             // 构建文件访问的完整 URL
-            String url = serverConfig.getUrl() + fileName;
-            ajax.put("url", url);
+            //String url = serverConfig.getUrl() + fileName;
+            ajax.put("url", fileName);
             ajax.put("fileName", fileName);
             ajax.put("newFileName", FileUtils.getName(fileName));
             ajax.put("originalFilename", file.getOriginalFilename());
             // 封面图URL路径(针对视频文件)
-            ajax.put("coverUrl",  serverConfig.getUrl() +substring);
+            ajax.put("coverUrl",  substring);
 
             // 保存文件记录到数据库
             TbFile tbFile = new TbFile();