yq пре 4 година
родитељ
комит
bb6c4644ef

+ 23 - 0
fiveep-service/src/main/java/com/bizmatics/service/config/CustomerDoubleSerialize.java

@@ -0,0 +1,23 @@
+package com.bizmatics.service.config;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.text.DecimalFormat;
+
+/**
+ * @author yq
+ * @date 2021/7/23 11:12
+ */
+public class CustomerDoubleSerialize extends JsonSerializer<Double> {
+    //原本这里是  ##.00 ,带来的问题是如果数据库数据为0.00返回“ .00 “经评论指正,改为0.00
+    private DecimalFormat df = new DecimalFormat("0.00");
+    @Override
+    public void serialize(Double arg0, JsonGenerator arg1, SerializerProvider arg2) throws IOException {
+        if(arg0 != null) {
+            arg1.writeString(df.format(arg0));
+        }
+    }
+}

+ 2 - 10
fiveep-service/src/main/java/com/bizmatics/service/es/impl/RtAnalogServiceImpl.java

@@ -1,19 +1,10 @@
 package com.bizmatics.service.es.impl;
 
 import com.bizmatics.model.Device;
-import com.bizmatics.model.UserSite;
 import com.bizmatics.model.es.RtAnalog;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.persistence.mapper.es.ElasticRepository;
-import com.bizmatics.service.RtAnalogDataService;
 import com.bizmatics.service.es.RtAnalogService;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.elasticsearch.search.sort.FieldSortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -28,7 +19,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.elasticsearch.index.query.QueryBuilders.*;
+import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
+import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
 
 /**
  * @author yq

+ 11 - 0
fiveep-service/src/main/java/com/bizmatics/service/vo/HadCountVO.java

@@ -1,5 +1,7 @@
 package com.bizmatics.service.vo;
 
+import com.bizmatics.service.config.CustomerDoubleSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
 /**
@@ -12,43 +14,52 @@ public class HadCountVO {
     /**
      * 日用电量
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double dayCount;
 
     /**
      * 月用电量
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double monthCount;
 
     /**
      * 年用电量
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double yearCount;
 
     /**
      * 昨天用电量
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double lastDayCount;
     /**
      * 上月用电量
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double lastMonthCount;
 
     /**
      * 年用电量
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double lastYearCount;
 
     /**
      * 日期比例
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double dayRadio;
     /**
      * 月比例
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double monthRadio;
 
     /**
      * 年比例
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double yearRadio;
 }

+ 6 - 0
fiveep-service/src/main/java/com/bizmatics/service/vo/TimeShareVO.java

@@ -1,5 +1,7 @@
 package com.bizmatics.service.vo;
 
+import com.bizmatics.service.config.CustomerDoubleSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
 /**
@@ -12,17 +14,21 @@ public class TimeShareVO {
     /**
      * 尖
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double need = 0.00;
     /**
      * 峰
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double peak = 0.00;
     /**
      * 谷
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double grain = 0.00;
     /**
      * 平
      */
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double flat = 0.00;
 }