日志变量描述新增unit单位
This commit is contained in:
parent
4cdf63fa44
commit
205945d5d8
@ -46,4 +46,6 @@ public class SysFaultRecordingDesc {
|
|||||||
@TableField("updated_time")
|
@TableField("updated_time")
|
||||||
private Date updatedTime;
|
private Date updatedTime;
|
||||||
|
|
||||||
|
@TableField("unit")
|
||||||
|
private String unit;
|
||||||
}
|
}
|
||||||
|
@ -20,4 +20,9 @@ public class SysFaultRecordingExcel implements Serializable {
|
|||||||
@ExcelProperty(value = "中文描述",index = 1)
|
@ExcelProperty(value = "中文描述",index = 1)
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单位
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "单位",index = 2)
|
||||||
|
private String unit;
|
||||||
}
|
}
|
||||||
|
@ -101,6 +101,7 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
|
|||||||
SheetInfoBean sheetDTO = new SheetInfoBean();
|
SheetInfoBean sheetDTO = new SheetInfoBean();
|
||||||
map.put("variable", "英文名称");
|
map.put("variable", "英文名称");
|
||||||
map.put("description", "中文描述");
|
map.put("description", "中文描述");
|
||||||
|
map.put("unit","单位");
|
||||||
sheetDTO.setSheetName(theoreticalPowerCurve.getMadeinfactory());
|
sheetDTO.setSheetName(theoreticalPowerCurve.getMadeinfactory());
|
||||||
sheetDTO.setFieldAndAlias(map);
|
sheetDTO.setFieldAndAlias(map);
|
||||||
sheetDTO.setCollection(sysFaultRecordingDescList);
|
sheetDTO.setCollection(sysFaultRecordingDescList);
|
||||||
|
@ -20,4 +20,9 @@ public class SysRunLogExcel implements Serializable {
|
|||||||
@ExcelProperty(value = "中文描述",index = 1)
|
@ExcelProperty(value = "中文描述",index = 1)
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单位
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "单位",index = 2)
|
||||||
|
private String unit;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.das.modules.plc.domain;
|
package com.das.modules.plc.domain;
|
||||||
|
|
||||||
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
@ -46,4 +47,9 @@ public class SysRunLogDesc {
|
|||||||
@TableField("updated_time")
|
@TableField("updated_time")
|
||||||
private Date updatedTime;
|
private Date updatedTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单位
|
||||||
|
*/
|
||||||
|
@TableField("unit")
|
||||||
|
private String unit;
|
||||||
}
|
}
|
||||||
|
@ -122,6 +122,7 @@ public class PlcLogsServiceImpl implements PlcLogService {
|
|||||||
SheetInfoBean sheetDTO = new SheetInfoBean();
|
SheetInfoBean sheetDTO = new SheetInfoBean();
|
||||||
map.put("variable", "英文名称");
|
map.put("variable", "英文名称");
|
||||||
map.put("description", "中文描述");
|
map.put("description", "中文描述");
|
||||||
|
map.put("unit","单位");
|
||||||
sheetDTO.setSheetName(theoreticalPowerCurve.getMadeinfactory());
|
sheetDTO.setSheetName(theoreticalPowerCurve.getMadeinfactory());
|
||||||
sheetDTO.setFieldAndAlias(map);
|
sheetDTO.setFieldAndAlias(map);
|
||||||
sheetDTO.setCollection(sysFaultRecordingDescList);
|
sheetDTO.setCollection(sysFaultRecordingDescList);
|
||||||
|
Loading…
Reference in New Issue
Block a user