From e018bf658d65fe1555f857b14980fa775c4faffa Mon Sep 17 00:00:00 2001 From: chenlw <874313221@qq.com> Date: Thu, 22 Sep 2016 19:43:04 +0800 Subject: [PATCH] =?UTF-8?q?volumeType=EF=BC=8C=E5=86=B7=E7=83=AD=E5=8C=BA?= =?UTF-8?q?=E7=9A=84=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/dao/mapper/data-details-mapper.xml | 9 +++-- .../controller/DataModelController.java | 3 +- src/com/platform/entities/DataInfoEntity.java | 32 +++++++++++++++++ src/com/platform/entities/PagerOptions.java | 34 ++++++++++++++++++- .../platform/service/DataInfoServiceImp.java | 5 +++ .../service/impl/MoveDataServiceImpl.java | 6 ++++ 6 files changed, 85 insertions(+), 4 deletions(-) diff --git a/src/com/dao/mapper/data-details-mapper.xml b/src/com/dao/mapper/data-details-mapper.xml index 71df0de5..8aa8b58f 100644 --- a/src/com/dao/mapper/data-details-mapper.xml +++ b/src/com/dao/mapper/data-details-mapper.xml @@ -44,11 +44,16 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" jdbcType="VARCHAR" /> + AND data_details.data_type=#{dataType} + + AND data_details.mark=#{mark} + AND data_details.submitted_batch=#{submittedBatch} @@ -80,7 +85,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" SELECT - id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path + id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path,mark FROM data_details ORDER BY data_details.id diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index edd37db6..b5c5cf25 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -93,7 +93,8 @@ public class DataModelController extends BaseController { .append("}").toString()); PagerOptions pagerOptions = (PagerOptions) UtilsHelper .newObjAndSetAttrsByClass(PagerOptions.class, params); - + //冷热区查询字段mark + pagerOptions.setMark(String.valueOf(pagerOptions.getVolumeType())); return dfs.getPagerTableData(pagerOptions); } diff --git a/src/com/platform/entities/DataInfoEntity.java b/src/com/platform/entities/DataInfoEntity.java index 062db3ce..e74dee30 100644 --- a/src/com/platform/entities/DataInfoEntity.java +++ b/src/com/platform/entities/DataInfoEntity.java @@ -35,6 +35,10 @@ public class DataInfoEntity { /** volume的path */ private String volumePath; + private int volumeType; + + private String mark; + public DataInfoEntity() { } @@ -251,6 +255,34 @@ public class DataInfoEntity { this.volumePath = volumePath; } + /** + * @return the volumeType + */ + public int getVolumeType() { + return volumeType; + } + + /** + * @param volumeType the volumeType to set + */ + public void setVolumeType(int volumeType) { + this.volumeType = volumeType; + } + + /** + * @return the mark + */ + public String getMark() { + return mark; + } + + /** + * @param mark the mark to set + */ + public void setMark(String mark) { + this.mark = mark; + } + @Override public String toString() { return "id=" + this.id + " ,regionalismCode=" + this.regionalismCode diff --git a/src/com/platform/entities/PagerOptions.java b/src/com/platform/entities/PagerOptions.java index 10f5f1fb..55955db7 100644 --- a/src/com/platform/entities/PagerOptions.java +++ b/src/com/platform/entities/PagerOptions.java @@ -27,9 +27,13 @@ public class PagerOptions { private Integer priorTableSize; //前一次操作一页显示的数据条数 private String keyQuery; - + //模糊查询字段 private String[] array; + private int volumeType; + //冷热区字段 + private String mark; + public Integer getCurrentPageNum() { return currentPageNum; } @@ -153,5 +157,33 @@ public class PagerOptions { public void setArray(String[] array) { this.array = array; } + + /** + * @return the volumeType + */ + public int getVolumeType() { + return volumeType; + } + + /** + * @param volumeType the volumeType to set + */ + public void setVolumeType(int volumeType) { + this.volumeType = volumeType; + } + + /** + * @return the mark + */ + public String getMark() { + return mark; + } + + /** + * @param mark the mark to set + */ + public void setMark(String mark) { + this.mark = mark; + } } diff --git a/src/com/platform/service/DataInfoServiceImp.java b/src/com/platform/service/DataInfoServiceImp.java index 95f79c0f..47db7781 100644 --- a/src/com/platform/service/DataInfoServiceImp.java +++ b/src/com/platform/service/DataInfoServiceImp.java @@ -46,6 +46,11 @@ public class DataInfoServiceImp implements DataInfoService { pagerOptions.setOffset(offset + 1); List result = dfdDao .getLimitedDataInfoEntities(pagerOptions); + if (null != result) { + for (DataInfoEntity dataInfoEntity : result) { + dataInfoEntity.setVolumeType(Integer.valueOf(dataInfoEntity.getMark())); + } + } modelMap.addAttribute("data", result); modelMap.addAttribute("length", count); } catch (Exception e) { diff --git a/src/com/platform/service/impl/MoveDataServiceImpl.java b/src/com/platform/service/impl/MoveDataServiceImpl.java index 163d86b3..7adb04dd 100644 --- a/src/com/platform/service/impl/MoveDataServiceImpl.java +++ b/src/com/platform/service/impl/MoveDataServiceImpl.java @@ -57,6 +57,12 @@ public class MoveDataServiceImpl implements IMoveDataService { public boolean moveData(List data, FolderNode node) throws Exception { boolean isSuccess = false; + if (null ==node.getName() ||"".equals(node.getName())) { + return false; + } + if (null ==node.getPath() ||"".equals(node.getPath())) { + return false; + } String tailPath = ""; if (null != data) { // XXX/320198_16/1,or XXX/320122KFQ_15/1 ---> /320198_16/1, or