From feb61eaf83472402b72551bb07c36be78f728835 Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Thu, 19 Sep 2024 15:56:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/IotCarbonProductionVarietyDTO.java    | 32 ++++++++++++++++++-
 .../IotCarbonProductionVarietyEntity.java     | 14 ++++++++
 .../listener/QueueDeviceEventListener.java    | 10 ++++--
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/production/dto/IotCarbonProductionVarietyDTO.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/production/dto/IotCarbonProductionVarietyDTO.java
index 12a553d..3924b33 100644
--- a/modules/carbon-track/src/main/java/com/thing/carbontrack/production/dto/IotCarbonProductionVarietyDTO.java
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/production/dto/IotCarbonProductionVarietyDTO.java
@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -75,10 +76,39 @@ public class IotCarbonProductionVarietyDTO implements Serializable {
     public String stepsUrl;
     @Schema(description = "工序拖拉拽json")
     private String stepsJson;
-
+    @Schema(description = "模型类型，1实采模型，2填报模型")
+    private String modelType;
+    @Schema(description = "填报模型开始时间")
+    private Date boundaryStartTime;
+    @Schema(description = "填报模型结束时间")
+    private Date boundaryEndTime;
     @Schema(description = "产品自定义属性信息")
     private List<IotCarbonProductionCustomDTO> customDTOS;
 
+    public String getModelType() {
+        return modelType;
+    }
+
+    public void setModelType(String modelType) {
+        this.modelType = modelType;
+    }
+
+    public Date getBoundaryStartTime() {
+        return boundaryStartTime;
+    }
+
+    public void setBoundaryStartTime(Date boundaryStartTime) {
+        this.boundaryStartTime = boundaryStartTime;
+    }
+
+    public Date getBoundaryEndTime() {
+        return boundaryEndTime;
+    }
+
+    public void setBoundaryEndTime(Date boundaryEndTime) {
+        this.boundaryEndTime = boundaryEndTime;
+    }
+
     public List<IotCarbonProductionCustomDTO> getCustomDTOS() {
         return customDTOS;
     }
diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/production/entity/IotCarbonProductionVarietyEntity.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/production/entity/IotCarbonProductionVarietyEntity.java
index 7d66d32..cd49f41 100644
--- a/modules/carbon-track/src/main/java/com/thing/carbontrack/production/entity/IotCarbonProductionVarietyEntity.java
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/production/entity/IotCarbonProductionVarietyEntity.java
@@ -2,6 +2,7 @@ package com.thing.carbontrack.production.entity;
 
 import com.mybatisflex.annotation.Table;
 import com.thing.common.orm.entity.BaseInfoEntity;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -10,6 +11,7 @@ import lombok.experimental.Accessors;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 产品信息表
@@ -103,4 +105,16 @@ public class IotCarbonProductionVarietyEntity extends BaseInfoEntity implements
 	 */
 	private String stepsJson;
 
+	/**
+	 * 模型类型，1实采模型，2填报模型
+	 */
+	private String modelType;
+	/**
+	 * 填报模型开始时间
+	 */
+	private Date boundaryStartTime;
+	/**
+	 * 填报模型结束时间
+	 */
+	private Date boundaryEndTime;
 }
\ No newline at end of file
diff --git a/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java b/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java
index f66d52d..9b69e33 100644
--- a/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java
+++ b/modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java
@@ -131,11 +131,17 @@ public class QueueDeviceEventListener {
                 item.setAuthNum(count + CollectionUtils.size(keyMap));
             });
             if(CollectionUtils.isNotEmpty(insertModelList)){
-                thingModelService.saveOrUpdateBatch(insertModelList);
+                try {
+                    thingModelService.saveOrUpdateBatch(insertModelList);
+                } catch (Exception e) {
+                }
                 updateModelCache(insertModelList);
             }
             if(CollectionUtils.isNotEmpty(distinctStudentFile)){
-                entityService.saveOrUpdateBatch(distinctStudentFile);
+                try {
+                    entityService.saveOrUpdateBatch(distinctStudentFile);
+                } catch (Exception e) {
+                }
                 updateEntityCache(distinctStudentFile);
             }
         } catch (Exception e) {