张浩---第八次提交：

修改部分接口和实体类;

taphole-iron/src/main/java/com/sckj/iron/controller/TIronDataController.java

@@ -23,7 +23,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @RestController
-@RequestMapping("api/iron")
+@RequestMapping("api/data")
 @Api(tags = "出铁数据管理")
 public class TIronDataController {
 

taphole-iron/src/main/java/com/sckj/iron/controller/TL2DataController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 
 @RestController
-@RequestMapping("api/data")
+@RequestMapping("api/l2")
 @Api(tags = "出铁数据管理")
 public class TL2DataController {
 

taphole-iron/src/main/java/com/sckj/iron/entity/TIronData.java

@@ -17,41 +17,47 @@ public class TIronData implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
     @TableId(value="id", type= IdType.AUTO)
     @ApiModelProperty(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "铁口编号")
-    private Integer tkbh;
+    @ApiModelProperty(value = "锅炉编号")
+    private Long boilerId;
+
+    @ApiModelProperty(value = "铁口区域编号")
+    private Long tapholeId;
 
     @ApiModelProperty(value = "出铁次数编号")
-    private Integer ctcsbh;
+    private String ironNo;
 
     @ApiModelProperty(value = "出铁时间")
-    private String ctsj;
+    private String ironCosttime;
+
+    @ApiModelProperty(value = "实际出铁量")
+    private Double ironWeight;
+
+    @ApiModelProperty(value = "实际渣量")
+    private String slagWeight;
+
+    @ApiModelProperty(value = "铁水平均温度")
+    private String avgTemp;
+
+    @ApiModelProperty(value = "泥炮量")
+    private String mudWeight;
+
+    @ApiModelProperty(value = "钻杆直径")
+    private String pollMm;
 
-    @ApiModelProperty(value = "出铁量")
-    private String ctl;
+    @ApiModelProperty(value = "开口深度")
+    private String openDepth;
 
-    @ApiModelProperty(value = "渣量")
-    private String zl;
+    @ApiModelProperty(value = "上料总干量")
+    private Double totalDry;
 
-    @ApiModelProperty(value = "危害程度")
-    private String whcd;
+    @ApiModelProperty(value = "开始时间")
+    private String ironStarttime;
 
-    @ApiModelProperty(value = "时间")
-    private String sj;
+    @ApiModelProperty(value = "结束时间")
+    private String ironEndtime;
 
-}
+}

taphole-iron/src/main/java/com/sckj/iron/validate/TIronDataSearchValidate.java

@@ -26,7 +26,7 @@ public class TIronDataSearchValidate implements Serializable {
     private String ironCosttime;
 
     @ApiModelProperty(value = "实际出铁量")
-    private double ironWeight;
+    private Double ironWeight;
 
     @ApiModelProperty(value = "实际渣量")
     private String slagWeight;
@@ -44,7 +44,7 @@ public class TIronDataSearchValidate implements Serializable {
     private String openDepth;
 
     @ApiModelProperty(value = "上料总干量")
-    private double totalDry;
+    private Double totalDry;
 
     @ApiModelProperty(value = "开始时间")
     private String ironStarttime;

taphole-iron/src/main/java/com/sckj/iron/vo/TIronDataDetailVo.java

@@ -17,29 +17,44 @@ public class TIronDataDetailVo implements Serializable {
     @ApiModelProperty(value = "")
     private Long id;
 
+    @ApiModelProperty(value = "锅炉编号")
+    private Long boilerId;
+
+    @ApiModelProperty(value = "铁口区域编号")
+    private Long tapholeId;
+
     @ApiModelProperty(value = "出铁次数编号")
-    private Integer ctcsbh;
+    private String ironNo;
 
     @ApiModelProperty(value = "出铁时间")
-    private String ctsj;
+    private String ironCosttime;
+
+    @ApiModelProperty(value = "实际出铁量")
+    private Double ironWeight;
+
+    @ApiModelProperty(value = "实际渣量")
+    private String slagWeight;
+
+    @ApiModelProperty(value = "铁水平均温度")
+    private String avgTemp;
 
-    @ApiModelProperty(value = "出铁量")
-    private String ctl;
+    @ApiModelProperty(value = "泥炮量")
+    private String mudWeight;
 
-    @ApiModelProperty(value = "渣量")
-    private String zl;
+    @ApiModelProperty(value = "钻杆直径")
+    private String pollMm;
 
-    @ApiModelProperty(value = "危害程度")
-    private String whcd;
+    @ApiModelProperty(value = "开口深度")
+    private String openDepth;
 
-    @ApiModelProperty(value = "设备区域")
-    private String sbqy;
+    @ApiModelProperty(value = "上料总干量")
+    private Double totalDry;
 
-    @ApiModelProperty(value = "时间")
-    private String sj;
+    @ApiModelProperty(value = "开始时间")
+    private String ironStarttime;
 
-    @ApiModelProperty(value = "次数")
-    private String cs;
+    @ApiModelProperty(value = "结束时间")
+    private String ironEndtime;
 
 
 }

taphole-iron/src/main/java/com/sckj/iron/vo/TIronDataListedVo.java

@@ -17,29 +17,44 @@ public class TIronDataListedVo implements Serializable {
     @ApiModelProperty(value = "")
     private Long id;
 
+    @ApiModelProperty(value = "锅炉编号")
+    private Long boilerId;
+
+    @ApiModelProperty(value = "铁口区域编号")
+    private Long tapholeId;
+
     @ApiModelProperty(value = "出铁次数编号")
-    private Integer ctcsbh;
+    private String ironNo;
 
     @ApiModelProperty(value = "出铁时间")
-    private String ctsj;
+    private String ironCosttime;
+
+    @ApiModelProperty(value = "实际出铁量")
+    private Double ironWeight;
+
+    @ApiModelProperty(value = "实际渣量")
+    private String slagWeight;
+
+    @ApiModelProperty(value = "铁水平均温度")
+    private String avgTemp;
 
-    @ApiModelProperty(value = "出铁量")
-    private String ctl;
+    @ApiModelProperty(value = "泥炮量")
+    private String mudWeight;
 
-    @ApiModelProperty(value = "渣量")
-    private String zl;
+    @ApiModelProperty(value = "钻杆直径")
+    private String pollMm;
 
-    @ApiModelProperty(value = "危害程度")
-    private String whcd;
+    @ApiModelProperty(value = "开口深度")
+    private String openDepth;
 
-    @ApiModelProperty(value = "设备区域")
-    private String sbqy;
+    @ApiModelProperty(value = "上料总干量")
+    private Double totalDry;
 
-    @ApiModelProperty(value = "时间")
-    private String sj;
+    @ApiModelProperty(value = "开始时间")
+    private String ironStarttime;
 
-    @ApiModelProperty(value = "次数")
-    private String cs;
+    @ApiModelProperty(value = "结束时间")
+    private String ironEndtime;
 
 
 }