From 87e524604a801de51cf277535e26988ce3d2ce53 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 05 Dec 2024 15:32:45 +0800
Subject: [PATCH] 白蚁新模块。图片上传接口。更新12-5 15:00
---
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/nettyUpload/HttpUploadFileHandler.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/nettyUpload/HttpUploadFileHandler.java b/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/nettyUpload/HttpUploadFileHandler.java
index 122e875..c14fe8e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/nettyUpload/HttpUploadFileHandler.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/nettyUpload/HttpUploadFileHandler.java
@@ -8,6 +8,7 @@
import cn.gistack.by.nettyUpload.utils.ExceptionUtils;
import cn.gistack.by.picUpload.entity.BaiyiPicEntity;
import cn.gistack.by.picUpload.entity.XfByPic;
+import cn.gistack.by.picUpload.entity.XfBySnRelation;
import cn.gistack.by.picUpload.service.BaiyiPicService;
import cn.gistack.resource.feign.IOssClient;
import cn.hutool.core.date.DateUtil;
@@ -27,6 +28,7 @@
import java.net.URISyntaxException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.mock.web.MockMultipartFile;
@@ -61,6 +63,11 @@
* 没有Authorization验证
*/
private static final String UPLOAD_FILE_URL_OLD = "/termite/termiteDataupOld";
+ /**
+ * * 旧设备sn码和物联网关系表
+ * * 没有Authorization验证
+ */
+ private static final String UPLOAD_FILE_OLD_RELATION = "/termite/termiteRelation";
private NettyHttpConfig nettyHttpConfig;
@@ -94,7 +101,9 @@
protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest fullRequest) throws Exception {
// 请求路径验证
- String urlyz = urlyz(ctx, fullRequest);
+ String urlyz = UriUtils.getURI(fullRequest).getPath();
+ log.info("请求路径urlyz::"+urlyz);
+
if (UPLOAD_FILE_URL.equals(urlyz)) { //传图片
// Authorization验证
boolean isRequestValid = isValidHttpRequest(ctx, fullRequest);
@@ -119,19 +128,31 @@
baiyiPicService.inserXfOldPicUrl(xfByPic);
- }else if(UPLOAD_DATA_URL.equals(urlyz)) { //传数据
+ }else if(UPLOAD_FILE_OLD_RELATION.equals(urlyz)) { //传sn和rtu编码关系接口
HttpPostMultipartRequestDecoder test = new HttpPostMultipartRequestDecoder(fullRequest);
List<InterfaceHttpData> bodyHttpDatas = test.getBodyHttpDatas();
+ String sn = "";
for (InterfaceHttpData item : bodyHttpDatas ) {
if ( item instanceof Attribute){
-
- } else if (item instanceof FileUpload) {
- System.out.println("Attribute:::"+item.getName());
-
+ Attribute attribute = (Attribute) item;
+ String value = attribute.getValue();
+ switch (attribute.getName()) {
+ case "sn":
+ sn = value;
+ break;
+ }
}
}
+ // 查询sn对应的
+ XfBySnRelation xfBySnRelation = baiyiPicService.selectMnnoBySn(sn);
+ HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+ objectObjectHashMap.put("mn_no", xfBySnRelation.getWlwRtu());
+ objectObjectHashMap.put("order", xfBySnRelation.getWlwOrder());
+
+ HttpResponseUtils.sendResponseJson2(ctx, HttpResponseStatus.OK, "查询成功",objectObjectHashMap);
+ return ;
} else {
HttpResponseUtils.sendResponseJson2(ctx, HttpResponseStatus.BAD_REQUEST, "验证失败",null);
return ;
@@ -214,8 +235,13 @@
if (uri.getPath().startsWith(UPLOAD_DATA_URL)) {
return UPLOAD_DATA_URL;
+
} else if (uri.getPath().startsWith(UPLOAD_FILE_URL)) {
return UPLOAD_FILE_URL;
+
+ } else if (uri.getPath().startsWith(UPLOAD_FILE_URL_OLD)) {
+
+ return UPLOAD_FILE_URL_OLD;
}
} catch (Exception exception) {
exception.printStackTrace();
--
Gitblit v1.9.3