张浩---第七次提交：

修改部分接口和实体类;

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

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

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

@@ -0,0 +1,69 @@
+package com.sckj.iron.controller;
+
+
+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.impl.TL2DataServiceImpl;
+import com.sckj.iron.validate.TL2DataCreateValidate;
+import com.sckj.iron.validate.TL2DataSearchValidate;
+import com.sckj.iron.validate.TL2DataUpdateValidate;
+import com.sckj.iron.vo.TL2DataDetailVo;
+import com.sckj.iron.vo.TL2DataListedVo;
+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;
+
+@RestController
+@RequestMapping("api/data")
+@Api(tags = "出铁数据管理")
+public class TL2DataController {
+
+    @Resource
+    TL2DataServiceImpl iTL2DataService;
+
+    @GetMapping("/list")
+    @ApiOperation(value="出铁数据列表")
+    public AjaxResult<PageResult<TL2DataListedVo>> list(@Validated PageValidate pageValidate,
+                                                        @Validated TL2DataSearchValidate searchValidate) {
+        PageResult<TL2DataListedVo> list = iTL2DataService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation(value="出铁数据详情")
+    public AjaxResult<TL2DataDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        TL2DataDetailVo detail = iTL2DataService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+
+    @PostMapping("/add")
+    @ApiOperation(value="出铁数据新增")
+    public AjaxResult<Object> add(@Validated @RequestBody TL2DataCreateValidate createValidate) {
+        iTL2DataService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+
+    @PostMapping("/edit")
+    @ApiOperation(value="出铁数据编辑")
+    public AjaxResult<Object> edit(@Validated @RequestBody TL2DataUpdateValidate updateValidate) {
+        iTL2DataService.edit(updateValidate);
+        return AjaxResult.success();
+    }
+
+
+    @PostMapping("/del")
+    @ApiOperation(value="出铁数据删除")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iTL2DataService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+}

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

@@ -2,15 +2,30 @@ package com.sckj.iron.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckj.common.core.PageResult;
 import com.sckj.common.util.ExcelUtils;
+import com.sckj.common.util.TimeUtils;
+import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.iron.entity.TL2Data;
 import com.sckj.iron.mapper.TL2DataMapper;
+import com.sckj.iron.validate.TL2DataCreateValidate;
+import com.sckj.iron.validate.TL2DataSearchValidate;
+import com.sckj.iron.validate.TL2DataUpdateValidate;
+import com.sckj.iron.vo.TL2DataDetailVo;
+import com.sckj.iron.vo.TL2DataListedVo;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -21,6 +36,167 @@ import java.util.List;
 @Service
 public class TL2DataServiceImpl extends ServiceImpl<TL2DataMapper, TL2Data> {
 
+    @Resource
+    TL2DataMapper tL2DataMapper;
+
+    /**
+     * 出铁数据列表
+     *
+     * @author LikeAdmin
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<TL2DataListedVo>
+     */
+
+    public PageResult<TL2DataListedVo> list(PageValidate pageValidate, TL2DataSearchValidate searchValidate) {
+        Integer page  = pageValidate.getPageNo();
+        Integer limit = pageValidate.getPageSize();
+
+        QueryWrapper<TL2Data> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("id");
+
+        tL2DataMapper.setSearch(queryWrapper, searchValidate, new String[]{
+                "=:boilerId@boiler_id:long",
+                "=:tapholeId@taphole_id:long",
+                "=:ironNo@iron_no:str",
+                "=:ironCosttime@iron_costtime:str",
+                "=:ironWeight@iron_weight:str",
+                "=:slagWeight@slag_weight:str",
+                "=:avgTemp@avg_temp:str",
+                "=:mudWeight@mud_weight:str",
+                "=:pollMm@poll_mm:str",
+                "=:openDepth@open_depth:str",
+                "=:totalDry@total_dry:str",
+                "=:ironStarttime@iron_starttime:str",
+                "=:ironEndtime@iron_endtime:str",
+                "=:elementC@element_c:str",
+                "=:elementSi@element_si:str",
+                "=:elementMn@element_mn:str",
+                "=:elementP@element_p:str",
+                "=:elementS@element_s:str",
+                "=:elementTi@element_ti:str",
+        });
+
+        IPage<TL2Data> iPage = tL2DataMapper.selectPage(new Page<>(page, limit), queryWrapper);
+
+        List<TL2DataListedVo> list = new LinkedList<>();
+        for(TL2Data item : iPage.getRecords()) {
+            TL2DataListedVo vo = new TL2DataListedVo();
+            BeanUtils.copyProperties(item, vo);
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * 出铁数据详情
+     *
+     * @author LikeAdmin
+     * @param id 主键参数
+     * @return TL2Data
+     */
+
+    public TL2DataDetailVo detail(Integer id) {
+        TL2Data model = tL2DataMapper.selectOne(
+                new QueryWrapper<TL2Data>()
+                        .eq("id", id)
+                        .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        TL2DataDetailVo vo = new TL2DataDetailVo();
+        BeanUtils.copyProperties(model, vo);
+        return vo;
+    }
+
+    /**
+     * 出铁数据新增
+     *
+     * @author LikeAdmin
+     * @param createValidate 参数
+     */
+
+    public void add(TL2DataCreateValidate createValidate) {
+        TL2Data model = new TL2Data();
+        model.setCreateTime(new Date(System.currentTimeMillis()));
+        model.setBoilerId(createValidate.getBoilerId());
+        model.setTapholeId(createValidate.getTapholeId());
+        model.setIronNo(createValidate.getIronNo());
+        model.setIronCosttime(createValidate.getIronCosttime());
+        model.setIronWeight(Double.valueOf(createValidate.getIronWeight()));
+        model.setSlagWeight(createValidate.getSlagWeight());
+        model.setAvgTemp(createValidate.getAvgTemp());
+        model.setMudWeight(createValidate.getMudWeight());
+        model.setPollMm(createValidate.getPollMm());
+        model.setOpenDepth(createValidate.getOpenDepth());
+        model.setTotalDry(Double.valueOf(createValidate.getTotalDry()));
+        model.setIronStarttime(createValidate.getIronStarttime());
+        model.setIronEndtime(createValidate.getIronEndtime());
+        model.setElementC(createValidate.getElementC());
+        model.setElementSi(createValidate.getElementSi());
+        model.setElementMn(createValidate.getElementMn());
+        model.setElementP(createValidate.getElementP());
+        model.setElementS(createValidate.getElementS());
+        model.setElementTi(createValidate.getElementTi());
+        tL2DataMapper.insert(model);
+    }
+
+    /**
+     * 出铁数据编辑
+     *
+     * @author LikeAdmin
+     * @param updateValidate 参数
+     */
+
+    public void edit(TL2DataUpdateValidate updateValidate) {
+        TL2Data model = tL2DataMapper.selectOne(
+                new QueryWrapper<TL2Data>()
+                        .eq("id",  updateValidate.getId())
+                        .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setId(updateValidate.getId());
+        model.setBoilerId(updateValidate.getBoilerId());
+        model.setTapholeId(updateValidate.getTapholeId());
+        model.setIronNo(updateValidate.getIronNo());
+        model.setIronCosttime(updateValidate.getIronCosttime());
+        model.setIronWeight(Double.valueOf(updateValidate.getIronWeight()));
+        model.setSlagWeight(updateValidate.getSlagWeight());
+        model.setAvgTemp(updateValidate.getAvgTemp());
+        model.setMudWeight(updateValidate.getMudWeight());
+        model.setPollMm(updateValidate.getPollMm());
+        model.setOpenDepth(updateValidate.getOpenDepth());
+        model.setTotalDry(Double.valueOf(updateValidate.getTotalDry()));
+        model.setIronStarttime(updateValidate.getIronStarttime());
+        model.setIronEndtime(updateValidate.getIronEndtime());
+        model.setElementC(updateValidate.getElementC());
+        model.setElementSi(updateValidate.getElementSi());
+        model.setElementMn(updateValidate.getElementMn());
+        model.setElementP(updateValidate.getElementP());
+        model.setElementS(updateValidate.getElementS());
+        model.setElementTi(updateValidate.getElementTi());
+        tL2DataMapper.updateById(model);
+    }
+
+    /**
+     * 出铁数据删除
+     *
+     * @author LikeAdmin
+     * @param id 主键ID
+     */
+
+    public void del(Integer id) {
+        TL2Data model = tL2DataMapper.selectOne(
+                new QueryWrapper<TL2Data>()
+                        .eq("id", id)
+                        .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        tL2DataMapper.delete(new QueryWrapper<TL2Data>().eq("id", id));
+    }
 
     /***
      * 获取最新2条数据

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

@@ -25,7 +25,7 @@ public class TIronDataSearchScreenValidate implements Serializable {
     private String ironCosttime;
 
     @ApiModelProperty(value = "实际出铁量")
-    private double ironWeight;
+    private Double ironWeight;
 
     @ApiModelProperty(value = "实际渣量")
     private String slagWeight;

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

@@ -0,0 +1,92 @@
+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 javax.validation.constraints.*;
+
+@Data
+@ApiModel("出铁数据创建参数")
+public class TL2DataCreateValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @NotNull(message = "boilerId参数缺失")
+    @ApiModelProperty(value = "锅炉编号")
+    private Long boilerId;
+
+    @NotNull(message = "tapholeId参数缺失")
+    @ApiModelProperty(value = "铁口区域编号")
+    private Long tapholeId;
+
+    @NotNull(message = "ironNo参数缺失")
+    @ApiModelProperty(value = "出铁次数编号")
+    private String ironNo;
+
+    @NotNull(message = "ironCosttime参数缺失")
+    @ApiModelProperty(value = "出铁时间")
+    private String ironCosttime;
+
+    @NotNull(message = "ironWeight参数缺失")
+    @ApiModelProperty(value = "实际出铁量")
+    private String ironWeight;
+
+    @NotNull(message = "slagWeight参数缺失")
+    @ApiModelProperty(value = "实际渣量")
+    private String slagWeight;
+
+    @NotNull(message = "avgTemp参数缺失")
+    @ApiModelProperty(value = "铁水平均温度")
+    private String avgTemp;
+
+    @NotNull(message = "mudWeight参数缺失")
+    @ApiModelProperty(value = "泥炮量")
+    private String mudWeight;
+
+    @NotNull(message = "pollMm参数缺失")
+    @ApiModelProperty(value = "钻杆直径")
+    private String pollMm;
+
+    @NotNull(message = "openDepth参数缺失")
+    @ApiModelProperty(value = "开口深度")
+    private String openDepth;
+
+    @NotNull(message = "totalDry参数缺失")
+    @ApiModelProperty(value = "上料总干量")
+    private String totalDry;
+
+    @NotNull(message = "ironStarttime参数缺失")
+    @ApiModelProperty(value = "开始时间")
+    private String ironStarttime;
+
+    @NotNull(message = "ironEndtime参数缺失")
+    @ApiModelProperty(value = "结束时间")
+    private String ironEndtime;
+
+    @NotNull(message = "elementC参数缺失")
+    @ApiModelProperty(value = "碳")
+    private String elementC;
+
+    @NotNull(message = "elementSi参数缺失")
+    @ApiModelProperty(value = "硅")
+    private String elementSi;
+
+    @NotNull(message = "elementMn参数缺失")
+    @ApiModelProperty(value = "锰")
+    private String elementMn;
+
+    @NotNull(message = "elementP参数缺失")
+    @ApiModelProperty(value = "磷")
+    private String elementP;
+
+    @NotNull(message = "elementS参数缺失")
+    @ApiModelProperty(value = "硫")
+    private String elementS;
+
+    @NotNull(message = "elementTi参数缺失")
+    @ApiModelProperty(value = "钛")
+    private String elementTi;
+
+}

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

@@ -0,0 +1,72 @@
+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 TL2DataSearchValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "锅炉编号")
+    private Long boilerId;
+
+    @ApiModelProperty(value = "铁口区域编号")
+    private Long tapholeId;
+
+    @ApiModelProperty(value = "出铁次数编号")
+    private String ironNo;
+
+    @ApiModelProperty(value = "出铁时间")
+    private String ironCosttime;
+
+    @ApiModelProperty(value = "实际出铁量")
+    private String ironWeight;
+
+    @ApiModelProperty(value = "实际渣量")
+    private String slagWeight;
+
+    @ApiModelProperty(value = "铁水平均温度")
+    private String avgTemp;
+
+    @ApiModelProperty(value = "泥炮量")
+    private String mudWeight;
+
+    @ApiModelProperty(value = "钻杆直径")
+    private String pollMm;
+
+    @ApiModelProperty(value = "开口深度")
+    private String openDepth;
+
+    @ApiModelProperty(value = "上料总干量")
+    private String totalDry;
+
+    @ApiModelProperty(value = "开始时间")
+    private String ironStarttime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String ironEndtime;
+
+    @ApiModelProperty(value = "碳")
+    private String elementC;
+
+    @ApiModelProperty(value = "硅")
+    private String elementSi;
+
+    @ApiModelProperty(value = "锰")
+    private String elementMn;
+
+    @ApiModelProperty(value = "磷")
+    private String elementP;
+
+    @ApiModelProperty(value = "硫")
+    private String elementS;
+
+    @ApiModelProperty(value = "钛")
+    private String elementTi;
+
+}

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

@@ -0,0 +1,101 @@
+package com.sckj.iron.validate;
+
+import com.sckj.common.validator.annotation.IDMust;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import javax.validation.constraints.*;
+
+
+/**
+ * 出铁数据参数
+ * @author LikeAdmin
+ */
+@Data
+@ApiModel("出铁数据更新参数")
+public class TL2DataUpdateValidate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @IDMust(message = "id参数必传且需大于0")
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    @NotNull(message = "boilerId参数缺失")
+    @ApiModelProperty(value = "锅炉编号")
+    private Long boilerId;
+
+    @NotNull(message = "tapholeId参数缺失")
+    @ApiModelProperty(value = "铁口区域编号")
+    private Long tapholeId;
+
+    @NotNull(message = "ironNo参数缺失")
+    @ApiModelProperty(value = "出铁次数编号")
+    private String ironNo;
+
+    @NotNull(message = "ironCosttime参数缺失")
+    @ApiModelProperty(value = "出铁时间")
+    private String ironCosttime;
+
+    @NotNull(message = "ironWeight参数缺失")
+    @ApiModelProperty(value = "实际出铁量")
+    private String ironWeight;
+
+    @NotNull(message = "slagWeight参数缺失")
+    @ApiModelProperty(value = "实际渣量")
+    private String slagWeight;
+
+    @NotNull(message = "avgTemp参数缺失")
+    @ApiModelProperty(value = "铁水平均温度")
+    private String avgTemp;
+
+    @NotNull(message = "mudWeight参数缺失")
+    @ApiModelProperty(value = "泥炮量")
+    private String mudWeight;
+
+    @NotNull(message = "pollMm参数缺失")
+    @ApiModelProperty(value = "钻杆直径")
+    private String pollMm;
+
+    @NotNull(message = "openDepth参数缺失")
+    @ApiModelProperty(value = "开口深度")
+    private String openDepth;
+
+    @NotNull(message = "totalDry参数缺失")
+    @ApiModelProperty(value = "上料总干量")
+    private String totalDry;
+
+    @NotNull(message = "ironStarttime参数缺失")
+    @ApiModelProperty(value = "开始时间")
+    private String ironStarttime;
+
+    @NotNull(message = "ironEndtime参数缺失")
+    @ApiModelProperty(value = "结束时间")
+    private String ironEndtime;
+
+    @NotNull(message = "elementC参数缺失")
+    @ApiModelProperty(value = "碳")
+    private String elementC;
+
+    @NotNull(message = "elementSi参数缺失")
+    @ApiModelProperty(value = "硅")
+    private String elementSi;
+
+    @NotNull(message = "elementMn参数缺失")
+    @ApiModelProperty(value = "锰")
+    private String elementMn;
+
+    @NotNull(message = "elementP参数缺失")
+    @ApiModelProperty(value = "磷")
+    private String elementP;
+
+    @NotNull(message = "elementS参数缺失")
+    @ApiModelProperty(value = "硫")
+    private String elementS;
+
+    @NotNull(message = "elementTi参数缺失")
+    @ApiModelProperty(value = "钛")
+    private String elementTi;
+
+}

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

@@ -0,0 +1,77 @@
+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;
+
+@Data
+@ApiModel("出铁数据详情Vo")
+public class TL2DataDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    @ApiModelProperty(value = "锅炉编号")
+    private Long boilerId;
+
+    @ApiModelProperty(value = "铁口区域编号")
+    private Long tapholeId;
+
+    @ApiModelProperty(value = "出铁次数编号")
+    private String ironNo;
+
+    @ApiModelProperty(value = "出铁时间")
+    private String ironCosttime;
+
+    @ApiModelProperty(value = "实际出铁量")
+    private String ironWeight;
+
+    @ApiModelProperty(value = "实际渣量")
+    private String slagWeight;
+
+    @ApiModelProperty(value = "铁水平均温度")
+    private String avgTemp;
+
+    @ApiModelProperty(value = "泥炮量")
+    private String mudWeight;
+
+    @ApiModelProperty(value = "钻杆直径")
+    private String pollMm;
+
+    @ApiModelProperty(value = "开口深度")
+    private String openDepth;
+
+    @ApiModelProperty(value = "上料总干量")
+    private String totalDry;
+
+    @ApiModelProperty(value = "开始时间")
+    private String ironStarttime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String ironEndtime;
+
+    @ApiModelProperty(value = "碳")
+    private String elementC;
+
+    @ApiModelProperty(value = "硅")
+    private String elementSi;
+
+    @ApiModelProperty(value = "锰")
+    private String elementMn;
+
+    @ApiModelProperty(value = "磷")
+    private String elementP;
+
+    @ApiModelProperty(value = "硫")
+    private String elementS;
+
+    @ApiModelProperty(value = "钛")
+    private String elementTi;
+
+
+}

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

@@ -0,0 +1,80 @@
+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;
+
+@Data
+@ApiModel("出铁数据列表Vo")
+public class TL2DataListedVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    @ApiModelProperty(value = "锅炉编号")
+    private Long boilerId;
+
+    @ApiModelProperty(value = "铁口区域编号")
+    private Long tapholeId;
+
+    @ApiModelProperty(value = "出铁次数编号")
+    private String ironNo;
+
+    @ApiModelProperty(value = "出铁时间")
+    private String ironCosttime;
+
+    @ApiModelProperty(value = "实际出铁量")
+    private String ironWeight;
+
+    @ApiModelProperty(value = "实际渣量")
+    private String slagWeight;
+
+    @ApiModelProperty(value = "铁水平均温度")
+    private String avgTemp;
+
+    @ApiModelProperty(value = "泥炮量")
+    private String mudWeight;
+
+    @ApiModelProperty(value = "钻杆直径")
+    private String pollMm;
+
+    @ApiModelProperty(value = "开口深度")
+    private String openDepth;
+
+    @ApiModelProperty(value = "上料总干量")
+    private String totalDry;
+
+    @ApiModelProperty(value = "开始时间")
+    private String ironStarttime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String ironEndtime;
+
+    @ApiModelProperty(value = "碳")
+    private String elementC;
+
+    @ApiModelProperty(value = "硅")
+    private String elementSi;
+
+    @ApiModelProperty(value = "锰")
+    private String elementMn;
+
+    @ApiModelProperty(value = "磷")
+    private String elementP;
+
+    @ApiModelProperty(value = "硫")
+    private String elementS;
+
+    @ApiModelProperty(value = "钛")
+    private String elementTi;
+
+
+}

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

@@ -76,7 +76,7 @@ public class TExceptionLogController {
     public ResponseEntity<byte[]> exportTExceptionLog(@Validated TExceptionLogSearchValidate searchValidate) {
         ByteArrayOutputStream outputStream = iTExceptionLogService.exportTExceptionLog(searchValidate);
         byte[] content = outputStream.toByteArray();
-
+        System.out.println("导出的字节长度：" + content.length);
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Disposition", "attachment; filename=ExceptionLog.xlsx");
         headers.add("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

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

@@ -42,6 +42,9 @@ public class TAudio implements Serializable {
     @ApiModelProperty(value = "危害程度")
     private String exceptionLevel;
 
+    @ApiModelProperty(value = "时长")
+    private String duration;
+
     @ApiModelProperty(value = "音频地址;存放音频路径文件")
     private String path;
 
@@ -50,4 +53,4 @@ public class TAudio implements Serializable {
 
     @ApiModelProperty(value = "删除标志（1删除 0未删）")
     private String delFlag;
-}
+}

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

@@ -36,8 +36,8 @@ public class TExceptionLog implements Serializable {
     @ApiModelProperty(value = "异常类型（开口耗时、出铁时间、出铁量、流速、铁水温度变化）")
     private Integer exceptionType;
 
-//    @ApiModelProperty(value = "异常区域（铁口区域，目前只有1号铁口区域）")
-//    private String exceptionArea;
+    @ApiModelProperty(value = "异常区域（铁口区域，目前只有1号铁口区域）")
+    private String exceptionArea;
 
     @ApiModelProperty(value = "危害程度(轻微、中等、重度)")
     private String exceptionLevel;
@@ -50,5 +50,4 @@ public class TExceptionLog implements Serializable {
 
     @ApiModelProperty(value = "铁口区域编号")
     private Integer tapholeId;
-
-}
+}

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

@@ -35,7 +35,7 @@ import java.util.*;
  */
 @Service
 public class TAudioServiceImpl implements ITAudioService {
-        
+
     @Resource
     TAudioMapper tAudioMapper;
 
@@ -118,6 +118,7 @@ public class TAudioServiceImpl implements ITAudioService {
         model.setCreateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
         model.setName(createValidate.getName());
         model.setPath(createValidate.getPath());
+        model.setDuration(createValidate.getDuration());
         model.setExceptionType(createValidate.getExceptionType());
         model.setExceptionLevel(createValidate.getExceptionLevel());
         //默认新增的音频初始状态为停用
@@ -145,6 +146,7 @@ public class TAudioServiceImpl implements ITAudioService {
         model.setUpdateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
         model.setName(updateValidate.getName());
         model.setPath(updateValidate.getPath());
+        model.setDuration(updateValidate.getDuration());
         model.setExceptionType(updateValidate.getExceptionType());
         model.setExceptionLevel(updateValidate.getExceptionLevel());
         tAudioMapper.updateById(model);

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

@@ -37,7 +37,7 @@ import java.util.List;
  */
 @Service
 public class TExceptionLogServiceImpl implements ITExceptionLogService {
-        
+
     @Resource
     TExceptionLogMapper tExceptionLogMapper;
 
@@ -119,11 +119,9 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
         model.setCreateTime(new Date(System.currentTimeMillis()));//gg
         model.setUpdateTime(new Date(System.currentTimeMillis()));//gg
         model.setExceptionType(createValidate.getExceptionType());
-       // model.setExceptionArea(createValidate.getExceptionArea());
         model.setExceptionLevel(createValidate.getExceptionLevel());
         model.setReportedStatus(createValidate.getReportedStatus());
         model.setBoilerId(createValidate.getBoilerId());
-        model.setTapholeId(createValidate.getTapholeId());
         tExceptionLogMapper.insert(model);
     }
 
@@ -196,7 +194,7 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
             TExceptionLog tExceptionLog = tExceptionLogList.get(i);
             row.createCell(0).setCellValue(tExceptionLog.getBoilerId());
             row.createCell(1).setCellValue(tExceptionLog.getExceptionType());
-            row.createCell(2).setCellValue(tExceptionLog.getTapholeId());
+            row.createCell(2).setCellValue(tExceptionLog.getExceptionArea());
             row.createCell(3).setCellValue(tExceptionLog.getExceptionLevel());
             row.createCell(4).setCellValue(tExceptionLog.getReportedStatus().equals("0") ? "未上报" : "已上报");
             row.createCell(5).setCellValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tExceptionLog.getCreateTime()));

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

@@ -30,4 +30,6 @@ public class TAudioCreateValidate implements Serializable {
     @ApiModelProperty(value = "音频地址;存放音频路径文件")
     private String path;
 
+    @ApiModelProperty(value = "时长")
+    private String duration;
 }

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

@@ -42,4 +42,6 @@ public class TAudioUpdateValidate implements Serializable {
     @ApiModelProperty(value = "状态（1正常 0停用）")
     private String status;
 
+    @ApiModelProperty(value = "时长")
+    private String duration;
 }

taphole-warn/src/main/java/com/sckj/warn/vo/TAudioDetailVo.java

@@ -32,5 +32,6 @@ public class TAudioDetailVo implements Serializable {
     @ApiModelProperty(value = "状态（1正常 0停用）")
     private String status;
 
-
+    @ApiModelProperty(value = "时长")
+    private String duration;
 }

taphole-warn/src/main/java/com/sckj/warn/vo/TAudioListedVo.java

@@ -44,5 +44,6 @@ public class TAudioListedVo implements Serializable {
     @ApiModelProperty(value = "状态（1正常 0停用）")
     private String status;
 
-
+    @ApiModelProperty(value = "时长")
+    private String duration;
 }

taphole-warn/src/main/java/com/sckj/warn/vo/TExceptionLogDetailVo.java

@@ -28,5 +28,8 @@ public class TExceptionLogDetailVo implements Serializable {
     private String reportedStatus;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Integer glId;
+    private Integer boilerId;
+
+    @ApiModelProperty(value = "铁口区域编号")
+    private Integer tapholeId;
 }