From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
index fccb6f7..f9f1183 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
@@ -11,6 +11,7 @@
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.JkCabinetGrid;
+import com.doumee.dao.business.model.JkInterfaceLog;
import com.doumee.dao.business.model.JkVersion;
import com.doumee.dao.business.vo.AdminCabinetVO;
import com.doumee.dao.business.vo.CabinetDetailVO;
@@ -52,7 +53,7 @@
private JkCabinetGridService jkCabinetGridService;
@Autowired
- private InterfaceLogService interfaceLogService;
+ private JkInterfaceLogService interfaceLogService;
@Autowired
private JkIccardService jkIccardService;
@@ -86,8 +87,6 @@
this.saveInterfaceLog(Constants.strToJson("id",id.toString()), null,"updateRunStatusById","鏇存柊閽ュ寵鏌滃湪绾跨姸鎬�");
return ApiResponse.success("鏇存柊鎴愬姛");
}
-
-
@ApiOperation("鑾峰彇鍙鐞嗙殑閽ュ寵鏌滃垪琛� - 绠＄悊鍛�")
@GetMapping("/getAdminCabinetInfo")
@@ -190,7 +189,7 @@
}
private void saveInterfaceLog(String s, String result,String url,String name) {
- InterfaceLog hkMonitoryLogDO=new InterfaceLog();
+ JkInterfaceLog hkMonitoryLogDO=new JkInterfaceLog();
hkMonitoryLogDO.setType(0);
hkMonitoryLogDO.setCreateDate(new Date());
hkMonitoryLogDO.setIsdeleted(0);
@@ -200,7 +199,6 @@
hkMonitoryLogDO.setUrl(url);
interfaceLogService.create(hkMonitoryLogDO);
}
-
@LoginNoRequired
@ApiOperation("閰掔簿妫�娴嬪憡璀�")
--
Gitblit v1.9.3