修改1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Device.java

@@ -1,5 +1,6 @@
 package com.management.platform.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -18,7 +19,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2024-10-08
+ * @since 2024-10-10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -30,7 +31,7 @@ public class Device extends Model<Device> {
     /**
      * 主键
      */
-    @TableId("id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
@@ -109,7 +110,7 @@ public class Device extends Model<Device> {
     @TableField(exist = false)
     private Integer deviceLogId;
 
-    @TableField("use_time")
+    @TableField(exist = false)
     private Double useTime;
 
     @Override

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/DeviceCost.java

@@ -1,6 +1,7 @@
 package com.management.platform.entity;
 
 import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2024-10-08
+ * @since 2024-10-10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,7 +28,7 @@ public class DeviceCost extends Model<DeviceCost> {
     /**
      * 主键id
      */
-    @TableId("id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/DeviceLog.java

@@ -1,6 +1,7 @@
 package com.management.platform.entity;
 
 import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -19,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2024-10-08
+ * @since 2024-10-10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -31,7 +32,7 @@ public class DeviceLog extends Model<DeviceLog> {
     /**
      * 主键
      */
-    @TableId("id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/DeviceLogMapper.xml

@@ -12,11 +12,12 @@
         <result column="create_date" property="createDate" />
         <result column="usage_user_id" property="usageUserId" />
         <result column="usage_cost" property="usageCost" />
+        <result column="use_time" property="useTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, device_id, project_id, start_time, end_time, create_date, usage_user_id, usage_cost
+        id, device_id, project_id, start_time, end_time, create_date, usage_user_id, usage_cost, use_time
     </sql>
     <select id="getDeviceLogList" resultType="java.util.HashMap">
         SELECT d.id deviceId,d.device_code deviceCode,d.device_name deviceName,d.usage_status usageStatus,d.usage_user_id usageUserId,

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/DeviceMapper.xml

@@ -10,9 +10,7 @@
         <result column="device_model" property="deviceModel" />
         <result column="manufacturer" property="manufacturer" />
         <result column="purchase_date" property="purchaseDate" />
-        <result column="
-maintenance_date" property="
-maintenanceDate" />
+        <result column="maintenance_date" property="maintenanceDate" />
         <result column="company_id" property="companyId" />
         <result column="usage_status" property="usageStatus" />
         <result column="usage_user_id" property="usageUserId" />
@@ -20,8 +18,7 @@ maintenanceDate" />
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, device_code, device_name, device_model, manufacturer, purchase_date, 
-maintenance_date, company_id, usage_status, usage_user_id
+        id, device_code, device_name, device_model, manufacturer, purchase_date, maintenance_date, company_id, usage_status, usage_user_id
     </sql>
 
 </mapper>