diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index b5c5cf25..528aa89a 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -94,7 +94,7 @@ public class DataModelController extends BaseController { PagerOptions pagerOptions = (PagerOptions) UtilsHelper .newObjAndSetAttrsByClass(PagerOptions.class, params); //冷热区查询字段mark - pagerOptions.setMark(String.valueOf(pagerOptions.getVolumeType())); + pagerOptions.setMark(pagerOptions.getVolumeType()); return dfs.getPagerTableData(pagerOptions); } diff --git a/src/com/platform/entities/DataInfoEntity.java b/src/com/platform/entities/DataInfoEntity.java index e74dee30..45a64a36 100644 --- a/src/com/platform/entities/DataInfoEntity.java +++ b/src/com/platform/entities/DataInfoEntity.java @@ -35,7 +35,7 @@ public class DataInfoEntity { /** volume的path */ private String volumePath; - private int volumeType; + private String volumeType; private String mark; @@ -258,14 +258,14 @@ public class DataInfoEntity { /** * @return the volumeType */ - public int getVolumeType() { + public String getVolumeType() { return volumeType; } /** * @param volumeType the volumeType to set */ - public void setVolumeType(int volumeType) { + public void setVolumeType(String volumeType) { this.volumeType = volumeType; } diff --git a/src/com/platform/entities/PagerOptions.java b/src/com/platform/entities/PagerOptions.java index 55955db7..39a68d35 100644 --- a/src/com/platform/entities/PagerOptions.java +++ b/src/com/platform/entities/PagerOptions.java @@ -30,7 +30,7 @@ public class PagerOptions { //模糊查询字段 private String[] array; - private int volumeType; + private String volumeType; //冷热区字段 private String mark; @@ -161,14 +161,14 @@ public class PagerOptions { /** * @return the volumeType */ - public int getVolumeType() { + public String getVolumeType() { return volumeType; } /** * @param volumeType the volumeType to set */ - public void setVolumeType(int volumeType) { + public void setVolumeType(String volumeType) { this.volumeType = volumeType; } diff --git a/src/com/platform/service/DataInfoServiceImp.java b/src/com/platform/service/DataInfoServiceImp.java index 47db7781..4baf7db0 100644 --- a/src/com/platform/service/DataInfoServiceImp.java +++ b/src/com/platform/service/DataInfoServiceImp.java @@ -48,7 +48,7 @@ public class DataInfoServiceImp implements DataInfoService { .getLimitedDataInfoEntities(pagerOptions); if (null != result) { for (DataInfoEntity dataInfoEntity : result) { - dataInfoEntity.setVolumeType(Integer.valueOf(dataInfoEntity.getMark())); + dataInfoEntity.setVolumeType(dataInfoEntity.getMark()); } } modelMap.addAttribute("data", result);