From 5a18b0532d280893b72bd58e81aaf7312685116b Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Wed, 14 Aug 2024 14:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7API=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=202024=E5=B9=B48=E6=9C=8814=E6=97=A514:17:37?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/thing/thing/api/entity/IotThingApiLogEntity.java | 9 +++------
 .../thing/thing/api/service/IotThingApiLogService.java   | 2 --
 .../thing/api/service/impl/IotThingApiServiceImpl.java   | 5 +++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/thing/api/entity/IotThingApiLogEntity.java b/modules/thing/src/main/java/com/thing/thing/api/entity/IotThingApiLogEntity.java
index 7c682aa..ebc3e3c 100644
--- a/modules/thing/src/main/java/com/thing/thing/api/entity/IotThingApiLogEntity.java
+++ b/modules/thing/src/main/java/com/thing/thing/api/entity/IotThingApiLogEntity.java
@@ -1,15 +1,12 @@
 package com.thing.thing.api.entity;
 
 import com.mybatisflex.annotation.Table;
-import com.thing.common.core.validator.group.UpdateGroup;
 import com.thing.common.orm.entity.BaseDateEntity;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serial;
 
 /**
@@ -27,9 +24,9 @@ public class IotThingApiLogEntity extends BaseDateEntity {
 	private static final long serialVersionUID = 1L;
 
 
-	@Schema(description = "主键")
-	@NotNull(message = "API日志id不能为空",groups = UpdateGroup.class)
-	private Long id;
+//	@Schema(description = "主键")
+//	@NotNull(message = "API日志id不能为空",groups = UpdateGroup.class)
+//	private Long id;
 
 	/**
 	 * 调用API的主键
diff --git a/modules/thing/src/main/java/com/thing/thing/api/service/IotThingApiLogService.java b/modules/thing/src/main/java/com/thing/thing/api/service/IotThingApiLogService.java
index 90dd25d..0626b1d 100644
--- a/modules/thing/src/main/java/com/thing/thing/api/service/IotThingApiLogService.java
+++ b/modules/thing/src/main/java/com/thing/thing/api/service/IotThingApiLogService.java
@@ -3,8 +3,6 @@ package com.thing.thing.api.service;
 import com.thing.common.orm.service.IBaseService;
 import com.thing.thing.api.entity.IotThingApiLogEntity;
 
-;
-
 /**
  * 超级api
  *
diff --git a/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java
index efd5fac..666187a 100644
--- a/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java
@@ -29,6 +29,7 @@ import com.thing.sys.security.context.UserContext;
 import com.thing.thing.api.controller.IotThingApiController;
 import com.thing.thing.api.dto.*;
 import com.thing.thing.api.entity.IotThingApiEntity;
+import com.thing.thing.api.entity.IotThingApiLogEntity;
 import com.thing.thing.api.excel.IotThingApiExcel;
 import com.thing.thing.api.mapper.IotThingApiMapper;
 import com.thing.thing.api.service.IotThingApiLogService;
@@ -823,7 +824,7 @@ public class IotThingApiServiceImpl extends BaseServiceImpl<IotThingApiMapper, I
 
     private void apiLog(IotThingApiEntity apiEntity, String caller) {
         try {
-            IotThingApiLogDTO apiLogDTO = new IotThingApiLogDTO();
+            IotThingApiLogEntity apiLogDTO = new IotThingApiLogEntity();
             apiLogDTO.setApiId(apiEntity.getId());
             apiLogDTO.setCaller(caller);
             apiLogDTO.setApiName(apiEntity.getName());
@@ -842,7 +843,7 @@ public class IotThingApiServiceImpl extends BaseServiceImpl<IotThingApiMapper, I
             //调用IP
             HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
             apiLogDTO.setIp(IpUtils.getIpAddr(request));
-            apiLogService.saveDto(apiLogDTO);
+            apiLogService.saveOrUpdate(apiLogDTO);
         } catch (Exception e) {
             log.error(e.getMessage());
         }