From 4fd3f760a30adf230f85b3e82d9a72af407266e7 Mon Sep 17 00:00:00 2001 From: 张洋洋 <10611411+yang-yang-z@user.noreply.gitee.com> Date: 星期四, 20 二月 2025 11:14:01 +0800 Subject: [PATCH] [add]服务发布 --- src/main/java/com/se/simu/utils/CsvToSQLiteUtils.java | 64 ++++++++++++++++ src/main/java/com/se/simu/service/Impl/ProjectRelatedServiceImpl.java | 16 ++- src/main/java/com/se/simu/utils/EntityLibraryUtils.java | 1 src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java | 12 +++ src/main/java/com/se/simu/enums/RadioEnums.java | 33 ++++++++ src/main/java/com/se/simu/controller/SimuController.java | 100 ++++++++++++++++-------- 6 files changed, 185 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java index 9374580..0c4bcad 100644 --- a/src/main/java/com/se/simu/controller/SimuController.java +++ b/src/main/java/com/se/simu/controller/SimuController.java @@ -11,6 +11,7 @@ import com.se.simu.domain.po.DataPo; import com.se.simu.domain.po.SimuPo; import com.se.simu.domain.vo.*; +import com.se.simu.enums.RadioEnums; import com.se.simu.service.*; import com.se.simu.utils.*; import io.swagger.annotations.*; @@ -24,10 +25,13 @@ import javax.annotation.Resource; import java.io.*; +import java.math.BigDecimal; import java.net.URL; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -231,6 +235,9 @@ if (StringUtils.isEmpty(floodFile)) { return fail("鑼冨洿鏂囦欢鍦板潃涓嶈兘涓虹┖", false); } else { + // todo: 瑙f瀽鑼冨洿鏂囦欢 鏍规嵁涓嶅悓鐨勭殑鏍煎紡鏂囦欢杩涜涓嶅悓鐨勮В鏋愶紝鑾峰彇闇�瑕佽绠楃殑鑼冨洿鍊� + // 涓婁紶鏍煎紡锛�.shp/.tiff/.img/.geojson + // 閲嶆柊缁檝o璧嬪�� // 鑾峰彇鏂囦欢鐨勫悗缂�鍚� String fileName = floodFile.substring(floodFile.lastIndexOf(".")); // 鍒ゆ柇鍚庣紑鍚嶆槸鍚︿负.shp @@ -252,54 +259,79 @@ rangeVerify(minX, maxX, minY, maxY); } } - // todo: 瑙f瀽鑼冨洿鏂囦欢 鏍规嵁涓嶅悓鐨勭殑鏍煎紡鏂囦欢杩涜涓嶅悓鐨勮В鏋愶紝鑾峰彇闇�瑕佽绠楃殑鑼冨洿鍊� - // 涓婁紶鏍煎紡锛�.shp/.tiff/.img/.geojson - // 閲嶆柊缁檝o璧嬪�� } catch (Exception e) { log.error("瑙f瀽鑼冨洿鏂囦欢澶辫触"); if (null == vo.getMinx() || null == vo.getMiny() || null == vo.getMaxx() || null == vo.getMaxy()) { return fail("瑙f瀽鑼冨洿鏂囦欢澶辫触锛侀�夋嫨鑼冨洿涓嶈兘涓虹┖锛岃閲嶆柊閫夋嫨鏂囦欢锛�", false); } } - JSONArray jsonArray = new JSONArray(); String stationFile = vo.getStationFile(); log.info("绔欑偣鏂囦欢shp鍦板潃锛歿}", stationFile); try { - // 鍒ゆ柇鍦板潃涓嶄负绌� - if (StringUtils.isEmpty(stationFile)) { - return fail("绔欑偣鏂囦欢shp鍦板潃涓嶈兘涓虹┖", false); + if (RadioEnums.ACCESS.getCode().equals(vo.getRadio()) && StringUtils.isNotEmpty(stationFile)) { + // 1 璇诲彇shp鏂囦欢锛岃幏鍙栫珯鐐瑰潗鏍囧�� + ShpToolUtils.readShpGetLocal(stationFile); } - // 1 璇诲彇shp鏂囦欢锛岃幏鍙栫珯鐐瑰潗鏍囧�� - jsonArray = ShpToolUtils.readShpGetLocal(stationFile); - System.out.println("jsonArray = " + jsonArray); } catch (Exception e) { log.error("瑙f瀽绔欑偣鏂囦欢shp澶辫触"); } - - String stationRainFile = vo.getStationRainFile(); - log.info("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃锛歿}", floodFile); - JSONArray array = new JSONArray(); // 鍒涘缓琛ㄥ悕 鏃堕棿鎴� String tableName = "station_rain_" + System.currentTimeMillis(); try { - // 鍒ゆ柇鍦板潃涓嶄负绌� - if (StringUtils.isEmpty(stationRainFile)) { - return fail("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃涓嶈兘涓虹┖", false); + //鎺ュ叆澶勭悊 + if (RadioEnums.ACCESS.getCode().equals(vo.getRadio())) { + String stationRainFile = vo.getStationRainFile(); + log.info("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃锛歿}", floodFile); + // 鍒ゆ柇鍦板潃涓嶄负绌� + if (StringUtils.isEmpty(stationRainFile)) { + return fail("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃涓嶈兘涓虹┖", false); + } + // 1 璇诲彇CSV 鏂囦欢 + CsvToSQLiteUtils.readCsvSaveLocal(stationRainFile, tableName); + // 鑾峰彇浠跨湡鏃堕棿 duration + Integer duration = CsvToSQLiteUtils.getDuration(tableName); + log.info("浠跨湡鏃堕棿 duration = {}", duration); + vo.setDuration(duration); + // 鑾峰彇闄嶉洦鎬婚噺 total + Double total = CsvToSQLiteUtils.getTotal(tableName); + log.info("闄嶉洦鎬婚噺 total = {}", total); + vo.setTotal(total); + } else if (RadioEnums.SIMULATE.getCode().equals(vo.getRadio())) { + if (StringUtils.isEmpty(vo.getStation())) { + return fail("妯℃嫙璁$畻绔欑偣涓嶈兘涓虹┖锛�", false); + } + if (vo.getTotal() == null) { + return fail("妯℃嫙璁$畻闄嶉洦閲忎笉鑳戒负绌猴紒", false); + } + if (vo.getDuration() == null || vo.getDuration() <= 0) { + return fail("妯℃嫙璁$畻璁$畻鏃堕暱涓嶈兘涓虹┖锛�", false); + } + if (vo.getStationLatitude() == null) { + return fail("妯℃嫙璁$畻璁$畻鍧愭爣锛�", false); + } + if (vo.getStationLongitude() == null) { + return fail("妯℃嫙璁$畻璁$畻鍧愭爣锛�", false); + } + double aveTotal = BigDecimal.valueOf(vo.getTotal()).divide(BigDecimal.valueOf(vo.getDuration()), 2, BigDecimal.ROUND_HALF_UP).doubleValue(); + JSONArray jsonArray=new JSONArray(); + LocalDateTime now=LocalDateTime.now(); + DateTimeFormatter customFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm"); + for (int i=0;i<vo.getDuration();i++){ + JSONObject jsonObject=new JSONObject(); + jsonObject.put("stationName", vo.getStation()); + jsonObject.put("rainfall", aveTotal); + jsonObject.put("longitude", vo.getStationLongitude()); + jsonObject.put("latitude", vo.getStationLatitude()); + LocalDateTime plusMinutes = now.plusMinutes(i); + jsonObject.put("datetime", customFormatter.format(plusMinutes)); + jsonArray.add(jsonObject); + } + CsvToSQLiteUtils.readCsvSaveLocal(jsonArray, tableName); + } else { + return fail("鏃犳晥鐨勬ā鍨嬭绠楁柟寮�", false); } - // 1 璇诲彇CSV 鏂囦欢 - array = CsvToSQLiteUtils.readCsvSaveLocal(stationRainFile, tableName); - // 鑾峰彇浠跨湡鏃堕棿 duration - Integer duration = CsvToSQLiteUtils.getDuration(tableName); - log.info("浠跨湡鏃堕棿 duration = {}", duration); - vo.setDuration(duration); - - // 鑾峰彇闄嶉洦鎬婚噺 total - Double total = CsvToSQLiteUtils.getTotal(tableName); - log.info("闄嶉洦鎬婚噺 total = {}", total); - vo.setTotal(total); - } catch (Exception e) { - log.error("瑙f瀽绔欑偣闆ㄩ噺CSV鏂囦欢澶辫触"); + return fail("闆ㄩ噺澶勭悊澶辫触锛�", false); } // TODO: 2024/12/24 鏍规嵁杩欎簺鏂囦欢鐨勫湴鍧�锛岃幏鍙栨枃浠跺唴瀹癸紝鍒涘缓浠跨湡瑙嗗浘 try { @@ -356,22 +388,22 @@ @ApiOperation(value = "鑾峰彇鐐硅矾寰�") @GetMapping("/getPointUrl") - public R<String> getPointUrl(@RequestParam("id") Integer id) throws Exception{ + public R<String> getPointUrl(@RequestParam("id") Integer id) throws Exception { SimuPo po = simuService.getSimuById(id); String token = EntityLibraryUtils.login(); if (po != null) { - return success(po.getPointUrl().replace("{token}",token)); + return success(po.getPointUrl().replace("{token}", token)); } return success(null); } @ApiOperation(value = "鑾峰彇绾胯矾寰�") @GetMapping("/getLineUrl") - public R<String> getLineUrl(@RequestParam("id") Integer id) throws Exception{ + public R<String> getLineUrl(@RequestParam("id") Integer id) throws Exception { SimuPo po = simuService.getSimuById(id); String token = EntityLibraryUtils.login(); if (po != null) { - return success(po.getLinkUrl().replace("{token}",token)); + return success(po.getLinkUrl().replace("{token}", token)); } return success(null); } diff --git a/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java b/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java index e7888d1..d8dcb61 100644 --- a/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java +++ b/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java @@ -94,4 +94,16 @@ @ApiModelProperty("绾跨敓鎴愯矾寰�") private String linkName; + @ApiModelProperty("妯″瀷璁$畻鏂瑰紡锛�1=妯℃嫙锛�2=鎺ュ叆") + private String radio; + + @ApiModelProperty("绔欑偣鍚嶇О") + private String station; + + @ApiModelProperty("绔欑偣缁忓害") + private Double stationLongitude; + + @ApiModelProperty("绔欑偣绾害") + private Double stationLatitude; + } diff --git a/src/main/java/com/se/simu/enums/RadioEnums.java b/src/main/java/com/se/simu/enums/RadioEnums.java new file mode 100644 index 0000000..077b2c5 --- /dev/null +++ b/src/main/java/com/se/simu/enums/RadioEnums.java @@ -0,0 +1,33 @@ +package com.se.simu.enums; + + + +public enum RadioEnums { + SIMULATE("1", "妯℃嫙"), + ACCESS("2", "鎺ュ叆"); + + private String code; + private String name; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + RadioEnums(String code, String name) { + this.code = code; + this.name = name; + } + +} diff --git a/src/main/java/com/se/simu/service/Impl/ProjectRelatedServiceImpl.java b/src/main/java/com/se/simu/service/Impl/ProjectRelatedServiceImpl.java index b0352cc..e3ffd4c 100644 --- a/src/main/java/com/se/simu/service/Impl/ProjectRelatedServiceImpl.java +++ b/src/main/java/com/se/simu/service/Impl/ProjectRelatedServiceImpl.java @@ -12,6 +12,7 @@ import com.se.simu.helper.CaffeineHelper; import com.se.simu.service.ProjectRelatedService; import com.se.simu.utils.CustomWebClient; +import com.se.simu.utils.EntityLibraryUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -308,12 +309,13 @@ if (!isExists) { token = (String) CaffeineHelper.get(CacheConstants.USER_CACHE_KEY + "entity_db_token"); } else { - // 鑾峰彇token - LoginParams loginParams = new LoginParams(); - loginParams.setUserid("admin"); - loginParams.setPassword("admin"); - loginEntity(loginParams); - token = (String) CaffeineHelper.get(CacheConstants.USER_CACHE_KEY + "entity_db_token"); + try { + token = EntityLibraryUtils.login(); + CaffeineHelper.remove(CacheConstants.USER_CACHE_KEY + "entity_db_token"); + CaffeineHelper.put(CacheConstants.USER_CACHE_KEY + "entity_db_token", token); + }catch (Exception e){ + return "鐧诲綍澶辫触锛�"; + } } log.info("token = " + token); // 娣诲姞form鍙傛暟 @@ -323,7 +325,7 @@ params.put("containCount", true); params.put("count", Objects.nonNull(entityTypeInfo.getCount()) ? entityTypeInfo.getCount() : 20); params.put("dbid", Objects.nonNull(entityTypeInfo.getDbid()) ? entityTypeInfo.getDbid() : "85257774fdb64e5f99f6778696cad02a"); - params.put("layerid", Objects.nonNull(entityTypeInfo.getLayerid()) ? entityTypeInfo.getLayerid() : "f6ff4412-4886-4c4b-83f7-13de24ee8353"); + params.put("layerid", Objects.nonNull(entityTypeInfo.getLayerid()) ? entityTypeInfo.getLayerid() : "8208c5be-adc1-4e7b-b952-37362e0bef32"); params.put("like", ""); params.put("querytype", "entity"); diff --git a/src/main/java/com/se/simu/utils/CsvToSQLiteUtils.java b/src/main/java/com/se/simu/utils/CsvToSQLiteUtils.java index 46d9e63..85b398f 100644 --- a/src/main/java/com/se/simu/utils/CsvToSQLiteUtils.java +++ b/src/main/java/com/se/simu/utils/CsvToSQLiteUtils.java @@ -157,6 +157,35 @@ } } + /** + * 璇诲彇 CSV 淇濆瓨鏈湴 + * + * @param array 鏁版嵁 + * @param tableName 琛ㄥ悕绉� + */ + public static void readCsvSaveLocal(JSONArray array, String tableName) { + // 1. 鍒涘缓SQLite鏁版嵁搴撹繛鎺� + try (Connection conn = DriverManager.getConnection("jdbc:sqlite:rainfall.db")) { + if (conn != null) { + // 2. 鍒涘缓琛紙濡傛灉涓嶅瓨鍦級 + createTableIfNotExists(conn, tableName); + // 3. 璁剧疆SQLite杩炴帴鐨勫瓧绗︾紪鐮佷负UTF-8 + try (Statement stmt = conn.createStatement()) { + // 璁剧疆SQLite缂栫爜涓篣TF-8 + stmt.execute("PRAGMA encoding = 'UTF-8';"); + } + // 4. 寮�濮嬩簨鍔� + conn.setAutoCommit(false); + // 5. 璇诲彇CSV鏂囦欢骞舵彃鍏ユ暟鎹� + readCsvAndInsertDatas(array, conn, tableName); + // 6. 鎻愪氦浜嬪姟 + conn.commit(); + System.out.println("鏁版嵁鎴愬姛鎻掑叆鍒癝QLite鏁版嵁搴擄紒"); + } + } catch (SQLException e) { + System.err.println("SQLite杩炴帴澶辫触: " + e.getMessage()); + } + } /** * 璇诲彇 CSV 淇濆瓨鏈湴 @@ -190,6 +219,41 @@ return array; } + private static void readCsvAndInsertDatas(JSONArray array, Connection conn, String tableName) { + + String insertDataSql = "INSERT INTO " + tableName + " (station_name, rainfall, longitude, latitude, datetime) VALUES (?, ?, ?, ?, ?);"; + try (PreparedStatement pstmt = conn.prepareStatement(insertDataSql)) { + // 鎵归噺澶у皬 + int batchSize = 1000; + int count = 0; + for (int i = 0; i < array.size(); i++) { + JSONObject object = array.getJSONObject(i); + // 鑾峰彇姣忎竴鍒楃殑鏁版嵁 + String stationName = object.getString("stationName"); + double rainfall = object.getDouble("rainfall"); + double longitude = object.getDouble("longitude"); + double latitude = object.getDouble("latitude"); + String datetime = object.getString("datetime"); + // 璁剧疆鎻掑叆鏁版嵁鐨勫弬鏁� + pstmt.setString(1, stationName); + pstmt.setDouble(2, rainfall); + pstmt.setDouble(3, longitude); + pstmt.setDouble(4, latitude); + pstmt.setString(5, datetime); + // 娣诲姞鍒版壒澶勭悊 + pstmt.addBatch(); + count++; + // 姣廱atchSize鏉℃暟鎹墽琛屼竴娆℃壒閲忔彃鍏� + if (count % batchSize == 0) { + pstmt.executeBatch(); + } + } + // 鎵ц鍓╀綑鐨勬壒閲忔彃鍏� + pstmt.executeBatch(); + } catch (SQLException e) { + System.err.println("鎵归噺鎻掑叆鏁版嵁鏃跺嚭閿�: " + e.getMessage()); + } + } private static JSONArray readCsvAndInsertDatas(String csvFilePath, Connection conn, String tableName) { // 浣跨敤 Apache Commons CSV 璇诲彇CSV鏂囦欢 diff --git a/src/main/java/com/se/simu/utils/EntityLibraryUtils.java b/src/main/java/com/se/simu/utils/EntityLibraryUtils.java index 2fec649..f5d4b09 100644 --- a/src/main/java/com/se/simu/utils/EntityLibraryUtils.java +++ b/src/main/java/com/se/simu/utils/EntityLibraryUtils.java @@ -17,6 +17,7 @@ import java.security.interfaces.RSAPublicKey; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; +import java.time.LocalDateTime; import java.util.List; /** -- Gitblit v1.9.3