From 71f3101370c3db0ec00178d51a723816c9bcddbd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java
index b94fb81..b6713fc 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java
@@ -7,6 +7,8 @@
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -26,210 +28,243 @@
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonProperty("")
     private Integer id;
 
     /**
      * 寮傚父绂荤嚎澶╂暟
      */
     @TableField("abnormal_off_line_days")
+    @JsonProperty("AbnormalOfflineDays")
     private Integer abnormalOffLineDays;
 
     /**
      * 澶勭悊鐜�
      */
     @TableField("abnormal_off_line_process_ratio")
+    @JsonProperty("AbnormalOfflineProcessRatio")
     private Integer abnormalOffLineProcessRatio;
 
     /**
      * 寮傚父绂荤嚎寰呭鐞嗗ぉ鏁�
      */
     @TableField("abnormal_off_line_to_process_days")
+    @JsonProperty("AbnormalOfflineToProcessDays")
     private Integer abnormalOffLineToProcessDays;
 
     /**
      * 鍦板潃
      */
     @TableField("addr")
+    @JsonProperty("Addr")
     private String addr;
 
     /**
      * 鎺掓斁鐗╂祿搴︽姌绠�(鏄ㄦ棩)
      */
     @TableField("c_emissions")
+    @JsonProperty("CEmissions")
     private BigDecimal cEmissions;
 
     /**
      * 鍦ㄧ嚎鏃ュ钩鍧囨帓鏀炬祿搴�
      */
     @TableField("c_emissions_avg_online")
+    @JsonProperty("CEmissionsAvgOnline")
     private BigDecimal cEmissionsAvgOnline;
 
     /**
      * 鏃ユ渶楂樻帓鏀炬祿搴�
      */
     @TableField("c_emissions_max")
+    @JsonProperty("CEmissionsMax")
     private BigDecimal cEmissionsMax;
 
     /**
      * 鏃ユ渶楂樻帓鏀炬祿搴︽棩鏈�
      */
     @TableField("c_emissions_max_date")
+    @JsonProperty("CEmissionsMaxDate")
     private LocalDateTime cEmissionsMaxDate;
 
     /**
      * 棰楃矑鐗╂祿搴︽姌绠�(鏄ㄦ棩)
      */
     @TableField("c_granule")
+    @JsonProperty("CGranule")
     private BigDecimal cGranule;
 
     /**
      * 闈炵敳鐑锋�荤儍娴撳害鎶樼畻	(鏄ㄦ棩)
      */
     @TableField("c_hydrocarbon")
+    @JsonProperty("CHydrocarbon")
     private BigDecimal cHydrocarbon;
 
     /**
      * 鑿滅郴鍚�
      */
     @TableField("cuisine_name")
+    @JsonProperty("CuisineName")
     private String cuisineName;
 
     /**
      * 钀ヤ笟鎵х収
      */
     @TableField("customer_bl_no")
+    @JsonProperty("CustomerBlNo")
     private String customerBlNo;
 
     /**
      * 鑱旂郴浜�
      */
     @TableField("customer_contact")
+    @JsonProperty("CustomerContact")
     private String customerContact;
 
     /**
      * 鐢佃瘽
      */
     @TableField("customer_mobile")
+    @JsonProperty("CustomerMobile")
     private String customerMobile;
 
     /**
      * 搴楀悕绉�
      */
     @TableField("customer_name")
+    @JsonProperty("CustomerName")
     private String customerName;
 
     /**
      * 鐩戞祴浠晠闅滃ぉ鏁�
      */
     @TableField("detector_failure_days")
+    @JsonProperty("DetectorFailureDays")
     private Integer detectorFailureDays;
 
     /**
      * 瓒呮爣闃堝��
      */
     @TableField("emissions_sill")
+    @JsonProperty("EmissionsSill")
     private Double emissionsSill;
 
     /**
      * 瓒呮爣鏁�
      */
     @TableField("excess_num")
+    @JsonProperty("ExcessNum")
     private Integer excessNum;
 
     /**
      * 瓒呮爣寰呭鐞嗗ぉ鏁�
      */
     @TableField("excess_to_process_days")
+    @JsonProperty("ExcessToProcessDays")
     private Integer excessToProcessDays;
 
     /**
      * 鍑�鍖栧櫒涓嶆甯镐娇鐢ㄥぉ鏁�
      */
     @TableField("filter_abnormally_used_days")
+    @JsonProperty("FilterAbnormallyUsedDays")
     private Integer filterAbnormallyUsedDays;
 
     /**
      * 鍑�鍖栧櫒娓呮礂娆℃暟
      */
     @TableField("filter_wash_times")
+    @JsonProperty("FilterWashTimes")
     private Integer filterWashTimes;
-
-    /**
-     * 棰楃矑鐗╄秴鏍囬槇鍊�
-     */
-    @TableField("granuli_sill")
-    private Double granuliSill;
 
     /**
      * 鍋ュ悍鐮侀鑹�
      */
     @TableField("health_code_color")
+    @JsonProperty("HealthCodeColor")
     private String healthCodeColor;
 
     /**
      * 闈炵敳鐑锋�荤儍瓒呮爣闃堝��
      */
     @TableField("hydrocarbon_sill")
+    @JsonProperty("HydrocarbonSill")
     private Double hydrocarbonSill;
-
+    /**
+     * 闈炵敳鐑锋�荤儍瓒呮爣闃堝��
+     */
+    @TableField("granule_sill")
+    @JsonProperty("GranuleSill")
+    private Double granuleSill;
     /**
      * 鐩戞祴鐐笽d
      */
     @TableField("locale_id")
+    @JsonProperty("LocaleId")
     private String localeId;
 
     /**
      * 绾害
      */
     @TableField("local_lat")
+    @JsonProperty("LocaleLat")
     private String localLat;
 
     /**
      * 缁忓害
      */
     @TableField("local_lng")
+    @JsonProperty("LocaleLng")
     private String localLng;
 
     /**
      * 璁惧鐨刴n鏁版嵁
      */
     @TableField("mn")
+    @JsonProperty("MN")
     private String mn;
 
     /**
      * 鍚嶇О
      */
     @TableField("name")
+    @JsonProperty("Name")
     private String name;
 
     /**
      * 搴楀鍘熷洜瀵艰嚧绂荤嚎澶╂暟
      */
     @TableField("off_line_cause_by_shop_days")
+    @JsonProperty("OfflineCausedByShopDays")
     private Integer offLineCauseByShopDays;
 
     /**
      * 鎵�灞炲崟浣�
      */
     @TableField("owner")
+    @JsonProperty("Owner")
     private String owner;
 
     /**
      * 姝囦笟澶╂暟
      */
     @TableField("shop_close_days")
+    @JsonProperty("ShopClosedDays")
     private Integer shopCloseDays;
 
     /**
      * 鐘舵�乕1:涓�鑸洃娴嬬偣,2:鐗规畩鐩戞祴鐐�,99:搴熷純鐩戞祴鐐筣
      */
     @TableField("status")
+    @JsonProperty("Status")
     private Integer status;
 
     /**
      * 鐘舵�佹弿杩�
      */
     @TableField("status_desc")
+    @JsonProperty("StatusDesc")
     private String statusDesc;
 
 

--
Gitblit v1.8.0