张浩---第六次提交：

修改部分接口和实体类;

taphole-camera/src/main/java/com.sckj.camera/controller/CameraController.java

@@ -23,7 +23,7 @@ import java.util.List;
 
 @Api(tags = "相机设备")
 @RestController
-@RequestMapping(value = "/camera")
+@RequestMapping(value = "api/camera")
 public class CameraController {
 
     @Autowired

taphole-device/src/main/java/com/sckj/device/controller/TCameraController.java

@@ -21,7 +21,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @RestController
-@RequestMapping("api/camera")
+@RequestMapping("api/cameraDevice")
 @Api(tags = "摄像头管理")
 public class TCameraController {
 

taphole-device/src/main/java/com/sckj/device/service/impl/TDeviceTypeServiceImpl.java

@@ -63,6 +63,7 @@ public class TDeviceTypeServiceImpl implements ITDeviceTypeService {
             TDeviceTypeListedVo vo = new TDeviceTypeListedVo();
             BeanUtils.copyProperties(item, vo);
             vo.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(item.getCreateTime()));
+            vo.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(item.getUpdateTime()));
             list.add(vo);
         }
 

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

@@ -12,12 +12,6 @@ public class TIronAfterCreateValidate implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
     @ApiModelProperty(value = "炉次")
     private String lc;
 

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

@@ -14,12 +14,6 @@ public class TIronBlockCreateValidate implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
     @ApiModelProperty(value = "堵口时间")
     private String dksj;
 

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

@@ -14,12 +14,6 @@ public class TIronDataCreateValidate implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
     @ApiModelProperty(value = "铁口编号")
     private Integer tkbh;
 

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

@@ -19,12 +19,6 @@ public class TIronParamCreateValidate implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
     @ApiModelProperty(value = "开口耗时(s)")
     private BigDecimal kkhs;
 

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

@@ -17,5 +17,15 @@ public class TIronAfterDetailVo implements Serializable {
     @ApiModelProperty(value = "")
     private Long id;
 
+    @ApiModelProperty(value = "炉次")
+    private String lc;
 
+    @ApiModelProperty(value = "鱼雷罐车车号")
+    private String ylgcch;
+
+    @ApiModelProperty(value = "铁口深度")
+    private String tksd;
+
+    @ApiModelProperty(value = "铁水流速")
+    private String tsls;
 }

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

@@ -14,8 +14,26 @@ public class TIronBlockDetailVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "堵口时间")
+    private String dksj;
+
     @ApiModelProperty(value = "")
     private Long id;
 
+    @ApiModelProperty(value = "出铁量")
+    private String ctl;
+
+    @ApiModelProperty(value = "打泥量")
+    private String dnl;
+
+    @ApiModelProperty(value = "是否喷溅")
+    private String isPj;
+
+    @ApiModelProperty(value = "是否跑泥")
+    private String isPn;
+
+    @ApiModelProperty(value = "记录编号")
+    private Integer recordId;
+
 
 }

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

@@ -17,5 +17,29 @@ public class TIronDataDetailVo implements Serializable {
     @ApiModelProperty(value = "")
     private Long id;
 
+    @ApiModelProperty(value = "出铁次数编号")
+    private Integer ctcsbh;
+
+    @ApiModelProperty(value = "出铁时间")
+    private String ctsj;
+
+    @ApiModelProperty(value = "出铁量")
+    private String ctl;
+
+    @ApiModelProperty(value = "渣量")
+    private String zl;
+
+    @ApiModelProperty(value = "危害程度")
+    private String whcd;
+
+    @ApiModelProperty(value = "设备区域")
+    private String sbqy;
+
+    @ApiModelProperty(value = "时间")
+    private String sj;
+
+    @ApiModelProperty(value = "次数")
+    private String cs;
+
 
 }

taphole-warn/src/main/java/com/sckj/warn/validate/TAudioCreateValidate.java

@@ -14,12 +14,6 @@ public class TAudioCreateValidate implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
     @NotNull(message = "name参数缺失")
     @ApiModelProperty(value = "音频名称")
     private String name;
@@ -36,8 +30,4 @@ public class TAudioCreateValidate implements Serializable {
     @ApiModelProperty(value = "音频地址;存放音频路径文件")
     private String path;
 
-    @NotNull(message = "status参数缺失")
-    @ApiModelProperty(value = "状态（1正常 0停用）")
-    private String status;
-
 }