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

@@ -18,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping("api/device")
@@ -68,4 +69,11 @@ public class TDeviceController {
         return AjaxResult.success();
     }
 
+    @Log(title = "设备编号批量删除")
+    @PostMapping("/del_ex")
+    @ApiOperation(value="设备编号批量删除")
+    public AjaxResult<Object> del_ex(@RequestBody List<Long> ids) {
+        return iTDeviceService.del_ex(ids);
+    }
+
 }

taphole-device/src/main/java/com/sckj/device/entity/TCamera.java

@@ -18,6 +18,9 @@ public class TCamera implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "删除标志（1删除 0未删）")
+    private String delFlag;
+
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
@@ -76,4 +79,4 @@ public class TCamera implements Serializable {
     @ApiModelProperty(value = "显示顺序")
     private Integer sort;
 
-}
+}

taphole-device/src/main/java/com/sckj/device/entity/TDevice.java

@@ -18,6 +18,9 @@ public class TDevice implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "删除标志（1删除 0未删）")
+    private String delFlag;
+
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
@@ -55,4 +58,4 @@ public class TDevice implements Serializable {
     @ApiModelProperty(value = "设备规格")
     private String size;
 
-}
+}

taphole-device/src/main/java/com/sckj/device/entity/TDeviceFactory.java

@@ -18,6 +18,9 @@ public class TDeviceFactory implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "删除标志（1删除 0未删）")
+    private String delFlag;
+
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
@@ -49,4 +52,4 @@ public class TDeviceFactory implements Serializable {
     @ApiModelProperty(value = "质量认证证书路径")
     private String qcPath;
 
-}
+}

taphole-device/src/main/java/com/sckj/device/entity/TDeviceLocation.java

@@ -18,6 +18,9 @@ public class TDeviceLocation implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "删除标志（1删除 0未删）")
+    private String delFlag;
+
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
@@ -55,4 +58,4 @@ public class TDeviceLocation implements Serializable {
     @ApiModelProperty(value = "维护日志")
     private String protectLog;
 
-}
+}

taphole-device/src/main/java/com/sckj/device/entity/TDeviceType.java

@@ -18,6 +18,9 @@ public class TDeviceType implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "删除标志（1删除 0未删）")
+    private String delFlag;
+
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
@@ -37,4 +40,4 @@ public class TDeviceType implements Serializable {
     @ApiModelProperty(value = "设备类型名称")
     private String name;
 
-}
+}

taphole-device/src/main/java/com/sckj/device/entity/TProtocol.java

@@ -17,6 +17,9 @@ public class TProtocol implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "删除标志（1删除 0未删）")
+    private String delFlag;
+
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
@@ -51,4 +54,4 @@ public class TProtocol implements Serializable {
     @ApiModelProperty(value = "超时时间")
     private String timeout;
 
-}
+}

taphole-device/src/main/java/com/sckj/device/service/ITDeviceService.java

@@ -1,5 +1,6 @@
 package com.sckj.device.service;
 
+import com.sckj.common.core.AjaxResult;
 import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.device.validate.TDeviceCreateValidate;
 import com.sckj.device.validate.TDeviceUpdateValidate;
@@ -8,6 +9,8 @@ import com.sckj.device.vo.TDeviceListedVo;
 import com.sckj.device.vo.TDeviceDetailVo;
 import com.sckj.common.core.PageResult;
 
+import java.util.List;
+
 /**
  * 设备编号服务接口类
  * @author zhanghao
@@ -57,4 +60,6 @@ public interface ITDeviceService {
      */
     void del(Integer id);
 
+    AjaxResult<Object> del_ex(List<Long> ids);
+
 }

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

@@ -58,6 +58,7 @@ public class TCameraServiceImpl extends ServiceImpl<TCameraMapper, TCamera> {
         Integer limit = pageValidate.getPageSize();
 
         QueryWrapper<TCamera> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("del_flag", "1");
         queryWrapper.orderByDesc("id");
 
         tCameraMapper.setSearch(queryWrapper, searchValidate, new String[]{
@@ -72,6 +73,7 @@ public class TCameraServiceImpl extends ServiceImpl<TCameraMapper, TCamera> {
         for (TCamera item : iPage.getRecords()) {
             TCameraListedVo vo = new TCameraListedVo();
             BeanUtils.copyProperties(item, vo);
+            vo.setAddress("rtsp://"+item.getAccount()+":"+item.getPassword()+"@"+item.getIp()+":"+item.getPort()+"/102");
             list.add(vo);
         }
 
@@ -88,7 +90,7 @@ public class TCameraServiceImpl extends ServiceImpl<TCameraMapper, TCamera> {
     public TCameraDetailVo detail(Integer id) {
         TCamera model = tCameraMapper.selectOne(
                 new QueryWrapper<TCamera>()
-                        .eq("id", id)
+                        .eq("id", id).eq("del_flag", "1")
                         .last("limit 1"));
 
         Assert.notNull(model, "数据不存在");
@@ -182,7 +184,9 @@ public class TCameraServiceImpl extends ServiceImpl<TCameraMapper, TCamera> {
 
         Assert.notNull(model, "数据不存在!");
 
-        tCameraMapper.delete(new QueryWrapper<TCamera>().eq("id", id));
+        model.setDelFlag("0");
+
+        tCameraMapper.updateById(model);
     }
 
     /**
@@ -196,10 +200,12 @@ public class TCameraServiceImpl extends ServiceImpl<TCameraMapper, TCamera> {
                 new QueryWrapper<TCamera>()
                         .in("id", ids));
 
-        if (CollectionUtils.isEmpty(models)) {
+        if (CollectionUtils.isEmpty(models)){
             return AjaxResult.failed("数据不存在");
         }
-        tCameraMapper.delete(new QueryWrapper<TCamera>().in("id", ids));
+        TCamera model = new TCamera();
+        model.setDelFlag("0");
+        tCameraMapper.update(model, new QueryWrapper<TCamera>().in("id", ids));
         return AjaxResult.success();
     }
 

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

@@ -52,6 +52,7 @@ public class TDeviceFactoryServiceImpl implements ITDeviceFactoryService {
         Integer limit = pageValidate.getPageSize();
 
         QueryWrapper<TDeviceFactory> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("del_flag", "1");
         queryWrapper.orderByDesc("id");
 
 //        if (StringUtils.isNotEmpty(searchValidate.getCreateTimeStart()) && StringUtils.isNotEmpty(searchValidate.getCreateTimeEnd())) {
@@ -89,7 +90,7 @@ public class TDeviceFactoryServiceImpl implements ITDeviceFactoryService {
     public TDeviceFactoryDetailVo detail(Integer id) {
         TDeviceFactory model = tDeviceFactoryMapper.selectOne(
                 new QueryWrapper<TDeviceFactory>()
-                        .eq("id", id)
+                        .eq("id", id).eq("del_flag", "1")
                         .last("limit 1"));
 
         Assert.notNull(model, "数据不存在");
@@ -166,7 +167,9 @@ public class TDeviceFactoryServiceImpl implements ITDeviceFactoryService {
 
         Assert.notNull(model, "数据不存在!");
 
-        tDeviceFactoryMapper.delete(new QueryWrapper<TDeviceFactory>().eq("id", id));
+        model.setDelFlag("0");
+
+        tDeviceFactoryMapper.updateById(model);
     }
 
     /**
@@ -184,7 +187,9 @@ public class TDeviceFactoryServiceImpl implements ITDeviceFactoryService {
         if (CollectionUtils.isEmpty(models)){
             return AjaxResult.failed("数据不存在");
         }
-        tDeviceFactoryMapper.delete(new QueryWrapper<TDeviceFactory>().in("id", ids));
+        TDeviceFactory model = new TDeviceFactory();
+        model.setDelFlag("0");
+        tDeviceFactoryMapper.update(model, new QueryWrapper<TDeviceFactory>().in("id", ids));
         return AjaxResult.success();
     }
 

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

@@ -31,7 +31,7 @@ import java.util.List;
  */
 @Service
 public class TDeviceLocationServiceImpl implements ITDeviceLocationService {
-        
+
     @Resource
     TDeviceLocationMapper tDeviceLocationMapper;
 
@@ -49,6 +49,7 @@ public class TDeviceLocationServiceImpl implements ITDeviceLocationService {
         Integer limit = pageValidate.getPageSize();
 
         QueryWrapper<TDeviceLocation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("del_flag", "1");
         queryWrapper.orderByDesc("id");
 
         tDeviceLocationMapper.setSearch(queryWrapper, searchValidate, new String[]{
@@ -80,7 +81,7 @@ public class TDeviceLocationServiceImpl implements ITDeviceLocationService {
     public TDeviceLocationDetailVo detail(Integer id) {
         TDeviceLocation model = tDeviceLocationMapper.selectOne(
                 new QueryWrapper<TDeviceLocation>()
-                    .eq("id", id)
+                    .eq("id", id).eq("del_flag", "1")
                     .last("limit 1"));
 
         Assert.notNull(model, "数据不存在");
@@ -144,12 +145,14 @@ public class TDeviceLocationServiceImpl implements ITDeviceLocationService {
     public void del(Integer id) {
         TDeviceLocation model = tDeviceLocationMapper.selectOne(
                 new QueryWrapper<TDeviceLocation>()
-                    .eq("id", id)
-                    .last("limit 1"));
+                        .eq("id", id)
+                        .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");
 
-        tDeviceLocationMapper.delete(new QueryWrapper<TDeviceLocation>().eq("id", id));
+        model.setDelFlag("0");
+
+        tDeviceLocationMapper.updateById(model);
     }
 
     /**
@@ -167,7 +170,9 @@ public class TDeviceLocationServiceImpl implements ITDeviceLocationService {
         if (CollectionUtils.isEmpty(models)){
             return AjaxResult.failed("数据不存在");
         }
-        tDeviceLocationMapper.delete(new QueryWrapper<TDeviceLocation>().in("id", ids));
+        TDeviceLocation model = new TDeviceLocation();
+        model.setDelFlag("0");
+        tDeviceLocationMapper.update(model, new QueryWrapper<TDeviceLocation>().in("id", ids));
         return AjaxResult.success();
     }
 

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

@@ -4,6 +4,7 @@ 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.device.entity.TDevice;
@@ -35,7 +36,7 @@ import static java.util.stream.Collectors.toMap;
  */
 @Service
 public class TDeviceServiceImpl implements ITDeviceService {
-        
+
     @Resource
     TDeviceMapper tDeviceMapper;
 
@@ -59,6 +60,7 @@ public class TDeviceServiceImpl implements ITDeviceService {
         Integer limit = pageValidate.getPageSize();
 
         QueryWrapper<TDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("del_flag", "1");
         queryWrapper.orderByDesc("id");
 
         tDeviceMapper.setSearch(queryWrapper, searchValidate, new String[]{
@@ -109,7 +111,7 @@ public class TDeviceServiceImpl implements ITDeviceService {
     public TDeviceDetailVo detail(Integer id) {
         TDevice model = tDeviceMapper.selectOne(
                 new QueryWrapper<TDevice>()
-                    .eq("id", id)
+                    .eq("id", id).eq("del_flag", "1")
                     .last("limit 1"));
 
         Assert.notNull(model, "数据不存在");
@@ -172,12 +174,29 @@ public class TDeviceServiceImpl implements ITDeviceService {
     public void del(Integer id) {
         TDevice model = tDeviceMapper.selectOne(
                 new QueryWrapper<TDevice>()
-                    .eq("id", id)
-                    .last("limit 1"));
+                        .eq("id", id)
+                        .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");
 
-        tDeviceMapper.delete(new QueryWrapper<TDevice>().eq("id", id));
+        model.setDelFlag("0");
+
+        tDeviceMapper.updateById(model);
+    }
+
+    @Override
+    public AjaxResult<Object> del_ex(List<Long> ids) {
+        List<TDevice> models = tDeviceMapper.selectList(
+                new QueryWrapper<TDevice>()
+                        .in("id", ids));
+
+        if (org.springframework.util.CollectionUtils.isEmpty(models)){
+            return AjaxResult.failed("数据不存在");
+        }
+        TDevice model = new TDevice();
+        model.setDelFlag("0");
+        tDeviceMapper.update(model, new QueryWrapper<TDevice>().in("id", ids));
+        return AjaxResult.success();
     }
 
 }

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

@@ -32,7 +32,7 @@ import java.util.List;
  */
 @Service
 public class TDeviceTypeServiceImpl implements ITDeviceTypeService {
-        
+
     @Resource
     TDeviceTypeMapper tDeviceTypeMapper;
 
@@ -50,6 +50,7 @@ public class TDeviceTypeServiceImpl implements ITDeviceTypeService {
         Integer limit = pageValidate.getPageSize();
 
         QueryWrapper<TDeviceType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("del_flag", "1");
         queryWrapper.orderByDesc("id");
 
         tDeviceTypeMapper.setSearch(queryWrapper, searchValidate, new String[]{
@@ -81,7 +82,7 @@ public class TDeviceTypeServiceImpl implements ITDeviceTypeService {
     public TDeviceTypeDetailVo detail(Integer id) {
         TDeviceType model = tDeviceTypeMapper.selectOne(
                 new QueryWrapper<TDeviceType>()
-                    .eq("id", id)
+                    .eq("id", id).eq("del_flag", "1")
                     .last("limit 1"));
 
         Assert.notNull(model, "数据不存在");
@@ -138,12 +139,14 @@ public class TDeviceTypeServiceImpl implements ITDeviceTypeService {
     public void del(Integer id) {
         TDeviceType model = tDeviceTypeMapper.selectOne(
                 new QueryWrapper<TDeviceType>()
-                    .eq("id", id)
-                    .last("limit 1"));
+                        .eq("id", id)
+                        .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");
 
-        tDeviceTypeMapper.delete(new QueryWrapper<TDeviceType>().eq("id", id));
+        model.setDelFlag("0");
+
+        tDeviceTypeMapper.updateById(model);
     }
 
     /**
@@ -161,7 +164,9 @@ public class TDeviceTypeServiceImpl implements ITDeviceTypeService {
         if (CollectionUtils.isEmpty(models)){
             return AjaxResult.failed("数据不存在");
         }
-        tDeviceTypeMapper.delete(new QueryWrapper<TDeviceType>().in("id", ids));
+        TDeviceType model = new TDeviceType();
+        model.setDelFlag("0");
+        tDeviceTypeMapper.update(model, new QueryWrapper<TDeviceType>().in("id", ids));
         return AjaxResult.success();
     }
 

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

@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
  */
 @Service
 public class TProtocolServiceImpl implements ITProtocolService {
-        
+
     @Resource
     TProtocolMapper tProtocolMapper;
 
@@ -51,6 +51,7 @@ public class TProtocolServiceImpl implements ITProtocolService {
         Integer limit = pageValidate.getPageSize();
 
         QueryWrapper<TProtocol> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("del_flag", "1");
         queryWrapper.orderByDesc("id");
 
         tProtocolMapper.setSearch(queryWrapper, searchValidate, new String[]{
@@ -82,7 +83,7 @@ public class TProtocolServiceImpl implements ITProtocolService {
     public TProtocolDetailVo detail(Integer id) {
         TProtocol model = tProtocolMapper.selectOne(
                 new QueryWrapper<TProtocol>()
-                    .eq("id", id)
+                    .eq("id", id).eq("del_flag", "1")
                     .last("limit 1"));
 
         Assert.notNull(model, "数据不存在");
@@ -167,12 +168,14 @@ public class TProtocolServiceImpl implements ITProtocolService {
     public void del(Integer id) {
         TProtocol model = tProtocolMapper.selectOne(
                 new QueryWrapper<TProtocol>()
-                    .eq("id", id)
-                    .last("limit 1"));
+                        .eq("id", id)
+                        .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");
 
-        tProtocolMapper.delete(new QueryWrapper<TProtocol>().eq("id", id));
+        model.setDelFlag("0");
+
+        tProtocolMapper.updateById(model);
     }
 
     /**
@@ -190,7 +193,9 @@ public class TProtocolServiceImpl implements ITProtocolService {
         if (CollectionUtils.isEmpty(models)){
             return AjaxResult.failed("数据不存在");
         }
-        tProtocolMapper.delete(new QueryWrapper<TProtocol>().in("id", ids));
+        TProtocol model = new TProtocol();
+        model.setDelFlag("0");
+        tProtocolMapper.update(model, new QueryWrapper<TProtocol>().in("id", ids));
         return AjaxResult.success();
     }
 

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

@@ -1,5 +1,6 @@
 package com.sckj.device.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -38,5 +39,8 @@ public class TCameraListedVo implements Serializable {
     @ApiModelProperty(value = "设备启用标志(1启用 0停用)")
     private String status;
 
+    @TableField(exist = false)
+    private String address;
+
 
 }

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

@@ -20,7 +20,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

@@ -119,4 +119,4 @@ public class TIronData implements Serializable {
     @ApiModelProperty(value = "钛")
     private String elementTi;
 
-}
+}

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

@@ -8,6 +8,7 @@ import com.sckj.common.core.AjaxResult;
 import com.sckj.common.core.PageResult;
 import com.sckj.common.exception.OperateException;
 import com.sckj.common.util.ExcelUtils;
+import com.sckj.common.util.StringUtils;
 import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.iron.entity.TIronData;
 import com.sckj.iron.mapper.TIronDataMapper;
@@ -143,9 +144,11 @@ public class TIronDataServiceImpl extends ServiceImpl<TIronDataMapper, TIronData
                 .eq(ObjectUtils.isNotEmpty(ironData.getIronWeight()), TIronData::getIronWeight, ironData.getIronWeight())
                 .eq(ObjectUtils.isNotEmpty(ironData.getIronCosttime()), TIronData::getIronCosttime, ironData.getIronCosttime())
                 .eq(ObjectUtils.isNotEmpty(ironData.getIronNo()), TIronData::getIronNo, ironData.getIronNo())
-                .between(TIronData::getCreateTime, ironData.getIronStarttime(), ironData.getIronEndtime())
                 .eq(ObjectUtils.isNotEmpty(ironData.getTapholeId()), TIronData::getTapholeId, ironData.getTapholeId())
         ;
+        if (StringUtils.isNotBlank(ironData.getIronStarttime()) && StringUtils.isNotBlank(ironData.getIronEndtime())){
+            queryWrapper.lambda().between(TIronData::getCreateTime, ironData.getIronStarttime(), ironData.getIronEndtime());
+        }
         return list(queryWrapper);
     }
 

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;
 
 
 }

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

@@ -70,6 +70,13 @@ public class TExceptionLogController {
         return AjaxResult.success();
     }
 
+    @Log(title = "异常情况记录批量删除")
+    @PostMapping("/del_ex")
+    @ApiOperation(value="异常情况记录批量删除")
+    public AjaxResult<Object> del_ex(@RequestBody List<Long> ids) {
+        return iTExceptionLogService.del_ex(ids);
+    }
+
     @Log(title = "异常情况记录导出")
     @PostMapping("/export")
     @ApiOperation(value="异常情况记录导出")

taphole-warn/src/main/java/com/sckj/warn/entity/TExceptionLog.java

@@ -17,6 +17,9 @@ public class TExceptionLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "删除标志（1删除 0未删）")
+    private String delFlag;
+
     @ApiModelProperty(value = "创建人")
     private String createBy;
 

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

@@ -1,5 +1,6 @@
 package com.sckj.warn.service;
 
+import com.sckj.common.core.AjaxResult;
 import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.warn.validate.TExceptionLogCreateValidate;
 import com.sckj.warn.validate.TExceptionLogUpdateValidate;
@@ -60,6 +61,8 @@ public interface ITExceptionLogService {
      */
     void del(Integer id);
 
+    AjaxResult<Object> del_ex(List<Long> ids);
+
     /**
      * 异常情况记录导出
      *

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

@@ -3,7 +3,9 @@ package com.sckj.warn.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.core.AjaxResult;
 import com.sckj.common.util.StringUtils;
+import com.sckj.warn.entity.TAudio;
 import com.sckj.warn.service.ITExceptionLogService;
 import com.sckj.common.core.PageResult;
 import com.sckj.common.util.TimeUtils;
@@ -23,6 +25,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 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.io.ByteArrayOutputStream;
@@ -55,6 +58,7 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
         Integer limit = pageValidate.getPageSize();
 
         QueryWrapper<TExceptionLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("del_flag", "1");
         queryWrapper.orderByDesc("id");
 
         /*数据库时间类型为datetime不可走setSearch()*/
@@ -97,7 +101,7 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
     public TExceptionLogDetailVo detail(Integer id) {
         TExceptionLog model = tExceptionLogMapper.selectOne(
                 new QueryWrapper<TExceptionLog>()
-                    .eq("id", id)
+                    .eq("id", id).eq("del_flag", "1")
                     .last("limit 1"));
 
         Assert.notNull(model, "数据不存在");
@@ -154,12 +158,29 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
     public void del(Integer id) {
         TExceptionLog model = tExceptionLogMapper.selectOne(
                 new QueryWrapper<TExceptionLog>()
-                    .eq("id", id)
-                    .last("limit 1"));
+                        .eq("id", id)
+                        .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");
 
-        tExceptionLogMapper.delete(new QueryWrapper<TExceptionLog>().eq("id", id));
+        model.setDelFlag("0");
+
+        tExceptionLogMapper.updateById(model);
+    }
+
+    @Override
+    public AjaxResult<Object> del_ex(List<Long> ids) {
+        List<TExceptionLog> models = tExceptionLogMapper.selectList(
+                new QueryWrapper<TExceptionLog>()
+                        .in("id", ids));
+
+        if (CollectionUtils.isEmpty(models)){
+            return AjaxResult.failed("数据不存在");
+        }
+        TExceptionLog model = new TExceptionLog();
+        model.setDelFlag("0");
+        tExceptionLogMapper.update(model, new QueryWrapper<TExceptionLog>().in("id", ids));
+        return AjaxResult.success();
     }
 
     /**