From 1ca48170fed2b32e2939049e2161118c0c521350 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 29 一月 2026 09:15:44 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java
index e591539..3a91c3f 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java
@@ -1,14 +1,11 @@
package com.fzzy.igds.api.v1.service;
+import com.alibaba.fastjson.JSONObject;
import com.fzzy.igds.api.v1.data.ApiV1Req;
import com.fzzy.igds.api.v1.data.ApiV1Resp;
-import com.fzzy.igds.api.v1.data.Param3030;
import com.fzzy.igds.api.v1.data.Param3031;
-import com.fzzy.igds.constant.WarnStatus;
import com.fzzy.igds.domain.EventInfo;
import com.fzzy.igds.domain.GatewaySer;
-import com.alibaba.fastjson.JSONObject;
-import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.igds.service.EventInfoService;
import com.fzzy.igds.service.FileService;
import com.fzzy.igds.utils.ContextUtil;
@@ -41,23 +38,24 @@
* @param gatewaySer
* @return
*/
- public ApiV1Resp<Object> analysis(ApiV1Req<JSONObject> req, GatewaySer gatewaySer) throws Exception {
+ public ApiV1Resp<Object> analysis(ApiV1Req<Object> req, GatewaySer gatewaySer) throws Exception {
//杞寲涓哄璞�
- List<Param3031> list = JSONObject.parseArray(req.getData().toString(), Param3031.class);
+ List<Param3031> list = JSONObject.parseArray(JSONObject.toJSONString(req.getData()), Param3031.class);
- if(null == list || list.isEmpty()){
+ if (null == list || list.isEmpty()) {
return ApiV1Resp.error("鎶撴媿淇℃伅涓虹┖锛屼笉瑙ｆ瀽锛�", req);
}
step1(list, gatewaySer);
- log.info("璐ㄦ娂鐩戠鎺ュ彛V1锛�3031鎺ュ彛瑙ｆ瀽瀹屾垚={}", req);
+
return ApiV1Resp.success(null, req);
}
/**
* 寮傛瑙ｆ瀽
+ *
* @param list
*/
@Async
@@ -76,14 +74,13 @@
info.setType(param.getType());
info.setLevel(param.getLevel());
info.setInfo(param.getInfo());
- info.setTime(DateUtils.parseDate(param.getTime(),"yyyy-MM-dd HH:mm:ss"));
+ info.setTime(DateUtils.parseDate(param.getTime(), "yyyy-MM-dd HH:mm:ss"));
info.setTags(param.getTags());
-
//base64杞寲涓哄浘鐗囦繚瀛�
String savePath = fileService.getFileSavePath("EVENT");
String fileName = ContextUtil.UUID() + ".jpg";
- String filePath = savePath+fileName;
+ String filePath = savePath + fileName;
fileService.baseImg2Disk(filePath, param.getImgBase64());
//璁剧疆淇濆瓨鍥剧墖璺緞
@@ -92,6 +89,8 @@
eventInfoService.addData(info);
}
+ log.info("璐ㄦ娂鐩戠鎺ュ彛V1锛�3031鎺ュ彛瑙ｆ瀽瀹屾垚");
+
}
}
--
Gitblit v1.9.3