From 83326b4b2a8a10d11ae18dcedd2e6904dd69d2b2 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 11 二月 2022 12:32:11 +0800
Subject: [PATCH] 功能完善
---
dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java
index d4bbd5a..f5e5894 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java
@@ -1,8 +1,10 @@
package com.sandu.ximon.dao.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sandu.common.mybatis.JsonIntegerArrayTypeHandler;
import lombok.Data;
import java.io.Serializable;
@@ -15,26 +17,32 @@
@TableId(type = IdType.AUTO)
private Long id;
- private String userName;
+ private Long userId;
+ /*浠诲姟鎵ц澶╂暟*/
+ @TableField(typeHandler = JsonIntegerArrayTypeHandler.class)
private Integer[] weeks;
//浜害
private Double initial;
/** 寮�鐏椂闂� */
- @JsonFormat(pattern = " HH:mm:ss")
+ // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+ //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
+ //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="HH:mm")
private LocalDateTime onTime;
/** 鍏崇伅鏃堕棿 */
- @JsonFormat(pattern = " HH:mm:ss")
+ // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+ //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
+ //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="HH:mm")
private LocalDateTime offTime;
/**
* 浜害璋冭妭
*/
- private List<LightAdjust> adjusts;
+ // private List<LightAdjust> adjusts;
}
--
Gitblit v1.9.3