Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/common/converter/Double3Serializer.java

@@ -0,0 +1,34 @@
+package com.huaxu.common.converter;
+
+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;
+
+public class Double3Serializer extends JsonSerializer<Double> {
+
+    private DecimalFormat df = new DecimalFormat("0.###");
+
+    /**
+     * 小数保留3位返回给前端序列化器
+     * @param data
+     * @param jsonGenerator
+     * @param serializerProvider
+     * @throws IOException
+     */
+    @Override
+    public void serialize(Double data, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+            throws IOException {
+        if (data != null) {
+            if (data == 0) {
+                jsonGenerator.writeString("0");
+            } else {
+                jsonGenerator.writeString(df.format(data));
+            }
+
+        }
+    }
+
+}

sms_water/src/main/java/com/huaxu/dto/MonitorDataCollectDto.java

@@ -2,6 +2,8 @@ package com.huaxu.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huaxu.common.converter.Double3Serializer;
 import com.huaxu.model.ProgramItem;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
@@ -42,15 +44,19 @@ public class MonitorDataCollectDto {
     @ApiModelProperty(value = "采集时间")
     private Date collectDate;
 
+    @JsonSerialize(using = Double3Serializer.class)
     @ApiModelProperty("今日供水量or今日出水量")
     private Double yieldWaterUsage;
 
+    @JsonSerialize(using = Double3Serializer.class)
     @ApiModelProperty("今日取水量or今日进水量")
     private Double intakeWaterUsage;
 
+    @JsonSerialize(using = Double3Serializer.class)
     @ApiModelProperty("今日耗电量")
     private Double powerUsage;
 
+    @JsonSerialize(using = Double3Serializer.class)
     @ApiModelProperty("今日耗药量")
     private Double drugUsage;
 

sms_water/src/main/java/com/huaxu/dto/MonitorDataDto.java

@@ -2,6 +2,8 @@ package com.huaxu.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huaxu.common.converter.Double3Serializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,6 +29,7 @@ public class MonitorDataDto implements Serializable {
     private Long attributeId;
     @ApiModelProperty(value = "设备属性名称")
     private String attributeName;
+    @JsonSerialize(using = Double3Serializer.class)
     @ApiModelProperty(value = "采集数据")
     private Double dataValue;
     @ApiModelProperty(value = "单位")

sms_water/src/main/java/com/huaxu/dto/OnlineDataDto.java

@@ -2,6 +2,8 @@ package com.huaxu.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huaxu.common.converter.Double3Serializer;
 import com.huaxu.model.ProgramItem;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,15 +33,19 @@ public class OnlineDataDto {
     @ApiModelProperty("场景地址")
     private String address;
 
+    @JsonSerialize(using = Double3Serializer.class)
     @ApiModelProperty("今日供水量、今日出水量")
     private Double yieldWaterUsage;
 
+    @JsonSerialize(using = Double3Serializer.class)
     @ApiModelProperty("今日取水量、今日进水量")
     private Double intakeWaterUsage;
 
+    @JsonSerialize(using = Double3Serializer.class)
     @ApiModelProperty("今日耗电量")
     private Double powerUsage;
 
+    @JsonSerialize(using = Double3Serializer.class)
     @ApiModelProperty("今日耗药量")
     private Double drugUsage;
 

sms_water/src/main/java/com/huaxu/service/impl/CameraManageServiceImpl.java

@@ -68,6 +68,9 @@ public class CameraManageServiceImpl implements CameraManageService {
             cameraManage.setPalyUrl(baseUrl.replace("${type}",play));
             cameraManage.setReplayUrl(baseUrl.replace("${type}",replay));
         }
+        Map<String, String> allOrgName = util.getAllOrgName();
+        cameraManage.setDepartName(allOrgName.get(String.valueOf(cameraManage.getDeptOrgId())));
+        cameraManage.setCompanyName(allOrgName.get(String.valueOf(cameraManage.getCompanyOrgId())));
 
         return cameraManage;
     }

sms_water/src/main/resources/mapper/CameraManageMapper.xml

@@ -32,9 +32,9 @@
     <!-- 查询单个 -->
     <select id="selectById" resultMap="CameraManageMap">
         select
-        <include refid="Base_Column_List"/>
-        from sms_camera_manage a
-        where ID = #{id}
+        <include refid="Base_Column_List"/>,b.SCENE_NAME
+        from sms_camera_manage a join sms_scene b on a.SCENE_ID=b.ID
+        where a.ID = #{id}
     </select>
 
 

sms_water/src/main/resources/mapper/OnlineMonitorMapper.xml

@@ -94,7 +94,7 @@
         <if test="tenantId != null and tenantId != ''">
             and t1.tenant_id = #{tenantId}
         </if>
-        order by t1.scene_name
+        order by t6.alarm_start_time desc
     </select>
     <!--查询实时报警数量-->
     <select id="selectAlarmCount" resultType="java.util.Map">