diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 9917a82..3a8b4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -99,7 +99,6 @@ List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); - page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 9917a82..3a8b4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -99,7 +99,6 @@ List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); - page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ef1a9a9..513f833 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, as INSTALLDATE diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 9917a82..3a8b4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -99,7 +99,6 @@ List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); - page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ef1a9a9..513f833 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, as INSTALLDATE diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index fcd5953..e944557 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -21,6 +21,10 @@ @Length(max = 15, min = 12) @Excel(name = "井编号", orderNum = "7") private String wellCode; + + @Excel(name = "井名称", orderNum = "8") + private String wellName; + /** * 设备编号 */ @@ -47,8 +51,11 @@ private String deptid; @Excel(name = "使用单位", orderNum = "5") private String deptName; - @Excel(name = "安装时间", orderNum = "8") + @Excel(name = "安装时间", orderNum = "9") private String installDate; + @Excel(name = "安装年份", orderNum = "10") + private String installYear; + @Excel(name = "设备位置", orderNum = "4") private String position; private Long concenId; @@ -81,8 +88,15 @@ /** * 设备厂商 */ + @Excel(name = "设备厂商", orderNum = "11") private String manufacture; + /** + * 电池电量 + */ + @Excel(name = "电池电量", orderNum = "12") + private String cell; + @Override protected Serializable pkVal() { return null; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 9917a82..3a8b4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -99,7 +99,6 @@ List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); - page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ef1a9a9..513f833 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, as INSTALLDATE diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index fcd5953..e944557 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -21,6 +21,10 @@ @Length(max = 15, min = 12) @Excel(name = "井编号", orderNum = "7") private String wellCode; + + @Excel(name = "井名称", orderNum = "8") + private String wellName; + /** * 设备编号 */ @@ -47,8 +51,11 @@ private String deptid; @Excel(name = "使用单位", orderNum = "5") private String deptName; - @Excel(name = "安装时间", orderNum = "8") + @Excel(name = "安装时间", orderNum = "9") private String installDate; + @Excel(name = "安装年份", orderNum = "10") + private String installYear; + @Excel(name = "设备位置", orderNum = "4") private String position; private Long concenId; @@ -81,8 +88,15 @@ /** * 设备厂商 */ + @Excel(name = "设备厂商", orderNum = "11") private String manufacture; + /** + * 电池电量 + */ + @Excel(name = "电池电量", orderNum = "12") + private String cell; + @Override protected Serializable pkVal() { return null; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 149e7ab..915abe2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -223,6 +223,7 @@ deviceDto.setCompanyName(companyName); deviceDto.setCompanyId(dept.getPid()); } + deviceDto.setInstallYear(deviceDto.getInstallDate().substring(0, 4)); }); return list; }