途宝报单新需求 09点09分

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wx/AttachmngsController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.wx;
 
 
+import com.ruoyi.common.MapUtils;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.AddWatermarkUtil;
@@ -8,26 +9,13 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.AttachMngs;
 import com.ruoyi.system.service.IAttachMngsService;
 import net.coobird.thumbnailator.Thumbnails;
-import org.apache.commons.compress.utils.IOUtils;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-
-import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import java.awt.*;
-import java.awt.font.FontRenderContext;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
 import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/attachmngs")
@@ -36,6 +24,9 @@ public class AttachmngsController {
     @Autowired
     private IAttachMngsService attachMngsService;
 
+    @Autowired
+    private MapUtils mapUtils;
+
     /**
      * 上传图片
      *
@@ -56,15 +47,19 @@ public class AttachmngsController {
             return AjaxResult.error("上传失败请重试1");
         }
 
-
         System.out.println("水印时间");
         System.out.println(date);
 
         // 水印
 //         String watermark = longitude + "," + latitude + "-" + date;
+
+        String address = mapUtils.pointsToLocationsAll(longitude + "," + latitude);
+
         SysUser user = SecurityUtils.getLoginUser().getUser();
 //        String watermark = longitude + "," + latitude + "-" + date + "-" + user.getNickName();
-        String watermark = date;
+        String watermark = address + "||" + date + "||" + user.getNickName();
+        System.out.println(watermark);
+//        String watermark = date;
         File file2 = AddWatermarkUtil.transferToFile(file);
         // addWaterMark(file2, file2, watermark);
 
@@ -101,7 +96,8 @@ public class AttachmngsController {
         String serverName = request.getServerName();
         int serverPort = request.getServerPort();
 
-        return AjaxResult.success("操作成功", "http://" + serverName + ":" + serverPort + "/attachmngs/img/" + attachId);
+//        return AjaxResult.success("操作成功", "http://" + serverName + ":" + serverPort + "/attachmngs/img/" + attachId);
+        return AjaxResult.success("操作成功", "https://yd.echepei.com/prod-api/attachmngs/img/" + attachId);
     }
 
     /**