Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/IndexDto.java

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
 import lombok.Data;
+import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 
@@ -42,8 +43,17 @@ public class IndexDto {
     private String displayName;
     private String pictureName;
     private String title;
+    private String timeString="";
     //对于创建时间进行处理用于列表排序
     public String getTimeString(){
-        return  getCreatedTime().replace("-","").replace(" ","").replace(":","");
+        String timeString = "";
+        if(!ObjectUtils.isEmpty(getCreatedTime())){
+            timeString =getCreatedTime().replace("-","").replace(" ","").replace(":","");
         }
+        return  timeString;
+    }
+    public void setTimeString(String timeString){
+        this.timeString = timeString;
+    }
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/StationBasic.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -151,5 +153,5 @@ public class StationBasic extends BaseEntity {
     private String boosterGatewayId;
     //地图偏移量
     @TableField(value = "title_pos",typeHandler = FastjsonTypeHandler.class)
-    private List<Double> titlePos;
+    private List<BigDecimal> titlePos;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MonitorFanIndicatorMapper.java

@@ -34,7 +34,8 @@ public interface MonitorFanIndicatorMapper extends BaseMapper<MonitorFanIndicato
 
     Object getIndicatoralueTotal(String gateway,String indicator);
 
-    List<Map<String, String>> getFanConfigPower(@Param("gatewayId") String gatewayId);
+    List<Map<String, String>> getFanConfigPower(@Param("gatewayId") String gatewayId,
+                                                @Param("equipmentNum") String equipmentNum);
 
     List<Map<String, String>> getBoosterStationInfo(@Param("gatewayId") String gatewayId);
 

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/MonitorFanIndicatorMapper.xml

@@ -86,7 +86,14 @@
             equipment_specific_name as equipmentSpecificName,
             gateway_id as gatewayId
         from fan_config_power
-        where gateway_id = #{gatewayId}
+            <where>
+                <if test="equipmentNum != null and equipmentNum != ''">
+                    and equipment_number = #{equipmentNum}
+                </if>
+                <if test="gatewayId != null and gatewayId != ''">
+                    and gateway_id = #{gatewayId}
+                </if>
+            </where>
     </select>
 
     <select id="getBoosterStationInfo" resultType="java.util.Map">