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/CalculateRule.java | 164 +++++++++++++++++++++---------------------------------
1 files changed, 64 insertions(+), 100 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
index 3439154..2e2cb7e 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
@@ -1,9 +1,17 @@
package com.ycl.platform.domain.entity;
-import annotation.Excel;
-import com.ycl.system.domain.TreeEntity;
-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.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import enumeration.converter.RuleDeductCategoryConverter;
+import enumeration.general.RuleDeductCategoryEnum;
+import lombok.Data;
+
+import java.util.Date;
/**
* 鍒嗘暟鏍哥畻瑙勫垯瀵硅薄 t_default_rule
@@ -11,112 +19,68 @@
* @author ruoyi
* @date 2024-04-01
*/
-public class CalculateRule extends TreeEntity
-{
- private static final long serialVersionUID = 1L;
+@Data
+@ExcelIgnoreUnannotated
+@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
+@TableName("t_calculate_rule")
+public class CalculateRule {
- /** 涓婚敭 */
- private Long id;
+ /**
+ * id
+ */
+ private Integer id;
- /** 瑙勫垯鍚嶇О */
- @Excel(name = "瑙勫垯鍚嶇О")
+ /**
+ * 鍚堝悓id
+ */
+ private Integer contractId;
+
+ /**
+ * 瑙勫垯鍚嶇О
+ */
+ @ExcelProperty("鑰冩牳鍐呭")
private String ruleName;
- /** 鎵ｅ噺鏂瑰紡 */
- @Excel(name = "鎵ｅ噺鏂瑰紡")
- private Long deductCategory;
+ /**
+ * 瑙勫垯鏉′欢
+ */
+ @ExcelProperty("鑰冩牳瑕佹眰")
+ private String ruleCondition;
- /** 浜哄伐鎵撳垎/绯荤粺鎵撳垎 */
- private Long deductWay;
+ /**
+ * 杩濊鏈�灏忓��
+ */
+ @ExcelProperty("杩濊鏈�灏忓��")
+ private Double min;
- /** 瑙勫垯鎻忚堪 */
- @Excel(name = "瑙勫垯鎻忚堪")
- private String ruleDesc;
+ /**
+ * 杩濊鏈�澶у��
+ */
+ @ExcelProperty("杩濊鏈�澶у��")
+ private Double max;
- /** 瑙勫垯鐘舵�� */
- @Excel(name = "瑙勫垯鐘舵��")
- private String ruleStatus;
+ /**
+ * 鎵ｅ噺鏂瑰紡 鎵ｆ寚瀹氬垎鏁�/鍒嗘暟涔樹互鏁伴噺/闄や互鏁伴噺鍚庝箻浠ュ垎鏁�
+ */
+ @ExcelProperty(value = "鎵ｅ垎鏂瑰紡", converter = RuleDeductCategoryConverter.class)
+ private RuleDeductCategoryEnum deductCategory;
- /** 閫昏緫鍒犻櫎 */
- private String deleted;
+ /**
+ * 鎵ｉ櫎鍒嗘暟
+ */
+ @ExcelProperty("鎵ｅ垎鏁板��")
+ private Double calcFraction;
- public void setId(Long id)
- {
- this.id = id;
- }
+ /**
+ * 褰撴柟寮忎负闄や互鏃讹紝闄や互褰撳墠瀛楁鏁伴噺
+ */
+ @ExcelProperty("闄や互鏁伴噺")
+ private Integer calcUnit;
- public Long getId()
- {
- return id;
- }
- public void setRuleName(String ruleName)
- {
- this.ruleName = ruleName;
- }
+ private Date createTime;
+ private Date updateTime;
- public String getRuleName()
- {
- return ruleName;
- }
- public void setDeductCategory(Long deductCategory)
- {
- this.deductCategory = deductCategory;
- }
+ @TableLogic
+ private Integer deleted;
- public Long getDeductCategory()
- {
- return deductCategory;
- }
- public void setDeductWay(Long deductWay)
- {
- this.deductWay = deductWay;
- }
-
- public Long getDeductWay()
- {
- return deductWay;
- }
- public void setRuleDesc(String ruleDesc)
- {
- this.ruleDesc = ruleDesc;
- }
-
- public String getRuleDesc()
- {
- return ruleDesc;
- }
- public void setRuleStatus(String ruleStatus)
- {
- this.ruleStatus = ruleStatus;
- }
-
- public String getRuleStatus()
- {
- return ruleStatus;
- }
- public void setDeleted(String deleted)
- {
- this.deleted = deleted;
- }
-
- public String getDeleted()
- {
- return deleted;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("ruleName", getRuleName())
- .append("parentId", getParentId())
- .append("deductCategory", getDeductCategory())
- .append("deductWay", getDeductWay())
- .append("ruleDesc", getRuleDesc())
- .append("ruleStatus", getRuleStatus())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .append("deleted", getDeleted())
- .toString();
- }
}
--
Gitblit v1.8.0