From df24d19b94e10009c54bf4de7182924059e8d319 Mon Sep 17 00:00:00 2001 From: majintao Date: Thu, 10 Oct 2024 14:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=8C=BA=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=88=B0=E6=88=91=E4=BB=AC=E7=9A=84=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevelopmentZoneController.java | 31 +++++++++++++- .../bkoff/model/DevelopmentZoneModel.java | 11 +++++ .../src/main/webapp/developmentZone/edit.ftl | 40 ++++++++----------- .../main/webapp/developmentZone/editFence.ftl | 13 +++--- .../src/main/webapp/developmentZone/show.ftl | 24 +++++++---- .../webapp/villageIdentify/importResult.ftl | 1 - 6 files changed, 81 insertions(+), 39 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java index 9cc24280f..b837cd5cd 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java @@ -3,9 +3,11 @@ package com.fangjia.bkoff.controllers; import com.fangjia.bkoff.model.DevelopmentZoneModel; import com.fangjia.bkoff.model.JsonModel; import com.fangjia.bkoff.model.LatlngPolygonModel; +import com.fangjia.bkoff.util.ExcelUtils; import com.fangjia.core.util.GeoUtils; import com.fangjia.core.util.ThreadLocalData; import com.fangjia.core.util.ThreadLocalKey; +import com.fangjia.dal.QueryParam; import com.fangjia.dal.mongo.model.DevelopmentZone; import com.fangjia.dal.mongo.model.LatlngPolygon; import com.fangjia.dal.mongo.model.StatsIndex; @@ -13,9 +15,19 @@ import com.fangjia.dal.mongo.model.bkoff.BkoffUsers; import com.fangjia.service.mongo.bkoff.BkoffUsersService; import com.fangjia.service.mongo.fangjia.DevelopmentZoneService; import com.fangjia.service.mongo.fangjia.LatlngPolygonService; +import com.mashape.unirest.http.HttpResponse; +import com.mashape.unirest.http.Unirest; +import com.mashape.unirest.http.exceptions.UnirestException; import org.apache.commons.lang.StringUtils; +import org.json.JSONException; +import org.json.JSONObject; import org.sothis.core.util.Pager; +import org.sothis.web.mvc.ActionContext; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.util.*; import static com.fangjia.core.util.GeoUtils.LAT; @@ -214,7 +226,7 @@ public class DevelopmentZoneController { if (StringUtils.isNotBlank(model.getDistrict())) { udata.put("district", model.getDistrict()); } - if (StringUtils.isNotBlank(model.getImgUrl())){ + if (StringUtils.isNotBlank(model.getImgUrl())) { udata.put("imgUrl", model.getImgUrl()); } udata.put("createTime", new Date()); @@ -272,5 +284,22 @@ public class DevelopmentZoneController { return gdLocationList; } + public Object uploadAction(DevelopmentZoneModel model) throws IOException, UnirestException, JSONException { + JsonModel ret = new JsonModel(); + Map data = new HashMap(); + File file = model.getFile(); + HttpResponse response = Unirest.post("http://open.fangjia.com/files/uploadGridFs") + .field("file", file) + .field("token", "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB") + .asString(); + // »ñȡ·µ»صÄÁ´½Ó + JSONObject jsonResponse = new JSONObject(response.getBody()); + String link = jsonResponse.getJSONObject("result").getString("link"); + data.put("imgUrl", link); + data.put("msg", "ͼƬÉϴ«³ɹ¦"); + ret.setJsonModel(data); + return ret; + } + } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java index a4b4e7552..25ddafe94 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java @@ -3,6 +3,7 @@ package com.fangjia.bkoff.model; import com.fangjia.dal.mongo.model.DevelopmentZone; import com.fangjia.dal.mongo.model.LatlngPolygon; +import java.io.File; import java.util.Date; import java.util.List; import java.util.Map; @@ -37,6 +38,8 @@ public class DevelopmentZoneModel extends BaseModel { private String imgUrl; + private File file; + public String getAlias() { return alias; } @@ -204,4 +207,12 @@ public class DevelopmentZoneModel extends BaseModel { public void setImgUrl(String imgUrl) { this.imgUrl = imgUrl; } + + public File getFile() { + return file; + } + + public void setFile(File file) { + this.file = file; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl index 40a4af521..3a6ee785c 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl @@ -188,38 +188,32 @@ document.getElementById('fileInput').addEventListener('change', async () => { const fileInput = document.getElementById('fileInput'); const file = fileInput.files[0]; - const token = "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"; if (!file) { alert('请选择一个文件!'); return; } + + // 使用 FormData 传输文件 const formData = new FormData(); formData.append('file', file); - formData.append('token', token); // 将 token 作为请求参数 - try { - // 发送 POST 请求上传文件 - const response = await fetch('http://open.fangjia.com/files/uploadGridFs', { - method: 'POST', - body: formData, - }); - - const result = await response.json(); - - if (result.result.link) { // 假设返回值包含图片URL - console.log(result.result.link); - document.getElementById('imgUrl').value = result.result.link; // 将图片URL赋值给 imgUrl 输入框 - } else { - alert('上传失败,未能获取图片URL'); + $.ajax({ + url: '../developmentZone/upload', + type: 'POST', + data: formData, + cache: false, + contentType: false, + processData: false, + success: function (data) { + document.getElementById('imgUrl').value = JSON.parse(data).imgUrl; + alert('上传成功!'); + console.log(data); + }, + error: function (returndata) { + alert("上传失败!"); } - - document.getElementById('response').innerText = '上传成功'; - - } catch (error) { - console.error('上传失败:', error); - document.getElementById('response').innerText = '上传失败,请查看控制台。'; - } + }); });