1.统一boilerId、tapholeId为字符类型

2.修改模型管理创建时间类型

taphole-admin/src/main/java/com/sckj/admin/controller/UploadController.java

@@ -162,5 +162,37 @@ public class UploadController {
         vo.setId(id);
         return AjaxResult.success(vo);
     }
+    @Log(title = "上传模型", requestType = RequestType.File)
+    @PostMapping("/model")
+    @ApiOperation(value="上传模型")
+    public AjaxResult<Object> uploadModel(HttpServletRequest request) {
+        MultipartFile multipartFile;
+        try {
+            multipartFile = ((MultipartRequest) request).getFile("file");
+        } catch (Exception e) {
+            throw new OperateException("请正确选择上传模型文件!");
+        }
+
+        if (multipartFile == null) {
+            throw new OperateException("请选择上传模型!");
+        }
+
+        StorageDriver storageDriver = new StorageDriver();
+        UploadFilesVo vo = storageDriver.upload(multipartFile, "model", AlbumEnum.Model.getCode());
+        String cid = StringUtils.isNotEmpty(request.getParameter("cid")) ? request.getParameter("cid") : "0";
+
+        Map<String, String> album = new LinkedHashMap<>();
+        album.put("cid", cid);
+        album.put("aid", String.valueOf(TapholeAdminThreadLocal.getAdminId()));
+        album.put("type", String.valueOf(AlbumEnum.Model.getCode()));
+        album.put("ext", vo.getExt());
+        album.put("size", vo.getSize().toString());
+        album.put("url", vo.getUrl());
+        album.put("name", vo.getName());
+        Integer id = iAlbumsService.albumAdd(album);
+
+        vo.setId(id);
+        return AjaxResult.success(vo);
+    }
 
 }

taphole-common/src/main/java/com/sckj/common/enums/AlbumEnum.java

@@ -8,7 +8,8 @@ public enum AlbumEnum {
     IMAGE(10, "图片"),
     Video(20, "视频"),
     Audio(30, "音频"),
-    Certificate(40, "证书");
+    Certificate(40, "证书"),
+    Model(40, "模型文件");
 
     /**
      * 构造方法

taphole-common/src/main/java/com/sckj/common/plugin/storage/StorageDriver.java

@@ -80,8 +80,8 @@ public class StorageDriver {
         vo.setName(multipartFile.getOriginalFilename());
         vo.setSize(multipartFile.getSize());
         vo.setExt(origFileExt.toLowerCase());
-        vo.setUrl(newFileName);
-        vo.setPath(UrlUtils.toAbsoluteUrl(newFileName));
+        vo.setUrl(UrlUtils.toAbsoluteUrl(newFileName));
+        vo.setPath(newFileName);
         return vo;
     }
 

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

@@ -2,14 +2,10 @@ package com.sckj.iron.controller;
 
 
 import com.sckj.common.aop.Log;
-import com.sckj.common.aop.NotLogin;
 import com.sckj.common.aop.NotPower;
 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.entity.TIronStep;
 import com.sckj.iron.service.impl.TIronStepServiceImpl;
 import com.sckj.iron.validate.TIronStepCreateValidate;
 import com.sckj.iron.validate.TIronStepSearchValidate;
@@ -23,6 +19,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 @RestController
 @RequestMapping("api/step")
@@ -33,7 +31,7 @@ public class TIronStepController {
     TIronStepServiceImpl iTIronStepService;
 
     @GetMapping("/list")
-    @ApiOperation(value="出铁步骤配置列表")
+    @ApiOperation(value = "出铁步骤配置列表")
     public AjaxResult<PageResult<TIronStepListedVo>> list(@Validated PageValidate pageValidate,
                                                           @Validated TIronStepSearchValidate searchValidate) {
         PageResult<TIronStepListedVo> list = iTIronStepService.list(pageValidate, searchValidate);
@@ -41,7 +39,7 @@ public class TIronStepController {
     }
 
     @GetMapping("/detail")
-    @ApiOperation(value="出铁步骤配置详情")
+    @ApiOperation(value = "出铁步骤配置详情")
     public AjaxResult<TIronStepDetailVo> detail(String stepId) {
         TIronStepDetailVo detail = iTIronStepService.detail(stepId);
         return AjaxResult.success(detail);
@@ -49,7 +47,7 @@ public class TIronStepController {
 
     @Log(title = "出铁步骤配置新增")
     @PostMapping("/add")
-    @ApiOperation(value="出铁步骤配置新增")
+    @ApiOperation(value = "出铁步骤配置新增")
     public AjaxResult<Object> add(@Validated @RequestBody TIronStepCreateValidate createValidate) {
         iTIronStepService.add(createValidate);
         return AjaxResult.success();
@@ -57,7 +55,7 @@ public class TIronStepController {
 
     @Log(title = "出铁步骤配置编辑")
     @PostMapping("/edit")
-    @ApiOperation(value="出铁步骤配置编辑")
+    @ApiOperation(value = "出铁步骤配置编辑")
     public AjaxResult<Object> edit(@Validated @RequestBody TIronStepUpdateValidate updateValidate) {
         iTIronStepService.edit(updateValidate);
         return AjaxResult.success();
@@ -65,9 +63,9 @@ public class TIronStepController {
 
     @Log(title = "出铁步骤配置删除")
     @PostMapping("/del")
-    @ApiOperation(value="出铁步骤配置删除")
-    public AjaxResult<Object> del(@RequestBody String stepId) {
-        iTIronStepService.del(stepId);
+    @ApiOperation(value = "出铁步骤配置删除")
+    public AjaxResult<Object> del(@RequestBody Map<String, String> requestParam) {
+        iTIronStepService.del(requestParam.getOrDefault("stepId", ""));
         return AjaxResult.success();
     }
 
@@ -79,7 +77,6 @@ public class TIronStepController {
     }
 
 
-
     @NotPower
     @GetMapping("/refreshTreeSteps")
     @ApiOperation(value = "刷新步骤")
@@ -95,6 +92,7 @@ public class TIronStepController {
         iTIronStepService.refreshParams();
         return AjaxResult.success(LocalDateTime.now());
     }
+
     @NotPower
     @GetMapping("/refreshModals")
     @ApiOperation(value = "刷新模型")
@@ -112,5 +110,4 @@ public class TIronStepController {
     }
 
 
-
 }

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

@@ -38,12 +38,12 @@ public class TIronData implements Serializable {
 
     @ApiModelProperty(value = "锅炉编号")
     @ExcelIgnore
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
     @ExcelProperty("铁口区域编号")
     @ColumnWidth(25)
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "出铁次数编号")
     @ExcelProperty("出铁次数编号")

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

@@ -18,7 +18,7 @@ public class TIronModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;
+    private String createTime;
 
     @ApiModelProperty(value = "创建人")
     private String createBy;
@@ -27,17 +27,17 @@ public class TIronModel implements Serializable {
     private String updateBy;
 
     @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
+    private String updateTime;
 
     @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     private Long id;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "参数名称")
     private String modelName;

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

@@ -35,10 +35,10 @@ public class TIronParam implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "参数类型")
     private String paramType;

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

@@ -56,11 +56,11 @@ public class TIronStepLog  implements Serializable {
 
     @ApiModelProperty(value = "锅炉编号")
     @ExcelIgnore
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
     @ExcelProperty("铁口区域编号")
     @ColumnWidth(25)
-    private Long tapholeId;
+    private String tapholeId;
 
 }

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

@@ -13,6 +13,7 @@ import com.sckj.iron.validate.TIronModelSearchValidate;
 import com.sckj.iron.validate.TIronModelUpdateValidate;
 import com.sckj.iron.vo.TIronModelDetailVo;
 import com.sckj.iron.vo.TIronModelListedVo;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
@@ -51,7 +52,7 @@ public class TIronModelServiceImpl extends ServiceImpl<TIronModelMapper, TIronMo
         tIronModelMapper.setSearch(queryWrapper, searchValidate, new String[]{
                 "like:modelName@model_name:str",
                 "=:modelExpression@model_expression:str",
-                "=:modelDesc@model_desc:str",
+                "like:modelDesc@model_desc:str",
                 "=:modelPath@model_path:str",
                 "=:status:str",
                 "=:sort:int",
@@ -106,6 +107,10 @@ public class TIronModelServiceImpl extends ServiceImpl<TIronModelMapper, TIronMo
         model.setModelDesc(createValidate.getModelDesc());
         model.setStatus(createValidate.getStatus());
         model.setSort(createValidate.getSort());
+        model.setModelPath(createValidate.getModelPath());
+        if(ObjectUtils.isNotEmpty(createValidate.getModelPath())){
+
+        }
         tIronModelMapper.insert(model);
     }
 

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

@@ -262,7 +262,7 @@ public class TIronStepServiceImpl extends ServiceImpl<TIronStepMapper, TIronStep
 
         Assert.notNull(model, "数据不存在!");
 
-        tIronStepMapper.delete(new QueryWrapper<TIronStep>().eq("identifier", id));
+        tIronStepMapper.delete(new QueryWrapper<TIronStep>().eq("step_id", id));
     }
 
 }

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

@@ -16,10 +16,10 @@ public class TIronDataSearchScreenValidate implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "出铁次数编号")
     private String ironNo;

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

@@ -14,10 +14,10 @@ public class TIronDataSearchValidate implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "出铁次数编号")
     private String ironNo;

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

@@ -38,9 +38,9 @@ public class TIronModelSearchValidate implements Serializable {
     private String updateBy;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
 }

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

@@ -15,11 +15,11 @@ public class TL2DataCreateValidate implements Serializable {
 
     @NotNull(message = "boilerId参数缺失")
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @NotNull(message = "tapholeId参数缺失")
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @NotNull(message = "ironNo参数缺失")
     @ApiModelProperty(value = "出铁次数编号")

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

@@ -13,10 +13,10 @@ public class TL2DataSearchValidate implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "出铁次数编号")
     private String ironNo;

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

@@ -24,11 +24,11 @@ public class TL2DataUpdateValidate implements Serializable {
 
     @NotNull(message = "boilerId参数缺失")
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @NotNull(message = "tapholeId参数缺失")
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @NotNull(message = "ironNo参数缺失")
     @ApiModelProperty(value = "出铁次数编号")

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

@@ -18,10 +18,10 @@ public class TIronDataDetailVo implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "出铁次数编号")
     private String ironNo;

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

@@ -18,10 +18,10 @@ public class TIronDataListedVo implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "出铁次数编号")
     private String ironNo;

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

@@ -15,7 +15,7 @@ public class TIronModelDetailVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "模型ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "模型名称")
     private String modelName;
@@ -42,10 +42,10 @@ public class TIronModelDetailVo implements Serializable {
     private String updateBy;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
 
 }

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

@@ -15,7 +15,7 @@ public class TIronModelListedVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "模型ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "模型名称")
     private String modelName;
@@ -48,10 +48,10 @@ public class TIronModelListedVo implements Serializable {
     private String updateTime;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
 
 }

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

@@ -23,10 +23,10 @@ public class TIronParamDetailVo implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "参数类型")
     private String paramType;

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

@@ -23,10 +23,10 @@ public class TIronParamListedVo implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "参数类型")
     private String paramType;

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

@@ -17,10 +17,10 @@ public class TL2DataDetailVo implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "出铁次数编号")
     private String ironNo;

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

@@ -20,10 +20,10 @@ public class TL2DataListedVo implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "出铁次数编号")
     private String ironNo;

taphole-l2/src/main/java/com/sckj/l2/dto/L2Material.java

@@ -23,10 +23,10 @@ public class L2Material implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "L1发过来的charge号")
     private String chargeNo;

taphole-l2/src/main/java/com/sckj/l2/entity/TL2Data.java

@@ -37,11 +37,11 @@ public class TL2Data implements Serializable {
 
     @ApiModelProperty(value = "锅炉编号")
     @ExcelIgnore
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
     @ExcelIgnore
-    private Long tapholeId;
+    private String tapholeId;
 
     @TableId(value = "id", type = IdType.INPUT)
     @ApiModelProperty(value = "出铁次数编号")

taphole-l2/src/main/java/com/sckj/l2/entity/TL2Material.java

@@ -35,10 +35,10 @@ public class TL2Material implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "出铁次数编号")
     private Long ironNo;
@@ -66,8 +66,8 @@ public class TL2Material implements Serializable {
 
 
     public void toDataStream(DataOutputStream dos) throws Exception {
-        dos.writeLong(tapholeId);
-        dos.writeLong(boilerId);
+        dos.writeUTF(tapholeId);
+        dos.writeUTF(boilerId);
         dos.writeUTF(chargeNo);
         dos.writeUTF(downTime);
         dos.writeUTF(dryWeight);
@@ -79,8 +79,8 @@ public class TL2Material implements Serializable {
 
     public static TL2Material fromDataStream(DataInputStream dis) throws Exception {
         TL2Material data = new TL2Material();
-        data.tapholeId = dis.readLong();
-        data.boilerId = dis.readLong();
+        data.tapholeId = dis.readUTF();
+        data.boilerId = dis.readUTF();
         data.chargeNo = dis.readUTF();
         data.downTime = dis.readUTF();
         data.dryWeight = dis.readUTF();

taphole-opc/src/main/java/com/sckj/opc/entity/OPCPoint.java

@@ -44,7 +44,7 @@ public class OPCPoint {
     private String opcProtocol;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "备注")
     private String remark;

taphole-opc/src/main/java/com/sckj/opc/entity/OPCServer.java

@@ -57,7 +57,7 @@ public class OPCServer {
     private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
+    private String tapholeId;
 
     @ApiModelProperty(value = "备注")
     private String remark;

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

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

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

@@ -27,7 +27,7 @@ public class TAudioCreateValidate implements Serializable {
     private String exceptionLevel;
 
     @NotNull(message = "path参数缺失")
-    @ApiModelProperty(value = "音频地址;存放音频路径文件")
+    @ApiModelProperty(value = "音频路径")
     private String path;
 
     @ApiModelProperty(value = "时长")

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

@@ -22,7 +22,7 @@ public class TAudioSearchValidate implements Serializable {
     @ApiModelProperty(value = "危害程度")
     private String exceptionLevel;
 
-    @ApiModelProperty(value = "音频地址;存放音频路径文件")
+    @ApiModelProperty(value = "音频路径")
     private String path;
 
     @ApiModelProperty(value = "状态（1正常 0停用）")

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

@@ -35,11 +35,11 @@ public class TAudioUpdateValidate implements Serializable {
     private String exceptionLevel;
 
     @NotNull(message = "path参数缺失")
-    @ApiModelProperty(value = "音频地址;存放音频路径文件")
+    @ApiModelProperty(value = "音频路径")
     private String path;
 
     @NotNull(message = "status参数缺失")
-    @ApiModelProperty(value = "状态（1正常 0停用）")
+    @ApiModelProperty(value = "状态")
     private String status;
 
     @ApiModelProperty(value = "时长")

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

@@ -39,11 +39,11 @@ public class TExceptionLogCreateValidate implements Serializable {
 
     @NotNull(message = "boilerId参数缺失")
     @ApiModelProperty(value = "锅炉编号")
-    private Integer boilerId;
+    private String boilerId;
 
 
     @NotNull(message = "boilerId参数缺失")
     @ApiModelProperty(value = "铁口区域编号")
-    private Integer tapholeId;
+    private String tapholeId;
 
 }

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

@@ -26,10 +26,10 @@ public class TAudioDetailVo implements Serializable {
     @ApiModelProperty(value = "危害程度")
     private String exceptionLevel;
 
-    @ApiModelProperty(value = "音频地址;存放音频路径文件")
+    @ApiModelProperty(value = "音频路径")
     private String path;
 
-    @ApiModelProperty(value = "状态（1正常 0停用）")
+    @ApiModelProperty(value = "状态")
     private String status;
 
     @ApiModelProperty(value = "时长")

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

@@ -38,10 +38,10 @@ public class TAudioListedVo implements Serializable {
     @ApiModelProperty(value = "危害程度")
     private String exceptionLevel;
 
-    @ApiModelProperty(value = "音频地址;存放音频路径文件")
+    @ApiModelProperty(value = "音频路径")
     private String path;
 
-    @ApiModelProperty(value = "状态（1正常 0停用）")
+    @ApiModelProperty(value = "状态")
     private String status;
 
     @ApiModelProperty(value = "时长")

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

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

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

@@ -31,10 +31,13 @@ public class TExceptionLogListedVo implements Serializable {
     private String reportedStatus;
 
     @ApiModelProperty(value = "锅炉编号")
-    private Integer boilerId;
+    private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    private Integer tapholeId;
+    private String tapholeId;
+
+    @ApiModelProperty(value = "异常描述")
+    private String exceptionDesc;
 
 
 }