From 553b053d458858f8b920189f955c93d9766e86a0 Mon Sep 17 00:00:00 2001 From: majintao Date: Tue, 23 Jul 2024 10:02:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B6=89=E5=86=9C=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=AF=BC=E5=85=A5excel=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VillageIdentifyController.java | 47 ++++++ .../main/resources/涉农结果导入å�Žå�°æ¨¡æ�¿.xlsx | Bin 0 -> 10374 bytes .../open/controllers/AddrSvcController.java | 135 +++++++++++------- 3 files changed, 134 insertions(+), 48 deletions(-) create mode 100644 projects/fangjia-bkoff/src/main/resources/涉农结果导入å�Žå�°æ¨¡æ�¿.xlsx diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java index 8d9325f21..923bf4f97 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java @@ -11,11 +11,17 @@ import org.apache.commons.lang.StringUtils; import org.sothis.core.util.Pager; import org.sothis.web.mvc.ActionContext; import org.sothis.web.mvc.interceptors.MultipartHttpServletRequest; +import org.springframework.core.io.ClassPathResource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; import java.util.*; +import java.net.URLEncoder; public class VillageIdentifyController { private VillageIdentifyService villageIdentifyService; @@ -27,6 +33,47 @@ public class VillageIdentifyController { return model; } + public void expectAction(HttpServletRequest request, HttpServletResponse response) throws IOException { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + + // ±àÂëÎļþÃû£¬±ÜÃâÂÒÂë + String fileName = "ɿũ½á¹ûµ¼Èëºǫ́ģ°å.xlsx"; + String encodedFileName = encodeFileName(fileName, request); + + // ÉèÖà Content-Disposition ÏìӦͷ + response.setHeader("Content-Disposition", "attachment; filename=\"" + encodedFileName + "\""); + + // ʹÓà ClassPathResource À´»ñÈ¡×ÊÔ´Îļþ + ClassPathResource resource = new ClassPathResource(fileName); + InputStream in = resource.getInputStream(); + OutputStream out = response.getOutputStream(); + + byte[] buffer = new byte[1024]; + int bytesRead; + + while ((bytesRead = in.read(buffer)) != -1) { + out.write(buffer, 0, bytesRead); + } + + out.flush(); + + } + + private String encodeFileName(String fileName, HttpServletRequest request) throws IOException { + String userAgent = request.getHeader("User-Agent"); + String encodedFileName; + + if (userAgent.contains("MSIE") || userAgent.contains("Trident")) { + // Õë¶ÔIEä¯ÀÀÆ÷ + encodedFileName = URLEncoder.encode(fileName, "UTF-8").replace("+", "%20"); + } else { + // Õë¶ÔÆäËûä¯ÀÀÆ÷ + encodedFileName = new String(fileName.getBytes("UTF-8"), "ISO-8859-1"); + } + + return encodedFileName; + } + public Object uploadAction(HttpServletRequest request) throws IOException { Object fileInputStream = ActionContext.getContext().getParameters().get("fileInputStream")[0]; JsonModel ret = new JsonModel(); diff --git a/projects/fangjia-bkoff/src/main/resources/涉农结果导入å�Žå�°æ¨¡æ�¿.xlsx b/projects/fangjia-bkoff/src/main/resources/涉农结果导入å�Žå�°æ¨¡æ�¿.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..f43174e2b9162bf0089bcf1e86bc7713371773e0 GIT binary patch literal 10374 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 resultMap = new HashMap(); + resultMap.put("province",villageResult.getProvince()); + resultMap.put("city",villageResult.getCity1()); + resultMap.put("district",villageResult.getDistrict()); + resultMap.put("town",villageResult.getTown()); + resultMap.put("committee",villageResult.getCommittee()); + resultMap.put("provinceCode",villageResult.getCityCode()); + resultMap.put("cityCode",villageResult.getCityCode()); + resultMap.put("districtCode",villageResult.getDistrictCode()); + resultMap.put("townCode",villageResult.getTownCode()); + resultMap.put("committeeCode",villageResult.getCommitteeCode()); + resultMap.put("typeCode",villageResult.getTypeCode()); + resultMap.put("typeName",villageResult.getTypeName()); + resultMap.put("verifyFlag",villageResult.getVerifyFlag()); + resultMap.put("addrVerify", villageResult.getAddrVerify()); + resultMap.put("countyLevelCity",villageResult.getCountyLevelCity()); + resultMap.put("administrativeTowns",villageResult.getAdministrativeTowns()); + resultMap.put("countyGov",villageResult.getCountyGov()); + resultMap.put("devDistrict",villageResult.getDevDistrict()); + resultMap.put("devDistrictName",villageResult.getDevDistrictName()); + resultMap.put("devLevel",villageResult.getDevLevel()); + resultMap.put("addrArea",villageResult.getAddrArea()); + BasicModel basicModel = new BasicModel(200, "OK"); + basicModel.setResult(resultMap); + mav.setModel(basicModel); + } else { // params.put("showTestValue", "2"); - Integer radius = model.getRadius(); - params.put("radius", (radius != null && radius != 0) ? radius.toString() : null); - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/villageIdentify", params, "UTF-8"); - } catch (Exception e) { + Integer radius = model.getRadius(); + params.put("radius", (radius != null && radius != 0) ? radius.toString() : null); try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/villageIdentify", params, "UTF-8"); - } catch (Exception ex) { - ex.printStackTrace(); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/villageIdentify", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } } - } - if (json != null) { - int code = json.getInt("msgCode"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if (json.containsKey("result")) { - //ÎÒÃǵĽá¹û - JSONObject result = json.getJSONObject("result"); - //ÎÒÃÇÊ¡¼¶¼°ÒÔÉÏÓпª·¢Çø£¬Ö±½ÓÓÃÎÒÃǵĽá¹û - if (result.containsKey("devDistrictName")) { - basicModel.setResult(result); - } else { - try { - //Èç¹ûÊǽ­ËÕÊ¡»òÕßÕã½­Ê¡ µ÷ÓÃÆëÁºµÄ½á¹û - if ("½­ËÕÊ¡".equals(result.getString("province")) || "Õã½­Ê¡".equals(result.getString("province"))) { + if (json != null) { + int code = json.getInt("msgCode"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + //ÎÒÃǵĽá¹û + JSONObject result = json.getJSONObject("result"); + //ÎÒÃÇÊ¡¼¶¼°ÒÔÉÏÓпª·¢Çø£¬Ö±½ÓÓÃÎÒÃǵĽá¹û + if (result.containsKey("devDistrictName")) { + basicModel.setResult(result); - //½á¹û±È½Ï£¬Èç¹ûɿũ½á¹û²»Ò»Ö - //µ÷ÓÃÆëÁº type £º1 ¶Ô¹« 0 ¶Ô˽ - //ÎÒÃÇ type £º1 ¶Ô˽ 2 ¶Ô¹² - String qltype = "2".equals(type) ? "1" : "0"; - Map map = senRequest(address, qltype); - // ɿũ½á¹û²»Ò»Ñù - if (!map.get("verifyFlag").equals(result.get("verifyFlag"))) { - //ÓÐÊÐϽ½¨ÖÆÕò, »òÕß³ÇÊв»Ò»Ñù ÓÃÎÒÃÇ - if (result.containsKey("city")) { - if ("ÊÇ".equals(result.get("administrativeTowns")) || (!result.get("city").equals(map.get("city")) && StringUtils.isNotBlank(result.getString("city")))) { - basicModel.setResult(result); + } else { + try { + //Èç¹ûÊǽ­ËÕÊ¡»òÕßÕã½­Ê¡ µ÷ÓÃÆëÁºµÄ½á¹û + if ("½­ËÕÊ¡".equals(result.getString("province")) || "Õã½­Ê¡".equals(result.getString("province"))) { + + //½á¹û±È½Ï£¬Èç¹ûɿũ½á¹û²»Ò»Ö + //µ÷ÓÃÆëÁº type £º1 ¶Ô¹« 0 ¶Ô˽ + //ÎÒÃÇ type £º1 ¶Ô˽ 2 ¶Ô¹² + String qltype = "2".equals(type) ? "1" : "0"; + Map map = senRequest(address, qltype); + // ɿũ½á¹û²»Ò»Ñù + if (!map.get("verifyFlag").equals(result.get("verifyFlag"))) { + //ÓÐÊÐϽ½¨ÖÆÕò, »òÕß³ÇÊв»Ò»Ñù ÓÃÎÒÃÇ + if (result.containsKey("city")) { + if ("ÊÇ".equals(result.get("administrativeTowns")) || (!result.get("city").equals(map.get("city")) && StringUtils.isNotBlank(result.getString("city")))) { + basicModel.setResult(result); + } else { + map.put("addrVerify", "µØÖ·ÓÐЧ"); + map.put("typeName", areaMap.get(map.get("typeCode"))); + basicModel.setResult(map); + } } else { map.put("addrVerify", "µØÖ·ÓÐЧ"); map.put("typeName", areaMap.get(map.get("typeCode"))); basicModel.setResult(map); } + } else { - map.put("addrVerify", "µØÖ·ÓÐЧ"); - map.put("typeName", areaMap.get(map.get("typeCode"))); - basicModel.setResult(map); + basicModel.setResult(result); } } else { basicModel.setResult(result); + } - } else { + } catch (Exception e) { + e.printStackTrace(); basicModel.setResult(result); - } - } catch (Exception e) { - e.printStackTrace(); - basicModel.setResult(result); } } - + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); } return mav; } @@ -757,8 +792,8 @@ public class AddrSvcController { params.put("district", StringUtils.isNotBlank(model.getDistrict()) ? model.getDistrict() : null); params.put("keywords", StringUtils.isNotBlank(model.getKeywords()) ? model.getKeywords() : null); if (StringUtils.isNotBlank(model.getLng()) && StringUtils.isNotBlank(model.getLat())) { - params.put("lat",model.getLat()); - params.put("lng",model.getLng()); + params.put("lat", model.getLat()); + params.put("lng", model.getLng()); } Integer radius = model.getRadius(); params.put("radius", (radius != null && radius != 0) ? radius.toString() : null); @@ -793,4 +828,8 @@ public class AddrSvcController { public void setDistrictService(DistrictService districtService) { this.districtService = districtService; } + + public void setVillageIdentifyService(VillageIdentifyService villageIdentifyService) { + this.villageIdentifyService = villageIdentifyService; + } }