张浩---第四次提交：

新增出铁管理模块;
加入出铁记录、堵口记录、出铁数据、出铁参数的crud接口;

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

@@ -33,8 +33,8 @@ public class CameraController {
     @ApiOperation("相机设备分页信息")
     @PostMapping("/list")
     public AjaxResult list(@Validated PageValidate pageValidate,
-                               @Validated Camera camera) {
-        PageHelper.startPage(pageValidate.getPageNo(),pageValidate.getPageSize());
+                           @Validated Camera camera) {
+        PageHelper.startPage(pageValidate.getPageNo(), pageValidate.getPageSize());
         return AjaxResult.success(cameraService.list());
     }
 
@@ -51,7 +51,7 @@ public class CameraController {
     //@Log(title = "文章分类新增")
     @ApiOperation("相机信息新增")
     @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody  Camera camera) {
+    public AjaxResult add(@Validated @RequestBody Camera camera) {
         cameraService.add(camera);
         return AjaxResult.success();
     }
@@ -70,6 +70,24 @@ public class CameraController {
         return AjaxResult.success();
     }
 
+    @ApiOperation("已启用相机信息查询")
+    @PostMapping("/enabledCameraMsg")
+    public AjaxResult enabledCameraMsg() {
+        return cameraService.enabledCameraMsg();
+    }
+
+    @ApiOperation("相机全局参数配置")
+    @PostMapping("/cameraConfig")
+    public AjaxResult cameraConfig(@RequestBody Long duration) {
+        return cameraService.cameraConfig(duration.toString());
+    }
+
+    @ApiOperation("相机状态切换")
+    @PostMapping("/statusChange")
+    public AjaxResult statusChange(@RequestBody Long id) {
+        return cameraService.statusChange(id);
+    }
+
 
     @ApiOperation("获取设备通道信息")
     @ApiImplicitParams({
@@ -109,6 +127,7 @@ public class CameraController {
 
     /**
      * 回放推流
+     *
      * @param id 相机id
      * @return ResultDTO
      */
@@ -132,6 +151,7 @@ public class CameraController {
 
     /**
      * 抓图
+     *
      * @return ResultDTO
      */
     @ApiOperation("抓图")
@@ -139,7 +159,7 @@ public class CameraController {
             @ApiImplicitParam(name = "id", value = "设备id", paramType = "query", dataType = "Long"),
     })
     @PostMapping("/catchPic")
-    public AjaxResult catchPic(Long id){
+    public AjaxResult catchPic(Long id) {
         CameraDTO cameraDTO = new CameraDTO();
         cameraDTO.setId(id);
         ResultDTO result = cameraService.catchPic(cameraDTO);
@@ -148,6 +168,7 @@ public class CameraController {
 
     /**
      * 视频下载
+     *
      * @return ResultDTO
      */
     @ApiOperation("视频下载")
@@ -169,6 +190,7 @@ public class CameraController {
 
     /**
      * 获取录像文件信息
+     *
      * @return ResultDTO
      */
     @ApiOperation("获取录像文件信息")
@@ -190,6 +212,7 @@ public class CameraController {
 
     /**
      * 关闭ffmpeg进程
+     *
      * @param id 相机id
      * @return Boolean
      */
@@ -198,13 +221,14 @@ public class CameraController {
             @ApiImplicitParam(name = "id", value = "FlowId", paramType = "query", dataType = "Long")
     })
     @PostMapping("/stopRtmp")
-    public AjaxResult stopRtmp(Long id){
+    public AjaxResult stopRtmp(Long id) {
         Boolean result = cameraService.stopRtmp(id);
         return AjaxResult.success(result);
     }
 
     /**
      * 关闭ffmpeg进程
+     *
      * @param taskName 相机id
      * @return Boolean
      */
@@ -213,13 +237,14 @@ public class CameraController {
             @ApiImplicitParam(name = "taskName", value = "taskName", paramType = "query", dataType = "String")
     })
     @PostMapping("/stopRtmpByTaskName")
-    public AjaxResult stopRtmpByTaskName(String taskName){
+    public AjaxResult stopRtmpByTaskName(String taskName) {
         Boolean result = cameraService.stopRtmpByTaskName(taskName);
         return AjaxResult.success(result);
     }
 
     /**
      * 关闭ffmpeg进程
+     *
      * @param ip 摄像机IP
      * @return Boolean
      */
@@ -228,7 +253,7 @@ public class CameraController {
             @ApiImplicitParam(name = "ip", value = "ip", paramType = "query", dataType = "String")
     })
     @PostMapping("/stopRtmpByIP")
-    public AjaxResult stopRtmpByIP(String ip){
+    public AjaxResult stopRtmpByIP(String ip) {
         Boolean result = cameraService.stopRtmpByIP(ip);
         return AjaxResult.success(result);
     }
@@ -236,6 +261,7 @@ public class CameraController {
 
     /**
      * 获取录像文件信息
+     *
      * @return ResultDTO
      */
     @ApiOperation("获取摄像机状态")
@@ -247,7 +273,7 @@ public class CameraController {
         CameraDTO cameraDTO = new CameraDTO();
         cameraDTO.setId(id);
         Integer result = cameraService.getState(cameraDTO);
-        return AjaxResult.success("成功",result);
+        return AjaxResult.success("成功", result);
     }
 
 }

taphole-camera/src/main/java/com.sckj.camera/service/CameraServiceImpl.java

@@ -14,6 +14,7 @@ import com.sckj.camera.model.mapper.CameraMapper;
 import com.sckj.camera.util.FlowUtils;
 import com.sckj.camera.util.HikCameraUtils;
 import com.sckj.common.aop.CameraLogin;
+import com.sckj.common.core.AjaxResult;
 import com.sckj.common.exception.OperateException;
 import com.sckj.common.util.UrlUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -23,8 +24,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
 import java.io.File;
@@ -35,6 +36,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
+import static com.sckj.common.util.ConfigUtils.set;
+
 @Service
 @Transactional
 public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> {
@@ -65,6 +68,31 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> {
         updateById(camera);
     }
 
+    public AjaxResult enabledCameraMsg(){
+        String[] status = new String[]{"1", "2"};
+        List<Camera> cameraList = baseMapper.selectList(
+                new QueryWrapper<Camera>().in("status", status).orderByDesc("id"));
+        return AjaxResult.success(cameraList);
+    }
+
+    public AjaxResult cameraConfig(@RequestBody String duration) {
+        set("camera", "duration", duration);
+        return AjaxResult.success();
+    }
+
+    public AjaxResult statusChange(Long id){
+        Camera camera = baseMapper.selectOne(
+                new QueryWrapper<Camera>()
+                        .eq("id", id)
+                        .last("limit 1"));
+        if (camera == null){
+            return AjaxResult.failed("该相机不存在");
+        }
+        camera.setStatus(camera.getStatus().equals("1") ? "2" : "1");
+        updateById(camera);
+        return AjaxResult.success("相机状态切换成功");
+    }
+
     @CameraLogin
     public ResultDTO getChannel(CameraDTO cameraDTO) {
         ResultDTO resultDTO = new ResultDTO();

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

@@ -155,7 +155,7 @@ public class TCameraServiceImpl implements ITCameraService {
     }
 
     public boolean checkPortAndIp(String port, String ip){
-        if (Integer.parseInt(port) > 65535){
+        if (Integer.parseInt(port) > 65535 && Integer.parseInt(port) < 0){
             return false;
         }
         String IP_PATTERN = "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$";

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

@@ -145,7 +145,7 @@ public class TProtocolServiceImpl implements ITProtocolService {
     }
 
     public boolean checkPortAndIp(String port, String ip){
-        if (Integer.parseInt(port) > 65535){
+        if (Integer.parseInt(port) > 65535 && Integer.parseInt(port) < 0){
             return false;
         }
         String IP_PATTERN = "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$";

taphole-device/src/main/java/com/sckj/device/vo/TDeviceTypeListedVo.java

@@ -22,6 +22,9 @@ public class TDeviceTypeListedVo implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private String createTime;
 
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
     @ApiModelProperty(value = "更新时间")
     private String updateTime;
 }

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

@@ -0,0 +1,69 @@
+package com.sckj.iron.controller;
+
+import com.sckj.common.aop.Log;
+import com.sckj.iron.service.ITIronAfterService;
+import com.sckj.common.validate.commons.IdValidate;
+import com.sckj.iron.validate.TIronAfterCreateValidate;
+import com.sckj.iron.validate.TIronAfterUpdateValidate;
+import com.sckj.iron.validate.TIronAfterSearchValidate;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.vo.TIronAfterListedVo;
+import com.sckj.iron.vo.TIronAfterDetailVo;
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.core.PageResult;
+import com.sckj.common.validator.annotation.IDMust;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("api/after")
+@Api(tags = "出铁后管理")
+public class TIronAfterController {
+
+    @Resource
+    ITIronAfterService iTIronAfterService;
+
+    @GetMapping("/list")
+    @ApiOperation(value="出铁后列表")
+    public AjaxResult<PageResult<TIronAfterListedVo>> list(@Validated PageValidate pageValidate,
+                                                     @Validated TIronAfterSearchValidate searchValidate) {
+        PageResult<TIronAfterListedVo> list = iTIronAfterService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation(value="出铁后详情")
+    public AjaxResult<TIronAfterDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        TIronAfterDetailVo detail = iTIronAfterService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+    @Log(title = "出铁后新增")
+    @PostMapping("/add")
+    @ApiOperation(value="出铁后新增")
+    public AjaxResult<Object> add(@Validated @RequestBody TIronAfterCreateValidate createValidate) {
+        iTIronAfterService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+    @Log(title = "出铁后删除")
+    @PostMapping("/del")
+    @ApiOperation(value="出铁后删除")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iTIronAfterService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+    @Log(title = "出铁后批量删除")
+    @PostMapping("/del_ex")
+    @ApiOperation(value="出铁后批量删除")
+    public AjaxResult<Object> del_ex(@RequestBody List<Long> ids) {
+        return iTIronAfterService.del_ex(ids);
+    }
+
+}

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

@@ -0,0 +1,69 @@
+package com.sckj.iron.controller;
+
+import com.sckj.common.aop.Log;
+import com.sckj.iron.service.ITIronBlockService;
+import com.sckj.common.validate.commons.IdValidate;
+import com.sckj.iron.validate.TIronBlockCreateValidate;
+import com.sckj.iron.validate.TIronBlockUpdateValidate;
+import com.sckj.iron.validate.TIronBlockSearchValidate;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.vo.TIronBlockListedVo;
+import com.sckj.iron.vo.TIronBlockDetailVo;
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.core.PageResult;
+import com.sckj.common.validator.annotation.IDMust;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("api/block")
+@Api(tags = "堵口后管理")
+public class TIronBlockController {
+
+    @Resource
+    ITIronBlockService iTIronBlockService;
+
+    @GetMapping("/list")
+    @ApiOperation(value="堵口后列表")
+    public AjaxResult<PageResult<TIronBlockListedVo>> list(@Validated PageValidate pageValidate,
+                                                     @Validated TIronBlockSearchValidate searchValidate) {
+        PageResult<TIronBlockListedVo> list = iTIronBlockService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation(value="堵口后详情")
+    public AjaxResult<TIronBlockDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        TIronBlockDetailVo detail = iTIronBlockService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+    @Log(title = "堵口后新增")
+    @PostMapping("/add")
+    @ApiOperation(value="堵口后新增")
+    public AjaxResult<Object> add(@Validated @RequestBody TIronBlockCreateValidate createValidate) {
+        iTIronBlockService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+    @Log(title = "堵口后删除")
+    @PostMapping("/del")
+    @ApiOperation(value="堵口后删除")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iTIronBlockService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+    @Log(title = "堵口后批量删除")
+    @PostMapping("/del_ex")
+    @ApiOperation(value="堵口后批量删除")
+    public AjaxResult<Object> del_ex(@RequestBody List<Long> ids) {
+        return iTIronBlockService.del_ex(ids);
+    }
+
+}

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

@@ -0,0 +1,68 @@
+package com.sckj.iron.controller;
+
+import com.sckj.common.aop.Log;
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.core.PageResult;
+import com.sckj.common.validate.commons.IdValidate;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.common.validator.annotation.IDMust;
+import com.sckj.iron.service.ITIronDataService;
+import com.sckj.iron.validate.TIronDataCreateValidate;
+import com.sckj.iron.validate.TIronDataSearchValidate;
+import com.sckj.iron.vo.TIronDataDetailVo;
+import com.sckj.iron.vo.TIronDataListedVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("api/data")
+@Api(tags = "出铁数据管理")
+public class TIronDataController {
+
+    @Resource
+    ITIronDataService iTIronDataService;
+
+    @GetMapping("/list")
+    @ApiOperation(value="出铁数据列表")
+    public AjaxResult<PageResult<TIronDataListedVo>> list(@Validated PageValidate pageValidate,
+                                                     @Validated TIronDataSearchValidate searchValidate) {
+        PageResult<TIronDataListedVo> list = iTIronDataService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation(value="出铁数据详情")
+    public AjaxResult<TIronDataDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        TIronDataDetailVo detail = iTIronDataService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+    @Log(title = "出铁数据新增")
+    @PostMapping("/add")
+    @ApiOperation(value="出铁数据新增")
+    public AjaxResult<Object> add(@Validated @RequestBody TIronDataCreateValidate createValidate) {
+        iTIronDataService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+    @Log(title = "出铁数据删除")
+    @PostMapping("/del")
+    @ApiOperation(value="出铁数据删除")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iTIronDataService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+    @Log(title = "出铁数据批量删除")
+    @PostMapping("/del_ex")
+    @ApiOperation(value="出铁数据批量删除")
+    public AjaxResult<Object> del_ex(@RequestBody List<Long> ids) {
+        return iTIronDataService.del_ex(ids);
+    }
+
+}

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

@@ -0,0 +1,77 @@
+package com.sckj.iron.controller;
+
+import com.sckj.common.aop.Log;
+import com.sckj.iron.service.ITIronParamService;
+import com.sckj.common.validate.commons.IdValidate;
+import com.sckj.iron.validate.TIronParamCreateValidate;
+import com.sckj.iron.validate.TIronParamUpdateValidate;
+import com.sckj.iron.validate.TIronParamSearchValidate;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.vo.TIronParamListedVo;
+import com.sckj.iron.vo.TIronParamDetailVo;
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.core.PageResult;
+import com.sckj.common.validator.annotation.IDMust;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("api/param")
+@Api(tags = "参数设定管理")
+public class TIronParamController {
+
+    @Resource
+    ITIronParamService iTIronParamService;
+
+    @GetMapping("/list")
+    @ApiOperation(value="参数设定列表")
+    public AjaxResult<PageResult<TIronParamListedVo>> list(@Validated PageValidate pageValidate,
+                                                     @Validated TIronParamSearchValidate searchValidate) {
+        PageResult<TIronParamListedVo> list = iTIronParamService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation(value="参数设定详情")
+    public AjaxResult<TIronParamDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        TIronParamDetailVo detail = iTIronParamService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+    @Log(title = "参数设定新增")
+    @PostMapping("/add")
+    @ApiOperation(value="参数设定新增")
+    public AjaxResult<Object> add(@Validated @RequestBody TIronParamCreateValidate createValidate) {
+        iTIronParamService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+    @Log(title = "参数设定编辑")
+    @PostMapping("/edit")
+    @ApiOperation(value="参数设定编辑")
+    public AjaxResult<Object> edit(@Validated @RequestBody TIronParamUpdateValidate updateValidate) {
+        iTIronParamService.edit(updateValidate);
+        return AjaxResult.success();
+    }
+
+    @Log(title = "参数设定删除")
+    @PostMapping("/del")
+    @ApiOperation(value="参数设定删除")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iTIronParamService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+    @Log(title = "参数设定批量删除")
+    @PostMapping("/del_ex")
+    @ApiOperation(value="参数设定批量删除")
+    public AjaxResult<Object> del_ex(@RequestBody List<Long> ids) {
+        return iTIronParamService.del_ex(ids);
+    }
+
+}

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

@@ -0,0 +1,54 @@
+package com.sckj.iron.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel("出铁后实体")
+@TableName("t_iron_after")
+public class TIronAfter 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 = "")
+    private Long id;
+
+    @ApiModelProperty(value = "炉次")
+    private String lc;
+
+    @ApiModelProperty(value = "开口时间")
+    private String kksj;
+
+    @ApiModelProperty(value = "鱼雷罐车车号")
+    private String ylgcch;
+
+    @ApiModelProperty(value = "铁口深度")
+    private String tksd;
+
+    @ApiModelProperty(value = "铁水流速")
+    private String tsls;
+
+    @ApiModelProperty(value = "记录编号")
+    private Integer recordId;
+
+}

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

@@ -0,0 +1,55 @@
+package com.sckj.iron.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+
+@Data
+@ApiModel("堵口后实体")
+@TableName("t_iron_block")
+public class TIronBlock 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;
+
+    @ApiModelProperty(value = "堵口时间")
+    private String dksj;
+
+    @TableId(value="id", type= IdType.AUTO)
+    @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/entity/TIronData.java

@@ -0,0 +1,63 @@
+package com.sckj.iron.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel("出铁数据实体")
+@TableName("t_iron_data")
+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 = "")
+    private Long id;
+
+    @ApiModelProperty(value = "铁口编号")
+    private Integer tkbh;
+
+    @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-iron/src/main/java/com/sckj/iron/entity/TIronParam.java

@@ -0,0 +1,52 @@
+package com.sckj.iron.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel("参数设定实体")
+@TableName("t_iron_param")
+public class TIronParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @TableId(value="id", type= IdType.AUTO)
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    @ApiModelProperty(value = "开口耗时(s)")
+    private BigDecimal kkhs;
+
+    @ApiModelProperty(value = "出铁时间(s)")
+    private BigDecimal ctsj;
+
+    @ApiModelProperty(value = "出铁量(t)")
+    private BigDecimal ctl;
+
+    @ApiModelProperty(value = "出铁流速(t/s)")
+    private BigDecimal ctls;
+
+    @ApiModelProperty(value = "铁水温度变化(℃/s)")
+    private BigDecimal tswdbh;
+
+}

taphole-iron/src/main/java/com/sckj/iron/mapper/TIronAfterMapper.java

@@ -0,0 +1,13 @@
+package com.sckj.iron.mapper;
+
+import com.sckj.common.core.basics.IBaseMapper;
+import com.sckj.iron.entity.TIronAfter;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 出铁后Mapper
+ * @author zhanghao
+ */
+@Mapper
+public interface TIronAfterMapper extends IBaseMapper<TIronAfter> {
+}

taphole-iron/src/main/java/com/sckj/iron/mapper/TIronBlockMapper.java

@@ -0,0 +1,13 @@
+package com.sckj.iron.mapper;
+
+import com.sckj.common.core.basics.IBaseMapper;
+import com.sckj.iron.entity.TIronBlock;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 堵口后Mapper
+ * @author zhanghao
+ */
+@Mapper
+public interface TIronBlockMapper extends IBaseMapper<TIronBlock> {
+}

taphole-iron/src/main/java/com/sckj/iron/mapper/TIronDataMapper.java

@@ -0,0 +1,13 @@
+package com.sckj.iron.mapper;
+
+import com.sckj.common.core.basics.IBaseMapper;
+import com.sckj.iron.entity.TIronData;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 出铁数据Mapper
+ * @author zhnaghao
+ */
+@Mapper
+public interface TIronDataMapper extends IBaseMapper<TIronData> {
+}

taphole-iron/src/main/java/com/sckj/iron/mapper/TIronParamMapper.java

@@ -0,0 +1,13 @@
+package com.sckj.iron.mapper;
+
+import com.sckj.common.core.basics.IBaseMapper;
+import com.sckj.iron.entity.TIronParam;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 参数设定Mapper
+ * @author zhnaghao
+ */
+@Mapper
+public interface TIronParamMapper extends IBaseMapper<TIronParam> {
+}

taphole-iron/src/main/java/com/sckj/iron/service/ITIronAfterService.java

@@ -0,0 +1,63 @@
+package com.sckj.iron.service;
+
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.validate.TIronAfterCreateValidate;
+import com.sckj.iron.validate.TIronAfterUpdateValidate;
+import com.sckj.iron.validate.TIronAfterSearchValidate;
+import com.sckj.iron.vo.TIronAfterListedVo;
+import com.sckj.iron.vo.TIronAfterDetailVo;
+import com.sckj.common.core.PageResult;
+
+import java.util.List;
+
+/**
+ * 出铁后服务接口类
+ * @author zhanghao
+ */
+public interface ITIronAfterService {
+
+    /**
+     * 出铁后列表
+     *
+     * @author zhanghao
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<TIronAfterListedVo>
+     */
+    PageResult<TIronAfterListedVo> list(PageValidate pageValidate, TIronAfterSearchValidate searchValidate);
+
+    /**
+     * 出铁后详情
+     *
+     * @author zhanghao
+     * @param id 主键ID
+     * @return TIronAfterDetailVo
+     */
+    TIronAfterDetailVo detail(Integer id);
+
+    /**
+     * 出铁后新增
+     *
+     * @author zhanghao
+     * @param createValidate 参数
+     */
+    void add(TIronAfterCreateValidate createValidate);
+
+    /**
+     * 出铁后删除
+     *
+     * @author zhanghao
+     * @param id 主键ID
+     */
+    void del(Integer id);
+
+    /**
+     * 出铁后批量删除
+     *
+     * @author zhanghao
+     * @param ids 主键数组
+     */
+    AjaxResult<Object> del_ex(List<Long> ids);
+
+}

taphole-iron/src/main/java/com/sckj/iron/service/ITIronBlockService.java

@@ -0,0 +1,63 @@
+package com.sckj.iron.service;
+
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.validate.TIronBlockCreateValidate;
+import com.sckj.iron.validate.TIronBlockUpdateValidate;
+import com.sckj.iron.validate.TIronBlockSearchValidate;
+import com.sckj.iron.vo.TIronBlockListedVo;
+import com.sckj.iron.vo.TIronBlockDetailVo;
+import com.sckj.common.core.PageResult;
+
+import java.util.List;
+
+/**
+ * 堵口后服务接口类
+ * @author zhanghao
+ */
+public interface ITIronBlockService {
+
+    /**
+     * 堵口后列表
+     *
+     * @author zhanghao
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<TIronBlockListedVo>
+     */
+    PageResult<TIronBlockListedVo> list(PageValidate pageValidate, TIronBlockSearchValidate searchValidate);
+
+    /**
+     * 堵口后详情
+     *
+     * @author zhanghao
+     * @param id 主键ID
+     * @return TIronBlockDetailVo
+     */
+    TIronBlockDetailVo detail(Integer id);
+
+    /**
+     * 堵口后新增
+     *
+     * @author zhanghao
+     * @param createValidate 参数
+     */
+    void add(TIronBlockCreateValidate createValidate);
+
+    /**
+     * 堵口后删除
+     *
+     * @author zhanghao
+     * @param id 主键ID
+     */
+    void del(Integer id);
+
+    /**
+     * 堵口后批量删除
+     *
+     * @author zhanghao
+     * @param ids 主键ID
+     */
+    AjaxResult<Object> del_ex(List<Long> ids);
+
+}

taphole-iron/src/main/java/com/sckj/iron/service/ITIronDataService.java

@@ -0,0 +1,63 @@
+package com.sckj.iron.service;
+
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.validate.TIronDataCreateValidate;
+import com.sckj.iron.validate.TIronDataUpdateValidate;
+import com.sckj.iron.validate.TIronDataSearchValidate;
+import com.sckj.iron.vo.TIronDataListedVo;
+import com.sckj.iron.vo.TIronDataDetailVo;
+import com.sckj.common.core.PageResult;
+
+import java.util.List;
+
+/**
+ * 出铁数据服务接口类
+ * @author zhnaghao
+ */
+public interface ITIronDataService {
+
+    /**
+     * 出铁数据列表
+     *
+     * @author zhnaghao
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<TIronDataListedVo>
+     */
+    PageResult<TIronDataListedVo> list(PageValidate pageValidate, TIronDataSearchValidate searchValidate);
+
+    /**
+     * 出铁数据详情
+     *
+     * @author zhnaghao
+     * @param id 主键ID
+     * @return TIronDataDetailVo
+     */
+    TIronDataDetailVo detail(Integer id);
+
+    /**
+     * 出铁数据新增
+     *
+     * @author zhnaghao
+     * @param createValidate 参数
+     */
+    void add(TIronDataCreateValidate createValidate);
+
+    /**
+     * 出铁数据删除
+     *
+     * @author zhnaghao
+     * @param id 主键ID
+     */
+    void del(Integer id);
+
+    /**
+     * 出铁数据批量删除
+     *
+     * @author zhanghao
+     * @param ids 主键数组
+     */
+    AjaxResult<Object> del_ex(List<Long> ids);
+
+}

taphole-iron/src/main/java/com/sckj/iron/service/ITIronParamService.java

@@ -0,0 +1,71 @@
+package com.sckj.iron.service;
+
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.validate.TIronParamCreateValidate;
+import com.sckj.iron.validate.TIronParamUpdateValidate;
+import com.sckj.iron.validate.TIronParamSearchValidate;
+import com.sckj.iron.vo.TIronParamListedVo;
+import com.sckj.iron.vo.TIronParamDetailVo;
+import com.sckj.common.core.PageResult;
+
+import java.util.List;
+
+/**
+ * 参数设定服务接口类
+ * @author zhnaghao
+ */
+public interface ITIronParamService {
+
+    /**
+     * 参数设定列表
+     *
+     * @author zhnaghao
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<TIronParamListedVo>
+     */
+    PageResult<TIronParamListedVo> list(PageValidate pageValidate, TIronParamSearchValidate searchValidate);
+
+    /**
+     * 参数设定详情
+     *
+     * @author zhnaghao
+     * @param id 主键ID
+     * @return TIronParamDetailVo
+     */
+    TIronParamDetailVo detail(Integer id);
+
+    /**
+     * 参数设定新增
+     *
+     * @author zhnaghao
+     * @param createValidate 参数
+     */
+    void add(TIronParamCreateValidate createValidate);
+
+    /**
+     * 参数设定编辑
+     *
+     * @author zhnaghao
+     * @param updateValidate 参数
+     */
+    void edit(TIronParamUpdateValidate updateValidate);
+
+    /**
+     * 参数设定删除
+     *
+     * @author zhnaghao
+     * @param id 主键ID
+     */
+    void del(Integer id);
+
+    /**
+     * 参数设定批量删除
+     *
+     * @author zhanghao
+     * @param ids 主键数组
+     */
+    AjaxResult<Object> del_ex(List<Long> ids);
+
+}

taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronAfterServiceImpl.java

@@ -0,0 +1,151 @@
+package com.sckj.iron.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sckj.common.TapholeAdminThreadLocal;
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.core.PageResult;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.entity.TIronAfter;
+import com.sckj.iron.entity.TIronData;
+import com.sckj.iron.mapper.TIronAfterMapper;
+import com.sckj.iron.service.ITIronAfterService;
+import com.sckj.iron.validate.TIronAfterCreateValidate;
+import com.sckj.iron.validate.TIronAfterSearchValidate;
+import com.sckj.iron.validate.TIronAfterUpdateValidate;
+import com.sckj.iron.vo.TIronAfterDetailVo;
+import com.sckj.iron.vo.TIronAfterListedVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 出铁后实现类
+ * @author zhanghao
+ */
+@Service
+public class TIronAfterServiceImpl implements ITIronAfterService {
+        
+    @Resource
+    TIronAfterMapper tIronAfterMapper;
+
+    /**
+     * 出铁后列表
+     *
+     * @author zhanghao
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<TIronAfterListedVo>
+     */
+    @Override
+    public PageResult<TIronAfterListedVo> list(PageValidate pageValidate, TIronAfterSearchValidate searchValidate) {
+        Integer page  = pageValidate.getPageNo();
+        Integer limit = pageValidate.getPageSize();
+
+        QueryWrapper<TIronAfter> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("id");
+
+        tIronAfterMapper.setSearch(queryWrapper, searchValidate, new String[]{
+            "=:lc:str",
+            "=:ylgcch:str",
+            "=:tksd:str",
+            "=:tsls:str",
+        });
+
+        IPage<TIronAfter> iPage = tIronAfterMapper.selectPage(new Page<>(page, limit), queryWrapper);
+
+        List<TIronAfterListedVo> list = new LinkedList<>();
+        for(TIronAfter item : iPage.getRecords()) {
+            TIronAfterListedVo vo = new TIronAfterListedVo();
+            BeanUtils.copyProperties(item, vo);
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * 出铁后详情
+     *
+     * @author zhanghao
+     * @param id 主键参数
+     * @return TIronAfter
+     */
+    @Override
+    public TIronAfterDetailVo detail(Integer id) {
+        TIronAfter model = tIronAfterMapper.selectOne(
+                new QueryWrapper<TIronAfter>()
+                    .eq("id", id)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        TIronAfterDetailVo vo = new TIronAfterDetailVo();
+        BeanUtils.copyProperties(model, vo);
+        return vo;
+    }
+
+    /**
+     * 出铁后新增
+     *
+     * @author zhanghao
+     * @param createValidate 参数
+     */
+    @Override
+    public void add(TIronAfterCreateValidate createValidate) {
+        TIronAfter model = new TIronAfter();
+        model.setCreateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
+        model.setCreateTime(new Date(System.currentTimeMillis()));
+        model.setLc(createValidate.getLc());
+        model.setKksj(createValidate.getKksj());
+        model.setYlgcch(createValidate.getYlgcch());
+        model.setTksd(createValidate.getTksd());
+        model.setTsls(createValidate.getTsls());
+        model.setRecordId(createValidate.getRecordId());
+        tIronAfterMapper.insert(model);
+    }
+
+    /**
+     * 出铁后删除
+     *
+     * @author zhanghao
+     * @param id 主键ID
+     */
+    @Override
+    public void del(Integer id) {
+        TIronAfter model = tIronAfterMapper.selectOne(
+                new QueryWrapper<TIronAfter>()
+                    .eq("id", id)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        tIronAfterMapper.delete(new QueryWrapper<TIronAfter>().eq("id", id));
+    }
+
+    /**
+     * 出铁后批量删除
+     *
+     * @author zhanghao
+     * @param ids 主键数组
+     */
+    public AjaxResult<Object> del_ex(List<Long> ids){
+        List<TIronAfter> models = tIronAfterMapper.selectList(
+                new QueryWrapper<TIronAfter>()
+                        .in("id", ids));
+
+        if (CollectionUtils.isEmpty(models)){
+            return AjaxResult.failed("数据不存在");
+        }
+        tIronAfterMapper.delete(new QueryWrapper<TIronAfter>().in("id", ids));
+        return AjaxResult.success();
+    }
+
+}

taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronBlockServiceImpl.java

@@ -0,0 +1,151 @@
+package com.sckj.iron.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sckj.common.TapholeAdminThreadLocal;
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.core.PageResult;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.entity.TIronBlock;
+import com.sckj.iron.entity.TIronData;
+import com.sckj.iron.mapper.TIronBlockMapper;
+import com.sckj.iron.service.ITIronBlockService;
+import com.sckj.iron.validate.TIronBlockCreateValidate;
+import com.sckj.iron.validate.TIronBlockSearchValidate;
+import com.sckj.iron.validate.TIronBlockUpdateValidate;
+import com.sckj.iron.vo.TIronBlockDetailVo;
+import com.sckj.iron.vo.TIronBlockListedVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 堵口后实现类
+ * @author zhanghao
+ */
+@Service
+public class TIronBlockServiceImpl implements ITIronBlockService {
+        
+    @Resource
+    TIronBlockMapper tIronBlockMapper;
+
+    /**
+     * 堵口后列表
+     *
+     * @author zhanghao
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<TIronBlockListedVo>
+     */
+    @Override
+    public PageResult<TIronBlockListedVo> list(PageValidate pageValidate, TIronBlockSearchValidate searchValidate) {
+        Integer page  = pageValidate.getPageNo();
+        Integer limit = pageValidate.getPageSize();
+
+        QueryWrapper<TIronBlock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("id");
+
+        tIronBlockMapper.setSearch(queryWrapper, searchValidate, new String[]{
+            "eq:ctl:str",
+            "=:dnl:str",
+            "=:isPj@is_pj:str",
+            "=:isPn@is_pn:str",
+        });
+
+        IPage<TIronBlock> iPage = tIronBlockMapper.selectPage(new Page<>(page, limit), queryWrapper);
+
+        List<TIronBlockListedVo> list = new LinkedList<>();
+        for(TIronBlock item : iPage.getRecords()) {
+            TIronBlockListedVo vo = new TIronBlockListedVo();
+            BeanUtils.copyProperties(item, vo);
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * 堵口后详情
+     *
+     * @author zhanghao
+     * @param id 主键参数
+     * @return TIronBlock
+     */
+    @Override
+    public TIronBlockDetailVo detail(Integer id) {
+        TIronBlock model = tIronBlockMapper.selectOne(
+                new QueryWrapper<TIronBlock>()
+                    .eq("id", id)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        TIronBlockDetailVo vo = new TIronBlockDetailVo();
+        BeanUtils.copyProperties(model, vo);
+        return vo;
+    }
+
+    /**
+     * 堵口后新增
+     *
+     * @author zhanghao
+     * @param createValidate 参数
+     */
+    @Override
+    public void add(TIronBlockCreateValidate createValidate) {
+        TIronBlock model = new TIronBlock();
+        model.setCreateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
+        model.setCreateTime(new Date(System.currentTimeMillis()));
+        model.setDksj(createValidate.getDksj());
+        model.setCtl(createValidate.getCtl());
+        model.setDnl(createValidate.getDnl());
+        model.setIsPj(createValidate.getIsPj());
+        model.setIsPn(createValidate.getIsPn());
+        model.setRecordId(createValidate.getRecordId());
+        tIronBlockMapper.insert(model);
+    }
+
+    /**
+     * 堵口后删除
+     *
+     * @author zhanghao
+     * @param id 主键ID
+     */
+    @Override
+    public void del(Integer id) {
+        TIronBlock model = tIronBlockMapper.selectOne(
+                new QueryWrapper<TIronBlock>()
+                    .eq("id", id)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        tIronBlockMapper.delete(new QueryWrapper<TIronBlock>().eq("id", id));
+    }
+
+    /**
+     * 堵口后批量删除
+     *
+     * @author zhanghao
+     * @param ids 主键数组
+     */
+    public AjaxResult<Object> del_ex(List<Long> ids){
+        List<TIronBlock> models = tIronBlockMapper.selectList(
+                new QueryWrapper<TIronBlock>()
+                        .in("id", ids));
+
+        if (CollectionUtils.isEmpty(models)){
+            return AjaxResult.failed("数据不存在");
+        }
+        tIronBlockMapper.delete(new QueryWrapper<TIronBlock>().in("id", ids));
+        return AjaxResult.success();
+    }
+
+}

taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronDataServiceImpl.java

@@ -0,0 +1,159 @@
+package com.sckj.iron.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sckj.common.TapholeAdminThreadLocal;
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.core.PageResult;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.entity.TIronData;
+import com.sckj.iron.mapper.TIronDataMapper;
+import com.sckj.iron.service.ITIronDataService;
+import com.sckj.iron.validate.TIronDataCreateValidate;
+import com.sckj.iron.validate.TIronDataSearchValidate;
+import com.sckj.iron.validate.TIronDataUpdateValidate;
+import com.sckj.iron.vo.TIronDataDetailVo;
+import com.sckj.iron.vo.TIronDataListedVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 出铁数据实现类
+ *
+ * @author zhnaghao
+ */
+@Service
+public class TIronDataServiceImpl implements ITIronDataService {
+
+    @Resource
+    TIronDataMapper tIronDataMapper;
+
+    /**
+     * 出铁数据列表
+     *
+     * @param pageValidate   分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<TIronDataListedVo>
+     * @author zhnaghao
+     */
+    @Override
+    public PageResult<TIronDataListedVo> list(PageValidate pageValidate, TIronDataSearchValidate searchValidate) {
+        Integer page = pageValidate.getPageNo();
+        Integer limit = pageValidate.getPageSize();
+
+        QueryWrapper<TIronData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("id");
+
+        tIronDataMapper.setSearch(queryWrapper, searchValidate, new String[]{
+                "=:tkbh:int",
+                "=:ctcsbh:int",
+                "=:ctsj:str",
+                "=:ctl:str",
+                "=:zl:str",
+                "=:whcd:str",
+                "=:sbqy:str",
+                "=:sj:str",
+                "=:cs:str",
+        });
+
+        IPage<TIronData> iPage = tIronDataMapper.selectPage(new Page<>(page, limit), queryWrapper);
+
+        List<TIronDataListedVo> list = new LinkedList<>();
+        for (TIronData item : iPage.getRecords()) {
+            TIronDataListedVo vo = new TIronDataListedVo();
+            BeanUtils.copyProperties(item, vo);
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * 出铁数据详情
+     *
+     * @param id 主键参数
+     * @return TIronData
+     * @author zhnaghao
+     */
+    @Override
+    public TIronDataDetailVo detail(Integer id) {
+        TIronData model = tIronDataMapper.selectOne(
+                new QueryWrapper<TIronData>()
+                        .eq("id", id)
+                        .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        TIronDataDetailVo vo = new TIronDataDetailVo();
+        BeanUtils.copyProperties(model, vo);
+        return vo;
+    }
+
+    /**
+     * 出铁数据新增
+     *
+     * @param createValidate 参数
+     * @author zhnaghao
+     */
+    @Override
+    public void add(TIronDataCreateValidate createValidate) {
+        TIronData model = new TIronData();
+        model.setCreateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
+        model.setCreateTime(new Date(System.currentTimeMillis()));
+        model.setTkbh(createValidate.getTkbh());
+        model.setCtcsbh(createValidate.getCtcsbh());
+        model.setCtsj(createValidate.getCtsj());
+        model.setCtl(createValidate.getCtl());
+        model.setZl(createValidate.getZl());
+        model.setWhcd(createValidate.getWhcd());
+        model.setSbqy(createValidate.getSbqy());
+        model.setSj(createValidate.getSj());
+        model.setCs(createValidate.getCs());
+        tIronDataMapper.insert(model);
+    }
+
+    /**
+     * 出铁数据删除
+     *
+     * @param id 主键ID
+     * @author zhnaghao
+     */
+    @Override
+    public void del(Integer id) {
+        TIronData model = tIronDataMapper.selectOne(
+                new QueryWrapper<TIronData>()
+                        .eq("id", id)
+                        .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        tIronDataMapper.delete(new QueryWrapper<TIronData>().eq("id", id));
+    }
+
+    /**
+     * 出铁数据批量删除
+     *
+     * @author zhanghao
+     * @param ids 主键数组
+     */
+    public AjaxResult<Object> del_ex(List<Long> ids){
+        List<TIronData> models = tIronDataMapper.selectList(
+                new QueryWrapper<TIronData>()
+                        .in("id", ids));
+
+        if (CollectionUtils.isEmpty(models)){
+            return AjaxResult.failed("数据不存在");
+        }
+        tIronDataMapper.delete(new QueryWrapper<TIronData>().in("id", ids));
+        return AjaxResult.success();
+    }
+
+}

taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronParamServiceImpl.java

@@ -0,0 +1,175 @@
+package com.sckj.iron.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sckj.common.TapholeAdminThreadLocal;
+import com.sckj.common.core.AjaxResult;
+import com.sckj.common.core.PageResult;
+import com.sckj.common.util.TimeUtils;
+import com.sckj.common.validate.commons.PageValidate;
+import com.sckj.iron.entity.TIronData;
+import com.sckj.iron.entity.TIronParam;
+import com.sckj.iron.mapper.TIronParamMapper;
+import com.sckj.iron.service.ITIronParamService;
+import com.sckj.iron.validate.TIronParamCreateValidate;
+import com.sckj.iron.validate.TIronParamSearchValidate;
+import com.sckj.iron.validate.TIronParamUpdateValidate;
+import com.sckj.iron.vo.TIronParamDetailVo;
+import com.sckj.iron.vo.TIronParamListedVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 参数设定实现类
+ * @author zhnaghao
+ */
+@Service
+public class TIronParamServiceImpl implements ITIronParamService {
+        
+    @Resource
+    TIronParamMapper tIronParamMapper;
+
+    /**
+     * 参数设定列表
+     *
+     * @author zhnaghao
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<TIronParamListedVo>
+     */
+    @Override
+    public PageResult<TIronParamListedVo> list(PageValidate pageValidate, TIronParamSearchValidate searchValidate) {
+        Integer page  = pageValidate.getPageNo();
+        Integer limit = pageValidate.getPageSize();
+
+        QueryWrapper<TIronParam> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("id");
+
+        tIronParamMapper.setSearch(queryWrapper, searchValidate, new String[]{
+            "=:kkhs:str",
+            "=:ctsj:str",
+            "=:ctl:str",
+        });
+
+        IPage<TIronParam> iPage = tIronParamMapper.selectPage(new Page<>(page, limit), queryWrapper);
+
+        List<TIronParamListedVo> list = new LinkedList<>();
+        for(TIronParam item : iPage.getRecords()) {
+            TIronParamListedVo vo = new TIronParamListedVo();
+            BeanUtils.copyProperties(item, vo);
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * 参数设定详情
+     *
+     * @author zhnaghao
+     * @param id 主键参数
+     * @return TIronParam
+     */
+    @Override
+    public TIronParamDetailVo detail(Integer id) {
+        TIronParam model = tIronParamMapper.selectOne(
+                new QueryWrapper<TIronParam>()
+                    .eq("id", id)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        TIronParamDetailVo vo = new TIronParamDetailVo();
+        BeanUtils.copyProperties(model, vo);
+        return vo;
+    }
+
+    /**
+     * 参数设定新增
+     *
+     * @author zhnaghao
+     * @param createValidate 参数
+     */
+    @Override
+    public void add(TIronParamCreateValidate createValidate) {
+        TIronParam model = new TIronParam();
+        model.setCreateTime(new Date(System.currentTimeMillis()));
+        model.setCreateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
+        model.setKkhs(createValidate.getKkhs());
+        model.setCtsj(createValidate.getCtsj());
+        model.setCtl(createValidate.getCtl());
+        model.setCtls(createValidate.getCtls());
+        model.setTswdbh(createValidate.getTswdbh());
+        tIronParamMapper.insert(model);
+    }
+
+    /**
+     * 参数设定编辑
+     *
+     * @author zhnaghao
+     * @param updateValidate 参数
+     */
+    @Override
+    public void edit(TIronParamUpdateValidate updateValidate) {
+        TIronParam model = tIronParamMapper.selectOne(
+                new QueryWrapper<TIronParam>()
+                    .eq("id",  updateValidate.getId())
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setUpdateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
+        model.setUpdateTime(new Date(System.currentTimeMillis()));
+        model.setKkhs(updateValidate.getKkhs());
+        model.setCtsj(updateValidate.getCtsj());
+        model.setCtl(updateValidate.getCtl());
+        model.setCtls(updateValidate.getCtls());
+        model.setTswdbh(updateValidate.getTswdbh());
+        tIronParamMapper.updateById(model);
+    }
+
+    /**
+     * 参数设定删除
+     *
+     * @author zhnaghao
+     * @param id 主键ID
+     */
+    @Override
+    public void del(Integer id) {
+        TIronParam model = tIronParamMapper.selectOne(
+                new QueryWrapper<TIronParam>()
+                    .eq("id", id)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        tIronParamMapper.delete(new QueryWrapper<TIronParam>().eq("id", id));
+    }
+
+    /**
+     * 参数设定批量删除
+     *
+     * @author zhanghao
+     * @param ids 主键数组
+     */
+    public AjaxResult<Object> del_ex(List<Long> ids){
+        List<TIronParam> models = tIronParamMapper.selectList(
+                new QueryWrapper<TIronParam>()
+                        .in("id", ids));
+
+        if (CollectionUtils.isEmpty(models)){
+            return AjaxResult.failed("数据不存在");
+        }
+        tIronParamMapper.delete(new QueryWrapper<TIronParam>().in("id", ids));
+        return AjaxResult.success();
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel("出铁后创建参数")
+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;
+
+    @ApiModelProperty(value = "开口时间")
+    private String kksj;
+
+    @ApiModelProperty(value = "鱼雷罐车车号")
+    private String ylgcch;
+
+    @ApiModelProperty(value = "铁口深度")
+    private String tksd;
+
+    @ApiModelProperty(value = "铁水流速")
+    private String tsls;
+
+    @ApiModelProperty(value = "记录编号")
+    private Integer recordId;
+
+}

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

@@ -0,0 +1,28 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+
+@Data
+@ApiModel("出铁后搜素参数")
+public class TIronAfterSearchValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @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/validate/TIronAfterUpdateValidate.java

@@ -0,0 +1,17 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 出铁后参数
+ * @author zhanghao
+ */
+@Data
+@ApiModel("出铁后更新参数")
+public class TIronAfterUpdateValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,41 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+import javax.validation.constraints.*;
+
+@Data
+@ApiModel("堵口后创建参数")
+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;
+
+    @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/validate/TIronBlockSearchValidate.java

@@ -0,0 +1,28 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+
+@Data
+@ApiModel("堵口后搜素参数")
+public class TIronBlockSearchValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "出铁量")
+    private String ctl;
+
+    @ApiModelProperty(value = "打泥量")
+    private String dnl;
+
+    @ApiModelProperty(value = "是否喷溅")
+    private String isPj;
+
+    @ApiModelProperty(value = "是否跑泥")
+    private String isPn;
+
+}

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

@@ -0,0 +1,17 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 堵口后参数
+ * @author zhanghao
+ */
+@Data
+@ApiModel("堵口后更新参数")
+public class TIronBlockUpdateValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,50 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+import javax.validation.constraints.*;
+
+@Data
+@ApiModel("出铁数据创建参数")
+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;
+
+    @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-iron/src/main/java/com/sckj/iron/validate/TIronDataSearchValidate.java

@@ -0,0 +1,43 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+
+@Data
+@ApiModel("出铁数据搜素参数")
+public class TIronDataSearchValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "铁口编号")
+    private Integer tkbh;
+
+    @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-iron/src/main/java/com/sckj/iron/validate/TIronDataUpdateValidate.java

@@ -0,0 +1,18 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 出铁数据参数
+ * @author zhnaghao
+ */
+@Data
+@ApiModel("出铁数据更新参数")
+public class TIronDataUpdateValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,43 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import javax.validation.constraints.*;
+
+@Data
+@ApiModel("参数设定创建参数")
+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;
+
+    @ApiModelProperty(value = "出铁时间(s)")
+    private BigDecimal ctsj;
+
+    @ApiModelProperty(value = "出铁量(t)")
+    private BigDecimal ctl;
+
+    @ApiModelProperty(value = "出铁流速(t/s)")
+    private BigDecimal ctls;
+
+    @ApiModelProperty(value = "铁水温度变化(℃/s)")
+    private BigDecimal tswdbh;
+
+}

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

@@ -0,0 +1,30 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("参数设定搜素参数")
+public class TIronParamSearchValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开口耗时(s)")
+    private BigDecimal kkhs;
+
+    @ApiModelProperty(value = "出铁时间(s)")
+    private BigDecimal ctsj;
+
+    @ApiModelProperty(value = "出铁量(t)")
+    private BigDecimal ctl;
+
+}

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

@@ -0,0 +1,39 @@
+package com.sckj.iron.validate;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 参数设定参数
+ * @author zhnaghao
+ */
+@Data
+@ApiModel("参数设定更新参数")
+public class TIronParamUpdateValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "开口耗时(s)")
+    private BigDecimal kkhs;
+
+    @ApiModelProperty(value = "出铁时间(s)")
+    private BigDecimal ctsj;
+
+    @ApiModelProperty(value = "出铁量(t)")
+    private BigDecimal ctl;
+
+    @ApiModelProperty(value = "出铁流速(t/s)")
+    private BigDecimal ctls;
+
+    @ApiModelProperty(value = "铁水温度变化(℃/s)")
+    private BigDecimal tswdbh;
+
+}

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

@@ -0,0 +1,21 @@
+package com.sckj.iron.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+
+@Data
+@ApiModel("出铁后详情Vo")
+public class TIronAfterDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "")
+    private Long id;
+
+
+}

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

@@ -0,0 +1,39 @@
+package com.sckj.iron.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+
+@Data
+@ApiModel("出铁后列表Vo")
+public class TIronAfterListedVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    @ApiModelProperty(value = "炉次")
+    private String lc;
+
+    @ApiModelProperty(value = "开口时间")
+    private String kksj;
+
+    @ApiModelProperty(value = "鱼雷罐车车号")
+    private String ylgcch;
+
+    @ApiModelProperty(value = "铁口深度")
+    private String tksd;
+
+    @ApiModelProperty(value = "铁水流速")
+    private String tsls;
+
+    @ApiModelProperty(value = "记录编号")
+    private Integer recordId;
+
+
+}

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

@@ -0,0 +1,21 @@
+package com.sckj.iron.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+
+@Data
+@ApiModel("堵口后详情Vo")
+public class TIronBlockDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "")
+    private Long id;
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.sckj.iron.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel("堵口后列表Vo")
+public class TIronBlockListedVo 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

@@ -0,0 +1,21 @@
+package com.sckj.iron.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+
+@Data
+@ApiModel("出铁数据详情Vo")
+public class TIronDataDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "")
+    private Long id;
+
+
+}

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

@@ -0,0 +1,45 @@
+package com.sckj.iron.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+
+@Data
+@ApiModel("出铁数据列表Vo")
+public class TIronDataListedVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @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-iron/src/main/java/com/sckj/iron/vo/TIronParamDetailVo.java

@@ -0,0 +1,41 @@
+package com.sckj.iron.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("参数设定详情Vo")
+public class TIronParamDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    @ApiModelProperty(value = "开口耗时(s)")
+    private BigDecimal kkhs;
+
+    @ApiModelProperty(value = "出铁时间(s)")
+    private BigDecimal ctsj;
+
+    @ApiModelProperty(value = "出铁量(t)")
+    private BigDecimal ctl;
+
+    @ApiModelProperty(value = "出铁流速(t/s)")
+    private BigDecimal ctls;
+
+    @ApiModelProperty(value = "铁水温度变化(℃/s)")
+    private BigDecimal tswdbh;
+
+
+}

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

@@ -0,0 +1,41 @@
+package com.sckj.iron.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("参数设定列表Vo")
+public class TIronParamListedVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    @ApiModelProperty(value = "开口耗时(s)")
+    private BigDecimal kkhs;
+
+    @ApiModelProperty(value = "出铁时间(s)")
+    private BigDecimal ctsj;
+
+    @ApiModelProperty(value = "出铁量(t)")
+    private BigDecimal ctl;
+
+    @ApiModelProperty(value = "出铁流速(t/s)")
+    private BigDecimal ctls;
+
+    @ApiModelProperty(value = "铁水温度变化(℃/s)")
+    private BigDecimal tswdbh;
+
+
+}

taphole-warn/src/main/java/com/sckj/warn/controller/TAudioController.java

@@ -65,10 +65,7 @@ public class TAudioController {
     @PostMapping("/status")
     @ApiOperation(value="音频启用状态修改")
     public AjaxResult<Object> status(@Validated @RequestBody TAudioUpdateValidate updateValidate) {
-        if (iTAudioService.status(updateValidate) == 1){
-            return AjaxResult.success();
-        }
-        return AjaxResult.failed("音频启用状态修改失败");
+            return iTAudioService.status(updateValidate);
     }
 
     @Log(title = "音频删除")

taphole-warn/src/main/java/com/sckj/warn/service/ITAudioService.java

@@ -58,7 +58,7 @@ public interface ITAudioService {
      * @author zhanghao
      * @param updateValidate 参数
      */
-    int status(TAudioUpdateValidate updateValidate);
+    AjaxResult<Object> status(TAudioUpdateValidate updateValidate);
 
     /**
      * 音频删除

taphole-warn/src/main/java/com/sckj/warn/service/impl/TAudioServiceImpl.java

@@ -53,6 +53,7 @@ public class TAudioServiceImpl implements ITAudioService {
         Integer limit = pageValidate.getPageSize();
 
         QueryWrapper<TAudio> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("del_flag", "1");
         queryWrapper.orderByDesc("id");
 
         tAudioMapper.setSearch(queryWrapper, searchValidate, new String[]{
@@ -93,8 +94,9 @@ public class TAudioServiceImpl implements ITAudioService {
     public TAudioDetailVo detail(Integer id) {
         TAudio model = tAudioMapper.selectOne(
                 new QueryWrapper<TAudio>()
-                    .eq("id", id)
-                    .last("limit 1"));
+                        .eq("id", id)
+                        .eq("del_flag", "1")
+                        .last("limit 1"));
 
         Assert.notNull(model, "数据不存在");
 
@@ -133,10 +135,10 @@ public class TAudioServiceImpl implements ITAudioService {
     public int edit(TAudioUpdateValidate updateValidate) {
         TAudio model = tAudioMapper.selectOne(
                 new QueryWrapper<TAudio>()
-                    .eq("id",  updateValidate.getId())
+                    .eq("id",  updateValidate.getId()).eq("del_flag", "1")
                     .last("limit 1"));
 
-        if (model.getId() == null){
+        if (model == null){
             return 0;
         }
         model.setUpdateTime(new Date(System.currentTimeMillis()));
@@ -156,13 +158,13 @@ public class TAudioServiceImpl implements ITAudioService {
      * @param updateValidate 参数
      */
     @Override
-    public int status(TAudioUpdateValidate updateValidate) {
+    public AjaxResult<Object> status(TAudioUpdateValidate updateValidate) {
         TAudio model = tAudioMapper.selectOne(
                 new QueryWrapper<TAudio>()
-                        .eq("id",  updateValidate.getId())
+                        .eq("id",  updateValidate.getId()).eq("del_flag", "1")
                         .last("limit 1"));
-        if (model.getId() == null){
-            return 0;
+        if (model == null){
+            return AjaxResult.failed("未找到该音频");
         }
         /*如果将要修改的状态值和原来的值不同，且修改音频状态为启用*/
         if (!model.getStatus().equals(updateValidate.getStatus()) && updateValidate.getStatus().equals("1")){
@@ -174,8 +176,8 @@ public class TAudioServiceImpl implements ITAudioService {
                             .eq("status",  "1")
                             .last("limit 1"));
             //存在冲突
-            if (tAudio.getId() != null){
-                return 0;
+            if (tAudio != null){
+                return AjaxResult.failed("存在已启用的同类音频，禁止修改");
             }
         }
         /*未修改音频状态或停用音频或不存在启用状态冲突*/
@@ -183,7 +185,7 @@ public class TAudioServiceImpl implements ITAudioService {
         model.setUpdateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
         model.setStatus(updateValidate.getStatus());
         tAudioMapper.updateById(model);
-        return 1;
+        return AjaxResult.success();
     }
 
     /**
@@ -201,7 +203,9 @@ public class TAudioServiceImpl implements ITAudioService {
 
         Assert.notNull(model, "数据不存在!");
 
-        tAudioMapper.delete(new QueryWrapper<TAudio>().eq("id", id));
+        model.setDelFlag("0");
+
+        tAudioMapper.updateById(model);
     }
 
     /**
@@ -213,7 +217,7 @@ public class TAudioServiceImpl implements ITAudioService {
     public String searchPath(Long id){
         TAudio model = tAudioMapper.selectOne(
                 new QueryWrapper<TAudio>()
-                        .eq("id",  id)
+                        .eq("id",  id).eq("del_flag", "1")
                         .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");
@@ -235,7 +239,9 @@ public class TAudioServiceImpl implements ITAudioService {
         if (CollectionUtils.isEmpty(models)){
             return AjaxResult.failed("数据不存在");
         }
-        tAudioMapper.delete(new QueryWrapper<TAudio>().in("id", ids));
+        TAudio model = new TAudio();
+        model.setDelFlag("0");
+        tAudioMapper.update(model, new QueryWrapper<TAudio>().in("id", ids));
         return AjaxResult.success();
     }