From 5eeefc6b1dd8c8c4f69efcec0c7ad13d35395487 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 13 一月 2026 16:02:51 +0800
Subject: [PATCH] 调整接口接收方式
---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3032.java | 4 ++--
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Resp.java | 6 +++---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java | 2 +-
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java | 2 +-
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java | 2 +-
fzzy-igdss-web/src/main/java/com/fzzy/init/SystemRunner.java | 5 -----
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java | 2 +-
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java | 4 ++--
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3022.java | 2 +-
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java | 2 +-
10 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java
index 46dc6fd..0298a93 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java
@@ -48,9 +48,9 @@
@PostMapping
@ResponseBody
- public ApiV1Resp<Object> gateway(@RequestBody ApiV1Req<JSONObject> req) {
+ public ApiV1Resp<Object> gateway(@RequestBody ApiV1Req<Object> req) {
- log.info("璐ㄦ娂鐩戠鎺ュ彛V1锛屾敹鍒板簱鍖虹綉鍏充俊鎭�={}", req);
+ log.debug("璐ㄦ娂鐩戠鎺ュ彛V1锛屾敹鍒板簱鍖虹綉鍏充俊鎭�={}", req);
try {
//鍙傛暟鏍￠獙
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Resp.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Resp.java
index c607b6a..b285263 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Resp.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Resp.java
@@ -36,7 +36,7 @@
super();
}
- public ApiV1Resp(String respCode, String respMsg, T data, ApiV1Req<JSONObject> req) {
+ public ApiV1Resp(String respCode, String respMsg, T data, ApiV1Req<Object> req) {
this.data = data;
this.sn = req.getSn();
this.auth = req.getAuth();
@@ -48,11 +48,11 @@
this.respMsg = respMsg;
}
- public static ApiV1Resp<Object> success(Object data, ApiV1Req<JSONObject> req) {
+ public static ApiV1Resp<Object> success(Object data, ApiV1Req<Object> req) {
return new ApiV1Resp<>(CODE_SUCCESS, null, data, req);
}
- public static ApiV1Resp<Object> error(String respMsg, ApiV1Req<JSONObject> req) {
+ public static ApiV1Resp<Object> error(String respMsg, ApiV1Req<Object> req) {
return new ApiV1Resp<>(CODE_ERROR, respMsg, null, req);
}
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java
index 7048f7c..61d5a8a 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java
@@ -33,7 +33,7 @@
* @param gatewaySer
* @return
*/
- public ApiV1Resp<Object> analysis(ApiV1Req<JSONObject> req, GatewaySer gatewaySer) {
+ public ApiV1Resp<Object> analysis(ApiV1Req<Object> req, GatewaySer gatewaySer) {
Date end = new Date();
Date start = gatewaySer.getHeartbeatTime();
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java
index fd1048b..75032f5 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java
@@ -30,7 +30,7 @@
* @param gatewaySer
* @return
*/
- public ApiV1Resp<Object> analysis(ApiV1Req<JSONObject> req, GatewaySer gatewaySer) {
+ public ApiV1Resp<Object> analysis(ApiV1Req<Object> req, GatewaySer gatewaySer) {
//鑾峰彇搴撳尯涓嬫墍鏈夋姄鎷嶉厤缃�
List<SnapConf> list = snapConfService.selectList(gatewaySer.getDeptId());
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java
index 4e4a9e0..7c5c6bc 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java
@@ -30,7 +30,7 @@
* @param gatewaySer
* @return
*/
- public ApiV1Resp<Object> analysis(ApiV1Req<JSONObject> req, GatewaySer gatewaySer) {
+ public ApiV1Resp<Object> analysis(ApiV1Req<Object> req, GatewaySer gatewaySer) {
//鑾峰彇搴撳尯涓嬫墍鏈夌洃鎺т俊鎭�
List<Camera> list = cameraService.getCameraByDeptId(gatewaySer.getCompanyId(), gatewaySer.getDeptId());
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3022.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3022.java
index 1b61b21..c38b423 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3022.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3022.java
@@ -32,7 +32,7 @@
* @param gatewaySer
* @return
*/
- public ApiV1Resp<Object> analysis(ApiV1Req<JSONObject> req, GatewaySer gatewaySer) {
+ public ApiV1Resp<Object> analysis(ApiV1Req<Object> req, GatewaySer gatewaySer) {
//鑾峰彇搴撳尯涓嬫墍鏈夊嚭鍏ュ簱璁惧
List<InoutConf> list = inoutConfService.getCacheInoutConf(gatewaySer.getCompanyId(), gatewaySer.getDeptId());
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java
index 3c18e42..f0f8fc4 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java
@@ -37,7 +37,7 @@
* @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<Param3030> list = JSONObject.parseArray(req.getData().toString(), Param3030.class);
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 207ed93..f692b43 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
@@ -41,7 +41,7 @@
* @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);
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3032.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3032.java
index 1c52bbd..c028567 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3032.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3032.java
@@ -29,10 +29,10 @@
* @param gatewaySer
* @return
*/
- public ApiV1Resp<Object> analysis(ApiV1Req<JSONObject> req, GatewaySer gatewaySer) {
+ public ApiV1Resp<Object> analysis(ApiV1Req<Object> req, GatewaySer gatewaySer) {
//杞寲涓哄璞�
- Param3032 param = JSONObject.parseObject(req.getData().toString(), Param3032.class);
+ Param3032 param = JSONObject.parseObject(JSONObject.toJSONString(req.getData()), Param3032.class);
if (null == param || StringUtils.isBlank(param.getFileName()) || StringUtils.isEmpty(param.getImgBase64())) {
return ApiV1Resp.error("鎶撴媿淇℃伅涓虹┖锛屼笉瑙ｆ瀽锛�", req);
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/init/SystemRunner.java b/fzzy-igdss-web/src/main/java/com/fzzy/init/SystemRunner.java
index a6df249..d243d47 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/init/SystemRunner.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/init/SystemRunner.java
@@ -1,6 +1,5 @@
package com.fzzy.init;
-import com.fzzy.igds.ServerRunner;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.*;
import com.ruoyi.system.service.ISysCompanyService;
@@ -8,7 +7,6 @@
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@@ -43,9 +41,6 @@
private InoutConfService inoutConfService;
@Resource
private SecCameraService secCameraService;
- @Resource
- private SnapConfService snapConfService;
-
@Override
public void run(String... args) throws Exception {
--
Gitblit v1.9.3