From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java | 181 +++++++++++++++++---------------------------
1 files changed, 70 insertions(+), 111 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
index 5c7e9ad..eb47cd8 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
@@ -1,135 +1,94 @@
package com.ycl.platform.domain.entity;
-import annotation.Excel;
-import com.ycl.system.entity.BaseEntity;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
+import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.Arrays;
import java.util.Date;
+import java.util.List;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆戝璞� t_contract
- *
- * @author ruoyi
- * @date 2024-03-12
+ * 杩愮淮鍚堝悓瀵硅薄 t_contract
+ *
+ * @author gonghl
+ * @date 2024-04-22
*/
-public class TContract extends BaseEntity
-{
+@Data
+@ExcelIgnoreUnannotated
+@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
+public class TContract {
private static final long serialVersionUID = 1L;
- /** 涓婚敭 */
+ /**
+ * 涓婚敭
+ */
+ @ExcelProperty("搴忓彿")
+ @TableId
private Long id;
- /** 鍏徃id */
- @Excel(name = "鍏徃id")
- private Long companyId;
+ /**
+ * 鍗曚綅id
+ */
+ @NotBlank
+ private Long unitId;
- /** 鍏徃鍚� */
- @Excel(name = "鍏徃鍚�")
- private String companyName;
+ @TableField(exist = false)
+ private String unitName;
- /** 瀵规帴鍏畨閮ㄩ棬id */
- @Excel(name = "瀵规帴鍏畨閮ㄩ棬id")
- private Long deptId;
+ /**
+ * 鍚堝悓鍚嶇О
+ */
+ @NotBlank
+ private String name;
- /** 閮ㄩ棬鍚嶇О */
- @Excel(name = "閮ㄩ棬鍚嶇О")
- private String deptName;
-
- /** 鍚堝悓鏄庣粏json */
- @Excel(name = "鍚堝悓鏄庣粏json")
- private String detail;
-
- /** 寮�濮嬫椂闂� */
- @Excel(name = "寮�濮嬫椂闂�")
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @NotNull
private Date startTime;
- /** 鎴鏃堕棿 */
- @Excel(name = "鎴鏃堕棿")
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @NotNull
private Date endTime;
- public Date getStartTime() {
- return startTime;
- }
+ /**
+ * 鍚堝悓闄勪欢
+ */
+ private String attachment;
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
+ private Date createTime;
- public Date getEndTime() {
- return endTime;
- }
+ private Date updateTime;
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
+ @TableLogic
+ private Integer deleted;
- public void setId(Long id)
- {
- this.id = id;
- }
+ @TableField(exist = false)
+ private String ruleList;
+ @TableField(exist = false)
+ private MultipartFile file;
- public Long getId()
- {
- return id;
- }
- public void setCompanyId(Long companyId)
- {
- this.companyId = companyId;
- }
-
- public Long getCompanyId()
- {
- return companyId;
- }
- public void setCompanyName(String companyName)
- {
- this.companyName = companyName;
- }
-
- public String getCompanyName()
- {
- return companyName;
- }
- public void setDeptId(Long deptId)
- {
- this.deptId = deptId;
- }
-
- public Long getDeptId()
- {
- return deptId;
- }
- public void setDeptName(String deptName)
- {
- this.deptName = deptName;
- }
-
- public String getDeptName()
- {
- return deptName;
- }
- public void setDetail(String detail)
- {
- this.detail = detail;
- }
-
- public String getDetail()
- {
- return detail;
- }
-
- @Override
- public String toString() {
- return "TContract{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", companyName='" + companyName + '\'' +
- ", deptId=" + deptId +
- ", deptName='" + deptName + '\'' +
- ", detail='" + detail + '\'' +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- '}';
- }
}
--
Gitblit v1.8.0