From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 21 二月 2025 09:52:14 +0800
Subject: [PATCH] 针对王江海制定的协议： 1、优化相关注释； 2、优化代码； 3、协议中报警信息有变化：外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java
index ae52a49..5d00701 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java
@@ -79,23 +79,44 @@
/**
* 閫氳繃鐓х墖璺緞锛屽緱鍒板搴旂缉鐣ュ浘鐨勮矾寰�
- * @param imgPath
+ * @param filePath
* @return
*/
- public String getImgFileZipPath(String imgPath){
+ public String getFileZipPath(String filePath){
String path_ = null ;
String prePath = null ;
String tailPath = null ;
- if(imgPath != null && !imgPath.trim().equals("")) {
- int lastDotIndex = imgPath.lastIndexOf('.');
+ if(filePath != null && !filePath.trim().equals("")) {
+ int lastDotIndex = filePath.lastIndexOf('.');
if (lastDotIndex >= 0) {
- prePath = imgPath.substring(0, lastDotIndex);
- tailPath = imgPath.substring(lastDotIndex);
+ prePath = filePath.substring(0, lastDotIndex);
+ tailPath = filePath.substring(lastDotIndex);
path_ = prePath + "_" + tailPath ;
}
}
if(path_ == null){
- path_ = imgPath ;
+ path_ = filePath;
+ }
+ return path_ ;
+ }
+
+ /**
+ * 閫氳繃瑙嗛璺緞锛屽緱鍒板搴旂缉鐣ュ浘鐨勮矾寰�
+ * @param filePath
+ * @return
+ */
+ public String getFileZipPath(String filePath, String extName){
+ String path_ = null ;
+ String prePath = null ;
+ if(filePath != null && !filePath.trim().equals("")) {
+ int lastDotIndex = filePath.lastIndexOf('.');
+ if (lastDotIndex >= 0) {
+ prePath = filePath.substring(0, lastDotIndex);
+ path_ = prePath + "_." + extName ;
+ }
+ }
+ if(path_ == null){
+ path_ = filePath;
}
return path_ ;
}
@@ -277,6 +298,34 @@
}
/**
+ * 瑙ｆ瀽鏂囦欢鍝堝笇鍊�
+ * @param fmUrl
+ * @param hashCodes
+ * @return
+ */
+ public List<FileRestVo> parseHashcode(String fmUrl, List<Integer> hashCodes){
+ List<FileRestVo> rList = null ;
+ if(hashCodes != null && hashCodes.size() > 0) {
+ // 鍑嗗璇锋眰鏁版嵁
+ MultiValueMap<String, Object> multipartRequestData = new LinkedMultiValueMap<>();
+ multipartRequestData.add(FileConstant.fmPostMapping_parseHashcodeList_paramName, hashCodes);
+
+ // 璁剧疆璇锋眰澶撮儴锛岃繖閲屽亣璁炬湇鍔″櫒鎺ユ敹multipart/form-data绫诲瀷鐨勬暟鎹�
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+ // 灏佽璇锋眰浣�
+ HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(multipartRequestData, headers);
+
+ String webUrl = fmUrl + "/" + FileConstant.fmRequestMapping + "/" + FileConstant.fmPostMapping_parseHashcodeList;
+ // 鍙戦�丳OST璇锋眰
+ FileRestVo[] rvos = restTemplate.postForObject(webUrl, requestEntity, FileRestVo[].class);
+ rList = Arrays.asList(rvos) ;
+ }
+ return rList ;
+ }
+
+ /**
* 瑙ｆ瀽鏂囦欢鏂囦欢璺緞涓殑鍝堝笇鍊煎苟杩斿洖鍥剧墖瀹屾暣璺緞
* @param fmUrl
* @param filePath
--
Gitblit v1.8.0