解决冲突

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

@@ -22,19 +22,11 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
     @Data
     @Accessors(chain = true)
     @ApiModel(value="MonitorFanAlarmInfoDto", description="")
-    public class MonitorFanAlarmInfoDto {
+    public class MonitorFanAlarmInfoDto extends BaseEntity{
 
     private static final long serialVersionUID = 1L;
 
 
-  @ApiModelProperty(value = "ID")
-    private Long sequenceNbr;
-
-    private Date recDate;
-
-    private Long recUserId;
-
-    private Integer isDelete;
 
             @ApiModelProperty(value = "风机编号")
     private String fanNumber;

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

@@ -26,16 +26,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
     private static final long serialVersionUID = 1L;
 
 
-            @ApiModelProperty(value = "ID")
-
-    private Long sequenceNbr;
-
-    private Date recDate;
-
-    private Long recUserId;
-
-    private Integer isDelete;
-
             @ApiModelProperty(value = "风机编号")
     private String fanNumber;
 

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

@@ -26,15 +26,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
     private static final long serialVersionUID = 1L;
 
 
-            @ApiModelProperty(value = "ID")
 
-    private Long sequenceNbr;
-
-    private Date recDate;
-
-    private Long recUserId;
-
-    private Integer isDelete;
 
             @ApiModelProperty(value = "风机编号")
     private String fanNumber;

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

@@ -26,15 +26,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
     private static final long serialVersionUID = 1L;
 
 
-            @ApiModelProperty(value = "ID")
 
-    private Long sequenceNbr;
-
-    private Date recDate;
-
-    private Long recUserId;
-
-    private Integer isDelete;
 
             @ApiModelProperty(value = "风机编号")
     private String fanNumber;

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

@@ -27,15 +27,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
     private static final long serialVersionUID = 1L;
 
 
-            @ApiModelProperty(value = "ID")
-
-    private Long sequenceNbr;
-
-    private Date recDate;
-
-    private Long recUserId;
-
-    private Integer isDelete;
 
             @ApiModelProperty(value = "有功功率")
     private Double activePower;

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

@@ -26,15 +26,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
     private static final long serialVersionUID = 1L;
 
 
-            @ApiModelProperty(value = "ID")
-
-    private Long sequenceNbr;
-
-    private Date recDate;
-
-    private Long recUserId;
-
-    private Integer isDelete;
 
             @ApiModelProperty(value = "场站名称")
     private String stationName;

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

@@ -28,7 +28,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 
 
-
             @ApiModelProperty(value = "风机编号")
     private String fanNumber;
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/RegionNationWideDto.java

@@ -26,7 +26,7 @@ public class RegionNationWideDto {
     private String staitionType ;
     @ApiModelProperty(value = "场站容量")
     private String stationCapacity ;
-    @ApiModelProperty(value = "场站容量")
+    @ApiModelProperty(value = "风速")
     private String speendOrirradiate ;
     @ApiModelProperty(value = "坐标")
     private HashMap<String,Double> position ;

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

@@ -59,7 +59,7 @@ public class MonitoringServiceImpl {
                 RegionNationWideDto regionNationWideDto =new RegionNationWideDto();
                 regionNationWideDto.setStaitionName(stationBasic.getStationName());
                 regionNationWideDto.setStaitionType(stationBasic.getStationType());
-                regionNationWideDto.setSpeendOrirradiate("222.22");
+                regionNationWideDto.setSpeendOrirradiate(String.valueOf(Math.random()*1000));
                 StationCoordinate stationCoordinate = stationCoordinateMapper.selectOne(new QueryWrapper<StationCoordinate>().eq("station_id",stationBasic.getSequenceNbr()).eq("is_main_coordinate",0));
                 hashMap.put("lng", Double.valueOf(stationCoordinate.getLongitude()));
                 hashMap.put("lat", Double.valueOf(stationCoordinate.getLaitude()));